Michal
/
Prusa-Firmware-ESP32-Cam
mirror of https://github.com/prusa3d/Prusa-Firmware-ESP32-Cam
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issues in CapturePhoto method 

- Added max attempts limit to avoid infinite loops which would let the flash on continuously

Additional cleanups:
- Removed redundant frame buffer handling
- Added error handling for semaphore take failure
- Ensured semaphore release on capture failure
pull/25/head
Gordon Breuer 2024-05-14 15:46:52 +02:00 committed by GitHub
parent 51f6249c4d
commit 8089ed4de8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
ESP32_PrusaConnectCam/camera.cpp
View File

@ -261,57 +261,57 @@ void Camera::ReinitCameraModule() {
*/ */
void Camera::CapturePhoto() { void Camera::CapturePhoto() {
if (false == StreamOnOff) { if (false == StreamOnOff) {
if (xSemaphoreTake(frameBufferSemaphore, portMAX_DELAY)) { if (!xSemaphoreTake(frameBufferSemaphore, portMAX_DELAY)) {
log->AddEvent(LogLevel_Error, F("Failed to take frame buffer semaphore"));
/* check flash, and enable FLASH LED */ return;
if (true == CameraFlashEnable) { }
ledcWrite(FLASH_PWM_CHANNEL, FLASH_ON_STATUS);
delay(CameraFlashTime); /* check flash, and enable FLASH LED */
if (true == CameraFlashEnable) {
ledcWrite(FLASH_PWM_CHANNEL, FLASH_ON_STATUS);
delay(CameraFlashTime);
}
int attempts = 0;
const int maxAttempts = 5;
do {
log->AddEvent(LogLevel_Info, F("Taking photo..."));
delay(5); // delay for camera stabilization. test it
FrameBuffer = esp_camera_fb_get();
if (!FrameBuffer) {
log->AddEvent(LogLevel_Error, F("Camera capture failed! photo"));
xSemaphoreGive(frameBufferSemaphore); // Release semaphore before returning
return;
}
char buf[150] = { '\0' };
uint8_t ControlFlag = (uint8_t)FrameBuffer->buf[15];
sprintf(buf, "The picture has been saved. Size: %d bytes, Photo resolution: %zu x %zu", FrameBuffer->len, FrameBuffer->width, FrameBuffer->height);
log->AddEvent(LogLevel_Info, buf);
if (ControlFlag != 0x00) {
log->AddEvent(LogLevel_Error, "Camera capture failed! photo " + String(ControlFlag, HEX));
FrameBuffer->len = 0;
} else {
log->AddEvent(LogLevel_Info, "Photo OK! " + String(ControlFlag, HEX));
} }
/* get train photo */
FrameBuffer = esp_camera_fb_get();
esp_camera_fb_return(FrameBuffer); esp_camera_fb_return(FrameBuffer);
do { attempts++;
log->AddEvent(LogLevel_Info, F("Taking photo...")); if (attempts >= maxAttempts) {
log->AddEvent(LogLevel_Error, F("Failed to capture a valid photo after max attempts"));
/* capture final photo */ break;
delay(5); // delay for camera stabilization. test it
FrameBuffer = esp_camera_fb_get();
if (!FrameBuffer) {
log->AddEvent(LogLevel_Error, F("Camera capture failed! photo"));
return;
} else {
/* copy photo from buffer to string array */
char buf[150] = { '\0' };
uint8_t ControlFlag = (uint8_t)FrameBuffer->buf[15];
sprintf(buf, "The picture has been saved. Size: %d bytes, Photo resolution: %zu x %zu", FrameBuffer->len, FrameBuffer->width, FrameBuffer->height);
log->AddEvent(LogLevel_Info, buf);
/* check corrupted photo */
if (ControlFlag != 0x00) {
log->AddEvent(LogLevel_Error, "Camera capture failed! photo " + String(ControlFlag, HEX));
FrameBuffer->len = 0;
} else {
log->AddEvent(LogLevel_Info, "Photo OK! " + String(ControlFlag, HEX));
}
esp_camera_fb_return(FrameBuffer);
}
/* check if photo is correctly saved */
} while (!(FrameBuffer->len > 100));
/* Disable flash */
if (true == CameraFlashEnable) {
delay(CameraFlashTime);
ledcWrite(FLASH_PWM_CHANNEL, FLASH_OFF_STATUS);
} }
xSemaphoreGive(frameBufferSemaphore); } while (!(FrameBuffer->len > 100));
/* Disable flash */
if (true == CameraFlashEnable) {
delay(CameraFlashTime);
ledcWrite(FLASH_PWM_CHANNEL, FLASH_OFF_STATUS);
} }
xSemaphoreGive(frameBufferSemaphore);
} }
} }
@ -1011,4 +1011,4 @@ uint16_t Camera::GetCameraFlashTime() {
return CameraFlashTime; return CameraFlashTime;
} }
/* EOF */ /* EOF */