Version bump to 1.0.2

Port [Ram] from ram_config.ini when present, preserve existing HekateAms settings, then remove the legacy file.

DEBUG_INI.md

@@ -8,7 +8,7 @@ Optional file to **skip parts of the install** for testing (e.g. run only deleti
 sd:/config/omninx/debug.ini
 ```
 
-Create the folder `sd:/config/omninx/` on the SD card if it does not exist. Same parent directory as `manifest.ini` and `ram_config.ini`.
+Create the folder `sd:/config/omninx/` on the SD card if it does not exist. Same parent directory as `manifest.ini` and `config.ini`.
 
 ## Format
 
@@ -87,4 +87,4 @@ skip_update_horizon_oc=1
 ## Implementation
 
 - Parsed in `install.c`: `install_debug_load()`, `perform_installation()`.
-- Uses the same INI parser as `ram_config.ini` (`ini_parse` from BDK).
+- Uses the same INI parser as `config.ini` (`ini_parse` from BDK).

VERSION

@@ -1 +1 @@
-1.0.0
+1.0.2

bdk/input/joycon.c

@@ -721,6 +721,12 @@ void jc_deinit()
 	clock_disable_uart(UART_C);
 }
 
+/* Drop current button state without power-cycling the Joy-Cons. */
+void jc_clear_input(void)
+{
+	jc_gamepad.buttons = 0;
+}
+
 static void jc_init_conn(joycon_ctxt_t *jc)
 {
 	if (((u32)get_tmr_ms() - jc->last_received_time) > 1000)

bdk/input/joycon.h

@@ -92,6 +92,7 @@ typedef struct _jc_gamepad_rpt_t
 void jc_power_supply(u8 uart, bool enable);
 void jc_init_hw();
 void jc_deinit();
+void jc_clear_input(void);
 jc_gamepad_rpt_t *joycon_poll();
 jc_gamepad_rpt_t *jc_get_bt_pairing_info(bool *is_l_hos, bool *is_r_hos);
 

source/backup.c

@@ -39,6 +39,35 @@ int backup_user_data(void) {
             return res;
         }
     }
+
+    // Backup CyberFoil (nro, config, remotes) if installed
+    if (path_exists(CYBERFOIL_DIR)) {
+        res = f_mkdir(TEMP_BACKUP_CYBERFOIL);
+        if (res != FR_OK && res != FR_EXIST) {
+            return res;
+        }
+
+        if (path_exists(CYBERFOIL_NRO)) {
+            res = file_copy(CYBERFOIL_NRO, TEMP_BACKUP_CYBERFOIL_NRO);
+            if (res != FR_OK) {
+                return res;
+            }
+        }
+
+        if (path_exists(CYBERFOIL_CONFIG)) {
+            res = file_copy(CYBERFOIL_CONFIG, TEMP_BACKUP_CYBERFOIL_CONFIG);
+            if (res != FR_OK) {
+                return res;
+            }
+        }
+
+        if (path_exists(CYBERFOIL_REMOTES)) {
+            res = folder_copy(CYBERFOIL_REMOTES, TEMP_BACKUP_CYBERFOIL);
+            if (res != FR_OK) {
+                return res;
+            }
+        }
+    }
     
     return FR_OK;
 }
@@ -72,6 +101,35 @@ int restore_user_data(void) {
             return res;
         }
     }
+
+    // Restore CyberFoil if backed up
+    if (path_exists(TEMP_BACKUP_CYBERFOIL)) {
+        res = f_mkdir(CYBERFOIL_DIR);
+        if (res != FR_OK && res != FR_EXIST) {
+            return res;
+        }
+
+        if (path_exists(TEMP_BACKUP_CYBERFOIL_NRO)) {
+            res = file_copy(TEMP_BACKUP_CYBERFOIL_NRO, CYBERFOIL_NRO);
+            if (res != FR_OK) {
+                return res;
+            }
+        }
+
+        if (path_exists(TEMP_BACKUP_CYBERFOIL_CONFIG)) {
+            res = file_copy(TEMP_BACKUP_CYBERFOIL_CONFIG, CYBERFOIL_CONFIG);
+            if (res != FR_OK) {
+                return res;
+            }
+        }
+
+        if (path_exists(TEMP_BACKUP_CYBERFOIL_REMOTES)) {
+            res = folder_copy(TEMP_BACKUP_CYBERFOIL_REMOTES, CYBERFOIL_DIR);
+            if (res != FR_OK) {
+                return res;
+            }
+        }
+    }
     
     return FR_OK;
 }

source/backup.h

@@ -11,13 +11,23 @@
 #define DBI_CONFIG_PATH "sd:/switch/DBI/dbi.config"
 #define TEMP_BACKUP_DBI_CONFIG TEMP_BACKUP_PATH "/dbi.config"
 
+/** CyberFoil homebrew; preserved across clean install (nro, config, remotes only). */
+#define CYBERFOIL_DIR "sd:/switch/CyberFoil"
+#define CYBERFOIL_NRO CYBERFOIL_DIR "/cyberfoil.nro"
+#define CYBERFOIL_CONFIG CYBERFOIL_DIR "/config.json"
+#define CYBERFOIL_REMOTES CYBERFOIL_DIR "/remotes"
+#define TEMP_BACKUP_CYBERFOIL TEMP_BACKUP_PATH "/CyberFoil"
+#define TEMP_BACKUP_CYBERFOIL_NRO TEMP_BACKUP_CYBERFOIL "/cyberfoil.nro"
+#define TEMP_BACKUP_CYBERFOIL_CONFIG TEMP_BACKUP_CYBERFOIL "/config.json"
+#define TEMP_BACKUP_CYBERFOIL_REMOTES TEMP_BACKUP_CYBERFOIL "/remotes"
+
 /** Live HorizonOC settings (Overclock tool). */
 #define HORIZON_OC_CONFIG_PATH "sd:/config/horizon-oc/config.ini"
 /** Scratch dir during OC-variant update only; removed after successful restore. */
 #define HORIZON_OC_UPDATE_BACKUP_DIR "sd:/.omninx_oc_update"
 #define HORIZON_OC_UPDATE_BACKUP_INI HORIZON_OC_UPDATE_BACKUP_DIR "/config.ini"
 
-// Backup user data (DBI dbi.config, prod.keys) before clean install
+// Backup user data (CyberFoil, DBI dbi.config, prod.keys) before clean install
 int backup_user_data(void);
 
 // Restore user data after clean install

source/deletion_lists_clean.h

@@ -2,7 +2,7 @@
  * OmniNX Installer - Deletion Lists for Clean Install Mode
  * Deletion policy aligned with NiklasCFW pack clean install (TegraExplorer script):
  * full sd:/atmosphere, bootloader/config subsets, sd:/switch, root + misc, then
- * post-restore paths (e.g. tinfoil db). DBI/prod.keys backup is in backup.c.
+ * post-restore paths (e.g. tinfoil db). CyberFoil/DBI/prod.keys backup is in backup.c.
  */
 
 #pragma once
@@ -128,5 +128,6 @@ static const char* old_version_files_to_delete[] = {
     "sd:/1.5.0",
     "sd:/1.6.0",
     "sd:/1.6.1",
+    "sd:/1.6.2",
     NULL
 };

source/deletion_lists_update.h

@@ -134,17 +134,19 @@ static const char* switch_dirs_to_delete[] = {
     "sd:/switch/amsPLUS-downloader",
     "sd:/switch/appstore",
     "sd:/switch/AtmoXL-Titel-Installer",
+    "sd:/switch/Benchmark-Toolbox",
     "sd:/switch/breeze",
-    "sd:/switch/checkpoint",
     "sd:/switch/cheats-updater",
     "sd:/switch/chiaki",
     "sd:/switch/ChoiDujourNX",
     "sd:/switch/crash_ams",
     "sd:/switch/Daybreak",
+    "sd:/switch/DNS-Block_Tester",
     "sd:/switch/DNS_mitm Tester",
     "sd:/switch/EdiZon",
     "sd:/switch/Fizeau",
     "sd:/switch/FTPD",
+    "sd:/switch/Furmark-NX",
     "sd:/switch/fw-downloader",
     "sd:/switch/gamecard_installer",
     "sd:/switch/Goldleaf",
@@ -169,6 +171,7 @@ static const char* switch_dirs_to_delete[] = {
     "sd:/switch/reboot_to_argonNX",
     "sd:/switch/reboot_to_hekate",
     "sd:/switch/Shutdown_System",
+    "sd:/switch/SimpleModAlchemist",
     "sd:/switch/SimpleModDownloader",
     "sd:/switch/SimpleModManager",
     "sd:/switch/sphaira",
@@ -176,18 +179,22 @@ static const char* switch_dirs_to_delete[] = {
     "sd:/switch/Switch-Time",
     "sd:/switch/SwitchIdent",
     "sd:/switch/Switch_themes_Installer",
+    "sd:/switch/swr-ini-tool",
     "sd:/switch/Sys-Clk Manager",
     "sd:/switch/Sys-Con",
     "sd:/switch/sys-clk-manager",
     "sd:/switch/themezer-nx",
+    "sd:/switch/ThemezerNX",
     "sd:/switch/themezernx",
     "sd:/switch/tinwoo",
+    "sd:/switch/Ultrahand-Reload",
     NULL
 };
 
 // Switch files (NRO) to delete
 static const char* switch_files_to_delete[] = {
     "sd:/switch/90DNS_tester/90DNS_tester.nro",
+    "sd:/switch/Benchmark-Toolbox/Benchmark-Toolbox.nro",
     "sd:/switch/breeze.nro",
     "sd:/switch/cheats-updater.nro",
     "sd:/switch/chiaki.nro",
@@ -207,9 +214,11 @@ static const char* switch_files_to_delete[] = {
     "sd:/switch/DBI_RU/DBI_RU.nro",
     "sd:/switch/DBI/DBI_EN.nro",
     "sd:/switch/DBI_DE/DBI_DE.nro",
+    "sd:/switch/DNS-Block_Tester/dns_tester.nro",
     "sd:/switch/DNS_mitm Tester.nro",
     "sd:/switch/EdiZon.nro",
     "sd:/switch/Fizeau.nro",
+    "sd:/switch/Furmark-NX/Furmark-NX.nro",
     "sd:/switch/Goldleaf.nro",
     "sd:/switch/haze.nro",
     "sd:/switch/JKSV.nro",
@@ -223,6 +232,7 @@ static const char* switch_files_to_delete[] = {
     "sd:/switch/nxdumptool.nro",
     "sd:/switch/nxtc.bin",
     "sd:/switch/reboot_to_payload.nro",
+    "sd:/switch/SimpleModAlchemist/Simple_Mod_Alchemist.nro",
     "sd:/switch/SimpleModDownloader.nro",
     "sd:/switch/SimpleModManager.nro",
     "sd:/switch/sphaira.nro",
@@ -232,10 +242,12 @@ static const char* switch_files_to_delete[] = {
     "sd:/switch/Sys-Clk Manager/sys-clk-manager.nro",
     "sd:/switch/Sys-Con.nro",
     "sd:/switch/sys-clk-manager.nro",
+    "sd:/switch/ThemezerNX/themezer-nx.nro",
     "sd:/switch/tinfoil.nro",
     "sd:/switch/tinfoil/tinfoil.nro",
     "sd:/switch/tinwoo.nro",
     "sd:/switch/tinwoo/tinwoo.nro",
+    "sd:/switch/Ultrahand-Reload/Ultrahand-Reload.nro",
     NULL
 };
 

source/install.c

@@ -23,11 +23,6 @@
 
 static bool install_path_blocked_by_user_preserve(const char *path);
 
-#ifndef VERSION
-#define VERSION "1.0.0"
-#endif
-
-
 // Color definitions (some already defined in types.h, but we override for consistency)
 #undef COLOR_CYAN
 #undef COLOR_WHITE
@@ -637,12 +632,19 @@ int delete_path_list(const char* paths[], const char* description) {
     return (failed == 0) ? FR_OK : FR_DISK_ERR;
 }
 
-#define HEKATE_8GB_SRC   "sd:/bootloader/hekate_8gb.bin"
-#define PAYLOAD_BIN_DST  "sd:/payload.bin"
-#define UPDATE_BIN_DST   "sd:/bootloader/update.bin"
-#define RAM_CONFIG_PATH  "sd:/config/omninx/ram_config.ini"
+#define EXTRAS_DIR              "sd:/extras"
+#define HEKATE_8GB_SRC          EXTRAS_DIR "/hekate_8gb.bin"
+#define HEKATE_PRO_8GB_SRC      EXTRAS_DIR "/hekate-pro_8gb.bin"
+#define HEKATE_AMS_PRO_SRC      EXTRAS_DIR "/hekate-ams-pro"
+#define PAYLOAD_BIN_DST         "sd:/payload.bin"
+#define UPDATE_BIN_DST          "sd:/bootloader/update.bin"
+#define INSTALL_CONFIG_INI         "sd:/config/omninx/config.ini"
+#define INSTALL_CONFIG_INI_LEGACY  "sd:/config/omninx/ram_config.ini"
 
-enum { RAM_READ_OK = 0, RAM_READ_NEED_MENU = 1 };
+enum {
+    INSTALL_CONFIG_OK = 0,
+    INSTALL_CONFIG_NEED_MENU = 1,
+};
 
 static void unlink_ignore_err(const char *path)
 {
@@ -654,30 +656,13 @@ static void unlink_ignore_err(const char *path)
     f_unlink(path);
 }
 
-static void ram_config_ensure_parent_dirs(void)
+static void install_config_ensure_parent_dirs(void)
 {
     f_mkdir("sd:/config");
     f_mkdir("sd:/config/omninx");
 }
 
-static int ram_config_write(bool use_8gb)
-{
-    ram_config_ensure_parent_dirs();
-    FIL f;
-    if (f_open(&f, RAM_CONFIG_PATH, FA_WRITE | FA_CREATE_ALWAYS) != FR_OK)
-        return FR_DISK_ERR;
-
-    static const char sec[] = "[Ram]\n";
-    static const char line0[] = "8gb=0\n";
-    static const char line1[] = "8gb=1\n";
-    UINT bw;
-    f_write(&f, sec, sizeof(sec) - 1, &bw);
-    f_write(&f, use_8gb ? line1 : line0, sizeof(line0) - 1, &bw);
-    f_close(&f);
-    return FR_OK;
-}
-
-static void ram_config_free_sections(link_t *sections)
+static void install_ini_free_sections(link_t *sections)
 {
     LIST_FOREACH_ENTRY(ini_sec_t, sec, sections, link) {
         LIST_FOREACH_ENTRY(ini_kv_t, kv, &sec->kvs, link) {
@@ -688,6 +673,124 @@ static void ram_config_free_sections(link_t *sections)
     }
 }
 
+static bool install_config_read_key_bool(const char *path, const char *section, const char *key, bool *out)
+{
+    FIL f;
+    if (f_open(&f, path, FA_READ) != FR_OK)
+        return false;
+
+    char line[96];
+    bool in_section = false;
+    bool found = false;
+
+    while (f_gets(line, sizeof(line), &f)) {
+        size_t n = strlen(line);
+        while (n > 0 && (line[n - 1] == '\n' || line[n - 1] == '\r'))
+            line[--n] = '\0';
+        if (n == 0)
+            continue;
+
+        if (line[0] == '[') {
+            in_section = false;
+            char *end = strchr(line, ']');
+            if (!end)
+                continue;
+            *end = '\0';
+            if (!strcmp(line + 1, section))
+                in_section = true;
+            continue;
+        }
+
+        if (!in_section)
+            continue;
+
+        char *eq = strchr(line, '=');
+        if (!eq)
+            continue;
+        *eq = '\0';
+        if (strcmp(line, key) != 0)
+            continue;
+
+        const char *val = eq + 1;
+        if (!strcmp(val, "0")) {
+            *out = false;
+            found = true;
+        } else if (!strcmp(val, "1")) {
+            *out = true;
+            found = true;
+        }
+        break;
+    }
+
+    f_close(&f);
+    return found;
+}
+
+/* Valid [Ram] 8gb=0|1 in config.ini → silent; else menu. */
+static int install_config_read_ram(bool *use_8gb)
+{
+    if (!install_path_exists(INSTALL_CONFIG_INI))
+        return INSTALL_CONFIG_NEED_MENU;
+    if (install_config_read_key_bool(INSTALL_CONFIG_INI, "Ram", "8gb", use_8gb))
+        return INSTALL_CONFIG_OK;
+    return INSTALL_CONFIG_NEED_MENU;
+}
+
+/* Valid [HekateAms] pro=0|1 in config.ini → silent; else menu. */
+static int install_config_read_hekate_ams(bool *use_pro)
+{
+    if (!install_path_exists(INSTALL_CONFIG_INI))
+        return INSTALL_CONFIG_NEED_MENU;
+    if (install_config_read_key_bool(INSTALL_CONFIG_INI, "HekateAms", "pro", use_pro))
+        return INSTALL_CONFIG_OK;
+    return INSTALL_CONFIG_NEED_MENU;
+}
+
+static int install_config_write_extras(bool need_ram, bool use_8gb, bool need_hekate_ams, bool use_pro)
+{
+    install_config_ensure_parent_dirs();
+
+    FIL f;
+    if (f_open(&f, INSTALL_CONFIG_INI, FA_WRITE | FA_CREATE_ALWAYS) != FR_OK)
+        return FR_DISK_ERR;
+
+    char line[32];
+    UINT bw;
+
+    if (need_ram) {
+        f_write(&f, "[Ram]\n", 6, &bw);
+        s_printf(line, "8gb=%d\n\n", use_8gb ? 1 : 0);
+        f_write(&f, line, (UINT)strlen(line), &bw);
+    }
+    if (need_hekate_ams) {
+        f_write(&f, "[HekateAms]\n", 12, &bw);
+        s_printf(line, "pro=%d\n", use_pro ? 1 : 0);
+        f_write(&f, line, (UINT)strlen(line), &bw);
+    }
+
+    f_close(&f);
+    return FR_OK;
+}
+
+/* If legacy ram_config.ini exists: port [Ram] into config.ini, then remove legacy. */
+static void install_config_migrate_legacy_ram(void)
+{
+    if (!install_path_exists(INSTALL_CONFIG_INI_LEGACY))
+        return;
+
+    bool use_8gb = false;
+    bool have_ram = install_config_read_key_bool(INSTALL_CONFIG_INI_LEGACY, "Ram", "8gb", &use_8gb);
+
+    if (have_ram) {
+        bool use_pro = false;
+        bool have_pro = install_path_exists(INSTALL_CONFIG_INI) &&
+            install_config_read_key_bool(INSTALL_CONFIG_INI, "HekateAms", "pro", &use_pro);
+        install_config_write_extras(true, use_8gb, have_pro, use_pro);
+    }
+
+    unlink_ignore_err(INSTALL_CONFIG_INI_LEGACY);
+}
+
 #define INSTALL_PRESERVE_INI "sd:/config/omninx/preserve.ini"
 #define INSTALL_PRESERVE_MAX 96
 #define INSTALL_PRESERVE_PATH_BYTES 224
@@ -776,7 +879,7 @@ void install_preserve_update_cleanup_begin(void)
     link_t sections;
     list_init(&sections);
     if (ini_parse(&sections, (char *)INSTALL_PRESERVE_INI, false) != 1) {
-        ram_config_free_sections(&sections);
+        install_ini_free_sections(&sections);
         free(g_preserve_block);
         g_preserve_block = NULL;
         return;
@@ -817,7 +920,7 @@ void install_preserve_update_cleanup_begin(void)
         }
         break;
     }
-    ram_config_free_sections(&sections);
+    install_ini_free_sections(&sections);
 
     if (g_preserve_count == 0) {
         free(g_preserve_block);
@@ -841,46 +944,21 @@ void install_preserve_update_cleanup_end(void)
     g_preserve_update_active = false;
 }
 
-/* Valid [Ram] 8gb=0|1 → silent; missing file or invalid → menu. */
-static int read_ram_config_silent(const char *path, bool *use_8gb)
+/* Clear Joy-Con input and wait briefly so a held A press cannot leak into the next menu. */
+static void install_joycon_reconnect(void)
 {
-    if (!install_path_exists(path))
-        return RAM_READ_NEED_MENU;
+    jc_clear_input();
 
-    link_t sections;
-    list_init(&sections);
-
-    if (ini_parse(&sections, (char *)path, false) != 1) {
-        ram_config_free_sections(&sections);
-        return RAM_READ_NEED_MENU;
-    }
-
-    bool found = false;
-    bool eight = false;
-    LIST_FOREACH_ENTRY(ini_sec_t, sec, &sections, link) {
-        if (sec->name && !strcmp(sec->name, "Ram")) {
-            LIST_FOREACH_ENTRY(ini_kv_t, kv, &sec->kvs, link) {
-                if (kv->key && kv->val && !strcmp(kv->key, "8gb")) {
-                    if (!strcmp(kv->val, "0")) {
-                        found = true;
-                        eight = false;
-                    } else if (!strcmp(kv->val, "1")) {
-                        found = true;
-                        eight = true;
-                    }
-                    break;
-                }
-            }
+    /* Wait until A/Power are actually released (no full power cycle). */
+    while (1) {
+        jc_gamepad_rpt_t *jc = joycon_poll();
+        if ((!jc || !jc->a) && !(btn_read() & BTN_POWER))
             break;
-        }
+        jc_clear_input();
+        msleep(20);
     }
 
-    ram_config_free_sections(&sections);
-
-    if (!found)
-        return RAM_READ_NEED_MENU;
-    *use_8gb = eight;
-    return RAM_READ_OK;
+    msleep(100);
 }
 
 /* Same navigation as main.c multi-variant menu; returns false if user aborts (payload/reboot). */
@@ -993,7 +1071,6 @@ static bool install_ram_config_menu(bool *use_8gb)
     }
 
     *use_8gb = (selected == 1);
-    ram_config_write(*use_8gb);
 
     gfx_clear_grey(0x1B);
     gfx_con_setpos(0, 0);
@@ -1001,25 +1078,267 @@ static bool install_ram_config_menu(bool *use_8gb)
     return true;
 }
 
-/* After pack copy: use ram_config.ini [Ram] 8gb=0|1 if present; else menu, write file, then apply. No fuse autodetect. */
-static void install_hekate_8gb_post_copy(void)
+static bool install_hekate_ams_menu(bool *use_pro)
 {
-    if (!install_path_exists(HEKATE_8GB_SRC))
-        return;
+    jc_init_hw();
+    while (btn_read() & BTN_POWER)
+        msleep(50);
 
-    bool use_8gb;
-    if (read_ram_config_silent(RAM_CONFIG_PATH, &use_8gb) != RAM_READ_OK) {
-        if (!install_ram_config_menu(&use_8gb))
-            return;
+    int selected = 0;
+    int prev_selected = 0;
+    bool confirmed = false;
+    const int n = 2;
+    const char *labels[2] = {
+        "Hekate / Atmosphere (Standard)",
+        "Hekate-Pro / Atmosphere-Pro",
+    };
+
+    gfx_clear_grey(0x1B);
+    gfx_con_setpos(0, 0);
+    install_print_main_header();
+
+    install_set_color(COLOR_YELLOW);
+    gfx_printf("Hekate / Atmosphere Auswahl:\n\n");
+    install_set_color(COLOR_RED);
+    gfx_printf("Waehle Hekate / Atmosphere (Standard) sofern du nicht weisst, was du tust.\n\n");
+    install_set_color(COLOR_WHITE);
+
+    u32 menu_x, menu_y;
+    gfx_con_getpos(&menu_x, &menu_y);
+    for (int i = 0; i < n; i++) {
+        if (i == selected) {
+            install_set_color(COLOR_GREEN);
+            gfx_printf("  > %s\n", labels[i]);
+            install_set_color(COLOR_WHITE);
+        } else {
+            gfx_printf("    %s\n", labels[i]);
+        }
+    }
+    gfx_printf("\n");
+    install_set_color(COLOR_CYAN);
+    gfx_printf("D-Pad / Vol+/-: Auswahl  |  A oder Power: Bestaetigen\n");
+    gfx_printf("Vol+ und Vol- gleichzeitig: Abbrechen (Hekate)\n");
+    install_set_color(COLOR_WHITE);
+
+    bool prev_up = false, prev_down = false;
+    bool menu_aborted = false;
+
+    while (!confirmed && !menu_aborted) {
+        if (selected != prev_selected) {
+            gfx_con_setpos(menu_x, menu_y + (u32)prev_selected * 16);
+            install_set_color(COLOR_WHITE);
+            gfx_printf("    %s\n", labels[prev_selected]);
+            gfx_con_setpos(menu_x, menu_y + (u32)selected * 16);
+            install_set_color(COLOR_GREEN);
+            gfx_printf("  > %s\n", labels[selected]);
+            install_set_color(COLOR_WHITE);
+            prev_selected = selected;
+        }
+
+        jc_gamepad_rpt_t *jc = joycon_poll();
+        u8 btn = btn_read();
+
+        if (jc && jc->cap)
+            take_screenshot();
+
+        if (cancel_combo_pressed(btn)) {
+            menu_aborted = true;
+            break;
+        }
+
+        bool cur_up = false, cur_down = false;
+        if (jc) {
+            cur_up = (jc->up != 0) && !jc->down;
+            cur_down = (jc->down != 0) && !jc->up;
+        }
+        if (btn & BTN_VOL_UP)
+            cur_up = true;
+        if (btn & BTN_VOL_DOWN)
+            cur_down = true;
+
+        if (cur_up && !prev_up)
+            selected = (selected - 1 + n) % n;
+        else if (cur_down && !prev_down)
+            selected = (selected + 1) % n;
+        else if (jc && jc->a)
+            confirmed = true;
+
+        prev_up = cur_up;
+        prev_down = cur_down;
+
+        if (btn & BTN_POWER)
+            confirmed = true;
+
+        msleep(50);
     }
 
-    if (use_8gb) {
-        int r1 = file_copy(HEKATE_8GB_SRC, PAYLOAD_BIN_DST);
-        int r2 = file_copy(HEKATE_8GB_SRC, UPDATE_BIN_DST);
-        if (r1 == FR_OK && r2 == FR_OK)
-            unlink_ignore_err(HEKATE_8GB_SRC);
-    } else {
+    if (menu_aborted) {
+        gfx_printf("\n");
+        install_set_color(COLOR_YELLOW);
+        gfx_printf("Abgebrochen. Starte Hekate...\n");
+        install_set_color(COLOR_WHITE);
+        msleep(500);
+        installer_launch_hekate_payload();
+        return false;
+    }
+
+    *use_pro = (selected == 1);
+
+    gfx_clear_grey(0x1B);
+    gfx_con_setpos(0, 0);
+    install_print_main_header();
+    return true;
+}
+
+static bool install_extras_ram_available(void)
+{
+    return install_path_exists(HEKATE_8GB_SRC) || install_path_exists(HEKATE_PRO_8GB_SRC);
+}
+
+static bool install_extras_hekate_ams_pro_available(void)
+{
+    FILINFO fno;
+    if (f_stat(HEKATE_AMS_PRO_SRC, &fno) != FR_OK)
+        return false;
+    return (fno.fattrib & AM_DIR) != 0;
+}
+
+static bool install_extras_post_copy_needed(void)
+{
+    return install_extras_ram_available() || install_extras_hekate_ams_pro_available();
+}
+
+static int install_apply_hekate_ams_pro(void)
+{
+    DIR dir;
+    FILINFO fno;
+    int res = f_opendir(&dir, HEKATE_AMS_PRO_SRC);
+    if (res != FR_OK)
+        return res;
+
+    while (1) {
+        res = f_readdir(&dir, &fno);
+        if (res != FR_OK)
+            break;
+        if (fno.fname[0] == 0)
+            break;
+        if (fno.fname[0] == '.')
+            continue;
+
+        char src[256];
+        s_printf(src, "%s/%s", HEKATE_AMS_PRO_SRC, fno.fname);
+
+        if (fno.fattrib & AM_DIR)
+            res = folder_copy(src, "sd:/");
+        else {
+            char dst[256];
+            s_printf(dst, "sd:/%s", fno.fname);
+            res = file_copy(src, dst);
+        }
+        if (res != FR_OK)
+            break;
+    }
+
+    f_closedir(&dir);
+    return res;
+}
+
+static void install_apply_8gb_payload(bool use_8gb, bool use_pro)
+{
+    if (!use_8gb) {
         unlink_ignore_err(HEKATE_8GB_SRC);
+        unlink_ignore_err(HEKATE_PRO_8GB_SRC);
+        return;
+    }
+
+    const char *src = use_pro ? HEKATE_PRO_8GB_SRC : HEKATE_8GB_SRC;
+    if (!install_path_exists(src))
+        return;
+
+    file_copy(src, PAYLOAD_BIN_DST);
+    file_copy(src, UPDATE_BIN_DST);
+    unlink_ignore_err(HEKATE_8GB_SRC);
+    unlink_ignore_err(HEKATE_PRO_8GB_SRC);
+}
+
+/* After pack copy: RAM + Hekate/AMS menus from extras; choices stored in config.ini. */
+static void install_extras_post_copy(void)
+{
+    install_config_migrate_legacy_ram();
+
+    if (!install_extras_post_copy_needed())
+        return;
+
+    bool need_ram = install_extras_ram_available();
+    bool need_hekate_ams = install_extras_hekate_ams_pro_available();
+    bool use_8gb = false;
+    bool use_pro = false;
+
+    if (need_ram) {
+        if (install_config_read_ram(&use_8gb) != INSTALL_CONFIG_OK) {
+            if (!install_ram_config_menu(&use_8gb))
+                return;
+            if (need_hekate_ams)
+                install_joycon_reconnect();
+        }
+    }
+
+    if (need_hekate_ams) {
+        if (install_config_read_hekate_ams(&use_pro) != INSTALL_CONFIG_OK) {
+            if (!install_hekate_ams_menu(&use_pro))
+                return;
+        }
+    }
+
+    install_set_color(COLOR_YELLOW);
+    gfx_printf("Extras: Speichere Auswahl in config.ini...\n");
+    install_set_color(COLOR_WHITE);
+    install_config_write_extras(need_ram, use_8gb, need_hekate_ams, use_pro);
+
+    if (use_pro && need_hekate_ams) {
+        install_set_color(COLOR_CYAN);
+        gfx_printf("Extras: Installiere Hekate-Pro / Atmosphere-Pro...\n");
+        install_set_color(COLOR_WHITE);
+        int res = install_apply_hekate_ams_pro();
+        if (res != FR_OK) {
+            install_set_color(COLOR_ORANGE);
+            gfx_printf("  [WARN] Hekate-Pro Installation fehlgeschlagen (err=%d)\n", res);
+            install_set_color(COLOR_WHITE);
+        } else {
+            install_set_color(COLOR_GREEN);
+            gfx_printf("  [OK] Hekate-Pro / Atmosphere-Pro installiert\n");
+            install_set_color(COLOR_WHITE);
+        }
+    } else if (need_hekate_ams) {
+        install_set_color(COLOR_GREEN);
+        gfx_printf("Extras: Standard Hekate / Atmosphere beibehalten\n");
+        install_set_color(COLOR_WHITE);
+    }
+
+    if (need_ram) {
+        install_set_color(COLOR_CYAN);
+        gfx_printf("Extras: Wende RAM-Einstellung an...\n");
+        install_set_color(COLOR_WHITE);
+        install_apply_8gb_payload(use_8gb, use_pro);
+        install_set_color(COLOR_GREEN);
+        gfx_printf("  [OK] RAM-Einstellung angewendet\n");
+        install_set_color(COLOR_WHITE);
+    }
+
+    if (install_path_exists(EXTRAS_DIR)) {
+        install_set_color(COLOR_CYAN);
+        gfx_printf("Extras: Entferne extras/\n");
+        install_set_color(COLOR_WHITE);
+        int res = folder_delete(EXTRAS_DIR);
+        if (res == FR_OK) {
+            install_set_color(COLOR_GREEN);
+            gfx_printf("  [OK] extras/ entfernt\n");
+            install_set_color(COLOR_WHITE);
+        } else {
+            install_set_color(COLOR_ORANGE);
+            gfx_printf("  [WARN] extras/ konnte nicht entfernt werden (err=%d)\n", res);
+            install_set_color(COLOR_WHITE);
+        }
     }
 }
 
@@ -1048,7 +1367,7 @@ static void install_debug_load(install_debug_opts_t *d)
     link_t sections;
     list_init(&sections);
     if (ini_parse(&sections, (char *)INSTALL_DEBUG_INI, false) != 1) {
-        ram_config_free_sections(&sections);
+        install_ini_free_sections(&sections);
         return;
     }
 
@@ -1081,7 +1400,7 @@ static void install_debug_load(install_debug_opts_t *d)
         }
         break;
     }
-    ram_config_free_sections(&sections);
+    install_ini_free_sections(&sections);
 
     d->active = d->skip_clean_backup || d->skip_clean_wipe || d->skip_clean_restore
         || d->skip_clean_install || d->skip_clean_staging_cleanup || d->skip_update_cleanup
@@ -1115,7 +1434,7 @@ static void install_debug_print_banner(const install_debug_opts_t *d)
     if (d->skip_update_horizon_oc)
         gfx_printf("  ueberspringe: HorizonOC Update (Backup/Restore)\n");
     if (d->skip_hekate_8gb_post_copy)
-        gfx_printf("  ueberspringe: hekate 8GB RAM Auswahl / Post-Copy\n");
+        gfx_printf("  ueberspringe: extras RAM / Hekate-Auswahl / Post-Copy\n");
     install_set_color(COLOR_WHITE);
     gfx_printf("\n");
 }
@@ -1175,10 +1494,10 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
         }
 
         if (!dbg.skip_hekate_8gb_post_copy)
-            install_hekate_8gb_post_copy();
+            install_extras_post_copy();
         else {
             install_set_color(COLOR_ORANGE);
-            gfx_printf("[DEBUG] hekate 8GB Post-Copy uebersprungen.\n");
+            gfx_printf("[DEBUG] extras Post-Copy uebersprungen.\n");
             install_set_color(COLOR_WHITE);
         }
 
@@ -1277,10 +1596,10 @@ int perform_installation(omninx_variant_t pack_variant, install_mode_t mode) {
     }
 
     if (!dbg.skip_hekate_8gb_post_copy)
-        install_hekate_8gb_post_copy();
+        install_extras_post_copy();
     else {
         install_set_color(COLOR_ORANGE);
-        gfx_printf("[DEBUG] hekate 8GB Post-Copy uebersprungen.\n");
+        gfx_printf("[DEBUG] extras Post-Copy uebersprungen.\n");
         install_set_color(COLOR_WHITE);
     }
 

source/install_clean.c

@@ -34,7 +34,7 @@
 // Clean mode: Backup user data
 int clean_mode_backup(void) {
     set_color(COLOR_CYAN);
-    gfx_printf("  Sichere: DBI (dbi.config), prod.keys\n");
+    gfx_printf("  Sichere: CyberFoil, DBI (dbi.config), prod.keys\n");
     set_color(COLOR_WHITE);
     int res = backup_user_data();
     if (res == FR_OK) {
@@ -95,7 +95,7 @@ int clean_mode_wipe(void) {
 // Clean mode: Restore user data
 int clean_mode_restore(void) {
     set_color(COLOR_CYAN);
-    gfx_printf("  Stelle wieder her: DBI (dbi.config), prod.keys\n");
+    gfx_printf("  Stelle wieder her: CyberFoil, DBI (dbi.config), prod.keys\n");
     set_color(COLOR_WHITE);
     int res = restore_user_data();
     if (res == FR_OK) {

source/install_update.c

@@ -12,10 +12,6 @@
 #include <string.h>
 #include <utils/sprintf.h>
 
-#ifndef VERSION
-#define VERSION "1.0.0"
-#endif
-
 #undef COLOR_CYAN
 #undef COLOR_WHITE
 #undef COLOR_GREEN
@@ -123,6 +119,10 @@ int update_mode_install(omninx_variant_t variant) {
         if (res != FR_OK && res != FR_NO_FILE) return res;
     }
 
+    s_printf(src_path, "%s/extras", staging);
+    res = folder_copy_with_progress_v2(src_path, "sd:/", "extras/");
+    if (res != FR_OK && res != FR_NO_FILE) return res;
+
     set_color(COLOR_CYAN);
     gfx_printf("  Kopiere Root-Dateien...\n");
     set_color(COLOR_WHITE);

source/libs/fatfs/ffconf.h

@@ -1,294 +1,294 @@
-/*---------------------------------------------------------------------------/
-/  FatFs Functional Configurations
-/---------------------------------------------------------------------------*/
-
-#define FFCONF_DEF	86604	/* Revision ID */
-
-/*---------------------------------------------------------------------------/
-/ Function Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_FS_READONLY	0
-/* This option switches read-only configuration. (0:Read/Write or 1:Read-only)
-/  Read-only configuration removes writing API functions, f_write(), f_sync(),
-/  f_unlink(), f_mkdir(), f_chmod(), f_rename(), f_truncate(), f_getfree()
-/  and optional writing functions as well. */
-
-
-#define FF_FS_MINIMIZE	0
-/* This option defines minimization level to remove some basic API functions.
-/
-/   0: Basic functions are fully enabled.
-/   1: f_stat(), f_getfree(), f_unlink(), f_mkdir(), f_truncate() and f_rename()
-/      are removed.
-/   2: f_opendir(), f_readdir() and f_closedir() are removed in addition to 1.
-/   3: f_lseek() function is removed in addition to 2. */
-
-
-#define FF_USE_STRFUNC	2
-/* This option switches string functions, f_gets(), f_putc(), f_puts() and f_printf().
-/
-/  0: Disable string functions.
-/  1: Enable without LF-CRLF conversion.
-/  2: Enable with LF-CRLF conversion. */
-
-
-#define FF_USE_FIND		1
-/* This option switches filtered directory read functions, f_findfirst() and
-/  f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */
-
-
-#define FF_USE_MKFS		1
-/* This option switches f_mkfs() function. (0:Disable or 1:Enable) */
-
-#define FF_FASTFS		0
-
-#if FF_FASTFS
-#define FF_USE_FASTSEEK	1
-#else
-#define FF_USE_FASTSEEK	0
-#endif
-/* This option switches fast seek function. (0:Disable or 1:Enable) */
-
-
-#define FF_USE_EXPAND	0
-/* This option switches f_expand function. (0:Disable or 1:Enable) */
-
-
-#define FF_USE_CHMOD	1
-/* This option switches attribute manipulation functions, f_chmod() and f_utime().
-/  (0:Disable or 1:Enable) Also FF_FS_READONLY needs to be 0 to enable this option. */
-
-
-#define FF_USE_LABEL	0
-/* This option switches volume label functions, f_getlabel() and f_setlabel().
-/  (0:Disable or 1:Enable) */
-
-
-#define FF_USE_FORWARD	0
-/* This option switches f_forward() function. (0:Disable or 1:Enable) */
-
-
-/*---------------------------------------------------------------------------/
-/ Locale and Namespace Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_CODE_PAGE	850
-/* This option specifies the OEM code page to be used on the target system.
-/  Incorrect code page setting can cause a file open failure.
-/
-/   437 - U.S.
-/   720 - Arabic
-/   737 - Greek
-/   771 - KBL
-/   775 - Baltic
-/   850 - Latin 1
-/   852 - Latin 2
-/   855 - Cyrillic
-/   857 - Turkish
-/   860 - Portuguese
-/   861 - Icelandic
-/   862 - Hebrew
-/   863 - Canadian French
-/   864 - Arabic
-/   865 - Nordic
-/   866 - Russian
-/   869 - Greek 2
-/   932 - Japanese (DBCS)
-/   936 - Simplified Chinese (DBCS)
-/   949 - Korean (DBCS)
-/   950 - Traditional Chinese (DBCS)
-/     0 - Include all code pages above and configured by f_setcp()
-*/
-
-
-#define FF_USE_LFN		3
-#define FF_MAX_LFN		255
-/* The FF_USE_LFN switches the support for LFN (long file name).
-/
-/   0: Disable LFN. FF_MAX_LFN has no effect.
-/   1: Enable LFN with static working buffer on the BSS. Always NOT thread-safe.
-/   2: Enable LFN with dynamic working buffer on the STACK.
-/   3: Enable LFN with dynamic working buffer on the HEAP.
-/
-/  To enable the LFN, ffunicode.c needs to be added to the project. The LFN function
-/  requiers certain internal working buffer occupies (FF_MAX_LFN + 1) * 2 bytes and
-/  additional (FF_MAX_LFN + 44) / 15 * 32 bytes when exFAT is enabled.
-/  The FF_MAX_LFN defines size of the working buffer in UTF-16 code unit and it can
-/  be in range of 12 to 255. It is recommended to be set 255 to fully support LFN
-/  specification.
-/  When use stack for the working buffer, take care on stack overflow. When use heap
-/  memory for the working buffer, memory management functions, ff_memalloc() and
-/  ff_memfree() in ffsystem.c, need to be added to the project. */
-
-
-#define FF_LFN_UNICODE	0
-/* This option switches the character encoding on the API when LFN is enabled.
-/
-/   0: ANSI/OEM in current CP (TCHAR = char)
-/   1: Unicode in UTF-16 (TCHAR = WCHAR)
-/   2: Unicode in UTF-8 (TCHAR = char)
-/   3: Unicode in UTF-32 (TCHAR = DWORD)
-/
-/  Also behavior of string I/O functions will be affected by this option.
-/  When LFN is not enabled, this option has no effect. */
-
-
-#define FF_LFN_BUF		255
-#define FF_SFN_BUF		12
-/* This set of options defines size of file name members in the FILINFO structure
-/  which is used to read out directory items. These values should be suffcient for
-/  the file names to read. The maximum possible length of the read file name depends
-/  on character encoding. When LFN is not enabled, these options have no effect. */
-
-
-#define FF_STRF_ENCODE	0
-/* When FF_LFN_UNICODE >= 1 with LFN enabled, string I/O functions, f_gets(),
-/  f_putc(), f_puts and f_printf() convert the character encoding in it.
-/  This option selects assumption of character encoding ON THE FILE to be
-/  read/written via those functions.
-/
-/   0: ANSI/OEM in current CP
-/   1: Unicode in UTF-16LE
-/   2: Unicode in UTF-16BE
-/   3: Unicode in UTF-8
-*/
-
-
-#define FF_FS_RPATH		0
-/* This option configures support for relative path.
-/
-/   0: Disable relative path and remove related functions.
-/   1: Enable relative path. f_chdir() and f_chdrive() are available.
-/   2: f_getcwd() function is available in addition to 1.
-*/
-
-
-/*---------------------------------------------------------------------------/
-/ Drive/Volume Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_VOLUMES		4
-/* Number of volumes (logical drives) to be used. (1-10) */
-
-
-#define FF_STR_VOLUME_ID	1
-// Order is important. Any change to order, must also be reflected to diskio drive enum.
-#define FF_VOLUME_STRS		"sd","ram","emmc","bis"
-/* FF_STR_VOLUME_ID switches support for volume ID in arbitrary strings.
-/  When FF_STR_VOLUME_ID is set to 1 or 2, arbitrary strings can be used as drive
-/  number in the path name. FF_VOLUME_STRS defines the volume ID strings for each
-/  logical drives. Number of items must not be less than FF_VOLUMES. Valid
-/  characters for the volume ID strings are A-Z, a-z and 0-9, however, they are
-/  compared in case-insensitive. If FF_STR_VOLUME_ID >= 1 and FF_VOLUME_STRS is
-/  not defined, a user defined volume string table needs to be defined as:
-/
-/  const char* VolumeStr[FF_VOLUMES] = {"ram","flash","sd","usb",...
-*/
-
-
-#define FF_MULTI_PARTITION	0
-/* This option switches support for multiple volumes on the physical drive.
-/  By default (0), each logical drive number is bound to the same physical drive
-/  number and only an FAT volume found on the physical drive will be mounted.
-/  When this function is enabled (1), each logical drive number can be bound to
-/  arbitrary physical drive and partition listed in the VolToPart[]. Also f_fdisk()
-/  funciton will be available. */
-
-
-#define FF_MIN_SS		512
-#define FF_MAX_SS		512
-/* This set of options configures the range of sector size to be supported. (512,
-/  1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and
-/  harddisk. But a larger value may be required for on-board flash memory and some
-/  type of optical media. When FF_MAX_SS is larger than FF_MIN_SS, FatFs is configured
-/  for variable sector size mode and disk_ioctl() function needs to implement
-/  GET_SECTOR_SIZE command. */
-
-
-#define FF_USE_TRIM		0
-/* This option switches support for ATA-TRIM. (0:Disable or 1:Enable)
-/  To enable Trim function, also CTRL_TRIM command should be implemented to the
-/  disk_ioctl() function. */
-
-
-#define FF_FS_NOFSINFO	1
-/* If you need to know correct free space on the FAT32 volume, set bit 0 of this
-/  option, and f_getfree() function at first time after volume mount will force
-/  a full FAT scan. Bit 1 controls the use of last allocated cluster number.
-/
-/  bit0=0: Use free cluster count in the FSINFO if available.
-/  bit0=1: Do not trust free cluster count in the FSINFO.
-/  bit1=0: Use last allocated cluster number in the FSINFO if available.
-/  bit1=1: Do not trust last allocated cluster number in the FSINFO.
-*/
-
-
-
-/*---------------------------------------------------------------------------/
-/ System Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_FS_TINY		0
-/* This option switches tiny buffer configuration. (0:Normal or 1:Tiny)
-/  At the tiny configuration, size of file object (FIL) is shrinked FF_MAX_SS bytes.
-/  Instead of private sector buffer eliminated from the file object, common sector
-/  buffer in the filesystem object (FATFS) is used for the file data transfer. */
-
-
-#define FF_FS_EXFAT		1
-/* This option switches support for exFAT filesystem. (0:Disable or 1:Enable)
-/  To enable exFAT, also LFN needs to be enabled. (FF_USE_LFN >= 1)
-/  Note that enabling exFAT discards ANSI C (C89) compatibility. */
-
-
-#define FF_FS_NORTC		1
-#define FF_NORTC_MON	1
-#define FF_NORTC_MDAY	1
-#define FF_NORTC_YEAR	2020
-/* The option FF_FS_NORTC switches timestamp function. If the system does not have
-/  any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
-/  the timestamp function. Every object modified by FatFs will have a fixed timestamp
-/  defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.
-/  To enable timestamp function (FF_FS_NORTC = 0), get_fattime() function need to be
-/  added to the project to read current time form real-time clock. FF_NORTC_MON,
-/  FF_NORTC_MDAY and FF_NORTC_YEAR have no effect.
-/  These options have no effect at read-only configuration (FF_FS_READONLY = 1). */
-
-
-#define FF_FS_LOCK		0
-/* The option FF_FS_LOCK switches file lock function to control duplicated file open
-/  and illegal operation to open objects. This option must be 0 when FF_FS_READONLY
-/  is 1.
-/
-/  0:  Disable file lock function. To avoid volume corruption, application program
-/      should avoid illegal open, remove and rename to the open objects.
-/  >0: Enable file lock function. The value defines how many files/sub-directories
-/      can be opened simultaneously under file lock control. Note that the file
-/      lock control is independent of re-entrancy. */
-
-
-/* #include <somertos.h>	// O/S definitions */
-#define FF_FS_REENTRANT	0
-#define FF_FS_TIMEOUT	1000
-#define FF_SYNC_t		HANDLE
-/* The option FF_FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
-/  module itself. Note that regardless of this option, file access to different
-/  volume is always re-entrant and volume control functions, f_mount(), f_mkfs()
-/  and f_fdisk() function, are always not re-entrant. Only file/directory access
-/  to the same volume is under control of this function.
-/
-/   0: Disable re-entrancy. FF_FS_TIMEOUT and FF_SYNC_t have no effect.
-/   1: Enable re-entrancy. Also user provided synchronization handlers,
-/      ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()
-/      function, must be added to the project. Samples are available in
-/      option/syscall.c.
-/
-/  The FF_FS_TIMEOUT defines timeout period in unit of time tick.
-/  The FF_SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,
-/  SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
-/  included somewhere in the scope of ff.h. */
-
-
-
-/*--- End of configuration options ---*/
+/*---------------------------------------------------------------------------/
+/  FatFs Functional Configurations
+/---------------------------------------------------------------------------*/
+
+#define FFCONF_DEF	86604	/* Revision ID */
+
+/*---------------------------------------------------------------------------/
+/ Function Configurations
+/---------------------------------------------------------------------------*/
+
+#define FF_FS_READONLY	0
+/* This option switches read-only configuration. (0:Read/Write or 1:Read-only)
+/  Read-only configuration removes writing API functions, f_write(), f_sync(),
+/  f_unlink(), f_mkdir(), f_chmod(), f_rename(), f_truncate(), f_getfree()
+/  and optional writing functions as well. */
+
+
+#define FF_FS_MINIMIZE	0
+/* This option defines minimization level to remove some basic API functions.
+/
+/   0: Basic functions are fully enabled.
+/   1: f_stat(), f_getfree(), f_unlink(), f_mkdir(), f_truncate() and f_rename()
+/      are removed.
+/   2: f_opendir(), f_readdir() and f_closedir() are removed in addition to 1.
+/   3: f_lseek() function is removed in addition to 2. */
+
+
+#define FF_USE_STRFUNC	2
+/* This option switches string functions, f_gets(), f_putc(), f_puts() and f_printf().
+/
+/  0: Disable string functions.
+/  1: Enable without LF-CRLF conversion.
+/  2: Enable with LF-CRLF conversion. */
+
+
+#define FF_USE_FIND		1
+/* This option switches filtered directory read functions, f_findfirst() and
+/  f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */
+
+
+#define FF_USE_MKFS		1
+/* This option switches f_mkfs() function. (0:Disable or 1:Enable) */
+
+#define FF_FASTFS		0
+
+#if FF_FASTFS
+#define FF_USE_FASTSEEK	1
+#else
+#define FF_USE_FASTSEEK	0
+#endif
+/* This option switches fast seek function. (0:Disable or 1:Enable) */
+
+
+#define FF_USE_EXPAND	0
+/* This option switches f_expand function. (0:Disable or 1:Enable) */
+
+
+#define FF_USE_CHMOD	1
+/* This option switches attribute manipulation functions, f_chmod() and f_utime().
+/  (0:Disable or 1:Enable) Also FF_FS_READONLY needs to be 0 to enable this option. */
+
+
+#define FF_USE_LABEL	0
+/* This option switches volume label functions, f_getlabel() and f_setlabel().
+/  (0:Disable or 1:Enable) */
+
+
+#define FF_USE_FORWARD	0
+/* This option switches f_forward() function. (0:Disable or 1:Enable) */
+
+
+/*---------------------------------------------------------------------------/
+/ Locale and Namespace Configurations
+/---------------------------------------------------------------------------*/
+
+#define FF_CODE_PAGE	850
+/* This option specifies the OEM code page to be used on the target system.
+/  Incorrect code page setting can cause a file open failure.
+/
+/   437 - U.S.
+/   720 - Arabic
+/   737 - Greek
+/   771 - KBL
+/   775 - Baltic
+/   850 - Latin 1
+/   852 - Latin 2
+/   855 - Cyrillic
+/   857 - Turkish
+/   860 - Portuguese
+/   861 - Icelandic
+/   862 - Hebrew
+/   863 - Canadian French
+/   864 - Arabic
+/   865 - Nordic
+/   866 - Russian
+/   869 - Greek 2
+/   932 - Japanese (DBCS)
+/   936 - Simplified Chinese (DBCS)
+/   949 - Korean (DBCS)
+/   950 - Traditional Chinese (DBCS)
+/     0 - Include all code pages above and configured by f_setcp()
+*/
+
+
+#define FF_USE_LFN		3
+#define FF_MAX_LFN		255
+/* The FF_USE_LFN switches the support for LFN (long file name).
+/
+/   0: Disable LFN. FF_MAX_LFN has no effect.
+/   1: Enable LFN with static working buffer on the BSS. Always NOT thread-safe.
+/   2: Enable LFN with dynamic working buffer on the STACK.
+/   3: Enable LFN with dynamic working buffer on the HEAP.
+/
+/  To enable the LFN, ffunicode.c needs to be added to the project. The LFN function
+/  requiers certain internal working buffer occupies (FF_MAX_LFN + 1) * 2 bytes and
+/  additional (FF_MAX_LFN + 44) / 15 * 32 bytes when exFAT is enabled.
+/  The FF_MAX_LFN defines size of the working buffer in UTF-16 code unit and it can
+/  be in range of 12 to 255. It is recommended to be set 255 to fully support LFN
+/  specification.
+/  When use stack for the working buffer, take care on stack overflow. When use heap
+/  memory for the working buffer, memory management functions, ff_memalloc() and
+/  ff_memfree() in ffsystem.c, need to be added to the project. */
+
+
+#define FF_LFN_UNICODE	0
+/* This option switches the character encoding on the API when LFN is enabled.
+/
+/   0: ANSI/OEM in current CP (TCHAR = char)
+/   1: Unicode in UTF-16 (TCHAR = WCHAR)
+/   2: Unicode in UTF-8 (TCHAR = char)
+/   3: Unicode in UTF-32 (TCHAR = DWORD)
+/
+/  Also behavior of string I/O functions will be affected by this option.
+/  When LFN is not enabled, this option has no effect. */
+
+
+#define FF_LFN_BUF		255
+#define FF_SFN_BUF		12
+/* This set of options defines size of file name members in the FILINFO structure
+/  which is used to read out directory items. These values should be suffcient for
+/  the file names to read. The maximum possible length of the read file name depends
+/  on character encoding. When LFN is not enabled, these options have no effect. */
+
+
+#define FF_STRF_ENCODE	0
+/* When FF_LFN_UNICODE >= 1 with LFN enabled, string I/O functions, f_gets(),
+/  f_putc(), f_puts and f_printf() convert the character encoding in it.
+/  This option selects assumption of character encoding ON THE FILE to be
+/  read/written via those functions.
+/
+/   0: ANSI/OEM in current CP
+/   1: Unicode in UTF-16LE
+/   2: Unicode in UTF-16BE
+/   3: Unicode in UTF-8
+*/
+
+
+#define FF_FS_RPATH		0
+/* This option configures support for relative path.
+/
+/   0: Disable relative path and remove related functions.
+/   1: Enable relative path. f_chdir() and f_chdrive() are available.
+/   2: f_getcwd() function is available in addition to 1.
+*/
+
+
+/*---------------------------------------------------------------------------/
+/ Drive/Volume Configurations
+/---------------------------------------------------------------------------*/
+
+#define FF_VOLUMES		4
+/* Number of volumes (logical drives) to be used. (1-10) */
+
+
+#define FF_STR_VOLUME_ID	1
+// Order is important. Any change to order, must also be reflected to diskio drive enum.
+#define FF_VOLUME_STRS		"sd","ram","emmc","bis"
+/* FF_STR_VOLUME_ID switches support for volume ID in arbitrary strings.
+/  When FF_STR_VOLUME_ID is set to 1 or 2, arbitrary strings can be used as drive
+/  number in the path name. FF_VOLUME_STRS defines the volume ID strings for each
+/  logical drives. Number of items must not be less than FF_VOLUMES. Valid
+/  characters for the volume ID strings are A-Z, a-z and 0-9, however, they are
+/  compared in case-insensitive. If FF_STR_VOLUME_ID >= 1 and FF_VOLUME_STRS is
+/  not defined, a user defined volume string table needs to be defined as:
+/
+/  const char* VolumeStr[FF_VOLUMES] = {"ram","flash","sd","usb",...
+*/
+
+
+#define FF_MULTI_PARTITION	0
+/* This option switches support for multiple volumes on the physical drive.
+/  By default (0), each logical drive number is bound to the same physical drive
+/  number and only an FAT volume found on the physical drive will be mounted.
+/  When this function is enabled (1), each logical drive number can be bound to
+/  arbitrary physical drive and partition listed in the VolToPart[]. Also f_fdisk()
+/  funciton will be available. */
+
+
+#define FF_MIN_SS		512
+#define FF_MAX_SS		512
+/* This set of options configures the range of sector size to be supported. (512,
+/  1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and
+/  harddisk. But a larger value may be required for on-board flash memory and some
+/  type of optical media. When FF_MAX_SS is larger than FF_MIN_SS, FatFs is configured
+/  for variable sector size mode and disk_ioctl() function needs to implement
+/  GET_SECTOR_SIZE command. */
+
+
+#define FF_USE_TRIM		0
+/* This option switches support for ATA-TRIM. (0:Disable or 1:Enable)
+/  To enable Trim function, also CTRL_TRIM command should be implemented to the
+/  disk_ioctl() function. */
+
+
+#define FF_FS_NOFSINFO	1
+/* If you need to know correct free space on the FAT32 volume, set bit 0 of this
+/  option, and f_getfree() function at first time after volume mount will force
+/  a full FAT scan. Bit 1 controls the use of last allocated cluster number.
+/
+/  bit0=0: Use free cluster count in the FSINFO if available.
+/  bit0=1: Do not trust free cluster count in the FSINFO.
+/  bit1=0: Use last allocated cluster number in the FSINFO if available.
+/  bit1=1: Do not trust last allocated cluster number in the FSINFO.
+*/
+
+
+
+/*---------------------------------------------------------------------------/
+/ System Configurations
+/---------------------------------------------------------------------------*/
+
+#define FF_FS_TINY		0
+/* This option switches tiny buffer configuration. (0:Normal or 1:Tiny)
+/  At the tiny configuration, size of file object (FIL) is shrinked FF_MAX_SS bytes.
+/  Instead of private sector buffer eliminated from the file object, common sector
+/  buffer in the filesystem object (FATFS) is used for the file data transfer. */
+
+
+#define FF_FS_EXFAT		1
+/* This option switches support for exFAT filesystem. (0:Disable or 1:Enable)
+/  To enable exFAT, also LFN needs to be enabled. (FF_USE_LFN >= 1)
+/  Note that enabling exFAT discards ANSI C (C89) compatibility. */
+
+
+#define FF_FS_NORTC		1
+#define FF_NORTC_MON	7
+#define FF_NORTC_MDAY	17
+#define FF_NORTC_YEAR	2026
+/* The option FF_FS_NORTC switches timestamp function. If the system does not have
+/  any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
+/  the timestamp function. Every object modified by FatFs will have a fixed timestamp
+/  defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.
+/  To enable timestamp function (FF_FS_NORTC = 0), get_fattime() function need to be
+/  added to the project to read current time form real-time clock. FF_NORTC_MON,
+/  FF_NORTC_MDAY and FF_NORTC_YEAR have no effect.
+/  These options have no effect at read-only configuration (FF_FS_READONLY = 1). */
+
+
+#define FF_FS_LOCK		0
+/* The option FF_FS_LOCK switches file lock function to control duplicated file open
+/  and illegal operation to open objects. This option must be 0 when FF_FS_READONLY
+/  is 1.
+/
+/  0:  Disable file lock function. To avoid volume corruption, application program
+/      should avoid illegal open, remove and rename to the open objects.
+/  >0: Enable file lock function. The value defines how many files/sub-directories
+/      can be opened simultaneously under file lock control. Note that the file
+/      lock control is independent of re-entrancy. */
+
+
+/* #include <somertos.h>	// O/S definitions */
+#define FF_FS_REENTRANT	0
+#define FF_FS_TIMEOUT	1000
+#define FF_SYNC_t		HANDLE
+/* The option FF_FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
+/  module itself. Note that regardless of this option, file access to different
+/  volume is always re-entrant and volume control functions, f_mount(), f_mkfs()
+/  and f_fdisk() function, are always not re-entrant. Only file/directory access
+/  to the same volume is under control of this function.
+/
+/   0: Disable re-entrancy. FF_FS_TIMEOUT and FF_SYNC_t have no effect.
+/   1: Enable re-entrancy. Also user provided synchronization handlers,
+/      ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()
+/      function, must be added to the project. Samples are available in
+/      option/syscall.c.
+/
+/  The FF_FS_TIMEOUT defines timeout period in unit of time tick.
+/  The FF_SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,
+/  SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
+/  included somewhere in the scope of ff.h. */
+
+
+
+/*--- End of configuration options ---*/

source/main.c

@@ -6,10 +6,6 @@
  * Based on TegraExplorer/hekate by CTCaer, naehrwert, shchmue
  */
 
-#ifndef VERSION
-#define VERSION "1.0.0"
-#endif
-
 #include <string.h>
 
 #include <display/di.h>
@@ -480,7 +476,8 @@ void ipl_main(void) {
     gfx_con_setpos(0, 0);
     print_header();
     
-    // UHS class check: recommend U2 / V30 / A2 for emuMMC (speed and reliability)
+    // UHS class check: recommend U2 / V30 / A2 for emuMMC (clean install only)
+    if (mode == INSTALL_MODE_CLEAN) {
     #define UHS_U2_MIN  2
     #define UHS_V30_MIN 30
     #define UHS_A2_MIN  2
@@ -557,6 +554,7 @@ void ipl_main(void) {
         gfx_con_setpos(0, 0);
         print_header();
     }
+    }
     
     // Show information
     set_color(COLOR_CYAN);
@@ -651,7 +649,7 @@ void ipl_main(void) {
     int result = perform_installation(pack_variant, mode);
     
     // Wait 3 seconds before clearing screen to allow errors to be visible
-    msleep(3000);
+    msleep(1500);
     // take_screenshot(); // Take a screenshot of the installation summary
 
     // Clear screen for final summary to ensure it's visible
@@ -659,25 +657,20 @@ void ipl_main(void) {
     gfx_con_setpos(0, 0);
     
     // Summary
-    set_color(COLOR_CYAN);
-    gfx_printf("========================================\n");
-    gfx_printf("  OmniNX Installer Payload v%s\n", VERSION);
-    gfx_printf("========================================\n\n");
-    set_color(COLOR_WHITE);
-    
+    const char *op_name = (mode == INSTALL_MODE_UPDATE) ? "     Update" : "  Installation";
     if (result == FR_OK && total_errors == 0) {
         set_color(COLOR_GREEN);
-        gfx_printf("========================================\n");
-        gfx_printf("    Installation abgeschlossen!\n");
-        gfx_printf("========================================\n");
+        gfx_printf("=======================================\n");
+        gfx_printf("    %s abgeschlossen!\n", op_name);
+        gfx_printf("=======================================\n");
     } else {
         set_color(COLOR_RED);
-        gfx_printf("========================================\n");
-        gfx_printf("    Installation beendet\n");
+        gfx_printf("=======================================\n");
+        gfx_printf("    %s beendet\n", op_name);
         if (total_errors > 0) {
             gfx_printf("    %d Fehler\n", total_errors);
         }
-        gfx_printf("========================================\n");
+        gfx_printf("=======================================\n");
     }
     set_color(COLOR_WHITE);