From 11a11acd2781be3c5219b91284085f2462e9297e Mon Sep 17 00:00:00 2001 From: reymalahay Date: Fri, 26 Jan 2024 18:00:20 -0700 Subject: [PATCH] Fix: Camera compilation errors - Fixed typedef issues for sensor. - Renamed uppercase Sensor.h header file to lowercase sensor.h - Fixed missing esp_jpg_decode.h import. - Fixed incorrectly named config pin names. --- src/eloquent_esp32cam/camera/camera.h | 10 +++++----- src/eloquent_esp32cam/camera/rgb_565.h | 3 ++- src/eloquent_esp32cam/camera/{Sensor.h => sensor.h} | 0 3 files changed, 7 insertions(+), 6 deletions(-) rename src/eloquent_esp32cam/camera/{Sensor.h => sensor.h} (100%) diff --git a/src/eloquent_esp32cam/camera/camera.h b/src/eloquent_esp32cam/camera/camera.h index 7f0c0143..7a1da7d5 100644 --- a/src/eloquent_esp32cam/camera/camera.h +++ b/src/eloquent_esp32cam/camera/camera.h @@ -34,7 +34,7 @@ namespace Eloquent { XCLK xclk; Resolution resolution; Pinout pinout; - Sensor sensor; + sensor_t sensor; Pixformat pixformat; Exception exception; RateLimit rateLimit; @@ -73,8 +73,8 @@ namespace Eloquent { config.pin_pclk = pinout.pins.pclk; config.pin_vsync = pinout.pins.vsync; config.pin_href = pinout.pins.href; - config.pin_sccb_sda = pinout.pins.sccb_sda; - config.pin_sccb_scl = pinout.pins.sccb_scl; + config.pin_sscb_sda = pinout.pins.sccb_sda; + config.pin_sscb_scl = pinout.pins.sccb_scl; config.pin_pwdn = pinout.pins.pwdn; config.pin_reset = pinout.pins.reset; @@ -90,7 +90,7 @@ namespace Eloquent { if (esp_camera_init(&config) != ESP_OK) return exception.set("Cannot init camera"); - sensor.setFrameSize(resolution.framesize); + sensor.set_framesize(&sensor, resolution.framesize); return exception.clear(); } @@ -181,4 +181,4 @@ namespace eloq { static Eloquent::Esp32cam::Camera::Camera camera; } -#endif \ No newline at end of file +#endif diff --git a/src/eloquent_esp32cam/camera/rgb_565.h b/src/eloquent_esp32cam/camera/rgb_565.h index 68dd0e11..2f6fa206 100644 --- a/src/eloquent_esp32cam/camera/rgb_565.h +++ b/src/eloquent_esp32cam/camera/rgb_565.h @@ -1,6 +1,7 @@ #ifndef ELOQUENT_ESP32CAM_CAMERA_CONVERTER #define ELOQUENT_ESP32CAM_CAMERA_CONVERTER +#include #include "../extra/exception.h" using Eloquent::Error::Exception; @@ -136,4 +137,4 @@ namespace Eloquent { } } -#endif \ No newline at end of file +#endif diff --git a/src/eloquent_esp32cam/camera/Sensor.h b/src/eloquent_esp32cam/camera/sensor.h similarity index 100% rename from src/eloquent_esp32cam/camera/Sensor.h rename to src/eloquent_esp32cam/camera/sensor.h