From 7cdc2f87d24b068d042f59323b4beb827aff8e94 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Tue, 21 Feb 2023 22:13:29 -0500 Subject: [PATCH 1/3] print if not start_flag_detected --- cubesatsim/pico-get-jpeg-serial.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cubesatsim/pico-get-jpeg-serial.cpp b/cubesatsim/pico-get-jpeg-serial.cpp index 29b18162..2bafbdf6 100644 --- a/cubesatsim/pico-get-jpeg-serial.cpp +++ b/cubesatsim/pico-get-jpeg-serial.cpp @@ -189,7 +189,9 @@ bool get_camera_image(bool debug_camera) { while ((!finished) && ((millis() - time_start) < CAMERA_TIMEOUT)) { if (Serial2.available()) { // If anything comes in Serial2 - byte octet = Serial2.read(); + byte octet = Serial2.read(); + if (!start_flag_detected) + Serial.write(octet); if (start_flag_complete) { // Serial.println("Start flag complete detected"); From 6ae4bdb8e8589a5bfd1d92ddc058b6eae9cb71a4 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Tue, 21 Feb 2023 22:19:44 -0500 Subject: [PATCH 2/3] only print info if debug mode. --- cubesatsim/pico-get-jpeg-serial.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cubesatsim/pico-get-jpeg-serial.cpp b/cubesatsim/pico-get-jpeg-serial.cpp index 2bafbdf6..5d0a8716 100644 --- a/cubesatsim/pico-get-jpeg-serial.cpp +++ b/cubesatsim/pico-get-jpeg-serial.cpp @@ -181,7 +181,7 @@ bool get_camera_image(bool debug_camera) { // #ifdef GET_IMAGE_DEBUG if (debug_camera) - Serial.println("Received from ESP32-CAM hex encoded:\n"); + Serial.println("Received from ESP32-CAM (hex encoded part is JPG image):\n"); // #endif finished = false; @@ -190,7 +190,7 @@ bool get_camera_image(bool debug_camera) { if (Serial2.available()) { // If anything comes in Serial2 byte octet = Serial2.read(); - if (!start_flag_detected) + if ((!start_flag_detected) && (debug_camera)) Serial.write(octet); if (start_flag_complete) { From e50aafca22e9d788fc25432d2da7da13f1e0fcb7 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Tue, 21 Feb 2023 22:31:08 -0500 Subject: [PATCH 3/3] moved v0.2 print to loop --- .../esp32-cam-send-jpeg-serial/esp32-cam-send-jpeg-serial.ino | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cubesatsim/esp32-cam-send-jpeg-serial/esp32-cam-send-jpeg-serial.ino b/cubesatsim/esp32-cam-send-jpeg-serial/esp32-cam-send-jpeg-serial.ino index 2c9d7163..9ba94de9 100644 --- a/cubesatsim/esp32-cam-send-jpeg-serial/esp32-cam-send-jpeg-serial.ino +++ b/cubesatsim/esp32-cam-send-jpeg-serial/esp32-cam-send-jpeg-serial.ino @@ -208,6 +208,8 @@ void setup() { } void loop() { + + Serial.println("ESP32-CAM Send JPG over Serial v0.2"); char filename[] = "/cam.jpg";