📷 Merges camera setting service and camera service

esp32/include/spot.h

@@ -16,7 +16,6 @@
 #include <MotionService.h>
 #include <ntp_service.h>
 #include <camera_service.h>
-#include <CameraSettingsService.h>
 #include <PsychicHttp.h>
 #include <task_manager.h>
 #include <WiFi.h>
@@ -97,7 +96,6 @@ class Spot {
 #endif
 #if FT_ENABLED(USE_CAMERA)
     Camera::CameraService _cameraService;
-    Camera::CameraSettingsService _cameraSettingsService;
 #endif
     Peripherals _peripherals;
     ServoController _servoController;

esp32/lib/ESP32-sveltekit/CameraSettingsService.h

@@ -1,105 +0,0 @@
-#ifndef CameraSettingsService_h
-#define CameraSettingsService_h
-
-#include <settings/camera_settings.h>
-
-namespace Camera {
-
-#include <camera_service.h>
-#include <EventEndpoint.h>
-#include <stateful_persistence.h>
-#include <stateful_service_endpoint.h>
-#include <JsonUtils.h>
-#include <PsychicHttp.h>
-#include <SettingValue.h>
-#include <stateful_service.h>
-#include <esp_camera.h>
-#include <filesystem.h>
-
-#define EVENT_CAMERA_SETTINGS "CameraSettings"
-
-class CameraSettingsService : public StatefulService<CameraSettings> {
-  public:
-    CameraSettingsService()
-        : endpoint(CameraSettings::read, CameraSettings::update, this),
-          _eventEndpoint(CameraSettings::read, CameraSettings::update, this, EVENT_CAMERA_SETTINGS),
-          _persistence(CameraSettings::read, CameraSettings::update, this, CAMERA_SETTINGS_FILE) {
-        addUpdateHandler([&](const String &originId) { updateCamera(); }, false);
-    }
-
-    void begin() {
-        _eventEndpoint.begin();
-        _persistence.readFromFS();
-        sensor_t *s = safe_sensor_get();
-        _state.pixformat = s->pixformat;
-        _state.framesize = s->status.framesize;
-        _state.brightness = s->status.brightness;
-        _state.contrast = s->status.contrast;
-        _state.saturation = s->status.saturation;
-        _state.sharpness = s->status.sharpness;
-        _state.denoise = s->status.denoise;
-        _state.gainceiling = (gainceiling_t)s->status.gainceiling;
-        _state.quality = s->status.quality;
-        _state.colorbar = s->status.colorbar;
-        _state.awb_gain = s->status.awb_gain;
-        _state.wb_mode = s->status.wb_mode;
-        _state.aec2 = s->status.aec2;
-        _state.ae_level = s->status.ae_level;
-        _state.aec_value = s->status.aec_value;
-        _state.agc_gain = s->status.agc_gain;
-        _state.bpc = s->status.bpc;
-        _state.wpc = s->status.wpc;
-        _state.special_effect = s->status.special_effect;
-        _state.raw_gma = s->status.raw_gma;
-        _state.lenc = s->status.lenc;
-        _state.hmirror = s->status.hmirror;
-        _state.vflip = s->status.vflip;
-        _state.dcw = s->status.dcw;
-        safe_sensor_return();
-    }
-
-    void updateCamera() {
-        ESP_LOGI("CameraSettings", "Updating camera settings");
-        sensor_t *s = safe_sensor_get();
-        if (!s) {
-            ESP_LOGE("CameraSettings", "Failed to update camera settings");
-            safe_sensor_return();
-            return;
-        }
-        s->set_pixformat(s, _state.pixformat);
-        s->set_framesize(s, _state.framesize);
-        s->set_brightness(s, _state.brightness);
-        s->set_contrast(s, _state.contrast);
-        s->set_saturation(s, _state.saturation);
-        s->set_sharpness(s, _state.sharpness);
-        s->set_denoise(s, _state.denoise);
-        s->set_gainceiling(s, _state.gainceiling);
-        s->set_quality(s, _state.quality);
-        s->set_colorbar(s, _state.colorbar);
-        s->set_awb_gain(s, _state.awb_gain);
-        s->set_wb_mode(s, _state.wb_mode);
-        s->set_aec2(s, _state.aec2);
-        s->set_ae_level(s, _state.ae_level);
-        s->set_aec_value(s, _state.aec_value);
-        s->set_agc_gain(s, _state.agc_gain);
-        s->set_bpc(s, _state.bpc);
-        s->set_wpc(s, _state.wpc);
-        s->set_special_effect(s, _state.special_effect);
-        s->set_raw_gma(s, _state.raw_gma);
-        s->set_lenc(s, _state.lenc);
-        s->set_hmirror(s, _state.hmirror);
-        s->set_vflip(s, _state.vflip);
-        s->set_dcw(s, _state.dcw);
-        safe_sensor_return();
-    }
-
-    StatefulHttpEndpoint<CameraSettings> endpoint;
-
-  private:
-    EventEndpoint<CameraSettings> _eventEndpoint;
-    FSPersistence<CameraSettings> _persistence;
-};
-
-} // namespace Camera
-
-#endif // end CameraSettingsService_h

esp32/lib/ESP32-sveltekit/camera_service.cpp

@@ -12,26 +12,33 @@ SemaphoreHandle_t cameraMutex = xSemaphoreCreateMutex();
 
 camera_fb_t *safe_camera_fb_get() {
     camera_fb_t *fb = NULL;
-    if (xSemaphoreTake(cameraMutex, portMAX_DELAY) == pdTRUE) {
+    if (xSemaphoreTakeRecursive(cameraMutex, portMAX_DELAY) == pdTRUE) {
         fb = esp_camera_fb_get();
-        xSemaphoreGive(cameraMutex);
+        xSemaphoreGiveRecursive(cameraMutex);
     }
     return fb;
 }
 
 sensor_t *safe_sensor_get() {
     sensor_t *s = NULL;
-    if (xSemaphoreTake(cameraMutex, portMAX_DELAY) == pdTRUE) {
+    if (xSemaphoreTakeRecursive(cameraMutex, portMAX_DELAY) == pdTRUE) {
         s = esp_camera_sensor_get();
     }
     return s;
 }
 
-void safe_sensor_return() { xSemaphoreGive(cameraMutex); }
+void safe_sensor_return() { xSemaphoreGiveRecursive(cameraMutex); }
 
-CameraService::CameraService() {}
+CameraService::CameraService()
+    : endpoint(CameraSettings::read, CameraSettings::update, this),
+      _eventEndpoint(CameraSettings::read, CameraSettings::update, this, EVENT_CAMERA_SETTINGS),
+      _persistence(CameraSettings::read, CameraSettings::update, this, CAMERA_SETTINGS_FILE) {
+    addUpdateHandler([&](const String &originId) { updateCamera(); }, false);
+}
 
 esp_err_t CameraService::begin() {
+    _eventEndpoint.begin();
+    _persistence.readFromFS();
     camera_config_t camera_config;
     camera_config.ledc_channel = LEDC_CHANNEL_0;
     camera_config.ledc_timer = LEDC_TIMER_0;
@@ -153,4 +160,39 @@ esp_err_t CameraService::cameraStream(PsychicRequest *request) {
     return ESP_OK;
 }
 
+void CameraService::updateCamera() {
+    ESP_LOGI("CameraSettings", "Updating camera settings");
+    sensor_t *s = safe_sensor_get();
+    if (!s) {
+        ESP_LOGE("CameraSettings", "Failed to update camera settings");
+        safe_sensor_return();
+        return;
+    }
+    s->set_pixformat(s, _state.pixformat);
+    s->set_framesize(s, _state.framesize);
+    s->set_brightness(s, _state.brightness);
+    s->set_contrast(s, _state.contrast);
+    s->set_saturation(s, _state.saturation);
+    s->set_sharpness(s, _state.sharpness);
+    s->set_denoise(s, _state.denoise);
+    s->set_gainceiling(s, _state.gainceiling);
+    s->set_quality(s, _state.quality);
+    s->set_colorbar(s, _state.colorbar);
+    s->set_awb_gain(s, _state.awb_gain);
+    s->set_wb_mode(s, _state.wb_mode);
+    s->set_aec2(s, _state.aec2);
+    s->set_ae_level(s, _state.ae_level);
+    s->set_aec_value(s, _state.aec_value);
+    s->set_agc_gain(s, _state.agc_gain);
+    s->set_bpc(s, _state.bpc);
+    s->set_wpc(s, _state.wpc);
+    s->set_special_effect(s, _state.special_effect);
+    s->set_raw_gma(s, _state.raw_gma);
+    s->set_lenc(s, _state.lenc);
+    s->set_hmirror(s, _state.hmirror);
+    s->set_vflip(s, _state.vflip);
+    s->set_dcw(s, _state.dcw);
+    safe_sensor_return();
+}
+
 } // namespace Camera

esp32/lib/ESP32-sveltekit/camera_service.h

@@ -3,10 +3,16 @@
 
 #include <ArduinoJson.h>
 #include <PsychicHttp.h>
-#include <task_manager.h>
 #include <WiFi.h>
 #include <async_worker.h>
+
 #include <features.h>
+#include <task_manager.h>
+#include <EventEndpoint.h>
+#include <stateful_persistence.h>
+#include <stateful_service_endpoint.h>
+
+#include <settings/camera_settings.h>
 
 namespace Camera {
 
@@ -18,11 +24,13 @@ namespace Camera {
 
 #define PART_BOUNDARY "frame"
 
+#define EVENT_CAMERA_SETTINGS "CameraSettings"
+
 camera_fb_t *safe_camera_fb_get();
 sensor_t *safe_sensor_get();
 void safe_sensor_return();
 
-class CameraService {
+class CameraService : public StatefulService<CameraSettings> {
   public:
     CameraService();
 
@@ -31,8 +39,12 @@ class CameraService {
     esp_err_t cameraStill(PsychicRequest *request);
     esp_err_t cameraStream(PsychicRequest *request);
 
+    StatefulHttpEndpoint<CameraSettings> endpoint;
+
   private:
-    PsychicHttpServer *_server;
+    EventEndpoint<CameraSettings> _eventEndpoint;
+    FSPersistence<CameraSettings> _persistence;
+    void updateCamera();
 };
 } // namespace Camera
 

esp32/src/spot.cpp

@@ -77,9 +77,9 @@ void Spot::setupServer() {
     _server->on("/api/camera/stream", HTTP_GET,
                 [this](PsychicRequest *request) { return _cameraService.cameraStream(request); });
     _server->on("/api/camera/settings", HTTP_GET,
-                [this](PsychicRequest *request) { return _cameraSettingsService.endpoint.getState(request); });
+                [this](PsychicRequest *request) { return _cameraService.endpoint.getState(request); });
     _server->on("/api/camera/settings", HTTP_POST, [this](PsychicRequest *request, JsonVariant &json) {
-        return _cameraSettingsService.endpoint.handleStateUpdate(request, json);
+        return _cameraService.endpoint.handleStateUpdate(request, json);
     });
 
     // SYSTEM
@@ -198,7 +198,6 @@ void Spot::startServices() {
 #endif
 #if FT_ENABLED(USE_CAMERA)
     _cameraService.begin();
-    _cameraSettingsService.begin();
 #endif
 }