4 files changed, 12 insertions, 6 deletions

diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 0aea47ea8f..544cfec32e 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -60,8 +60,14 @@ static bool flipped;  /* buttons can be flipped to match the LCD flip */
 /* speed repeat finishes at */
 #define REPEAT_INTERVAL_FINISH  5
 
-/* Number of repeated keys before shutting off */
+/* the power-off button and number of repeated keys before shutting off */
+#if CONFIG_KEYPAD == IPOD_4G_PAD
+#define POWEROFF_BUTTON BUTTON_PLAY
+#define POWEROFF_COUNT 40
+#else
+#define POWEROFF_BUTTON BUTTON_OFF
 #define POWEROFF_COUNT 10
+#endif
 
 static int button_read(void);
 
@@ -274,9 +280,9 @@ static void button_tick(void)
                                key */
 #ifdef HAVE_SW_POWEROFF
 #ifdef BUTTON_RC_STOP
-                            if ((btn == BUTTON_OFF || btn == BUTTON_RC_STOP) &&
+                            if ((btn == POWEROFF_BUTTON || btn == BUTTON_RC_STOP) &&
 #else
-                            if (btn == BUTTON_OFF &&
+                            if (btn == POWEROFF_BUTTON &&
 #endif
 #ifndef HAVE_POWEROFF_WHILE_CHARGING
                                 !charger_inserted() &&
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index 9f71ba895f..6de461f952 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -30,7 +30,7 @@
 #define CONFIG_RTC RTC_PCF50605
 
 /* Define this if you have a software controlled poweroff */
-//#define HAVE_SW_POWEROFF
+#define HAVE_SW_POWEROFF
 
 /* The number of bytes reserved for loadable codecs */
 #define CODEC_SIZE 0x80000
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index 8c7a3b2f8c..bf7362a168 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -30,7 +30,7 @@
 #define CONFIG_RTC RTC_PCF50605
 
 /* Define this if you have a software controlled poweroff */
-//#define HAVE_SW_POWEROFF
+#define HAVE_SW_POWEROFF
 
 /* The number of bytes reserved for loadable codecs */
 #define CODEC_SIZE 0x80000
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index 5972915965..3c3f403983 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -30,7 +30,7 @@
 #define CONFIG_RTC RTC_PCF50605
 
 /* Define this if you have a software controlled poweroff */
-//#define HAVE_SW_POWEROFF
+#define HAVE_SW_POWEROFF
 
 /* The number of bytes reserved for loadable codecs */
 #define CODEC_SIZE 0x80000