diff --git a/.vscode/settings.json b/.vscode/settings.json index 59886ab..0a9fe64 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { - "idf.portWin": "COM21", + "idf.portWin": "COM22", "idf.flashType": "UART" } \ No newline at end of file diff --git a/components/CameraManager/CameraManager/CameraManager.cpp b/components/CameraManager/CameraManager/CameraManager.cpp index 511a48d..0fcdadf 100644 --- a/components/CameraManager/CameraManager/CameraManager.cpp +++ b/components/CameraManager/CameraManager/CameraManager.cpp @@ -71,8 +71,7 @@ void CameraManager::setupCameraPinout() .pin_href = CONFIG_HREF_GPIO_NUM, // CAM_PIN_HREF, .pin_pclk = CONFIG_PCLK_GPIO_NUM, // CAM_PIN_PCLK, - // XCLK 20MHz or 10MHz for OV2640 double FPS (Experimental) - .xclk_freq_hz = xclk_freq_hz, // 20000000, + .xclk_freq_hz = xclk_freq_hz, // Set in config .ledc_timer = LEDC_TIMER_0, .ledc_channel = LEDC_CHANNEL_0, @@ -80,10 +79,10 @@ void CameraManager::setupCameraPinout() .pixel_format = PIXFORMAT_JPEG, // YUV422,GRAYSCALE,RGB565,JPEG .frame_size = FRAMESIZE_240X240, // QQVGA-UXGA, For ESP32, do not use sizes above QVGA when not JPEG. The performance of the ESP32-S series has improved a lot, but JPEG mode always gives better frame rates. - .jpeg_quality = 7, // 0-63, for OV series camera sensors, lower number means higher quality - .fb_count = 2, // 3 // When jpeg mode is used, if fb_count more than one, the driver will work in continuous mode. - .fb_location = CAMERA_FB_IN_PSRAM, // maybe it cannot put them fully in psram? - .grab_mode = CAMERA_GRAB_WHEN_EMPTY, // CAMERA_GRAB_LATEST + .jpeg_quality = 7, // 0-63, for OV series camera sensors, lower number means higher quality // Below 6 stability problems + .fb_count = 2, // When jpeg mode is used, if fb_count more than one, the driver will work in continuous mode. + .fb_location = CAMERA_FB_IN_DRAM, + .grab_mode = CAMERA_GRAB_WHEN_EMPTY, }; } @@ -95,7 +94,7 @@ void CameraManager::setupBasicResolution() ESP_LOGE(CAMERA_MANAGER_TAG, "PSRAM not initialized!"); ESP_LOGD(CAMERA_MANAGER_TAG, "Setting fb_location to CAMERA_FB_IN_DRAM with lower picture quality"); config.fb_location = CAMERA_FB_IN_DRAM; - config.jpeg_quality = 9; + config.jpeg_quality = 7; config.fb_count = 2; return; } diff --git a/sdkconfig b/sdkconfig index 4500264..a822a4f 100644 --- a/sdkconfig +++ b/sdkconfig @@ -580,7 +580,7 @@ CONFIG_LED_BLINK_GPIO=8 CONFIG_LED_EXTERNAL_GPIO=9 CONFIG_LED_EXTERNAL_CONTROL=y CONFIG_LED_EXTERNAL_PWM_FREQ=20000 -CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=100 +CONFIG_LED_EXTERNAL_PWM_DUTY_CYCLE=50 # end of OpenIris: LED Configuration #