Merge branch 'main' into develop

rzeldent · Mar 10, 2024 · c61e6cd · c61e6cd
2 parents 80a23aa + a60fbc7
commit c61e6cd
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 14 deletions.
diff --git a/boards/esp32cam_espressif_esp32s2_cam_board.json b/boards/esp32cam_espressif_esp32s2_cam_board.json
@@ -33,7 +33,6 @@
       "'-D CAMERA_CONFIG_FB_COUNT=2'",
       "'-D CAMERA_CONFIG_FB_LOCATION=CAMERA_FB_IN_PSRAM'",
       "'-D SCCB_I2C_PORT=I2C_NUM_0'"
-    ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",

diff --git a/boards/esp32cam_espressif_esp32s3_cam_lcd.json b/boards/esp32cam_espressif_esp32s3_cam_lcd.json
@@ -69,4 +69,4 @@
   },
   "url": "https://www.espressif.com/en/news/Maple_Eye_ESP32-S3",
   "vendor": "Espressif"
-}
+}
diff --git a/boards/esp32cam_espressif_esp32s3_eye.json b/boards/esp32cam_espressif_esp32s3_eye.json
@@ -73,4 +73,4 @@
   },
   "url": "https://www.espressif.com/en/products/devkits/esp-eye/overview",
   "vendor": "Espressif"
-}
+}
diff --git a/boards/esp32cam_espressif_esp_eye.json b/boards/esp32cam_espressif_esp_eye.json
@@ -63,4 +63,4 @@
   },
   "url": "https://www.espressif.com/en/products/devkits/esp-eye/overview",
   "vendor": "Espressif"
-}
+}
diff --git a/boards/esp32cam_freenove_wrover_kit.json b/boards/esp32cam_freenove_wrover_kit.json
@@ -63,4 +63,4 @@
   },
   "url": "https://www.aliexpress.com/item/1005004960637276.html",
   "vendor": "Freenove"
-}
+}
diff --git a/boards/esp32cam_m5stack_camera.json b/boards/esp32cam_m5stack_camera.json
@@ -61,4 +61,4 @@
   },
   "url": "https://docs.m5stack.com/en/unit/m5camera",
   "vendor": "M5STACK"
-}
+}
diff --git a/boards/esp32cam_m5stack_camera_psram.json b/boards/esp32cam_m5stack_camera_psram.json
@@ -63,4 +63,4 @@
   },
   "url": "https://docs.m5stack.com/en/unit/m5camera",
   "vendor": "M5STACK"
-}
+}
diff --git a/boards/esp32cam_m5stack_esp32cam.json b/boards/esp32cam_m5stack_esp32cam.json
@@ -66,4 +66,4 @@
   },
   "url": "https://docs.m5stack.com/en/unit/esp32cam",
   "vendor": "M5STACK"
-}
+}
diff --git a/boards/esp32cam_m5stack_unitcam.json b/boards/esp32cam_m5stack_unitcam.json
@@ -61,4 +61,4 @@
   },
   "url": "https://docs.m5stack.com/en/unit/unit_cam",
   "vendor": "M5STACK"
-}
+}
diff --git a/boards/esp32cam_m5stack_unitcams3.json b/boards/esp32cam_m5stack_unitcams3.json
@@ -81,4 +81,4 @@
   },
   "url": "https://docs.m5stack.com/en/unit/Unit-CamS3",
   "vendor": "M5STACK"
-}
+}
diff --git a/boards/esp32cam_m5stack_wide.json b/boards/esp32cam_m5stack_wide.json
@@ -61,4 +61,4 @@
   },
   "url": "https://shop.m5stack.com/collections/m5-cameras",
   "vendor": "M5STACK"
-}
+}
diff --git a/boards/esp32cam_seeed_xiao_esp32s3_sense.json b/boards/esp32cam_seeed_xiao_esp32s3_sense.json
@@ -81,4 +81,4 @@
   },
   "url": "https://www.seeedstudio.com/XIAO-ESP32S3-p-5627.html",
   "vendor": "Seeed Studio"
-}
+}
diff --git a/platformio.ini b/platformio.ini
@@ -10,7 +10,7 @@
 
 ###############################################################################
 [platformio]
-default_envs = esp32cam_ai_thinker
+#default_envs = esp32cam_ai_thinker
 #default_envs = esp32cam_espressif_esp_eye
 #default_envs = esp32cam_espressif_esp32s2_cam_board
 #default_envs = esp32cam_espressif_esp32s2_cam_header

diff --git a/src/main.cpp b/src/main.cpp
@@ -219,7 +219,6 @@ esp_err_t initialize_camera()
   log_i("JPEG quality: %d", param_jpg_quality.value());
   auto jpeg_quality = param_jpg_quality.value();
   log_i("Frame duration: %d ms", param_frame_duration.value());
-
   camera_config_t camera_config = {
     .pin_pwdn = CAMERA_CONFIG_PIN_PWDN,         // GPIO pin for camera power down line
     .pin_reset = CAMERA_CONFIG_PIN_RESET,       // GPIO pin for camera reset line
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,4 +69,4 @@ @@
       },
       "url": "https://www.espressif.com/en/news/Maple_Eye_ESP32-S3",
       "vendor": "Espressif"
-    }
+    }