Merge branch 'main' into develop

This commit is contained in:
Rene
2024-03-10 11:10:09 +01:00
committed by GitHub
14 changed files with 12 additions and 14 deletions

View File

@@ -33,7 +33,6 @@
"'-D CAMERA_CONFIG_FB_COUNT=2'", "'-D CAMERA_CONFIG_FB_COUNT=2'",
"'-D CAMERA_CONFIG_FB_LOCATION=CAMERA_FB_IN_PSRAM'", "'-D CAMERA_CONFIG_FB_LOCATION=CAMERA_FB_IN_PSRAM'",
"'-D SCCB_I2C_PORT=I2C_NUM_0'" "'-D SCCB_I2C_PORT=I2C_NUM_0'"
],
"f_cpu": "240000000L", "f_cpu": "240000000L",
"f_flash": "80000000L", "f_flash": "80000000L",
"flash_mode": "qio", "flash_mode": "qio",

View File

@@ -10,7 +10,7 @@
############################################################################### ###############################################################################
[platformio] [platformio]
default_envs = esp32cam_ai_thinker #default_envs = esp32cam_ai_thinker
#default_envs = esp32cam_espressif_esp_eye #default_envs = esp32cam_espressif_esp_eye
#default_envs = esp32cam_espressif_esp32s2_cam_board #default_envs = esp32cam_espressif_esp32s2_cam_board
#default_envs = esp32cam_espressif_esp32s2_cam_header #default_envs = esp32cam_espressif_esp32s2_cam_header

View File

@@ -219,7 +219,6 @@ esp_err_t initialize_camera()
log_i("JPEG quality: %d", param_jpg_quality.value()); log_i("JPEG quality: %d", param_jpg_quality.value());
auto jpeg_quality = param_jpg_quality.value(); auto jpeg_quality = param_jpg_quality.value();
log_i("Frame duration: %d ms", param_frame_duration.value()); log_i("Frame duration: %d ms", param_frame_duration.value());
camera_config_t camera_config = { camera_config_t camera_config = {
.pin_pwdn = CAMERA_CONFIG_PIN_PWDN, // GPIO pin for camera power down line .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 .pin_reset = CAMERA_CONFIG_PIN_RESET, // GPIO pin for camera reset line