Cody Tolene пре 11 месеци
родитељ
комит
a88f5e36b3

+ 1 - 1
helpers/camera_suite_storage.c

@@ -119,4 +119,4 @@ void camera_suite_read_settings(void* context) {
 
 
     camera_suite_close_config_file(fff_file);
     camera_suite_close_config_file(fff_file);
     camera_suite_close_storage();
     camera_suite_close_storage();
-}
+}

+ 12 - 12
helpers/camera_suite_storage.h

@@ -8,18 +8,18 @@
 #ifndef CAMERA_SUITE_STORAGE_H
 #ifndef CAMERA_SUITE_STORAGE_H
 #define CAMERA_SUITE_STORAGE_H
 #define CAMERA_SUITE_STORAGE_H
 
 
-#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 BOILERPLATE_SETTINGS_SAVE_PATH_TMP BOILERPLATE_SETTINGS_SAVE_PATH ".tmp"
-#define BOILERPLATE_SETTINGS_HEADER "Camera Suite Config File"
-#define BOILERPLATE_SETTINGS_KEY_ORIENTATION "Orientation"
-#define BOILERPLATE_SETTINGS_KEY_DITHER "Dither"
-#define BOILERPLATE_SETTINGS_KEY_FLASH "Flash"
-#define BOILERPLATE_SETTINGS_KEY_JPEG "SaveJPEG"
-#define BOILERPLATE_SETTINGS_KEY_HAPTIC "Haptic"
-#define BOILERPLATE_SETTINGS_KEY_LED "Led"
-#define BOILERPLATE_SETTINGS_KEY_SPEAKER "Speaker"
+#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 BOILERPLATE_SETTINGS_SAVE_PATH_TMP     BOILERPLATE_SETTINGS_SAVE_PATH ".tmp"
+#define BOILERPLATE_SETTINGS_HEADER            "Camera Suite Config File"
+#define BOILERPLATE_SETTINGS_KEY_ORIENTATION   "Orientation"
+#define BOILERPLATE_SETTINGS_KEY_DITHER        "Dither"
+#define BOILERPLATE_SETTINGS_KEY_FLASH         "Flash"
+#define BOILERPLATE_SETTINGS_KEY_JPEG          "SaveJPEG"
+#define BOILERPLATE_SETTINGS_KEY_HAPTIC        "Haptic"
+#define BOILERPLATE_SETTINGS_KEY_LED           "Led"
+#define BOILERPLATE_SETTINGS_KEY_SPEAKER       "Speaker"
 #define BOILERPLATE_SETTINGS_KEY_SAVE_SETTINGS "SaveSettings"
 #define BOILERPLATE_SETTINGS_KEY_SAVE_SETTINGS "SaveSettings"
 
 
 void camera_suite_save_settings(void* context);
 void camera_suite_save_settings(void* context);

+ 1 - 1
scenes/camera_suite_scene_guide.c

@@ -48,4 +48,4 @@ bool camera_suite_scene_guide_on_event(void* context, SceneManagerEvent event) {
 void camera_suite_scene_guide_on_exit(void* context) {
 void camera_suite_scene_guide_on_exit(void* context) {
     CameraSuite* app = context;
     CameraSuite* app = context;
     UNUSED(app);
     UNUSED(app);
-}
+}

+ 1 - 1
scenes/camera_suite_scene_menu.c

@@ -90,4 +90,4 @@ bool camera_suite_scene_menu_on_event(void* context, SceneManagerEvent event) {
 void camera_suite_scene_menu_on_exit(void* context) {
 void camera_suite_scene_menu_on_exit(void* context) {
     CameraSuite* app = context;
     CameraSuite* app = context;
     submenu_reset(app->submenu);
     submenu_reset(app->submenu);
-}
+}

+ 1 - 1
scenes/camera_suite_scene_start.c

@@ -52,4 +52,4 @@ bool camera_suite_scene_start_on_event(void* context, SceneManagerEvent event) {
 void camera_suite_scene_start_on_exit(void* context) {
 void camera_suite_scene_start_on_exit(void* context) {
     CameraSuite* app = context;
     CameraSuite* app = context;
     UNUSED(app);
     UNUSED(app);
-}
+}

+ 3 - 5
views/camera_suite_view_camera.c

@@ -557,8 +557,7 @@ static int32_t camera_suite_camera_worker(void* context) {
                 }
                 }
             } while(length > 0);
             } while(length > 0);
 
 
-            with_view_model(
-                instance->view, UartDumpModel * model, { UNUSED(model); }, true);
+            with_view_model(instance->view, UartDumpModel * model, { UNUSED(model); }, true);
         }
         }
     }
     }
 
 
@@ -625,8 +624,7 @@ void camera_suite_view_camera_free(CameraSuiteViewCamera* instance) {
     furi_hal_serial_deinit(instance->serial_handle);
     furi_hal_serial_deinit(instance->serial_handle);
     furi_hal_serial_control_release(instance->serial_handle);
     furi_hal_serial_control_release(instance->serial_handle);
 
 
-    with_view_model(
-        instance->view, UartDumpModel * model, { UNUSED(model); }, true);
+    with_view_model(instance->view, UartDumpModel * model, { UNUSED(model); }, true);
     view_free(instance->view);
     view_free(instance->view);
     free(instance);
     free(instance);
 }
 }
@@ -644,4 +642,4 @@ void camera_suite_view_camera_set_callback(
     furi_assert(callback);
     furi_assert(callback);
     instance->callback = callback;
     instance->callback = callback;
     instance->context = context;
     instance->context = context;
-}
+}

+ 8 - 8
views/camera_suite_view_camera.h

@@ -48,14 +48,14 @@
 #endif
 #endif
 
 
 #define BITMAP_HEADER_LENGTH 62
 #define BITMAP_HEADER_LENGTH 62
-#define FRAME_BIT_DEPTH 1
-#define FRAME_BUFFER_LENGTH 1024
-#define FRAME_HEIGHT 64
-#define FRAME_WIDTH 128
-#define HEADER_LENGTH 3 // 'Y', ':', and row identifier
-#define LAST_ROW_INDEX 1008
-#define RING_BUFFER_LENGTH 19
-#define ROW_BUFFER_LENGTH 16
+#define FRAME_BIT_DEPTH      1
+#define FRAME_BUFFER_LENGTH  1024
+#define FRAME_HEIGHT         64
+#define FRAME_WIDTH          128
+#define HEADER_LENGTH        3 // 'Y', ':', and row identifier
+#define LAST_ROW_INDEX       1008
+#define RING_BUFFER_LENGTH   19
+#define ROW_BUFFER_LENGTH    16
 
 
 static const unsigned char bitmap_header[BITMAP_HEADER_LENGTH] = {
 static const unsigned char bitmap_header[BITMAP_HEADER_LENGTH] = {
     0x42, 0x4D, 0x3E, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x28, 0x00,
     0x42, 0x4D, 0x3E, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x28, 0x00,

+ 1 - 2
views/camera_suite_view_guide.c

@@ -108,8 +108,7 @@ CameraSuiteViewGuide* camera_suite_view_guide_alloc() {
 void camera_suite_view_guide_free(CameraSuiteViewGuide* instance) {
 void camera_suite_view_guide_free(CameraSuiteViewGuide* instance) {
     furi_assert(instance);
     furi_assert(instance);
 
 
-    with_view_model(
-        instance->view, CameraSuiteViewGuideModel * model, { UNUSED(model); }, true);
+    with_view_model(instance->view, CameraSuiteViewGuideModel * model, { UNUSED(model); }, true);
     view_free(instance->view);
     view_free(instance->view);
     free(instance);
     free(instance);
 }
 }

+ 1 - 1
views/camera_suite_view_guide.h

@@ -16,4 +16,4 @@ View* camera_suite_view_guide_get_view(CameraSuiteViewGuide* camera_suite_static
 
 
 CameraSuiteViewGuide* camera_suite_view_guide_alloc();
 CameraSuiteViewGuide* camera_suite_view_guide_alloc();
 
 
-void camera_suite_view_guide_free(CameraSuiteViewGuide* camera_suite_static);
+void camera_suite_view_guide_free(CameraSuiteViewGuide* camera_suite_static);

+ 1 - 2
views/camera_suite_view_start.c

@@ -189,8 +189,7 @@ CameraSuiteViewStart* camera_suite_view_start_alloc() {
 void camera_suite_view_start_free(CameraSuiteViewStart* instance) {
 void camera_suite_view_start_free(CameraSuiteViewStart* instance) {
     furi_assert(instance);
     furi_assert(instance);
 
 
-    with_view_model(
-        instance->view, CameraSuiteViewStartModel * model, { UNUSED(model); }, true);
+    with_view_model(instance->view, CameraSuiteViewStartModel * model, { UNUSED(model); }, true);
     view_free(instance->view);
     view_free(instance->view);
     free(instance);
     free(instance);
 }
 }