Added option to select startup app (Launcher or last used emu)

Author: ducalex

components/odroid/odroid_overlay.c

@@ -10,7 +10,6 @@
 #include "math.h"
 
 static uint16_t *overlay_buffer = NULL;
-static const char *NVS_KEY_FONTSIZE = "FontSize";
 
 short ODROID_FONT_WIDTH = 8;
 short ODROID_FONT_HEIGHT = 8;
@@ -33,17 +32,15 @@ void odroid_overlay_init()
 	if (!overlay_buffer) {
         overlay_buffer = (uint16_t *)rg_alloc(ODROID_SCREEN_WIDTH * 16 * 2, MEM_SLOW);
     }
-    odroid_overlay_set_font_size(odroid_settings_int32_get(NVS_KEY_FONTSIZE, 1));
+    odroid_overlay_set_font_size(odroid_settings_FontSize_get());
 }
 
 void odroid_overlay_set_font_size(int factor)
 {
     factor = factor < 1 ? 1 : factor;
     factor = factor > 3 ? 3 : factor;
     ODROID_FONT_HEIGHT = 8 * factor;
-    if (factor != odroid_settings_int32_get(NVS_KEY_FONTSIZE, 0)) {
-        odroid_settings_int32_set(NVS_KEY_FONTSIZE, factor);
-    }
+    odroid_settings_FontSize_set(factor);
 }
 
 void odroid_overlay_draw_text(uint16_t x_pos, uint16_t y_pos, uint16_t width, char *text, uint16_t color, uint16_t color_bg)

components/odroid/odroid_settings.c

@@ -11,11 +11,13 @@ static const char* NvsKey_VRef = "VRef";
 static const char* NvsKey_DataSlot = "DataSlot";
 static const char* NvsKey_Backlight = "Backlight";
 static const char* NvsKey_StartAction = "StartAction";
+static const char* NvsKey_StartupApp = "StartupApp";
 static const char* NvsKey_Scaling = "Scaling";
 static const char* NvsKey_AudioSink = "AudioSink";
 static const char* NvsKey_Palette = "Palette";
 static const char* NvsKey_Region = "Region";
 static const char* NvsKey_DispFilter = "DispFilter";
+static const char* NvsKey_FontSize = "FontSize";
 
 static nvs_handle my_handle;
 
@@ -112,23 +114,23 @@ void odroid_settings_app_int32_set(const char *key, int32_t value)
 }
 
 
-char* odroid_settings_RomFilePath_get()
+int32_t odroid_settings_FontSize_get()
 {
-    return odroid_settings_string_get(NvsKey_RomFilePath, NULL);
+    return odroid_settings_int32_get(NvsKey_FontSize, 1);
 }
-void odroid_settings_RomFilePath_set(char* value)
+void odroid_settings_FontSize_set(int32_t value)
 {
-    odroid_settings_string_set(NvsKey_RomFilePath, value);
+    odroid_settings_int32_set(NvsKey_FontSize, value);
 }
 
 
-int32_t odroid_settings_VRef_get()
+char* odroid_settings_RomFilePath_get()
 {
-	return odroid_settings_int32_get(NvsKey_VRef, 1100);
+    return odroid_settings_string_get(NvsKey_RomFilePath, NULL);
 }
-void odroid_settings_VRef_set(int32_t value)
+void odroid_settings_RomFilePath_set(char* value)
 {
-    odroid_settings_int32_set(NvsKey_VRef, value);
+    odroid_settings_string_set(NvsKey_RomFilePath, value);
 }
 
 
@@ -172,6 +174,15 @@ void odroid_settings_StartAction_set(ODROID_START_ACTION value)
 }
 
 
+int32_t odroid_settings_StartupApp_get()
+{
+    return odroid_settings_int32_get(NvsKey_StartupApp, 1);
+}
+void odroid_settings_StartupApp_set(int32_t value)
+{
+    odroid_settings_int32_set(NvsKey_StartupApp, value);
+}
+
 
 int32_t odroid_settings_DataSlot_get()
 {

components/odroid/odroid_settings.h

@@ -5,7 +5,7 @@
 typedef enum
 {
     ODROID_START_ACTION_RESUME = 0,
-    ODROID_START_ACTION_RESTART,
+    ODROID_START_ACTION_NEWGAME,
     ODROID_START_ACTION_NETPLAY
 } ODROID_START_ACTION;
 
@@ -24,8 +24,8 @@ typedef enum
 
 void odroid_settings_init();
 
-int32_t odroid_settings_VRef_get();
-void odroid_settings_VRef_set(int32_t value);
+int32_t odroid_settings_FontSize_get();
+void odroid_settings_FontSize_set(int32_t);
 
 int32_t odroid_settings_Volume_get();
 void odroid_settings_Volume_set(int32_t value);
@@ -39,6 +39,9 @@ void odroid_settings_DataSlot_set(int32_t value);
 int32_t odroid_settings_Backlight_get();
 void odroid_settings_Backlight_set(int32_t value);
 
+int32_t odroid_settings_StartupApp_get();
+void odroid_settings_StartupApp_set(int32_t value);
+
 ODROID_START_ACTION odroid_settings_StartAction_get();
 void odroid_settings_StartAction_set(ODROID_START_ACTION value);
 
@@ -57,6 +60,8 @@ void odroid_settings_DisplayScaling_set(int32_t value);
 int32_t odroid_settings_DisplayFilter_get();
 void odroid_settings_DisplayFilter_set(int32_t value);
 
+/*** Generic functions ***/
+
 void odroid_settings_string_set(const char *key, char *value);
 char* odroid_settings_string_get(const char *key, char *default_value);
 

components/odroid/odroid_system.c

@@ -92,12 +92,6 @@ void odroid_system_init(int appId, int sampleRate)
         odroid_system_halt();
     }
 
-    startAction = odroid_settings_StartAction_get();
-    if (startAction == ODROID_START_ACTION_RESTART)
-    {
-        odroid_settings_StartAction_set(ODROID_START_ACTION_RESUME);
-    }
-
     xTaskCreate(&odroid_system_monitor_task, "sysmon", 2048, NULL, 7, NULL);
 
     // esp_task_wdt_init(5, true);
@@ -121,6 +115,18 @@ void odroid_system_emu_init(state_handler_t load, state_handler_t save, netplay_
         odroid_netplay_pre_init(netplay_cb);
     }
 
+    if (odroid_settings_StartupApp_get() == 0)
+    {
+        // Only boot this emu once, next time will return to launcher
+        odroid_system_set_boot_app(0);
+    }
+
+    startAction = odroid_settings_StartAction_get();
+    if (startAction == ODROID_START_ACTION_NEWGAME)
+    {
+        odroid_settings_StartAction_set(ODROID_START_ACTION_RESUME);
+    }
+
     romPath = odroid_settings_RomFilePath_get();
     if (!romPath || strlen(romPath) < 4)
     {
@@ -333,7 +339,7 @@ void odroid_system_set_boot_app(int slot)
     // Do not overwrite the boot sector for nothing
     const esp_partition_t* boot_partition = esp_ota_get_boot_partition();
 
-    if (partition != NULL && partition != boot_partition)
+    if (partition != NULL) //  && partition != boot_partition
     {
         esp_err_t err = esp_ota_set_boot_partition(partition);
         if (err != ESP_OK)

retro-go/main/main.c

@@ -26,7 +26,7 @@ static void redraw_screen()
 
 static bool font_size_cb(odroid_dialog_choice_t *option, odroid_dialog_event_t event)
 {
-    int font_size = odroid_settings_int32_get("FontSize", 1);
+    int font_size = odroid_settings_FontSize_get();
     if (event == ODROID_DIALOG_PREV) {
         if (--font_size < 1) font_size = 2;
         odroid_overlay_set_font_size(font_size);
@@ -51,6 +51,17 @@ static bool hide_empty_cb(odroid_dialog_choice_t *option, odroid_dialog_event_t
     return event == ODROID_DIALOG_ENTER;
 }
 
+static bool startup_app_cb(odroid_dialog_choice_t *option, odroid_dialog_event_t event)
+{
+    int startup_app = odroid_settings_StartupApp_get();
+    if (event == ODROID_DIALOG_PREV || event == ODROID_DIALOG_NEXT) {
+        startup_app = startup_app ? 0 : 1;
+        odroid_settings_StartupApp_set(startup_app);
+    }
+    strcpy(option->value, startup_app == 0 ? "Launcher" : "LastUsed");
+    return event == ODROID_DIALOG_ENTER;
+}
+
 static bool show_cover_cb(odroid_dialog_choice_t *option, odroid_dialog_event_t event)
 {
     if (event == ODROID_DIALOG_PREV) {
@@ -199,7 +210,7 @@ void retro_loop()
                         break;
                     }
                     else if (sel == 1) {
-                        odroid_settings_StartAction_set(ODROID_START_ACTION_RESTART);
+                        odroid_settings_StartAction_set(ODROID_START_ACTION_NEWGAME);
                         break;
                     }
                     else if (sel == 2) {
@@ -251,6 +262,8 @@ void retro_loop()
                     {0, "Font size", "Small", 1, &font_size_cb},
                     {0, "Show cover", "Yes", 1, &show_cover_cb},
                     {0, "Show empty", "Yes", 1, &hide_empty_cb},
+                    {0, "---", "", -1, NULL},
+                    {0, "Startup app", "Last", 1, &startup_app_cb},
                     ODROID_DIALOG_CHOICE_LAST
                 };
                 odroid_overlay_settings_menu(choices);