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

update frame buffer return

pull/21/merge v1.0.3
Miroslav Pivovarsky 2024-06-02 15:27:44 +02:00
parent ec7b7eabc7
commit 276d0309c2
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ESP32_PrusaConnectCam/camera.cpp
View File

@ -86,7 +86,7 @@ void Camera::InitCameraModule() {
CameraConfig.pin_sccb_scl = SIOC_GPIO_NUM; CameraConfig.pin_sccb_scl = SIOC_GPIO_NUM;
CameraConfig.pin_pwdn = PWDN_GPIO_NUM; CameraConfig.pin_pwdn = PWDN_GPIO_NUM;
CameraConfig.pin_reset = RESET_GPIO_NUM; CameraConfig.pin_reset = RESET_GPIO_NUM;
CameraConfig.xclk_freq_hz = 20000000; // or 3000000; 16500000; 20000000 CameraConfig.xclk_freq_hz = 16500000; // or 3000000; 16500000; 20000000
CameraConfig.pixel_format = PIXFORMAT_JPEG; /* YUV422,GRAYSCALE,RGB565,JPEG */ CameraConfig.pixel_format = PIXFORMAT_JPEG; /* YUV422,GRAYSCALE,RGB565,JPEG */
/* OV2640 /* OV2640
@ -318,10 +318,13 @@ void Camera::GetCameraModel() {
*/ */
void Camera::CapturePhoto() { void Camera::CapturePhoto() {
/* Check if photo is already sending */
if (true == PhotoSending) { if (true == PhotoSending) {
log->AddEvent(LogLevel_Info, F("Sending photo"));
return; return;
} }
/* Check if stream is on */
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")); log->AddEvent(LogLevel_Error, F("Failed to take frame buffer semaphore"));
@ -335,10 +338,15 @@ void Camera::CapturePhoto() {
delay(CameraFlashTime); delay(CameraFlashTime);
} }
if (FrameBuffer) {
esp_camera_fb_return(FrameBuffer);
}
/* Capturing a training photo. Without this sequence, the camera will not obtain the current photo but photo from the previous cycle. */ /* Capturing a training photo. Without this sequence, the camera will not obtain the current photo but photo from the previous cycle. */
FrameBuffer = esp_camera_fb_get(); FrameBuffer = esp_camera_fb_get();
if (FrameBuffer) { if (FrameBuffer) {
esp_camera_fb_return(FrameBuffer); esp_camera_fb_return(FrameBuffer);
log->AddEvent(LogLevel_Verbose, F("Camera capture training photo"));
} else { } else {
esp_camera_fb_return(FrameBuffer); esp_camera_fb_return(FrameBuffer);
log->AddEvent(LogLevel_Error, F("Camera capture failed training photo")); log->AddEvent(LogLevel_Error, F("Camera capture failed training photo"));
@ -351,7 +359,6 @@ void Camera::CapturePhoto() {
do { do {
log->AddEvent(LogLevel_Info, F("Taking photo...")); log->AddEvent(LogLevel_Info, F("Taking photo..."));
delay(5); // delay for camera stabilization. test it
FrameBuffer = esp_camera_fb_get(); FrameBuffer = esp_camera_fb_get();
if (!FrameBuffer) { if (!FrameBuffer) {
CameraCaptureFailedCounter++; CameraCaptureFailedCounter++;
@ -395,7 +402,7 @@ void Camera::CapturePhoto() {
/* Disable flash */ /* Disable flash */
if (true == CameraFlashEnable) { if (true == CameraFlashEnable) {
delay(CameraFlashTime); //delay(CameraFlashTime);
ledcWrite(FLASH_PWM_CHANNEL, FLASH_OFF_STATUS); ledcWrite(FLASH_PWM_CHANNEL, FLASH_OFF_STATUS);
} }
xSemaphoreGive(frameBufferSemaphore); xSemaphoreGive(frameBufferSemaphore);
@ -489,6 +496,9 @@ void Camera::CaptureReturnFrameBuffer() {
*/ */
void Camera::SetStreamStatus(bool i_status) { void Camera::SetStreamStatus(bool i_status) {
StreamOnOff = i_status; StreamOnOff = i_status;
if (FrameBuffer) {
esp_camera_fb_return(FrameBuffer);
}
log->AddEvent(LogLevel_Info, F("Camera video stream: "), String(StreamOnOff)); log->AddEvent(LogLevel_Info, F("Camera video stream: "), String(StreamOnOff));
} }

5
ESP32_PrusaConnectCam/connect.cpp
View File

@ -314,10 +314,7 @@ void PrusaConnect::TakePictureAndSendToBackend() {
} }
/* return frame buffer */ /* return frame buffer */
if (camera->GetStreamStatus() == false) { if (camera->GetStreamStatus() == true) {
/* return frame buffer when photo is not sent during stream */
camera->CaptureReturnFrameBuffer();
} else {
/* set stream flag for sending photo to false */ /* set stream flag for sending photo to false */
camera->StreamSetSendingPhoto(false); camera->StreamSetSendingPhoto(false);
} }

1
ESP32_PrusaConnectCam/server.cpp
View File

@ -405,7 +405,6 @@ void Server_InitWebServer_Actions() {
return; return;
SystemCamera.CapturePhoto(); SystemCamera.CapturePhoto();
request->send_P(200, "text/plain", "Take Photo"); request->send_P(200, "text/plain", "Take Photo");
SystemCamera.CaptureReturnFrameBuffer();
}); });
/* route for send photo to prusa backend */ /* route for send photo to prusa backend */