Compare commits
6 Commits
a26531c702
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 405bed7291 | |||
| 3a2fb4fb2e | |||
| eb18bf8c72 | |||
| 05926f7828 | |||
| 7b85d428a8 | |||
| dce83bc3be |
@@ -134,17 +134,19 @@ static const char* switch_dirs_to_delete[] = {
|
|||||||
"sd:/switch/amsPLUS-downloader",
|
"sd:/switch/amsPLUS-downloader",
|
||||||
"sd:/switch/appstore",
|
"sd:/switch/appstore",
|
||||||
"sd:/switch/AtmoXL-Titel-Installer",
|
"sd:/switch/AtmoXL-Titel-Installer",
|
||||||
|
"sd:/switch/Benchmark-Toolbox",
|
||||||
"sd:/switch/breeze",
|
"sd:/switch/breeze",
|
||||||
"sd:/switch/checkpoint",
|
|
||||||
"sd:/switch/cheats-updater",
|
"sd:/switch/cheats-updater",
|
||||||
"sd:/switch/chiaki",
|
"sd:/switch/chiaki",
|
||||||
"sd:/switch/ChoiDujourNX",
|
"sd:/switch/ChoiDujourNX",
|
||||||
"sd:/switch/crash_ams",
|
"sd:/switch/crash_ams",
|
||||||
"sd:/switch/Daybreak",
|
"sd:/switch/Daybreak",
|
||||||
|
"sd:/switch/DNS-Block_Tester",
|
||||||
"sd:/switch/DNS_mitm Tester",
|
"sd:/switch/DNS_mitm Tester",
|
||||||
"sd:/switch/EdiZon",
|
"sd:/switch/EdiZon",
|
||||||
"sd:/switch/Fizeau",
|
"sd:/switch/Fizeau",
|
||||||
"sd:/switch/FTPD",
|
"sd:/switch/FTPD",
|
||||||
|
"sd:/switch/Furmark-NX",
|
||||||
"sd:/switch/fw-downloader",
|
"sd:/switch/fw-downloader",
|
||||||
"sd:/switch/gamecard_installer",
|
"sd:/switch/gamecard_installer",
|
||||||
"sd:/switch/Goldleaf",
|
"sd:/switch/Goldleaf",
|
||||||
@@ -169,6 +171,7 @@ static const char* switch_dirs_to_delete[] = {
|
|||||||
"sd:/switch/reboot_to_argonNX",
|
"sd:/switch/reboot_to_argonNX",
|
||||||
"sd:/switch/reboot_to_hekate",
|
"sd:/switch/reboot_to_hekate",
|
||||||
"sd:/switch/Shutdown_System",
|
"sd:/switch/Shutdown_System",
|
||||||
|
"sd:/switch/SimpleModAlchemist",
|
||||||
"sd:/switch/SimpleModDownloader",
|
"sd:/switch/SimpleModDownloader",
|
||||||
"sd:/switch/SimpleModManager",
|
"sd:/switch/SimpleModManager",
|
||||||
"sd:/switch/sphaira",
|
"sd:/switch/sphaira",
|
||||||
@@ -176,18 +179,22 @@ static const char* switch_dirs_to_delete[] = {
|
|||||||
"sd:/switch/Switch-Time",
|
"sd:/switch/Switch-Time",
|
||||||
"sd:/switch/SwitchIdent",
|
"sd:/switch/SwitchIdent",
|
||||||
"sd:/switch/Switch_themes_Installer",
|
"sd:/switch/Switch_themes_Installer",
|
||||||
|
"sd:/switch/swr-ini-tool",
|
||||||
"sd:/switch/Sys-Clk Manager",
|
"sd:/switch/Sys-Clk Manager",
|
||||||
"sd:/switch/Sys-Con",
|
"sd:/switch/Sys-Con",
|
||||||
"sd:/switch/sys-clk-manager",
|
"sd:/switch/sys-clk-manager",
|
||||||
"sd:/switch/themezer-nx",
|
"sd:/switch/themezer-nx",
|
||||||
|
"sd:/switch/ThemezerNX",
|
||||||
"sd:/switch/themezernx",
|
"sd:/switch/themezernx",
|
||||||
"sd:/switch/tinwoo",
|
"sd:/switch/tinwoo",
|
||||||
|
"sd:/switch/Ultrahand-Reload",
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
// Switch files (NRO) to delete
|
// Switch files (NRO) to delete
|
||||||
static const char* switch_files_to_delete[] = {
|
static const char* switch_files_to_delete[] = {
|
||||||
"sd:/switch/90DNS_tester/90DNS_tester.nro",
|
"sd:/switch/90DNS_tester/90DNS_tester.nro",
|
||||||
|
"sd:/switch/Benchmark-Toolbox/Benchmark-Toolbox.nro",
|
||||||
"sd:/switch/breeze.nro",
|
"sd:/switch/breeze.nro",
|
||||||
"sd:/switch/cheats-updater.nro",
|
"sd:/switch/cheats-updater.nro",
|
||||||
"sd:/switch/chiaki.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_RU/DBI_RU.nro",
|
||||||
"sd:/switch/DBI/DBI_EN.nro",
|
"sd:/switch/DBI/DBI_EN.nro",
|
||||||
"sd:/switch/DBI_DE/DBI_DE.nro",
|
"sd:/switch/DBI_DE/DBI_DE.nro",
|
||||||
|
"sd:/switch/DNS-Block_Tester/dns_tester.nro",
|
||||||
"sd:/switch/DNS_mitm Tester.nro",
|
"sd:/switch/DNS_mitm Tester.nro",
|
||||||
"sd:/switch/EdiZon.nro",
|
"sd:/switch/EdiZon.nro",
|
||||||
"sd:/switch/Fizeau.nro",
|
"sd:/switch/Fizeau.nro",
|
||||||
|
"sd:/switch/Furmark-NX/Furmark-NX.nro",
|
||||||
"sd:/switch/Goldleaf.nro",
|
"sd:/switch/Goldleaf.nro",
|
||||||
"sd:/switch/haze.nro",
|
"sd:/switch/haze.nro",
|
||||||
"sd:/switch/JKSV.nro",
|
"sd:/switch/JKSV.nro",
|
||||||
@@ -223,6 +232,7 @@ static const char* switch_files_to_delete[] = {
|
|||||||
"sd:/switch/nxdumptool.nro",
|
"sd:/switch/nxdumptool.nro",
|
||||||
"sd:/switch/nxtc.bin",
|
"sd:/switch/nxtc.bin",
|
||||||
"sd:/switch/reboot_to_payload.nro",
|
"sd:/switch/reboot_to_payload.nro",
|
||||||
|
"sd:/switch/SimpleModAlchemist/Simple_Mod_Alchemist.nro",
|
||||||
"sd:/switch/SimpleModDownloader.nro",
|
"sd:/switch/SimpleModDownloader.nro",
|
||||||
"sd:/switch/SimpleModManager.nro",
|
"sd:/switch/SimpleModManager.nro",
|
||||||
"sd:/switch/sphaira.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-Clk Manager/sys-clk-manager.nro",
|
||||||
"sd:/switch/Sys-Con.nro",
|
"sd:/switch/Sys-Con.nro",
|
||||||
"sd:/switch/sys-clk-manager.nro",
|
"sd:/switch/sys-clk-manager.nro",
|
||||||
|
"sd:/switch/ThemezerNX/themezer-nx.nro",
|
||||||
"sd:/switch/tinfoil.nro",
|
"sd:/switch/tinfoil.nro",
|
||||||
"sd:/switch/tinfoil/tinfoil.nro",
|
"sd:/switch/tinfoil/tinfoil.nro",
|
||||||
"sd:/switch/tinwoo.nro",
|
"sd:/switch/tinwoo.nro",
|
||||||
"sd:/switch/tinwoo/tinwoo.nro",
|
"sd:/switch/tinwoo/tinwoo.nro",
|
||||||
|
"sd:/switch/Ultrahand-Reload/Ultrahand-Reload.nro",
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -726,18 +726,13 @@ static bool install_config_read_key_bool(const char *path, const char *section,
|
|||||||
return found;
|
return found;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Valid [Ram] 8gb=0|1 in config.ini (or legacy ram_config.ini) → silent; else menu. */
|
/* Valid [Ram] 8gb=0|1 in config.ini → silent; else menu. */
|
||||||
static int install_config_read_ram(bool *use_8gb)
|
static int install_config_read_ram(bool *use_8gb)
|
||||||
{
|
{
|
||||||
static const char *paths[] = { INSTALL_CONFIG_INI, INSTALL_CONFIG_INI_LEGACY, NULL };
|
if (!install_path_exists(INSTALL_CONFIG_INI))
|
||||||
|
return INSTALL_CONFIG_NEED_MENU;
|
||||||
for (int i = 0; paths[i]; i++) {
|
if (install_config_read_key_bool(INSTALL_CONFIG_INI, "Ram", "8gb", use_8gb))
|
||||||
if (!install_path_exists(paths[i]))
|
return INSTALL_CONFIG_OK;
|
||||||
continue;
|
|
||||||
if (install_config_read_key_bool(paths[i], "Ram", "8gb", use_8gb))
|
|
||||||
return INSTALL_CONFIG_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
return INSTALL_CONFIG_NEED_MENU;
|
return INSTALL_CONFIG_NEED_MENU;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -777,6 +772,25 @@ static int install_config_write_extras(bool need_ram, bool use_8gb, bool need_he
|
|||||||
return FR_OK;
|
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_INI "sd:/config/omninx/preserve.ini"
|
||||||
#define INSTALL_PRESERVE_MAX 96
|
#define INSTALL_PRESERVE_MAX 96
|
||||||
#define INSTALL_PRESERVE_PATH_BYTES 224
|
#define INSTALL_PRESERVE_PATH_BYTES 224
|
||||||
@@ -1250,6 +1264,8 @@ static void install_apply_8gb_payload(bool use_8gb, bool use_pro)
|
|||||||
/* After pack copy: RAM + Hekate/AMS menus from extras; choices stored in config.ini. */
|
/* After pack copy: RAM + Hekate/AMS menus from extras; choices stored in config.ini. */
|
||||||
static void install_extras_post_copy(void)
|
static void install_extras_post_copy(void)
|
||||||
{
|
{
|
||||||
|
install_config_migrate_legacy_ram();
|
||||||
|
|
||||||
if (!install_extras_post_copy_needed())
|
if (!install_extras_post_copy_needed())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|||||||
@@ -243,9 +243,9 @@
|
|||||||
|
|
||||||
|
|
||||||
#define FF_FS_NORTC 1
|
#define FF_FS_NORTC 1
|
||||||
#define FF_NORTC_MON 1
|
#define FF_NORTC_MON 7
|
||||||
#define FF_NORTC_MDAY 1
|
#define FF_NORTC_MDAY 17
|
||||||
#define FF_NORTC_YEAR 2020
|
#define FF_NORTC_YEAR 2026
|
||||||
/* The option FF_FS_NORTC switches timestamp function. If the system does not have
|
/* 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
|
/ 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
|
/ the timestamp function. Every object modified by FatFs will have a fixed timestamp
|
||||||
|
|||||||
@@ -657,25 +657,20 @@ void ipl_main(void) {
|
|||||||
gfx_con_setpos(0, 0);
|
gfx_con_setpos(0, 0);
|
||||||
|
|
||||||
// Summary
|
// Summary
|
||||||
set_color(COLOR_CYAN);
|
const char *op_name = (mode == INSTALL_MODE_UPDATE) ? " Update" : " Installation";
|
||||||
gfx_printf("========================================\n");
|
|
||||||
gfx_printf(" OmniNX Installer Payload v%s\n", VERSION);
|
|
||||||
gfx_printf("========================================\n\n");
|
|
||||||
set_color(COLOR_WHITE);
|
|
||||||
|
|
||||||
if (result == FR_OK && total_errors == 0) {
|
if (result == FR_OK && total_errors == 0) {
|
||||||
set_color(COLOR_GREEN);
|
set_color(COLOR_GREEN);
|
||||||
gfx_printf("========================================\n");
|
gfx_printf("=======================================\n");
|
||||||
gfx_printf(" Installation abgeschlossen!\n");
|
gfx_printf(" %s abgeschlossen!\n", op_name);
|
||||||
gfx_printf("========================================\n");
|
gfx_printf("=======================================\n");
|
||||||
} else {
|
} else {
|
||||||
set_color(COLOR_RED);
|
set_color(COLOR_RED);
|
||||||
gfx_printf("========================================\n");
|
gfx_printf("=======================================\n");
|
||||||
gfx_printf(" Installation beendet\n");
|
gfx_printf(" %s beendet\n", op_name);
|
||||||
if (total_errors > 0) {
|
if (total_errors > 0) {
|
||||||
gfx_printf(" %d Fehler\n", total_errors);
|
gfx_printf(" %d Fehler\n", total_errors);
|
||||||
}
|
}
|
||||||
gfx_printf("========================================\n");
|
gfx_printf("=======================================\n");
|
||||||
}
|
}
|
||||||
set_color(COLOR_WHITE);
|
set_color(COLOR_WHITE);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user