Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/eloquent_esp32cam/camera/camera.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace Eloquent {
XCLK xclk;
Resolution resolution;
Pinout pinout;
Sensor sensor;
sensor_t sensor;
Pixformat pixformat;
Exception exception;
RateLimit rateLimit;
Expand Down Expand Up @@ -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;

Expand All @@ -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();
}
Expand Down Expand Up @@ -181,4 +181,4 @@ namespace eloq {
static Eloquent::Esp32cam::Camera::Camera camera;
}

#endif
#endif
3 changes: 2 additions & 1 deletion src/eloquent_esp32cam/camera/rgb_565.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef ELOQUENT_ESP32CAM_CAMERA_CONVERTER
#define ELOQUENT_ESP32CAM_CAMERA_CONVERTER

#include <esp_jpg_decode.h>
#include "../extra/exception.h"

using Eloquent::Error::Exception;
Expand Down Expand Up @@ -136,4 +137,4 @@ namespace Eloquent {
}
}

#endif
#endif