Seperate settings into two views: app and cam settings.

camera_suite.c

@@ -42,16 +42,18 @@ CameraSuite* camera_suite_app_alloc() {
         app->view_dispatcher, camera_suite_custom_event_callback);
     app->submenu = submenu_alloc();
 
-    // Set defaults, in case no config loaded
-    app->orientation = 0; // Orientation is "portrait", zero degrees by default.
-    app->dither = 0; // Dither algorithm is "Floyd Steinberg" by default.
-    app->flash = 1; // Flash is enabled by default.
+    // Set app default settings values.
     app->haptic = 1; // Haptic is enabled by default
     app->jpeg = 0; // Save JPEG to ESP32-CAM sd-card is disabled by default.
     app->speaker = 1; // Speaker is enabled by default
     app->led = 1; // LED is enabled by default
 
-    // Load configs
+    // Set cam default settings values.
+    app->orientation = 0; // Orientation is "portrait", zero degrees by default.
+    app->dither = 0; // Dither algorithm is "Floyd Steinberg" by default.
+    app->flash = 1; // Flash is enabled by default.
+
+    // Load configs if available (overrides defaults).
     camera_suite_read_settings(app);
 
     view_dispatcher_add_view(
@@ -80,7 +82,11 @@ CameraSuite* camera_suite_app_alloc() {
     app->variable_item_list = variable_item_list_alloc();
     view_dispatcher_add_view(
         app->view_dispatcher,
-        CameraSuiteViewIdSettings,
+        CameraSuiteViewIdAppSettings,
+        variable_item_list_get_view(app->variable_item_list));
+    view_dispatcher_add_view(
+        app->view_dispatcher,
+        CameraSuiteViewIdCamSettings,
         variable_item_list_get_view(app->variable_item_list));
 
     //End Scene Additions
@@ -99,7 +105,7 @@ void camera_suite_app_free(CameraSuite* app) {
     view_dispatcher_remove_view(app->view_dispatcher, CameraSuiteViewIdMenu);
     view_dispatcher_remove_view(app->view_dispatcher, CameraSuiteViewIdCamera);
     view_dispatcher_remove_view(app->view_dispatcher, CameraSuiteViewIdGuide);
-    view_dispatcher_remove_view(app->view_dispatcher, CameraSuiteViewIdSettings);
+    view_dispatcher_remove_view(app->view_dispatcher, CameraSuiteViewIdCamSettings);
     submenu_free(app->submenu);
 
     view_dispatcher_free(app->view_dispatcher);

camera_suite.h

@@ -45,7 +45,8 @@ typedef enum {
     CameraSuiteViewIdMenu,
     CameraSuiteViewIdCamera,
     CameraSuiteViewIdGuide,
-    CameraSuiteViewIdSettings,
+    CameraSuiteViewIdAppSettings,
+    CameraSuiteViewIdCamSettings,
 } CameraSuiteViewId;
 
 typedef enum {

scenes/camera_suite_scene_app_settings.c

@@ -0,0 +1,103 @@
+#include "../camera_suite.h"
+#include <lib/toolbox/value_index.h>
+
+const char* const haptic_text[2] = {
+    "OFF",
+    "ON",
+};
+
+const uint32_t haptic_value[2] = {
+    CameraSuiteHapticOff,
+    CameraSuiteHapticOn,
+};
+
+const char* const speaker_text[2] = {
+    "OFF",
+    "ON",
+};
+
+const uint32_t speaker_value[2] = {
+    CameraSuiteSpeakerOff,
+    CameraSuiteSpeakerOn,
+};
+
+const char* const led_text[2] = {
+    "OFF",
+    "ON",
+};
+
+const uint32_t led_value[2] = {
+    CameraSuiteLedOff,
+    CameraSuiteLedOn,
+};
+
+static void camera_suite_scene_app_settings_set_haptic(VariableItem* item) {
+    CameraSuite* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, haptic_text[index]);
+    app->haptic = haptic_value[index];
+}
+
+static void camera_suite_scene_app_settings_set_speaker(VariableItem* item) {
+    CameraSuite* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+    variable_item_set_current_value_text(item, speaker_text[index]);
+    app->speaker = speaker_value[index];
+}
+
+static void camera_suite_scene_app_settings_set_led(VariableItem* item) {
+    CameraSuite* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+    variable_item_set_current_value_text(item, led_text[index]);
+    app->led = led_value[index];
+}
+
+void camera_suite_scene_app_settings_submenu_callback(void* context, uint32_t index) {
+    CameraSuite* app = context;
+    view_dispatcher_send_custom_event(app->view_dispatcher, index);
+}
+
+void camera_suite_scene_app_settings_on_enter(void* context) {
+    CameraSuite* app = context;
+    VariableItem* item;
+    uint8_t value_index;
+
+    // Haptic FX ON/OFF
+    item = variable_item_list_add(
+        app->variable_item_list, "Haptic FX:", 2, camera_suite_scene_app_settings_set_haptic, app);
+    value_index = value_index_uint32(app->haptic, haptic_value, 2);
+    variable_item_set_current_value_index(item, value_index);
+    variable_item_set_current_value_text(item, haptic_text[value_index]);
+
+    // Sound FX ON/OFF
+    item = variable_item_list_add(
+        app->variable_item_list, "Sound FX:", 2, camera_suite_scene_app_settings_set_speaker, app);
+    value_index = value_index_uint32(app->speaker, speaker_value, 2);
+    variable_item_set_current_value_index(item, value_index);
+    variable_item_set_current_value_text(item, speaker_text[value_index]);
+
+    // LED FX ON/OFF
+    item = variable_item_list_add(
+        app->variable_item_list, "LED FX:", 2, camera_suite_scene_app_settings_set_led, app);
+    value_index = value_index_uint32(app->led, led_value, 2);
+    variable_item_set_current_value_index(item, value_index);
+    variable_item_set_current_value_text(item, led_text[value_index]);
+
+    view_dispatcher_switch_to_view(app->view_dispatcher, CameraSuiteViewIdAppSettings);
+}
+
+bool camera_suite_scene_app_settings_on_event(void* context, SceneManagerEvent event) {
+    CameraSuite* app = context;
+    UNUSED(app);
+    bool consumed = false;
+    if(event.type == SceneManagerEventTypeCustom) {
+    }
+    return consumed;
+}
+
+void camera_suite_scene_app_settings_on_exit(void* context) {
+    CameraSuite* app = context;
+    variable_item_list_set_selected_item(app->variable_item_list, 0);
+    variable_item_list_reset(app->variable_item_list);
+}

scenes/camera_suite_scene_settings.c → scenes/camera_suite_scene_cam_settings.c

@@ -49,37 +49,7 @@ const uint32_t jpeg_value[2] = {
     CameraSuiteJpegOn,
 };
 
-const char* const haptic_text[2] = {
-    "OFF",
-    "ON",
-};
-
-const uint32_t haptic_value[2] = {
-    CameraSuiteHapticOff,
-    CameraSuiteHapticOn,
-};
-
-const char* const speaker_text[2] = {
-    "OFF",
-    "ON",
-};
-
-const uint32_t speaker_value[2] = {
-    CameraSuiteSpeakerOff,
-    CameraSuiteSpeakerOn,
-};
-
-const char* const led_text[2] = {
-    "OFF",
-    "ON",
-};
-
-const uint32_t led_value[2] = {
-    CameraSuiteLedOff,
-    CameraSuiteLedOn,
-};
-
-static void camera_suite_scene_settings_set_camera_orientation(VariableItem* item) {
+static void camera_suite_scene_cam_settings_set_camera_orientation(VariableItem* item) {
     CameraSuite* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
 
@@ -87,7 +57,7 @@ static void camera_suite_scene_settings_set_camera_orientation(VariableItem* ite
     app->orientation = orientation_value[index];
 }
 
-static void camera_suite_scene_settings_set_camera_dither(VariableItem* item) {
+static void camera_suite_scene_cam_settings_set_camera_dither(VariableItem* item) {
     CameraSuite* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
 
@@ -95,7 +65,7 @@ static void camera_suite_scene_settings_set_camera_dither(VariableItem* item) {
     app->dither = dither_value[index];
 }
 
-static void camera_suite_scene_settings_set_flash(VariableItem* item) {
+static void camera_suite_scene_cam_settings_set_flash(VariableItem* item) {
     CameraSuite* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
 
@@ -103,7 +73,7 @@ static void camera_suite_scene_settings_set_flash(VariableItem* item) {
     app->flash = flash_value[index];
 }
 
-static void camera_suite_scene_settings_set_jpeg(VariableItem* item) {
+static void camera_suite_scene_cam_settings_set_jpeg(VariableItem* item) {
     CameraSuite* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
 
@@ -111,34 +81,12 @@ static void camera_suite_scene_settings_set_jpeg(VariableItem* item) {
     app->jpeg = jpeg_value[index];
 }
 
-static void camera_suite_scene_settings_set_haptic(VariableItem* item) {
-    CameraSuite* app = variable_item_get_context(item);
-    uint8_t index = variable_item_get_current_value_index(item);
-
-    variable_item_set_current_value_text(item, haptic_text[index]);
-    app->haptic = haptic_value[index];
-}
-
-static void camera_suite_scene_settings_set_speaker(VariableItem* item) {
-    CameraSuite* app = variable_item_get_context(item);
-    uint8_t index = variable_item_get_current_value_index(item);
-    variable_item_set_current_value_text(item, speaker_text[index]);
-    app->speaker = speaker_value[index];
-}
-
-static void camera_suite_scene_settings_set_led(VariableItem* item) {
-    CameraSuite* app = variable_item_get_context(item);
-    uint8_t index = variable_item_get_current_value_index(item);
-    variable_item_set_current_value_text(item, led_text[index]);
-    app->led = led_value[index];
-}
-
-void camera_suite_scene_settings_submenu_callback(void* context, uint32_t index) {
+void camera_suite_scene_cam_settings_submenu_callback(void* context, uint32_t index) {
     CameraSuite* app = context;
     view_dispatcher_send_custom_event(app->view_dispatcher, index);
 }
 
-void camera_suite_scene_settings_on_enter(void* context) {
+void camera_suite_scene_cam_settings_on_enter(void* context) {
     CameraSuite* app = context;
     VariableItem* item;
     uint8_t value_index;
@@ -148,7 +96,7 @@ void camera_suite_scene_settings_on_enter(void* context) {
         app->variable_item_list,
         "Orientation:",
         4,
-        camera_suite_scene_settings_set_camera_orientation,
+        camera_suite_scene_cam_settings_set_camera_orientation,
         app);
     value_index = value_index_uint32(app->orientation, orientation_value, 4);
     variable_item_set_current_value_index(item, value_index);
@@ -159,7 +107,7 @@ void camera_suite_scene_settings_on_enter(void* context) {
         app->variable_item_list,
         "Dithering Type:",
         3,
-        camera_suite_scene_settings_set_camera_dither,
+        camera_suite_scene_cam_settings_set_camera_dither,
         app);
     value_index = value_index_uint32(app->dither, dither_value, 3);
     variable_item_set_current_value_index(item, value_index);
@@ -167,7 +115,7 @@ void camera_suite_scene_settings_on_enter(void* context) {
 
     // Flash ON/OFF
     item = variable_item_list_add(
-        app->variable_item_list, "Flash:", 2, camera_suite_scene_settings_set_flash, app);
+        app->variable_item_list, "Flash:", 2, camera_suite_scene_cam_settings_set_flash, app);
     value_index = value_index_uint32(app->flash, flash_value, 2);
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, flash_text[value_index]);
@@ -179,38 +127,17 @@ void camera_suite_scene_settings_on_enter(void* context) {
     //     app->variable_item_list,
     //     "Save JPEG to ext sdcard:",
     //     2,
-    //     camera_suite_scene_settings_set_jpeg,
+    //     camera_suite_scene_cam_settings_set_jpeg,
     //     app);
     // value_index = value_index_uint32(app->jpeg, jpeg_value, 2);
     // variable_item_set_current_value_index(item, value_index);
     // variable_item_set_current_value_text(item, jpeg_text[value_index]);
-    UNUSED(camera_suite_scene_settings_set_jpeg);
+    UNUSED(camera_suite_scene_cam_settings_set_jpeg);
 
-    // Haptic FX ON/OFF
-    item = variable_item_list_add(
-        app->variable_item_list, "Haptic FX:", 2, camera_suite_scene_settings_set_haptic, app);
-    value_index = value_index_uint32(app->haptic, haptic_value, 2);
-    variable_item_set_current_value_index(item, value_index);
-    variable_item_set_current_value_text(item, haptic_text[value_index]);
-
-    // Sound FX ON/OFF
-    item = variable_item_list_add(
-        app->variable_item_list, "Sound FX:", 2, camera_suite_scene_settings_set_speaker, app);
-    value_index = value_index_uint32(app->speaker, speaker_value, 2);
-    variable_item_set_current_value_index(item, value_index);
-    variable_item_set_current_value_text(item, speaker_text[value_index]);
-
-    // LED FX ON/OFF
-    item = variable_item_list_add(
-        app->variable_item_list, "LED FX:", 2, camera_suite_scene_settings_set_led, app);
-    value_index = value_index_uint32(app->led, led_value, 2);
-    variable_item_set_current_value_index(item, value_index);
-    variable_item_set_current_value_text(item, led_text[value_index]);
-
-    view_dispatcher_switch_to_view(app->view_dispatcher, CameraSuiteViewIdSettings);
+    view_dispatcher_switch_to_view(app->view_dispatcher, CameraSuiteViewIdCamSettings);
 }
 
-bool camera_suite_scene_settings_on_event(void* context, SceneManagerEvent event) {
+bool camera_suite_scene_cam_settings_on_event(void* context, SceneManagerEvent event) {
     CameraSuite* app = context;
     UNUSED(app);
     bool consumed = false;
@@ -219,8 +146,8 @@ bool camera_suite_scene_settings_on_event(void* context, SceneManagerEvent event
     return consumed;
 }
 
-void camera_suite_scene_settings_on_exit(void* context) {
+void camera_suite_scene_cam_settings_on_exit(void* context) {
     CameraSuite* app = context;
     variable_item_list_set_selected_item(app->variable_item_list, 0);
     variable_item_list_reset(app->variable_item_list);
-}
+}

scenes/camera_suite_scene_config.h

@@ -2,4 +2,5 @@ ADD_SCENE(camera_suite, start, Start)
 ADD_SCENE(camera_suite, menu, Menu)
 ADD_SCENE(camera_suite, camera, Camera)
 ADD_SCENE(camera_suite, guide, Guide)
-ADD_SCENE(camera_suite, settings, Settings)
+ADD_SCENE(camera_suite, app_settings, AppSettings)
+ADD_SCENE(camera_suite, cam_settings, CamSettings)

scenes/camera_suite_scene_menu.c

@@ -5,8 +5,10 @@ enum SubmenuIndex {
     SubmenuIndexSceneCamera = 10,
     /** Guide/how-to. */
     SubmenuIndexGuide,
-    /** Settings menu. */
-    SubmenuIndexSettings,
+    /** Cam settings menu. */
+    SubmenuIndexCamSettings,
+    /** App settings menu. */
+    SubmenuIndexAppSettings,
 };
 
 void camera_suite_scene_menu_submenu_callback(void* context, uint32_t index) {
@@ -23,12 +25,21 @@ void camera_suite_scene_menu_on_enter(void* context) {
         SubmenuIndexSceneCamera,
         camera_suite_scene_menu_submenu_callback,
         app);
+
     submenu_add_item(
         app->submenu, "Guide", SubmenuIndexGuide, camera_suite_scene_menu_submenu_callback, app);
+
     submenu_add_item(
         app->submenu,
-        "Settings",
-        SubmenuIndexSettings,
+        "Cam Settings",
+        SubmenuIndexCamSettings,
+        camera_suite_scene_menu_submenu_callback,
+        app);
+
+    submenu_add_item(
+        app->submenu,
+        "App Settings",
+        SubmenuIndexAppSettings,
         camera_suite_scene_menu_submenu_callback,
         app);
 
@@ -57,10 +68,15 @@ bool camera_suite_scene_menu_on_event(void* context, SceneManagerEvent event) {
                 app->scene_manager, CameraSuiteSceneMenu, SubmenuIndexGuide);
             scene_manager_next_scene(app->scene_manager, CameraSuiteSceneGuide);
             return true;
-        } else if(event.event == SubmenuIndexSettings) {
+        } else if(event.event == SubmenuIndexAppSettings) {
+            scene_manager_set_scene_state(
+                app->scene_manager, CameraSuiteSceneMenu, SubmenuIndexAppSettings);
+            scene_manager_next_scene(app->scene_manager, CameraSuiteSceneAppSettings);
+            return true;
+        } else if(event.event == SubmenuIndexCamSettings) {
             scene_manager_set_scene_state(
-                app->scene_manager, CameraSuiteSceneMenu, SubmenuIndexSettings);
-            scene_manager_next_scene(app->scene_manager, CameraSuiteSceneSettings);
+                app->scene_manager, CameraSuiteSceneMenu, SubmenuIndexCamSettings);
+            scene_manager_next_scene(app->scene_manager, CameraSuiteSceneCamSettings);
             return true;
         }
     }