🧼 Moves camera to peripherals

2024-11-14 15:52:53 +01:00
parent 62f3ee1bcb
commit b6fe8844f4
4 changed files with 3 additions and 3 deletions
@@ -0,0 +1,337 @@
+#if defined(CAMERA_MODEL_WROVER_KIT)
+#define PWDN_GPIO_NUM -1
+#define RESET_GPIO_NUM -1
+#define XCLK_GPIO_NUM 21
+#define SIOD_GPIO_NUM 26
+#define SIOC_GPIO_NUM 27
+
+#define Y9_GPIO_NUM 35
+#define Y8_GPIO_NUM 34
+#define Y7_GPIO_NUM 39
+#define Y6_GPIO_NUM 36
+#define Y5_GPIO_NUM 19
+#define Y4_GPIO_NUM 18
+#define Y3_GPIO_NUM 5
+#define Y2_GPIO_NUM 4
+#define VSYNC_GPIO_NUM 25
+#define HREF_GPIO_NUM 23
+#define PCLK_GPIO_NUM 22
+
+#elif defined(CAMERA_MODEL_ESP_EYE)
+#define PWDN_GPIO_NUM -1
+#define RESET_GPIO_NUM -1
+#define XCLK_GPIO_NUM 4
+#define SIOD_GPIO_NUM 18
+#define SIOC_GPIO_NUM 23
+
+#define Y9_GPIO_NUM 36
+#define Y8_GPIO_NUM 37
+#define Y7_GPIO_NUM 38
+#define Y6_GPIO_NUM 39
+#define Y5_GPIO_NUM 35
+#define Y4_GPIO_NUM 14
+#define Y3_GPIO_NUM 13
+#define Y2_GPIO_NUM 34
+#define VSYNC_GPIO_NUM 5
+#define HREF_GPIO_NUM 27
+#define PCLK_GPIO_NUM 25
+
+#define LED_GPIO_NUM 22
+
+#elif defined(CAMERA_MODEL_M5STACK_PSRAM)
+#define PWDN_GPIO_NUM -1
+#define RESET_GPIO_NUM 15
+#define XCLK_GPIO_NUM 27
+#define SIOD_GPIO_NUM 25
+#define SIOC_GPIO_NUM 23
+
+#define Y9_GPIO_NUM 19
+#define Y8_GPIO_NUM 36
+#define Y7_GPIO_NUM 18
+#define Y6_GPIO_NUM 39
+#define Y5_GPIO_NUM 5
+#define Y4_GPIO_NUM 34
+#define Y3_GPIO_NUM 35
+#define Y2_GPIO_NUM 32
+#define VSYNC_GPIO_NUM 22
+#define HREF_GPIO_NUM 26
+#define PCLK_GPIO_NUM 21
+
+#elif defined(CAMERA_MODEL_M5STACK_V2_PSRAM)
+#define PWDN_GPIO_NUM -1
+#define RESET_GPIO_NUM 15
+#define XCLK_GPIO_NUM 27
+#define SIOD_GPIO_NUM 22
+#define SIOC_GPIO_NUM 23
+
+#define Y9_GPIO_NUM 19
+#define Y8_GPIO_NUM 36
+#define Y7_GPIO_NUM 18
+#define Y6_GPIO_NUM 39
+#define Y5_GPIO_NUM 5
+#define Y4_GPIO_NUM 34
+#define Y3_GPIO_NUM 35
+#define Y2_GPIO_NUM 32
+#define VSYNC_GPIO_NUM 25
+#define HREF_GPIO_NUM 26
+#define PCLK_GPIO_NUM 21
+
+#elif defined(CAMERA_MODEL_M5STACK_WIDE)
+#define PWDN_GPIO_NUM -1
+#define RESET_GPIO_NUM 15
+#define XCLK_GPIO_NUM 27
+#define SIOD_GPIO_NUM 22
+#define SIOC_GPIO_NUM 23
+
+#define Y9_GPIO_NUM 19
+#define Y8_GPIO_NUM 36
+#define Y7_GPIO_NUM 18
+#define Y6_GPIO_NUM 39
+#define Y5_GPIO_NUM 5
+#define Y4_GPIO_NUM 34
+#define Y3_GPIO_NUM 35
+#define Y2_GPIO_NUM 32
+#define VSYNC_GPIO_NUM 25
+#define HREF_GPIO_NUM 26
+#define PCLK_GPIO_NUM 21
+
+#define LED_GPIO_NUM 2
+
+#elif defined(CAMERA_MODEL_M5STACK_ESP32CAM)
+#define PWDN_GPIO_NUM -1
+#define RESET_GPIO_NUM 15
+#define XCLK_GPIO_NUM 27
+#define SIOD_GPIO_NUM 25
+#define SIOC_GPIO_NUM 23
+
+#define Y9_GPIO_NUM 19
+#define Y8_GPIO_NUM 36
+#define Y7_GPIO_NUM 18
+#define Y6_GPIO_NUM 39
+#define Y5_GPIO_NUM 5
+#define Y4_GPIO_NUM 34
+#define Y3_GPIO_NUM 35
+#define Y2_GPIO_NUM 17
+#define VSYNC_GPIO_NUM 22
+#define HREF_GPIO_NUM 26
+#define PCLK_GPIO_NUM 21
+
+#elif defined(CAMERA_MODEL_M5STACK_UNITCAM)
+#define PWDN_GPIO_NUM -1
+#define RESET_GPIO_NUM 15
+#define XCLK_GPIO_NUM 27
+#define SIOD_GPIO_NUM 25
+#define SIOC_GPIO_NUM 23
+
+#define Y9_GPIO_NUM 19
+#define Y8_GPIO_NUM 36
+#define Y7_GPIO_NUM 18
+#define Y6_GPIO_NUM 39
+#define Y5_GPIO_NUM 5
+#define Y4_GPIO_NUM 34
+#define Y3_GPIO_NUM 35
+#define Y2_GPIO_NUM 32
+#define VSYNC_GPIO_NUM 22
+#define HREF_GPIO_NUM 26
+#define PCLK_GPIO_NUM 21
+
+#elif defined(CAMERA_MODEL_AI_THINKER)
+#define PWDN_GPIO_NUM 32
+#define RESET_GPIO_NUM -1
+#define XCLK_GPIO_NUM 0
+#define SIOD_GPIO_NUM 26
+#define SIOC_GPIO_NUM 27
+
+#define Y9_GPIO_NUM 35
+#define Y8_GPIO_NUM 34
+#define Y7_GPIO_NUM 39
+#define Y6_GPIO_NUM 36
+#define Y5_GPIO_NUM 21
+#define Y4_GPIO_NUM 19
+#define Y3_GPIO_NUM 18
+#define Y2_GPIO_NUM 5
+#define VSYNC_GPIO_NUM 25
+#define HREF_GPIO_NUM 23
+#define PCLK_GPIO_NUM 22
+
+// 4 for flash led or 33 for normal led
+#define LED_GPIO_NUM 4
+
+#elif defined(CAMERA_MODEL_TTGO_T_JOURNAL)
+#define PWDN_GPIO_NUM 0
+#define RESET_GPIO_NUM 15
+#define XCLK_GPIO_NUM 27
+#define SIOD_GPIO_NUM 25
+#define SIOC_GPIO_NUM 23
+
+#define Y9_GPIO_NUM 19
+#define Y8_GPIO_NUM 36
+#define Y7_GPIO_NUM 18
+#define Y6_GPIO_NUM 39
+#define Y5_GPIO_NUM 5
+#define Y4_GPIO_NUM 34
+#define Y3_GPIO_NUM 35
+#define Y2_GPIO_NUM 17
+#define VSYNC_GPIO_NUM 22
+#define HREF_GPIO_NUM 26
+#define PCLK_GPIO_NUM 21
+
+#elif defined(CAMERA_MODEL_XIAO_ESP32S3)
+#define PWDN_GPIO_NUM -1
+#define RESET_GPIO_NUM -1
+#define XCLK_GPIO_NUM 10
+#define SIOD_GPIO_NUM 40
+#define SIOC_GPIO_NUM 39
+
+#define Y9_GPIO_NUM 48
+#define Y8_GPIO_NUM 11
+#define Y7_GPIO_NUM 12
+#define Y6_GPIO_NUM 14
+#define Y5_GPIO_NUM 16
+#define Y4_GPIO_NUM 18
+#define Y3_GPIO_NUM 17
+#define Y2_GPIO_NUM 15
+#define VSYNC_GPIO_NUM 38
+#define HREF_GPIO_NUM 47
+#define PCLK_GPIO_NUM 13
+
+#elif defined(CAMERA_MODEL_ESP32_CAM_BOARD)
+// The 18 pin header on the board has Y5 and Y3 swapped
+#define USE_BOARD_HEADER 0
+#define PWDN_GPIO_NUM 32
+#define RESET_GPIO_NUM 33
+#define XCLK_GPIO_NUM 4
+#define SIOD_GPIO_NUM 18
+#define SIOC_GPIO_NUM 23
+
+#define Y9_GPIO_NUM 36
+#define Y8_GPIO_NUM 19
+#define Y7_GPIO_NUM 21
+#define Y6_GPIO_NUM 39
+#if USE_BOARD_HEADER
+#define Y5_GPIO_NUM 13
+#else
+#define Y5_GPIO_NUM 35
+#endif
+#define Y4_GPIO_NUM 14
+#if USE_BOARD_HEADER
+#define Y3_GPIO_NUM 35
+#else
+#define Y3_GPIO_NUM 13
+#endif
+#define Y2_GPIO_NUM 34
+#define VSYNC_GPIO_NUM 5
+#define HREF_GPIO_NUM 27
+#define PCLK_GPIO_NUM 25
+
+#elif defined(CAMERA_MODEL_ESP32S3_CAM_LCD)
+#define PWDN_GPIO_NUM -1
+#define RESET_GPIO_NUM -1
+#define XCLK_GPIO_NUM 40
+#define SIOD_GPIO_NUM 17
+#define SIOC_GPIO_NUM 18
+
+#define Y9_GPIO_NUM 39
+#define Y8_GPIO_NUM 41
+#define Y7_GPIO_NUM 42
+#define Y6_GPIO_NUM 12
+#define Y5_GPIO_NUM 3
+#define Y4_GPIO_NUM 14
+#define Y3_GPIO_NUM 47
+#define Y2_GPIO_NUM 13
+#define VSYNC_GPIO_NUM 21
+#define HREF_GPIO_NUM 38
+#define PCLK_GPIO_NUM 11
+
+#elif defined(CAMERA_MODEL_ESP32S2_CAM_BOARD)
+// The 18 pin header on the board has Y5 and Y3 swapped
+#define USE_BOARD_HEADER 0
+#define PWDN_GPIO_NUM 1
+#define RESET_GPIO_NUM 2
+#define XCLK_GPIO_NUM 42
+#define SIOD_GPIO_NUM 41
+#define SIOC_GPIO_NUM 18
+
+#define Y9_GPIO_NUM 16
+#define Y8_GPIO_NUM 39
+#define Y7_GPIO_NUM 40
+#define Y6_GPIO_NUM 15
+#if USE_BOARD_HEADER
+#define Y5_GPIO_NUM 12
+#else
+#define Y5_GPIO_NUM 13
+#endif
+#define Y4_GPIO_NUM 5
+#if USE_BOARD_HEADER
+#define Y3_GPIO_NUM 13
+#else
+#define Y3_GPIO_NUM 12
+#endif
+#define Y2_GPIO_NUM 14
+#define VSYNC_GPIO_NUM 38
+#define HREF_GPIO_NUM 4
+#define PCLK_GPIO_NUM 3
+
+#elif defined(CAMERA_MODEL_ESP32S3_EYE)
+#define PWDN_GPIO_NUM -1
+#define RESET_GPIO_NUM -1
+#define XCLK_GPIO_NUM 15
+#define SIOD_GPIO_NUM 4
+#define SIOC_GPIO_NUM 5
+
+#define Y2_GPIO_NUM 11
+#define Y3_GPIO_NUM 9
+#define Y4_GPIO_NUM 8
+#define Y5_GPIO_NUM 10
+#define Y6_GPIO_NUM 12
+#define Y7_GPIO_NUM 18
+#define Y8_GPIO_NUM 17
+#define Y9_GPIO_NUM 16
+
+#define VSYNC_GPIO_NUM 6
+#define HREF_GPIO_NUM 7
+#define PCLK_GPIO_NUM 13
+
+#elif defined(CAMERA_MODEL_ESP32S3_WROVER)
+#define PWDN_GPIO_NUM -1
+#define RESET_GPIO_NUM -1
+#define XCLK_GPIO_NUM 21
+#define SIOD_GPIO_NUM 26
+#define SIOC_GPIO_NUM 27
+
+#define Y2_GPIO_NUM 4
+#define Y3_GPIO_NUM 5
+#define Y4_GPIO_NUM 18
+#define Y5_GPIO_NUM 19
+#define Y6_GPIO_NUM 36
+#define Y7_GPIO_NUM 39
+#define Y8_GPIO_NUM 34
+#define Y9_GPIO_NUM 35
+
+#define VSYNC_GPIO_NUM 25
+#define HREF_GPIO_NUM 23
+#define PCLK_GPIO_NUM 22
+
+#elif defined(CAMERA_MODEL_ESP32S3_EYE)
+#define PWDN_GPIO_NUM -1
+#define RESET_GPIO_NUM -1
+#define XCLK_GPIO_NUM 15
+#define SIOD_GPIO_NUM 4
+#define SIOC_GPIO_NUM 5
+
+#define Y2_GPIO_NUM 11
+#define Y3_GPIO_NUM 9
+#define Y4_GPIO_NUM 8
+#define Y5_GPIO_NUM 10
+#define Y6_GPIO_NUM 12
+#define Y7_GPIO_NUM 18
+#define Y8_GPIO_NUM 17
+#define Y9_GPIO_NUM 16
+
+#define VSYNC_GPIO_NUM 6
+#define HREF_GPIO_NUM 7
+#define PCLK_GPIO_NUM 13
+
+#else
+#error "Camera model not selected"
+#endif
@@ -0,0 +1,198 @@
+#include <peripherals/camera_service.h>
+
+namespace Camera {
+
+static const char *const TAG = "CameraService";
+
+static const char *_STREAM_CONTENT_TYPE = "multipart/x-mixed-replace;boundary=" PART_BOUNDARY;
+static const char *_STREAM_BOUNDARY = "\r\n--" PART_BOUNDARY "\r\n";
+static const char *_STREAM_PART = "Content-Type: image/jpeg\r\nContent-Length: %u\r\n\r\n";
+
+SemaphoreHandle_t cameraMutex = xSemaphoreCreateMutex();
+
+camera_fb_t *safe_camera_fb_get() {
+    camera_fb_t *fb = NULL;
+    if (xSemaphoreTakeRecursive(cameraMutex, portMAX_DELAY) == pdTRUE) {
+        fb = esp_camera_fb_get();
+        xSemaphoreGiveRecursive(cameraMutex);
+    }
+    return fb;
+}
+
+sensor_t *safe_sensor_get() {
+    sensor_t *s = NULL;
+    if (xSemaphoreTakeRecursive(cameraMutex, portMAX_DELAY) == pdTRUE) {
+        s = esp_camera_sensor_get();
+    }
+    return s;
+}
+
+void safe_sensor_return() { xSemaphoreGiveRecursive(cameraMutex); }
+
+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;
+#if FT_ENABLED(USE_CAMERA)
+    camera_config.pin_d0 = Y2_GPIO_NUM;
+    camera_config.pin_d1 = Y3_GPIO_NUM;
+    camera_config.pin_d2 = Y4_GPIO_NUM;
+    camera_config.pin_d3 = Y5_GPIO_NUM;
+    camera_config.pin_d4 = Y6_GPIO_NUM;
+    camera_config.pin_d5 = Y7_GPIO_NUM;
+    camera_config.pin_d6 = Y8_GPIO_NUM;
+    camera_config.pin_d7 = Y9_GPIO_NUM;
+    camera_config.pin_xclk = XCLK_GPIO_NUM;
+    camera_config.pin_pclk = PCLK_GPIO_NUM;
+    camera_config.pin_vsync = VSYNC_GPIO_NUM;
+    camera_config.pin_href = HREF_GPIO_NUM;
+    camera_config.pin_sccb_sda = SIOD_GPIO_NUM;
+    camera_config.pin_sccb_scl = SIOC_GPIO_NUM;
+    camera_config.pin_pwdn = PWDN_GPIO_NUM;
+    camera_config.pin_reset = RESET_GPIO_NUM;
+#endif
+    camera_config.xclk_freq_hz = 20000000;
+    camera_config.pixel_format = PIXFORMAT_JPEG;
+
+    if (psramFound()) {
+        camera_config.frame_size = FRAMESIZE_SVGA;
+        camera_config.jpeg_quality = 10;
+        camera_config.fb_location = CAMERA_FB_IN_PSRAM;
+        camera_config.fb_count = 2;
+        camera_config.grab_mode = CAMERA_GRAB_LATEST;
+    } else {
+        camera_config.frame_size = FRAMESIZE_SVGA;
+        camera_config.jpeg_quality = 12;
+        camera_config.fb_count = 1;
+    }
+
+    log_i("Initializing camera");
+    esp_err_t err = esp_camera_init(&camera_config);
+    if (err == ESP_OK)
+        ESP_LOGI(TAG, "Camera probe successful");
+    else
+        ESP_LOGE(TAG, "Camera probe failed with error 0x%x", err);
+
+    return err;
+}
+
+esp_err_t CameraService::cameraStill(PsychicRequest *request) {
+    camera_fb_t *fb = safe_camera_fb_get();
+    if (!fb) {
+        ESP_LOGE(TAG, "Camera capture failed");
+        request->reply(500, "text/plain", "Camera capture failed");
+        return ESP_FAIL;
+    }
+    PsychicStreamResponse response = PsychicStreamResponse(request, "image/jpeg", "capture.jpg");
+    response.beginSend();
+    response.write(fb->buf, fb->len);
+    esp_camera_fb_return(fb);
+    return response.endSend();
+}
+
+void streamTask(void *pv) {
+    esp_err_t res = ESP_OK;
+
+    PsychicRequest *request = static_cast<PsychicRequest *>(pv);
+
+    httpd_req_t *copy = nullptr;
+    res = httpd_req_async_handler_begin(request->request(), &copy);
+    if (res != ESP_OK) {
+        return;
+    }
+    PsychicHttpServer *server = request->server();
+    PsychicRequest new_request = PsychicRequest(server, copy);
+    request = &new_request;
+
+    PsychicStreamResponse response = PsychicStreamResponse(request, _STREAM_CONTENT_TYPE);
+    camera_fb_t *fb = NULL;
+
+    char *part_buf[64];
+    size_t buf_len = 0;
+    uint8_t *buf = NULL;
+    int64_t fr_start = esp_timer_get_time();
+
+    response.beginSend();
+
+    for (;;) {
+        fb = safe_camera_fb_get();
+        if (!fb) {
+            ESP_LOGE("Stream", "Camera capture failed");
+            break;
+        }
+        if (fb->format != PIXFORMAT_JPEG) {
+            if (!frame2jpg(fb, 80, &buf, &buf_len)) break;
+        } else {
+            buf_len = fb->len;
+            buf = fb->buf;
+        }
+
+        size_t hlen = snprintf((char *)part_buf, 64, _STREAM_PART, buf_len);
+        size_t w = response.write((const char *)part_buf, hlen);
+        w += response.write((const char *)buf, buf_len);
+        w += response.write((char *)_STREAM_BOUNDARY, strlen(_STREAM_BOUNDARY));
+        if (w == 62) break;
+        esp_camera_fb_return(fb);
+        safe_sensor_return();
+        buf = NULL;
+        taskYIELD();
+        int64_t delay = 30000ll - esp_timer_get_time() - fr_start;
+        if (delay > 0) vTaskDelay(pdMS_TO_TICKS(delay));
+    }
+    ESP_LOGI("Stream", "Stream ended");
+    response.endSend();
+    httpd_req_async_handler_complete(copy);
+    vTaskDelete(NULL);
+}
+
+esp_err_t CameraService::cameraStream(PsychicRequest *request) {
+    g_taskManager.createTask(streamTask, "Stream client task", 4096, request, 4);
+    vTaskDelay(pdMS_TO_TICKS(100));
+    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
@@ -0,0 +1,51 @@
+#ifndef CameraService_h
+#define CameraService_h
+
+#include <ArduinoJson.h>
+#include <PsychicHttp.h>
+#include <WiFi.h>
+#include <async_worker.h>
+
+#include <features.h>
+#include <task_manager.h>
+#include <stateful_socket.h>
+#include <stateful_persistence.h>
+#include <stateful_service_endpoint.h>
+
+#include <settings/camera_settings.h>
+
+namespace Camera {
+
+#include <esp_camera.h>
+
+#if USE_CAMERA
+#include <peripherals/camera_pins.h>
+#endif
+
+#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 : public StatefulService<CameraSettings> {
+  public:
+    CameraService();
+
+    esp_err_t begin();
+
+    esp_err_t cameraStill(PsychicRequest *request);
+    esp_err_t cameraStream(PsychicRequest *request);
+
+    StatefulHttpEndpoint<CameraSettings> endpoint;
+
+  private:
+    EventEndpoint<CameraSettings> _eventEndpoint;
+    FSPersistence<CameraSettings> _persistence;
+    void updateCamera();
+};
+} // namespace Camera
+
+#endif // end CameraService_h