feat: Fix ov5640 support implementation after beta cleanup

This commit is contained in:
Lorow 2024-06-11 23:22:40 +02:00
parent 1733a1ed38
commit 4894c22058
2 changed files with 27 additions and 18 deletions

View File

@ -16,7 +16,7 @@ void CameraHandler::setupCameraPinout() {
// 16500000 optimal freq on ESP32-CAM (default)
// 20000000 max freq on ESP32-CAM
// 24000000 optimal freq on ESP32-S3
int xclk_freq_hz = 16500000;
int xclk_freq_hz = DEFAULT_XCLK_FREQ_HZ;
#if CONFIG_CAMERA_MODULE_ESP_EYE
/* IO13, IO14 is designed for JTAG by default,
@ -35,20 +35,8 @@ void CameraHandler::setupCameraPinout() {
pinMode(14, INPUT_PULLUP);
log_i("CAM_BOARD");
#endif
#ifdef ETVR_EYE_TRACKER_USB_API
auto camera_id = camera_sensor->id.PID;
switch (camera_id)
{
// Thanks to lick_it, we discovered that OV5640 likes to overheat when
// running at higher than usual xclk frequencies.
// Hence why we're limit the faster ones for OV2640
case OV2640_PID:
xclk_freq_hz = 24000000;
break;
default:
break;
}
#if ETVR_EYE_TRACKER_USB_API
xclk_freq_hz = USB_DEFAULT_XCLK_FREQ_HZ;
#endif
config.ledc_channel = LEDC_CHANNEL_0;
@ -94,7 +82,7 @@ void CameraHandler::setupBasicResolution() {
void CameraHandler::setupCameraSensor() {
log_d("[Camera]: Setting up camera sensor");
camera_sensor = esp_camera_sensor_get();
// fixes corrupted jpegs, https://github.com/espressif/esp32-camera/issues/203
// documentation https://www.uctronics.com/download/cam_module/OV2640DS.pdf
@ -175,6 +163,23 @@ bool CameraHandler::setupCamera() {
return false;
}
#if ETVR_EYE_TRACKER_USB_API
auto temp_sensor = esp_camera_sensor_get();
auto camera_id = temp_sensor->id.PID;
switch (camera_id) {
// Thanks to lick_it, we discovered that OV5640 likes to overheat when
// running at higher than usual xclk frequencies.
// Hence why we're limit the faster ones for OV2640
case OV5640_PID:
config.xclk_freq_hz = OV5640_XCLK_FREQ_HZ;
esp_camera_deinit();
esp_camera_init(&config);
break;
default:
break;
}
#endif
this->setupCameraSensor();
return true;
}

View File

@ -1,10 +1,14 @@
#pragma once
#include <Arduino.h>
#include <esp_camera.h>
#include "data/StateManager/StateManager.hpp"
#include "data/config/project_config.hpp"
#include "data/utilities/Observer.hpp"
#include "data/utilities/network_utilities.hpp"
#include "data/config/project_config.hpp"
#include "data/StateManager/StateManager.hpp"
#define DEFAULT_XCLK_FREQ_HZ 16500000
#define USB_DEFAULT_XCLK_FREQ_HZ 24000000
#define OV5640_XCLK_FREQ_HZ DEFAULT_XCLK_FREQ_HZ
class CameraHandler : public IObserver<ConfigState_e> {
private: