use single powerdown script

Signed-off-by: Vincent-FK <[email protected]>
FunKey-Project · Jun 3, 2021 · 5d8490f · 5d8490f
1 parent c3de812
commit 5d8490f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/menu/main.cpp b/menu/main.cpp
@@ -601,7 +601,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/menu/menu.cpp b/menu/menu.cpp
@@ -945,8 +945,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/menu/menu.h b/menu/menu.h
@@ -180,9 +180,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"