mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-08 12:36:52 +03:00
Update server_camera.cpp
Fix building with -D DEBUG_DETAIL_ON better alternative to: https://github.com/jomjol/AI-on-the-edge-device/pull/3160
This commit is contained in:
@@ -92,11 +92,7 @@ esp_err_t handler_capture(httpd_req_t *req)
|
|||||||
|
|
||||||
if (Camera.getCameraInitSuccessful())
|
if (Camera.getCameraInitSuccessful())
|
||||||
{
|
{
|
||||||
#ifdef DEBUG_DETAIL_ON
|
// If the camera settings were changed by creating a new reference image, they must be reset
|
||||||
ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// wenn die Kameraeinstellungen durch Erstellen eines neuen Referenzbildes verändert wurden, müssen sie neu gesetzt werden
|
|
||||||
if (CFstatus.changedCameraSettings)
|
if (CFstatus.changedCameraSettings)
|
||||||
{
|
{
|
||||||
Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
|
Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
|
||||||
@@ -104,6 +100,10 @@ esp_err_t handler_capture(httpd_req_t *req)
|
|||||||
CFstatus.changedCameraSettings = false;
|
CFstatus.changedCameraSettings = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef DEBUG_DETAIL_ON
|
||||||
|
ESP_LOGD(TAG, "Size: %d, Quality: %d", CCstatus.ImageFrameSize, CCstatus.ImageQuality);
|
||||||
|
#endif
|
||||||
|
|
||||||
esp_err_t result;
|
esp_err_t result;
|
||||||
result = Camera.CaptureToHTTP(req);
|
result = Camera.CaptureToHTTP(req);
|
||||||
|
|
||||||
@@ -150,11 +150,7 @@ esp_err_t handler_capture_with_light(httpd_req_t *req)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEBUG_DETAIL_ON
|
// If the camera settings were changed by creating a new reference image, they must be reset
|
||||||
ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// wenn die Kameraeinstellungen durch Erstellen eines neuen Referenzbildes verändert wurden, müssen sie neu gesetzt werden
|
|
||||||
if (CFstatus.changedCameraSettings)
|
if (CFstatus.changedCameraSettings)
|
||||||
{
|
{
|
||||||
Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
|
Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
|
||||||
@@ -162,6 +158,10 @@ esp_err_t handler_capture_with_light(httpd_req_t *req)
|
|||||||
CFstatus.changedCameraSettings = false;
|
CFstatus.changedCameraSettings = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef DEBUG_DETAIL_ON
|
||||||
|
ESP_LOGD(TAG, "Size: %d, Quality: %d", CCstatus.ImageFrameSize, CCstatus.ImageQuality);
|
||||||
|
#endif
|
||||||
|
|
||||||
Camera.LightOnOff(true);
|
Camera.LightOnOff(true);
|
||||||
const TickType_t xDelay = delay / portTICK_PERIOD_MS;
|
const TickType_t xDelay = delay / portTICK_PERIOD_MS;
|
||||||
vTaskDelay(xDelay);
|
vTaskDelay(xDelay);
|
||||||
@@ -232,11 +232,7 @@ esp_err_t handler_capture_save_to_file(httpd_req_t *req)
|
|||||||
fn.append("noname.jpg");
|
fn.append("noname.jpg");
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEBUG_DETAIL_ON
|
// If the camera settings were changed by creating a new reference image, they must be reset
|
||||||
ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// wenn die Kameraeinstellungen durch Erstellen eines neuen Referenzbildes verändert wurden, müssen sie neu gesetzt werden
|
|
||||||
if (CFstatus.changedCameraSettings)
|
if (CFstatus.changedCameraSettings)
|
||||||
{
|
{
|
||||||
Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
|
Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
|
||||||
@@ -244,6 +240,10 @@ esp_err_t handler_capture_save_to_file(httpd_req_t *req)
|
|||||||
CFstatus.changedCameraSettings = false;
|
CFstatus.changedCameraSettings = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef DEBUG_DETAIL_ON
|
||||||
|
ESP_LOGD(TAG, "Size: %d, Quality: %d", CCstatus.ImageFrameSize, CCstatus.ImageQuality);
|
||||||
|
#endif
|
||||||
|
|
||||||
esp_err_t result;
|
esp_err_t result;
|
||||||
result = Camera.CaptureToFile(fn, delay);
|
result = Camera.CaptureToFile(fn, delay);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user