From e53e33cfcf8e0770feea9b9653eda5bcdaa50141 Mon Sep 17 00:00:00 2001 From: Michel-FK Date: Thu, 3 Jun 2021 23:35:15 +0200 Subject: [PATCH] use single powerdown script Signed-off-by: Michel-FK --- platform/common/emu.c | 2 +- platform/common/menu_pico.c | 4 ++-- platform/common/menu_pico.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/common/emu.c b/platform/common/emu.c index d74e997f..1d2ca13e 100644 --- a/platform/common/emu.c +++ b/platform/common/emu.c @@ -1534,7 +1534,7 @@ void quick_save_and_poweroff() printf("Save Instant Play file\n"); /* Send command to cancel any previously scheduled powerdown */ - fp = popen(SHELL_CMD_CANCEL_SCHED_POWERDOWN, "r"); + fp = popen(SHELL_CMD_POWERDOWN_HANDLE, "r"); if (fp == NULL) { /* Countdown is still ticking, so better do nothing diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c index cf378c62..6a63fed0 100644 --- a/platform/common/menu_pico.c +++ b/platform/common/menu_pico.c @@ -1021,8 +1021,8 @@ void run_menu_loop() if(menu_confirmation){ MENU_DEBUG_PRINTF("Powerdown - confirmed\n"); /// ----- Shell cmd ---- - execlp(SHELL_CMD_SHUTDOWN_FUNKEY, SHELL_CMD_SHUTDOWN_FUNKEY, NULL); - MENU_ERROR_PRINTF("Failed to run command %s\n", SHELL_CMD_SHUTDOWN_FUNKEY); + execlp(SHELL_CMD_POWERDOWN, SHELL_CMD_POWERDOWN, NULL); + MENU_ERROR_PRINTF("Failed to run command %s\n", SHELL_CMD_POWERDOWN); exit(0); } else{ diff --git a/platform/common/menu_pico.h b/platform/common/menu_pico.h index a86abe12..9883e74c 100644 --- a/platform/common/menu_pico.h +++ b/platform/common/menu_pico.h @@ -40,9 +40,9 @@ typedef enum {RESUME_OPTIONS} ENUM_RESUME_OPTIONS; #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" +#define SHELL_CMD_POWERDOWN "powerdown" +#define SHELL_CMD_POWERDOWN_HANDLE "powerdown handle" #define SHELL_CMD_INSTANT_PLAY "instant_play" -#define SHELL_CMD_SHUTDOWN_FUNKEY "shutdown_funkey" #define SHELL_CMD_KEYMAP_DEFAULT "keymap default" #define SHELL_CMD_KEYMAP_RESUME "keymap resume"