Merge branch 'feature/isp_dvp_example_v5.4' into 'release/v5.4'

feat(dvp_isp_dsi_example): add new option to connect a DVP camera sensor (ov2640) through ISP_DVP (v5.4)

See merge request espressif/esp-idf!35973

Author: suda-morris

components/esp_driver_cam/isp_dvp/src/esp_cam_ctlr_isp_dvp.c

@@ -495,28 +495,28 @@ static esp_err_t s_isp_io_init(isp_dvp_controller_t *dvp_ctlr, const esp_cam_ctl
         .pull_up_en = true,
     };
 
-    if (ctlr_config->pclk_io) {
+    if (ctlr_config->pclk_io >= 0) {
         gpio_conf.pin_bit_mask = 1ULL << ctlr_config->pclk_io;
         ESP_RETURN_ON_ERROR(gpio_config(&gpio_conf), TAG, "failed to configure pclk gpio");
         ESP_LOGD(TAG, "pclk_io: %d, dvp_pclk_sig: %"PRId32, ctlr_config->pclk_io, isp_hw_info.dvp_ctlr[dvp_ctlr->id].dvp_pclk_sig);
         esp_rom_gpio_connect_in_signal(ctlr_config->pclk_io, isp_hw_info.dvp_ctlr[dvp_ctlr->id].dvp_pclk_sig, false);
     }
 
-    if (ctlr_config->hsync_io) {
+    if (ctlr_config->hsync_io >= 0) {
         gpio_conf.pin_bit_mask = 1ULL << ctlr_config->hsync_io;
         ESP_RETURN_ON_ERROR(gpio_config(&gpio_conf), TAG, "failed to configure hsync gpio");
         ESP_LOGD(TAG, "hsync_io: %d, dvp_hsync_sig: %"PRId32, ctlr_config->hsync_io, isp_hw_info.dvp_ctlr[dvp_ctlr->id].dvp_hsync_sig);
         esp_rom_gpio_connect_in_signal(ctlr_config->hsync_io, isp_hw_info.dvp_ctlr[dvp_ctlr->id].dvp_hsync_sig, false);
     }
 
-    if (ctlr_config->vsync_io) {
+    if (ctlr_config->vsync_io >= 0) {
         gpio_conf.pin_bit_mask = 1ULL << ctlr_config->vsync_io;
         ESP_RETURN_ON_ERROR(gpio_config(&gpio_conf), TAG, "failed to configure vsync gpio");
         ESP_LOGD(TAG, "vsync_io: %d, dvp_vsync_sig: %"PRId32, ctlr_config->vsync_io, isp_hw_info.dvp_ctlr[dvp_ctlr->id].dvp_vsync_sig);
         esp_rom_gpio_connect_in_signal(ctlr_config->vsync_io, isp_hw_info.dvp_ctlr[dvp_ctlr->id].dvp_vsync_sig, false);
     }
 
-    if (ctlr_config->de_io) {
+    if (ctlr_config->de_io >= 0) {
         gpio_conf.pin_bit_mask = 1ULL << ctlr_config->de_io;
         ESP_RETURN_ON_ERROR(gpio_config(&gpio_conf), TAG, "failed to configure de gpio");
         ESP_LOGD(TAG, "de_io: %d, dvp_de_sig: %"PRId32, ctlr_config->de_io, isp_hw_info.dvp_ctlr[dvp_ctlr->id].dvp_de_sig);

components/esp_driver_isp/src/isp_core.c

@@ -145,6 +145,10 @@ esp_err_t esp_isp_new_processor(const esp_isp_processor_cfg_t *proc_config, isp_
         isp_ll_yuv_set_range(proc->hal.hw, proc_config->yuv_range);
     }
 
+    if (out_color_format.color_space == COLOR_SPACE_RGB && proc_config->input_data_source == ISP_INPUT_DATA_SOURCE_DVP) {
+        isp_ll_color_enable(proc->hal.hw, true); // workaround for DIG-474
+    }
+
     proc->in_color_format = in_color_format;
     proc->out_color_format = out_color_format;
     proc->h_res = proc_config->h_res;

components/esp_driver_isp/src/isp_demosaic.c

@@ -59,7 +59,10 @@ esp_err_t esp_isp_demosaic_disable(isp_proc_handle_t proc)
     ESP_RETURN_ON_FALSE(proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
     ESP_RETURN_ON_FALSE(proc->demosaic_fsm == ISP_FSM_ENABLE, ESP_ERR_INVALID_STATE, TAG, "demosaic isn't enabled yet");
 
-    isp_ll_demosaic_enable(proc->hal.hw, false);
+    if (proc->out_color_format.color_space == (uint32_t)COLOR_SPACE_RAW) {
+        // for other out_color_format, demosaic module is needed for rgb interpolation algorithm
+        isp_ll_demosaic_enable(proc->hal.hw, false);
+    }
     proc->demosaic_fsm = ISP_FSM_INIT;
 
     return ESP_OK;

docs/en/api-reference/peripherals/camera_driver.rst

@@ -212,7 +212,8 @@ This allows the interrupt to run while the cache is disabled, but comes at the c
 Application Examples
 --------------------
 
-* :example:`peripherals/camera/camera_dsi` demonstrates how to use the ``esp_driver_cam`` component to capture signals from a camera sensor and display it on an ILI9881C LCD screen via a DSI interface.
+* :example:`peripherals/camera/mipi_isp_dsi` demonstrates how to use the ``esp_driver_cam`` component to capture signals from a MIPI CSI camera sensor via the ISP module and display it on a LCD screen via a DSI interface.
+* :example:`peripherals/camera/dvp_isp_dsi` demonstrates how to use the ``esp_driver_cam`` component to capture signals from a DVP camera sensor via the ISP module and display it on a LCD screen via a DSI interface.
 
 API Reference
 -------------

docs/en/api-reference/peripherals/isp.rst

@@ -589,6 +589,10 @@ After calling :cpp:func:`esp_isp_color_configure`, you need to enable the ISP co
 
 Calling :cpp:func:`esp_isp_color_disable` does the opposite, that is, put the driver back to the **init** state.
 
+.. note::
+
+    When the ISP DVP peripheral is used with the output color format set to the RGB color space, :ref:`isp-color` is automatically enabled in the camera driver to ensure correct data output. The function :cpp:func:`esp_isp_color_disable` should never be called in this case, otherwise it may result in disarrayed camera data.
+
 .. _isp-ccm-config:
 
 Configure CCM

docs/zh_CN/api-reference/peripherals/camera_driver.rst

@@ -212,7 +212,8 @@ IRAM 安全
 应用示例
 --------
 
-* :example:`peripherals/camera/camera_dsi` 演示了如何使用 ``esp_driver_cam`` 组件从摄像头传感器捕获信号，并通过 DSI 接口将其显示在 ILI9881C LCD 屏幕上。
+* :example:`peripherals/camera/mipi_isp_dsi` 演示了如何使用 ``esp_driver_cam`` 组件从 MIPI CSI 摄像头传感器捕获信号，传入 ISP 模块，并通过 DSI 接口将其显示在 LCD 屏幕上。
+* :example:`peripherals/camera/dvp_isp_dsi` 演示了如何使用 ``esp_driver_cam`` 组件从 DVP 摄像头传感器捕获信号，传入 ISP 模块，并通过 DSI 接口将其显示在 LCD 屏幕上。
 
 API 参考
 --------

examples/peripherals/.build-test-rules.yml

@@ -32,7 +32,14 @@ examples/peripherals/analog_comparator:
     - esp_driver_gpio
     - esp_driver_ana_cmpr
 
-examples/peripherals/camera/camera_dsi:
+examples/peripherals/camera/dvp_isp_dsi:
+  disable:
+    - if: SOC_ISP_DVP_SUPPORTED != 1 or SOC_MIPI_DSI_SUPPORTED != 1
+  depends_components:
+    - esp_lcd
+    - esp_driver_cam
+
+examples/peripherals/camera/mipi_isp_dsi:
   disable:
     - if: SOC_MIPI_CSI_SUPPORTED != 1 or SOC_MIPI_DSI_SUPPORTED != 1
   depends_components:

examples/peripherals/camera/camera_dsi/components/sensor_init/include/example_sensor_init.h

@@ -1,3 +1,4 @@
 idf_component_register(SRCS "example_sensor_init.c"
                        INCLUDE_DIRS "include"
+                       REQUIRES esp_cam_sensor
                        )

examples/peripherals/camera/camera_dsi/main/idf_component.yml

@@ -13,36 +13,32 @@
 #include "driver/i2c_master.h"
 #include "esp_sccb_intf.h"
 #include "esp_sccb_i2c.h"
-#include "esp_cam_sensor.h"
 #include "esp_cam_sensor_detect.h"
 #include "example_sensor_init.h"
 #include "example_sensor_init_config.h"
 
 static const char *TAG = "sensor_init";
 
-void example_sensor_init(int i2c_port, i2c_master_bus_handle_t *out_i2c_bus_handle)
+void example_sensor_init(example_sensor_config_t *sensor_config, i2c_master_bus_handle_t *out_i2c_bus_handle)
 {
     esp_err_t ret = ESP_FAIL;
 
     //---------------I2C Init------------------//
     i2c_master_bus_config_t i2c_bus_conf = {
         .clk_source = I2C_CLK_SRC_DEFAULT,
-        .sda_io_num = EXAMPLE_CAM_SCCB_SDA_IO,
-        .scl_io_num = EXAMPLE_CAM_SCCB_SCL_IO,
-        .i2c_port = i2c_port,
+        .sda_io_num = sensor_config->i2c_sda_io_num,
+        .scl_io_num = sensor_config->i2c_scl_io_num,
+        .i2c_port = sensor_config->i2c_port_num,
         .flags.enable_internal_pullup = true,
     };
     i2c_master_bus_handle_t i2c_bus_handle = NULL;
     ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_conf, &i2c_bus_handle));
 
     //---------------SCCB Init------------------//
-    esp_sccb_io_handle_t sccb_io_handle = NULL;
     esp_cam_sensor_config_t cam_config = {
-        .sccb_handle = sccb_io_handle,
         .reset_pin = -1,
         .pwdn_pin = -1,
         .xclk_pin = -1,
-        .sensor_port = ESP_CAM_SENSOR_MIPI_CSI,
     };
 
     esp_cam_sensor_device_t *cam = NULL;
@@ -54,9 +50,11 @@ void example_sensor_init(int i2c_port, i2c_master_bus_handle_t *out_i2c_bus_hand
         };
         ESP_ERROR_CHECK(sccb_new_i2c_io(i2c_bus_handle, &i2c_config, &cam_config.sccb_handle));
 
+        cam_config.sensor_port = p->port;
+
         cam = (*(p->detect))(&cam_config);
         if (cam) {
-            if (p->port != ESP_CAM_SENSOR_MIPI_CSI) {
+            if (p->port != sensor_config->port) {
                 ESP_LOGE(TAG, "detect a camera sensor with mismatched interface");
                 return;
             }
@@ -79,8 +77,8 @@ void example_sensor_init(int i2c_port, i2c_master_bus_handle_t *out_i2c_bus_hand
 
     esp_cam_sensor_format_t *cam_cur_fmt = NULL;
     for (int i = 0; i < cam_fmt_array.count; i++) {
-        if (!strcmp(parray[i].name, EXAMPLE_CAM_FORMAT)) {
-            cam_cur_fmt = (esp_cam_sensor_format_t *) & (parray[i].name);
+        if (!strcmp(parray[i].name, sensor_config->format_name)) {
+            cam_cur_fmt = (esp_cam_sensor_format_t *) & (parray[i]);
         }
     }
 

examples/peripherals/camera/camera_dsi/components/dsi_init/CMakeLists.txt renamed to examples/peripherals/camera/common_components/dsi_init/CMakeLists.txt

@@ -1,4 +1,4 @@
 dependencies:
-  espressif/esp_cam_sensor: "^0.5.1"
+  espressif/esp_cam_sensor: "^0.6.1"
   idf:
     version: ">=5.3.0"

examples/peripherals/camera/camera_dsi/components/dsi_init/Kconfig.projbuild renamed to examples/peripherals/camera/common_components/dsi_init/Kconfig.projbuild

@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include "driver/i2c_master.h"
+#include "esp_cam_sensor.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Configuration of SCCB interface and sensor
+ */
+typedef struct {
+    int i2c_port_num;               /* SCCB: i2c port */
+    int i2c_sda_io_num;             /* SCCB: i2c SDA IO number */
+    int i2c_scl_io_num;             /* SCCB: i2c SCL IO number */
+    esp_cam_sensor_port_t port;     /* Sensor: interface of the camera sensor */
+    const char *format_name;        /* Sensor: format to be set for the camera sensor */
+} example_sensor_config_t;
+
+/**
+ * @brief SCCB Interface and Sensor Init
+ *
+ * @param[in]  sensor_config         Camera sensor configuration
+ * @param[out] out_i2c_bus_handle    I2C bus handle
+ */
+void example_sensor_init(example_sensor_config_t *sensor_config, i2c_master_bus_handle_t *out_i2c_bus_handle);
+
+#ifdef __cplusplus
+}
+#endif

examples/peripherals/camera/camera_dsi/components/dsi_init/example_dsi_init.c renamed to examples/peripherals/camera/common_components/dsi_init/example_dsi_init.c

@@ -10,9 +10,7 @@
 extern "C" {
 #endif
 
-#define EXAMPLE_RGB565_BITS_PER_PIXEL           16
-#define EXAMPLE_MIPI_IDI_CLOCK_RATE             (50000000)
-#define EXAMPLE_MIPI_CSI_LANE_BITRATE_MBPS      200 //line_rate = pclk * 4
+#define EXAMPLE_CAM_SCCB_FREQ                   (100000)
 
 #ifdef __cplusplus
 }

examples/peripherals/camera/camera_dsi/components/dsi_init/idf_component.yml renamed to examples/peripherals/camera/common_components/dsi_init/idf_component.yml

@@ -0,0 +1,8 @@
+# The following lines of boilerplate have to be in your project's CMakeLists
+# in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.16)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
+idf_build_set_property(MINIMAL_BUILD ON)
+project(dvp_isp_dsi)