Defined a standard RG_UPDATER_DOWNLOAD_LOCATION

Author: ducalex

components/retro-go/config.h

@@ -84,9 +84,12 @@
 #define RG_UPDATER_ENABLE 1
 #endif
 
-// If either of the following isn't defined then the updater will only perform version *checks*, not self-update
+// If RG_UPDATER_APPLICATION is not defined then the updater only performs version *checks*, not self-update
 // #define RG_UPDATER_APPLICATION       RG_APP_FACTORY
-// #define RG_UPDATER_DOWNLOAD_LOCATION RG_STORAGE_ROOT "/odroid/firmware"
+
+#ifndef RG_UPDATER_DOWNLOAD_LOCATION
+#define RG_UPDATER_DOWNLOAD_LOCATION RG_STORAGE_ROOT "/retro-go/updates"
+#endif
 
 #ifndef RG_UPDATER_GITHUB_RELEASES
 #define RG_UPDATER_GITHUB_RELEASES "https://api.github.com/repos/ducalex/retro-go/releases?per_page=10"

components/retro-go/rg_storage.h

@@ -15,6 +15,11 @@
 #define RG_BASE_PATH_SAVES  RG_BASE_PATH "/saves"
 #define RG_BASE_PATH_THEMES RG_BASE_PATH "/themes"
 #define RG_BASE_PATH_BORDERS RG_BASE_PATH "/borders"
+#ifdef RG_UPDATER_DOWNLOAD_LOCATION
+#define RG_BASE_PATH_UPDATES RG_UPDATER_DOWNLOAD_LOCATION
+#else
+#define RG_BASE_PATH_UPDATES RG_BASE_PATH "/updates"
+#endif
 
 typedef struct
 {

launcher/main/updater.c

@@ -130,7 +130,7 @@ static rg_gui_event_t view_release_cb(rg_gui_option_t *option, rg_gui_event_t ev
 
     if (event == RG_DIALOG_ENTER)
     {
-    #if defined(RG_UPDATER_APPLICATION) && defined(RG_UPDATER_DOWNLOAD_LOCATION)
+    #if defined(RG_UPDATER_APPLICATION)
         rg_gui_option_t options[release->assets_count + 4];
         rg_gui_option_t *opt = options;
 
@@ -145,7 +145,7 @@ static rg_gui_event_t view_release_cb(rg_gui_option_t *option, rg_gui_event_t ev
         if (sel != RG_DIALOG_CANCELLED)
         {
             char dest_path[RG_PATH_MAX];
-            snprintf(dest_path, RG_PATH_MAX, "%s/%s", RG_UPDATER_DOWNLOAD_LOCATION, release->assets[sel].name);
+            snprintf(dest_path, RG_PATH_MAX, "%s/%s", RG_BASE_PATH_UPDATES, release->assets[sel].name);
             if (download_file(release->assets[sel].url, dest_path))
             {
                 if (rg_gui_confirm(_("Download complete!"), _("Reboot to flash?"), true))

updater/main/main.c

@@ -11,12 +11,6 @@
 #include <esp_spi_flash.h>
 #include <esp_ota_ops.h>
 
-#ifdef RG_UPDATER_DOWNLOAD_LOCATION
-#define DOWNLOAD_LOCATION RG_UPDATER_DOWNLOAD_LOCATION
-#else
-#define DOWNLOAD_LOCATION RG_BASE_PATH
-#endif
-
 #if CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED
 #define CAN_UPDATE_PARTITION_TABLE 1
 #else
@@ -206,7 +200,7 @@ void app_main(void)
     // const char *filename = app->romPath;
     while (true)
     {
-        char *filename = rg_gui_file_picker("Select update", DOWNLOAD_LOCATION, NULL, true, true);
+        char *filename = rg_gui_file_picker("Select update", RG_BASE_PATH_UPDATES, NULL, true, true);
         if (!filename || !*filename)
             break;
         if (do_update(filename))