MrUnknownDE/OpenIris-ESPIDF
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/OpenIris-ESPIDF.git synced 2026-04-30 19:43:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for ov3660

Browse Source
This commit is contained in:
MrUnknownDE
2026-02-28 20:27:02 +01:00
parent 6971464fbd
commit 2109dacd42
1 changed files with 62 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
components/CameraManager/CameraManager/CameraManager.cpp
View File

@@ -90,12 +90,20 @@ void CameraManager::setupCameraSensor()
ESP_LOGI(CAMERA_MANAGER_TAG, "Setting up camera sensor"); ESP_LOGI(CAMERA_MANAGER_TAG, "Setting up camera sensor");
camera_sensor = esp_camera_sensor_get(); camera_sensor = esp_camera_sensor_get();
// fixes corrupted jpegs, https://github.com/espressif/esp32-camera/issues/203
// The following hardcoded register hacks, manual exposure, and grayscale effects
// were specifically calibrated for the OV2640 for OpenIris' IR tracking.
// Applying them to other sensors like the OV3660 can result in completely pitch-black
// images (1KB empty frames) or ISP crashes.
if (camera_sensor->id.PID == OV2640_PID)
{
// fixes corrupted jpegs on OV2640, https://github.com/espressif/esp32-camera/issues/203
// documentation https://www.uctronics.com/download/cam_module/OV2640DS.pdf // documentation https://www.uctronics.com/download/cam_module/OV2640DS.pdf
camera_sensor->set_reg(camera_sensor, 0xff, 0xff, camera_sensor->set_reg(camera_sensor, 0xff, 0xff,
0x00); // banksel, here we're directly writing to the registers. 0x00); // banksel, here we're directly writing to the registers.
// 0xFF==0x00 is the first bank, there's also 0xFF==0x01 // 0xFF==0x00 is the first bank, there's also 0xFF==0x01
camera_sensor->set_reg(camera_sensor, 0xd3, 0xff, 5); // clock camera_sensor->set_reg(camera_sensor, 0xd3, 0xff, 5); // clock
camera_sensor->set_brightness(camera_sensor, 2); // -2 to 2 camera_sensor->set_brightness(camera_sensor, 2); // -2 to 2
camera_sensor->set_contrast(camera_sensor, 2); // -2 to 2 camera_sensor->set_contrast(camera_sensor, 2); // -2 to 2
camera_sensor->set_saturation(camera_sensor, -2); // -2 to 2 camera_sensor->set_saturation(camera_sensor, -2); // -2 to 2
@@ -140,8 +148,9 @@ void CameraManager::setupCameraSensor()
camera_sensor->set_special_effect(camera_sensor, camera_sensor->set_special_effect(camera_sensor,
2); // 0 to 6 (0 - No Effect, 1 - Negative, 2 - Grayscale, 3 - Red Tint, 2); // 0 to 6 (0 - No Effect, 1 - Negative, 2 - Grayscale, 3 - Red Tint,
// 4 - Green Tint, 5 - Blue Tint, 6 - Sepia) // 4 - Green Tint, 5 - Blue Tint, 6 - Sepia)
}
// it gets overriden somewhere somehow // Default framesize for OpenIris tracking
camera_sensor->set_framesize(camera_sensor, FRAMESIZE_240X240); camera_sensor->set_framesize(camera_sensor, FRAMESIZE_240X240);
ESP_LOGI(CAMERA_MANAGER_TAG, "Setting up camera sensor done"); ESP_LOGI(CAMERA_MANAGER_TAG, "Setting up camera sensor done");
} }
@@ -172,21 +181,29 @@ bool CameraManager::setupCamera()
return false; return false;
} }
#if CONFIG_GENERAL_INCLUDE_UVC_MODE
const auto temp_sensor = esp_camera_sensor_get(); const auto temp_sensor = esp_camera_sensor_get();
#if CONFIG_GENERAL_INCLUDE_UVC_MODE
// Thanks to lick_it, we discovered that OV5640 likes to overheat when // Thanks to lick_it, we discovered that OV5640 likes to overheat when
// running at higher than usual xclk frequencies. // running at higher than usual xclk frequencies.
// Hence, why we're limiting the faster ones for OV2640 // Hence, why we're limiting the faster ones for OV2640
if (const auto camera_id = temp_sensor->id.PID; camera_id == OV5640_PID) if (temp_sensor->id.PID == OV5640_PID)
{ {
config.xclk_freq_hz = OV5640_XCLK_FREQ_HZ; config.xclk_freq_hz = OV5640_XCLK_FREQ_HZ;
esp_camera_deinit(); esp_camera_deinit();
esp_camera_init(&config); esp_camera_init(&config);
} }
#endif #endif
// OV3660 requires 20MHz XCLK to generate proper JPEG streams in esp32-camera,
// otherwise the PLL settings result in broken/empty 1KB frames.
if (temp_sensor->id.PID == OV3660_PID)
{
config.xclk_freq_hz = 20000000;
esp_camera_deinit();
esp_camera_init(&config);
}
this->setupCameraSensor(); this->setupCameraSensor();
return true; return true;
} }