A proper alarm clock for the V2/FM (and v1 with mod)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5818 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 14 insertions, 12 deletions

diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c
index 20b2f51821..47d2c1226b 100644
--- a/apps/alarm_menu.c
+++ b/apps/alarm_menu.c
@@ -82,20 +82,11 @@ bool alarm_screen(void)
                 lcd_update();
                 rtc_init();
                 rtc_set_alarm(h,m);
-                /* in some cases enabling the alarm results in an activated AF flag */
-                /* this should not happen, but it does */
-                /* if you know why, tell me! */
-                /* for now, we try again forever in this case */
-                while (rtc_enable_alarm(true)) { /* error occured */
-                  sleep(HZ / 10);
-                  rtc_init();
-                  rtc_set_alarm(h,m);
-                }
-                sleep(HZ);
+                rtc_enable_alarm(true);
                 lcd_puts(0,1,str(LANG_ALARM_MOD_SHUTDOWN));
                 lcd_update();
                 sleep(HZ);
-                power_off();
+                done = true;
             } else {
                 lcd_clear_display();
                 lcd_puts(0,0,str(LANG_ALARM_MOD_ERROR));
@@ -150,6 +141,11 @@ bool alarm_screen(void)
         case BUTTON_STOP:
         case BUTTON_MENU:
 #endif
+            lcd_clear_display();
+            lcd_puts(0,0,str(LANG_ALARM_MOD_DISABLE));
+            lcd_update();
+            sleep(HZ);
+            rtc_enable_alarm(false);
             done = true;
             break;
         }
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 827ec0d002..82e3da494c 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -1155,7 +1155,7 @@ new:
 
 id: LANG_ALARM_MOD_SHUTDOWN
 desc: The text that tells the user that the alarm time is ok and the device shuts off (for the RTC alarm mod).
-eng: "Shutting Down..."
+eng: "Alarm Set"
 voice: ""
 new: 
 
@@ -3003,3 +3003,9 @@ desc: Start Rockbox in Recording screen
 eng: "Show recording screen on startup"
 voice: "Show recording screen on startup"
 new:
+
+id: LANG_ALARM_MOD_DISABLE
+desc: Announce that the RTC alarm has been turned off
+eng: "Alarm Disabled"
+voice: "Alarm Disabled"
+new: