Merge pull request #33 from CodyTolene/ct/32-image-fix

[32] Fix missing image issue.
RogueMaster · Jan 11, 2024 · 815aa97 · 815aa97
2 parents 850c70a + 66386b9
commit 815aa97
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 13 deletions.
diff --git a/fap/.gitignore b/fap/.gitignore
@@ -0,0 +1,6 @@
+dist/*
+.vscode
+.clang-format
+.editorconfig
+.env
+.ufbt
diff --git a/fap/docs/CHANGELOG.md b/fap/docs/CHANGELOG.md
@@ -4,6 +4,10 @@
 - Camera preview GUI overlay (#21).
 - Full screen 90 degree and 270 degree fill (#6).
 
+## v1.4.1 (patch)
+
+- Remove usage of image no longer found in the Flipper Zero firmware build.
+
 ## v1.4
 
 - Add RC builds to repo.
@@ -36,25 +40,25 @@
 - Update documentation to reflect changes.
 - Update firmware with new dithering options set.
 - Update firmware with new flash support.
-- Update repo to reflect https://github.com/CodyTolene/Flipper-Zero-Development-Toolkit for easier tooling.
+- Update repo to reflect <https://github.com/CodyTolene/Flipper-Zero-Development-Toolkit> for easier tooling.
 
 ## v1.1
 
 - Support and picture stabilization for all camera orientations (0 degree, 90 degree, 180 degree, and 270 degree).
 - Rename "Scene 1" to "Camera". No UX changes there.
 - Clean up unused "Scene 2". This was inaccessible to users previously and unused.
-- Add new dithering variations (requires the latest firmware installation, see here for the installation guide https://github.com/CodyTolene/Flipper-Zero-Camera-Suite#firmware-installation):
+- Add new dithering variations (requires the latest firmware installation, see here for the installation guide <https://github.com/CodyTolene/Flipper-Zero-Camera-Suite#firmware-installation>):
   - "Jarvis Judice Ninke" dithering option
   - "Stucki" dithering option.
   - "Floyd-Steinberg" dithering option.
   - Cycle through the dithering options with the center button on the Flipper Zero.
-- Resolves issue https://github.com/CodyTolene/Flipper-Zero-Camera-Suite/issues/7
-- Resolves issue https://github.com/CodyTolene/Flipper-Zero-Camera-Suite/pull/17
+- Resolves issue <https://github.com/CodyTolene/Flipper-Zero-Camera-Suite/issues/7>
+- Resolves issue <https://github.com/CodyTolene/Flipper-Zero-Camera-Suite/pull/17>
 
 ## v1.0
 
-- Builds upon Z4urce's software found here (updated 6 months ago): https://github.com/Z4urce/flipperzero-camera
-- Utilizes the superb C boilerplate examples laid out by leedave (updated last month): https://github.com/leedave/flipper-zero-fap-boilerplate
+- Builds upon Z4urce's software found here (updated 6 months ago): <https://github.com/Z4urce/flipperzero-camera>
+- Utilizes the superb C boilerplate examples laid out by leedave (updated last month): <https://github.com/leedave/flipper-zero-fap-boilerplate>
 - Builds upon the "Camera" software into the new "Camera Suite" application with new usage:
   - Add a scene for a guide.
   - Add a scene for settings.

diff --git a/fap/views/camera_suite_view_camera.c b/fap/views/camera_suite_view_camera.c
@@ -61,13 +61,20 @@ static void camera_suite_view_camera_draw(Canvas* canvas, void* model) {
 
     // Draw the guide if the camera is not initialized.
     if(!uartDumpModel->is_initialized) {
-        canvas_draw_icon(canvas, 74, 16, &I_DolphinCommon_56x48);
         canvas_set_font(canvas, FontSecondary);
-        canvas_draw_str(canvas, 8, 12, "Connect the ESP32-CAM");
-        canvas_draw_str(canvas, 20, 24, "VCC - 3V3");
-        canvas_draw_str(canvas, 20, 34, "GND - GND");
-        canvas_draw_str(canvas, 20, 44, "U0R - TX");
-        canvas_draw_str(canvas, 20, 54, "U0T - RX");
+        canvas_draw_str(canvas, 10, 25, "VCC - 3V3");
+        canvas_set_font(canvas, FontSecondary);
+        canvas_draw_str(canvas, 73, 25, "GND - GND");
+        canvas_set_font(canvas, FontSecondary);
+        canvas_draw_str(canvas, 10, 11, "Connect the ESP32-CAM:");
+        canvas_set_font(canvas, FontSecondary);
+        canvas_draw_str(canvas, 10, 36, "U0R - TX");
+        canvas_set_font(canvas, FontSecondary);
+        canvas_draw_str(canvas, 73, 36, "U0T - RX");
+        canvas_set_font(canvas, FontSecondary);
+        canvas_draw_str(canvas, 10, 49, "github.com/CodyTolene/");
+        canvas_set_font(canvas, FontSecondary);
+        canvas_draw_str(canvas, 4, 60, "Flipper-Zero-Camera-Suite");
     }
 }
 
@@ -332,6 +339,7 @@ static bool camera_suite_view_camera_input(InputEvent* event, void* context) {
         }
         }
     }
+
     return false;
 }
 

diff --git a/fap/views/camera_suite_view_camera.h b/fap/views/camera_suite_view_camera.h
@@ -33,7 +33,6 @@ static const unsigned char bitmap_header[BITMAP_HEADER_LENGTH] = {
     0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00};
 
-extern const Icon I_DolphinCommon_56x48;
 typedef enum {
     WorkerEventReserved = (1 << 0), // Reserved for StreamBuffer internal event
     WorkerEventStop = (1 << 1),