diff --git a/platform/common/emu.c b/platform/common/emu.c index c5fa2030..d74e997f 100644 --- a/platform/common/emu.c +++ b/platform/common/emu.c @@ -281,7 +281,7 @@ static const char *find_bios(int *region, const char *cd_fname) /** Set notif for BIOS */ char shell_cmd[400]; sprintf(shell_cmd, "%s 0 \" %s BIOS FILE MISSING^^Connect your FunKey S to ^your computer and copy the^BIOS file in the folder:^ Sega Genesis/bios/^^The file can be called:^ - %s.bin^ - %s.bin^ - %s.bin^ - %s.bin^^For more instructions:^www.funkey-project.com^^Press any button to exit...\"", - SHELL_CMD_NOTIF, country, bios_names[0], bios_names[1], bios_names[2], bios_names[3]); + SHELL_CMD_NOTIF_SET, country, bios_names[0], bios_names[1], bios_names[2], bios_names[3]); FILE *fp = popen(shell_cmd, "r"); if (fp == NULL) { printf("In %s, Failed to run command %s\n", __func__, shell_cmd); @@ -1350,7 +1350,7 @@ static void run_events_ui(unsigned int which) sprintf(txt, " DISPLAY MODE: ZOOMED - %d%%", aspect_ratio_factor_percent); plat_status_msg_busy_first(txt);*/ sprintf(shell_cmd, "%s %d \" DISPLAY MODE: ZOOMED %d%%%%\"", - SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP, aspect_ratio_factor_percent); + SHELL_CMD_NOTIF_SET, NOTIF_SECONDS_DISP, aspect_ratio_factor_percent); fp = popen(shell_cmd, "r"); if (fp == NULL) { printf("Failed to run command %s\n", shell_cmd); @@ -1379,7 +1379,7 @@ static void run_events_ui(unsigned int which) sprintf(txt, " DISPLAY MODE: ZOOMED - %d%%", aspect_ratio_factor_percent); plat_status_msg_busy_first(txt);*/ sprintf(shell_cmd, "%s %d \" DISPLAY MODE: ZOOMED %d%%%%\"", - SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP, aspect_ratio_factor_percent); + SHELL_CMD_NOTIF_SET, NOTIF_SECONDS_DISP, aspect_ratio_factor_percent); fp = popen(shell_cmd, "r"); if (fp == NULL) { printf("Failed to run command %s\n", shell_cmd); @@ -1401,12 +1401,12 @@ static void run_events_ui(unsigned int which) if(aspect_ratio == ASPECT_RATIOS_TYPE_MANUAL){ //sprintf(txt, " DISPLAY MODE: ZOOMED - %d%%", aspect_ratio_factor_percent); sprintf(shell_cmd, "%s %d \" DISPLAY MODE: ZOOMED %d%%%%\"", - SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP, aspect_ratio_factor_percent); + SHELL_CMD_NOTIF_SET, NOTIF_SECONDS_DISP, aspect_ratio_factor_percent); } else{ //sprintf(txt, "DISPLAY MODE: %s", aspect_ratio_name[aspect_ratio]); sprintf(shell_cmd, "%s %d \" DISPLAY MODE: %s\"", - SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP, aspect_ratio_name[aspect_ratio]); + SHELL_CMD_NOTIF_SET, NOTIF_SECONDS_DISP, aspect_ratio_name[aspect_ratio]); } //plat_status_msg_busy_first(txt); fp = popen(shell_cmd, "r"); diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c index 23e3db06..cf378c62 100644 --- a/platform/common/menu_pico.c +++ b/platform/common/menu_pico.c @@ -939,11 +939,11 @@ void run_menu_loop() if(ret){ MENU_ERROR_PRINTF("Save Failed\n"); sprintf(shell_cmd, "%s %d \" SAVE FAILED\"", - SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP); + SHELL_CMD_NOTIF_SET, NOTIF_SECONDS_DISP); } else{ sprintf(shell_cmd, "%s %d \" SAVED IN SLOT %d\"", - SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP, state_slot+1); + SHELL_CMD_NOTIF_SET, NOTIF_SECONDS_DISP, state_slot+1); } system(shell_cmd); stop_menu_loop = 1; @@ -974,16 +974,16 @@ void run_menu_loop() if(ret){ MENU_ERROR_PRINTF("Load Failed\n"); sprintf(shell_cmd, "%s %d \" LOAD FAILED\"", - SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP); + SHELL_CMD_NOTIF_SET, NOTIF_SECONDS_DISP); } else{ if(quick_load_slot_chosen){ sprintf(shell_cmd, "%s %d \" LOADED FROM AUTO SAVE\"", - SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP); + SHELL_CMD_NOTIF_SET, NOTIF_SECONDS_DISP); } else{ sprintf(shell_cmd, "%s %d \" LOADED FROM SLOT %d\"", - SHELL_CMD_NOTIF, NOTIF_SECONDS_DISP, state_slot+1); + SHELL_CMD_NOTIF_SET, NOTIF_SECONDS_DISP, state_slot+1); } } system(shell_cmd); diff --git a/platform/common/menu_pico.h b/platform/common/menu_pico.h index 8533eb17..a86abe12 100644 --- a/platform/common/menu_pico.h +++ b/platform/common/menu_pico.h @@ -36,8 +36,8 @@ typedef enum {RESUME_OPTIONS} ENUM_RESUME_OPTIONS; #define SHELL_CMD_VOLUME_SET "volume set" #define SHELL_CMD_BRIGHTNESS_GET "brightness get" #define SHELL_CMD_BRIGHTNESS_SET "brightness set" -#define SHELL_CMD_NOTIF "notif_set" -#define SHELL_CMD_NOTIF_CLEAR "notif_clear" +#define SHELL_CMD_NOTIF_SET "notif set" +#define SHELL_CMD_NOTIF_CLEAR "notif clear" #define SHELL_CMD_AUDIO_AMP_ON "audio_amp on" #define SHELL_CMD_AUDIO_AMP_OFF "audio_amp off" #define SHELL_CMD_CANCEL_SCHED_POWERDOWN "cancel_sched_powerdown"