Merge pull request espressif#88 from jjsch-dev/master

me-no-dev · web-flow · commit dfff30876e3e · 2020-10-14T01:50:21.000+03:00
adding a OV7670 driver.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,6 +9,7 @@ if(IDF_TARGET STREQUAL "esp32")
     sensors/ov3660.c
     sensors/ov5640.c
     sensors/ov7725.c
+    sensors/ov7670.c
     conversions/yuv.c
     conversions/to_jpg.cpp
     conversions/to_bmp.c
diff --git a/Kconfig b/Kconfig
@@ -7,6 +7,13 @@ config OV2640_SUPPORT
 		Enable this option if you want to use the OV2640.
 		Disable this option to save memory.
 
+config OV7670_SUPPORT
+	bool "OV7670 Support"
+	default y
+	help
+		Enable this option if you want to use the OV7670.
+		Disable this option to safe memory.
+
 config OV7725_SUPPORT
 	bool "OV7725 Support"
 	default n
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## General Information
 
-This repository hosts ESP32 compatible driver for OV2640, OV3660, OV5640 and OV7725 image sensors. Additionally it provides a few tools, which allow converting the captured frame data to the more common BMP and JPEG formats.
+This repository hosts ESP32 compatible driver for OV2640, OV3660, OV5640, OV7670 and OV7725 image sensors. Additionally it provides a few tools, which allow converting the captured frame data to the more common BMP and JPEG formats.
 
 ## Important to Remember
 
diff --git a/conversions/to_bmp.c b/conversions/to_bmp.c
@@ -20,6 +20,17 @@
 #include "sdkconfig.h"
 #include "esp_jpg_decode.h"
 
+#include "esp_system.h"
+#if ESP_IDF_VERSION_MAJOR >= 4 // IDF 4+
+#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
+#include "esp32/spiram.h"
+#else 
+#error Target CONFIG_IDF_TARGET is not supported
+#endif
+#else // ESP32 Before IDF 4.0
+#include "esp_spiram.h"
+#endif
+
 #if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
 #include "esp32-hal-log.h"
 #define TAG ""
diff --git a/driver/camera.c b/driver/camera.c
@@ -48,6 +48,9 @@
 #if CONFIG_OV5640_SUPPORT
 #include "ov5640.h"
 #endif
+#if CONFIG_OV7670_SUPPORT
+#include "ov7670.h"
+#endif
 
 typedef enum {
     CAMERA_NONE = 0,
@@ -56,6 +59,7 @@ typedef enum {
     CAMERA_OV2640 = 2640,
     CAMERA_OV3660 = 3660,
     CAMERA_OV5640 = 5640,
+    CAMERA_OV7670 = 7670,
 } camera_model_t;
 
 #define REG_PID        0x0A
@@ -1060,6 +1064,12 @@ esp_err_t camera_probe(const camera_config_t* config, camera_model_t* out_camera
         *out_camera_model = CAMERA_OV5640;
         ov5640_init(&s_state->sensor);
         break;
+#endif
+#if CONFIG_OV7670_SUPPORT
+    case OV7670_PID:
+        *out_camera_model = CAMERA_OV7670;
+        ov7670_init(&s_state->sensor);
+        break;
 #endif
     default:
         id->PID = 0;
@@ -1116,6 +1126,13 @@ esp_err_t camera_init(const camera_config_t* config)
                 frame_size = FRAMESIZE_QSXGA;
             }
             break;
+#endif
+#if CONFIG_OV7670_SUPPORT
+        case OV7670_PID:
+            if (frame_size > FRAMESIZE_VGA) {
+                frame_size = FRAMESIZE_VGA;
+            }
+            break;
 #endif
         default:
             return ESP_ERR_CAMERA_NOT_SUPPORTED;
@@ -1147,20 +1164,28 @@ esp_err_t camera_init(const camera_config_t* config)
         }
         s_state->fb_bytes_per_pixel = 1;       // frame buffer stores Y8
     } else if (pix_format == PIXFORMAT_YUV422 || pix_format == PIXFORMAT_RGB565) {
-        s_state->fb_size = s_state->width * s_state->height * 2;
-        if (is_hs_mode() && s_state->sensor.id.PID != OV7725_PID) {
-            s_state->sampling_mode = SM_0A00_0B00;
-            s_state->dma_filter = &dma_filter_yuyv_highspeed;
-        } else {
-            s_state->sampling_mode = SM_0A0B_0C0D;
-            s_state->dma_filter = &dma_filter_yuyv;
-        }
-        s_state->in_bytes_per_pixel = 2;       // camera sends YU/YV
-        s_state->fb_bytes_per_pixel = 2;       // frame buffer stores YU/YV/RGB565
+            s_state->fb_size = s_state->width * s_state->height * 2;
+            if (is_hs_mode() && s_state->sensor.id.PID != OV7725_PID) {
+                if(s_state->sensor.id.PID == OV7670_PID) {
+                    s_state->sampling_mode = SM_0A0B_0B0C;
+                }else{
+                    s_state->sampling_mode = SM_0A00_0B00;
+                }
+                s_state->dma_filter = &dma_filter_yuyv_highspeed;
+            } else {
+                s_state->sampling_mode = SM_0A0B_0C0D;
+                s_state->dma_filter = &dma_filter_yuyv;
+            }
+            s_state->in_bytes_per_pixel = 2;       // camera sends YU/YV
+            s_state->fb_bytes_per_pixel = 2;       // frame buffer stores YU/YV/RGB565
     } else if (pix_format == PIXFORMAT_RGB888) {
         s_state->fb_size = s_state->width * s_state->height * 3;
         if (is_hs_mode()) {
-            s_state->sampling_mode = SM_0A00_0B00;
+            if(s_state->sensor.id.PID == OV7670_PID) {
+                s_state->sampling_mode = SM_0A0B_0B0C;
+            }else{
+                s_state->sampling_mode = SM_0A00_0B00;
+            }
             s_state->dma_filter = &dma_filter_rgb888_highspeed;
         } else {
             s_state->sampling_mode = SM_0A0B_0C0D;
@@ -1324,6 +1349,8 @@ esp_err_t esp_camera_init(const camera_config_t* config)
         ESP_LOGI(TAG, "Detected OV3660 camera");
     } else if (camera_model == CAMERA_OV5640) {
         ESP_LOGI(TAG, "Detected OV5640 camera");
+    } else if (camera_model == CAMERA_OV7670) {
+        ESP_LOGI(TAG, "Detected OV7670 camera");
     } else {
         ESP_LOGI(TAG, "Camera not supported");
         err = ESP_ERR_CAMERA_NOT_SUPPORTED;
diff --git a/driver/include/sensor.h b/driver/include/sensor.h
@@ -16,6 +16,7 @@
 #define OV2640_PID     (0x26)
 #define OV3660_PID     (0x36)
 #define OV5640_PID     (0x56)
+#define OV7670_PID     (0x76)
 
 typedef enum {
     PIXFORMAT_RGB565,    // 2BPP/RGB565
diff --git a/library.json b/library.json
@@ -2,7 +2,7 @@
   "name": "esp32-camera",
   "version": "1.0.0",
   "keywords": "esp32, camera, espressif, esp32-cam",
-  "description": "ESP32 compatible driver for OV2640, OV3660, OV5640 and OV7725 image sensors.",
+  "description": "ESP32 compatible driver for OV2640, OV3660, OV5640, OV7670 and OV7725 image sensors.",
   "repository": {
     "type": "git",
     "url": "https://github.com/espressif/esp32-camera"
diff --git a/sensors/ov7670.c b/sensors/ov7670.c
diff --git a/sensors/private_include/ov7670.h b/sensors/private_include/ov7670.h
diff --git a/sensors/private_include/ov7670_regs.h b/sensors/private_include/ov7670_regs.h
