Merge pull request #28 from CodyTolene/ct/27-mirrored-image-fix

[27] Bugfix - Horizontal flip when switching between camera apps.
RogueMaster · Nov 17, 2023 · 03b64d0 · 03b64d0
2 parents bff8dd2 + 2f05d8f
commit 03b64d0
Show file tree

Hide file tree

Showing 16 changed files with 229 additions and 171 deletions.
diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml
@@ -4,9 +4,11 @@ on:
     branches:
       # Run on push to main.
       - main
+
   schedule:
     # Run every day at 00:00 UTC (midnight)
     - cron: "0 0 * * *"
+
 jobs:
   ufbt-build-action:
     runs-on: ubuntu-latest
@@ -15,20 +17,24 @@ jobs:
         include:
           - name: dev
             sdk-channel: dev
+
           - name: release
             sdk-channel: release
+
     name: "ufbt: Build for ${{ matrix.name }}"
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           submodules: recursive
+
       - name: Build with ufbt
-        uses: flipperdevices/flipperzero-ufbt-action@v0.1.2
+        uses: flipperdevices/flipperzero-ufbt-action@v0.1.3
         id: build-app
         with:
           app-dir: ./fap
           sdk-channel: ${{ matrix.sdk-channel }}
+
       - name: Upload app artifacts
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/lint-pull-request.yml b/.github/workflows/lint-pull-request.yml
@@ -7,16 +7,18 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+
       - name: Build with ufbt
         # Flipper Zero ufbt action
         # https://github.com/flipperdevices/flipperzero-ufbt-action
-        uses: flipperdevices/flipperzero-ufbt-action@v0.1.2
+        uses: flipperdevices/flipperzero-ufbt-action@v0.1.3
         id: build-app
         with:
           app-dir: ./fap
           sdk-channel: dev
+
       - name: Lint sources
-        uses: flipperdevices/flipperzero-ufbt-action@v0.1.2
+        uses: flipperdevices/flipperzero-ufbt-action@v0.1.3
         with:
           skip-setup: true
           task: lint
diff --git a/arduino-cli.yaml b/arduino-cli.yaml
@@ -8,7 +8,7 @@ daemon:
   port: "50051"
 directories:
   data: C:\temp\arduino-cli\data
-  downloads: C:\temp\arduino-cli\downloads
+  downloads: C:\temp\arduino-cli\staging
   user: C:\temp\arduino-cli\user
 library:
   enable_unsafe_install: false

diff --git a/fap/camera_suite.h b/fap/camera_suite.h
@@ -1,10 +1,5 @@
 #pragma once
 
-#include "helpers/camera_suite_storage.h"
-#include "scenes/camera_suite_scene.h"
-#include "views/camera_suite_view_guide.h"
-#include "views/camera_suite_view_start.h"
-#include "views/camera_suite_view_camera.h"
 #include <furi.h>
 #include <furi_hal.h>
 #include <gui/gui.h>
@@ -17,6 +12,12 @@
 #include <notification/notification_messages.h>
 #include <stdlib.h>
 
+#include "scenes/camera_suite_scene.h"
+#include "views/camera_suite_view_guide.h"
+#include "views/camera_suite_view_start.h"
+#include "views/camera_suite_view_camera.h"
+#include "helpers/camera_suite_storage.h"
+
 #define TAG "Camera Suite"
 
 typedef struct {

diff --git a/fap/helpers/camera_suite_storage.h b/fap/helpers/camera_suite_storage.h
@@ -26,4 +26,4 @@ void camera_suite_save_settings(void* context);
 
 void camera_suite_read_settings(void* context);
 
-#endif
+#endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,4 +26,4 @@ void camera_suite_save_settings(void* context);

		void camera_suite_read_settings(void* context);

		#endif
		#endif