Bläddra i källkod

Add updates from xMasterx: https://github.com/DarkFlippers/unleashed-firmware/commit/b41ffd887da30f1234bd26c9c1293646c89d4296

Cody Tolene 2 år sedan
förälder
incheckning
81bb51f6f6

+ 6 - 6
src-fap/application.fam

@@ -3,14 +3,14 @@ App(
     apptype=FlipperAppType.EXTERNAL,
     apptype=FlipperAppType.EXTERNAL,
     cdefines=["APP_CAMERA_SUITE"],
     cdefines=["APP_CAMERA_SUITE"],
     entry_point="camera_suite_app",
     entry_point="camera_suite_app",
-	fap_author="Cody Tolene",
+    fap_author="Cody Tolene",
     fap_category="GPIO",
     fap_category="GPIO",
-	fap_description="A camera suite application for the Flipper Zero ESP32-CAM module.",
-	fap_icon="icons/camera-suite.png",
+    fap_description="A camera suite application for the Flipper Zero ESP32-CAM module.",
+    fap_icon="icons/camera_suite.png",
     fap_libs=["assets"],
     fap_libs=["assets"],
-	fap_weburl="https://github.com/CodyTolene/Flipper-Zero-Cam",
+    fap_weburl="https://github.com/CodyTolene/Flipper-Zero-Cam",
     name="[ESP32] Camera Suite",
     name="[ESP32] Camera Suite",
     order=1,
     order=1,
     requires=["gui", "storage"],
     requires=["gui", "storage"],
-    stack_size=8 * 1024
-)
+    stack_size=8 * 1024,
+)

+ 1 - 1
src-fap/camera-suite.c → src-fap/camera_suite.c

@@ -1,4 +1,4 @@
-#include "camera-suite.h"
+#include "camera_suite.h"
 #include <stdlib.h>
 #include <stdlib.h>
 
 
 bool camera_suite_custom_event_callback(void* context, uint32_t event) {
 bool camera_suite_custom_event_callback(void* context, uint32_t event) {

+ 0 - 0
src-fap/camera-suite.h → src-fap/camera_suite.h


+ 1 - 1
src-fap/helpers/camera_suite_haptic.c

@@ -1,5 +1,5 @@
 #include "camera_suite_haptic.h"
 #include "camera_suite_haptic.h"
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 
 
 void camera_suite_play_happy_bump(void* context) {
 void camera_suite_play_happy_bump(void* context) {
     CameraSuite* app = context;
     CameraSuite* app = context;

+ 2 - 2
src-fap/helpers/camera_suite_led.c

@@ -1,5 +1,5 @@
 #include "camera_suite_led.h"
 #include "camera_suite_led.h"
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 
 
 void camera_suite_led_set_rgb(void* context, int red, int green, int blue) {
 void camera_suite_led_set_rgb(void* context, int red, int green, int blue) {
     CameraSuite* app = context;
     CameraSuite* app = context;
@@ -34,5 +34,5 @@ void camera_suite_led_reset(void* context) {
     notification_message(app->notification, &sequence_reset_green);
     notification_message(app->notification, &sequence_reset_green);
     notification_message(app->notification, &sequence_reset_blue);
     notification_message(app->notification, &sequence_reset_blue);
     //Delay, prevent removal from RAM before LED value set.
     //Delay, prevent removal from RAM before LED value set.
-    furi_thread_flags_wait(0, FuriFlagWaitAny, 300); 
+    furi_thread_flags_wait(0, FuriFlagWaitAny, 300);
 }
 }

+ 1 - 1
src-fap/helpers/camera_suite_speaker.c

@@ -1,5 +1,5 @@
 #include "camera_suite_speaker.h"
 #include "camera_suite_speaker.h"
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 
 
 #define NOTE_INPUT 587.33f
 #define NOTE_INPUT 587.33f
 
 

+ 3 - 3
src-fap/helpers/camera_suite_storage.h

@@ -2,11 +2,11 @@
 #include <string.h>
 #include <string.h>
 #include <storage/storage.h>
 #include <storage/storage.h>
 #include <flipper_format/flipper_format_i.h>
 #include <flipper_format/flipper_format_i.h>
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 
 
 #define BOILERPLATE_SETTINGS_FILE_VERSION 1
 #define BOILERPLATE_SETTINGS_FILE_VERSION 1
-#define CONFIG_FILE_DIRECTORY_PATH EXT_PATH("apps_data/camera-suite")
-#define BOILERPLATE_SETTINGS_SAVE_PATH CONFIG_FILE_DIRECTORY_PATH "/camera-suite.conf"
+#define CONFIG_FILE_DIRECTORY_PATH EXT_PATH("apps_data/camera_suite")
+#define BOILERPLATE_SETTINGS_SAVE_PATH CONFIG_FILE_DIRECTORY_PATH "/camera_suite.conf"
 #define BOILERPLATE_SETTINGS_SAVE_PATH_TMP BOILERPLATE_SETTINGS_SAVE_PATH ".tmp"
 #define BOILERPLATE_SETTINGS_SAVE_PATH_TMP BOILERPLATE_SETTINGS_SAVE_PATH ".tmp"
 #define BOILERPLATE_SETTINGS_HEADER "Camera Suite Config File"
 #define BOILERPLATE_SETTINGS_HEADER "Camera Suite Config File"
 #define BOILERPLATE_SETTINGS_KEY_ORIENTATION "Orientation"
 #define BOILERPLATE_SETTINGS_KEY_ORIENTATION "Orientation"

+ 0 - 0
src-fap/icons/camera-suite.png → src-fap/icons/camera_suite.png


+ 1 - 1
src-fap/scenes/camera_suite_scene_guide.c

@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include "../helpers/camera_suite_custom_event.h"
 #include "../helpers/camera_suite_custom_event.h"
 #include "../views/camera_suite_view_guide.h"
 #include "../views/camera_suite_view_guide.h"
 
 

+ 1 - 1
src-fap/scenes/camera_suite_scene_menu.c

@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 
 
 enum SubmenuIndex {
 enum SubmenuIndex {
     /** Atkinson Dithering Algorithm. */
     /** Atkinson Dithering Algorithm. */

+ 1 - 1
src-fap/scenes/camera_suite_scene_settings.c

@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include <lib/toolbox/value_index.h>
 #include <lib/toolbox/value_index.h>
 
 
 // Camera orientation, in degrees.
 // Camera orientation, in degrees.

+ 1 - 1
src-fap/scenes/camera_suite_scene_start.c

@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include "../helpers/camera_suite_custom_event.h"
 #include "../helpers/camera_suite_custom_event.h"
 #include "../views/camera_suite_view_start.h"
 #include "../views/camera_suite_view_start.h"
 
 

+ 1 - 1
src-fap/scenes/camera_suite_scene_style_1.c

@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include "../helpers/camera_suite_custom_event.h"
 #include "../helpers/camera_suite_custom_event.h"
 #include "../views/camera_suite_view_style_1.h"
 #include "../views/camera_suite_view_style_1.h"
 
 

+ 1 - 1
src-fap/scenes/camera_suite_scene_style_2.c

@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include "../helpers/camera_suite_custom_event.h"
 #include "../helpers/camera_suite_custom_event.h"
 #include "../helpers/camera_suite_haptic.h"
 #include "../helpers/camera_suite_haptic.h"
 #include "../helpers/camera_suite_led.h"
 #include "../helpers/camera_suite_led.h"

+ 1 - 1
src-fap/views/camera_suite_view_guide.c

@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include <furi.h>
 #include <furi.h>
 #include <furi_hal.h>
 #include <furi_hal.h>
 #include <input/input.h>
 #include <input/input.h>

+ 1 - 1
src-fap/views/camera_suite_view_start.c

@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include <furi.h>
 #include <furi.h>
 #include <furi_hal.h>
 #include <furi_hal.h>
 #include <input/input.h>
 #include <input/input.h>

+ 1 - 1
src-fap/views/camera_suite_view_style_1.c

@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include <furi.h>
 #include <furi.h>
 #include <furi_hal.h>
 #include <furi_hal.h>
 #include <input/input.h>
 #include <input/input.h>

+ 1 - 1
src-fap/views/camera_suite_view_style_2.c

@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include <furi.h>
 #include <furi.h>
 #include <furi_hal.h>
 #include <furi_hal.h>
 #include <input/input.h>
 #include <input/input.h>