diff options
Diffstat (limited to 'apps/alarm_menu.c')
-rw-r--r-- | apps/alarm_menu.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c index a1b9947439..e8b421955c 100644 --- a/apps/alarm_menu.c +++ b/apps/alarm_menu.c | |||
@@ -92,16 +92,9 @@ bool alarm_screen(void) | |||
92 | rtc_init(); | 92 | rtc_init(); |
93 | rtc_set_alarm(h,m); | 93 | rtc_set_alarm(h,m); |
94 | rtc_enable_alarm(true); | 94 | rtc_enable_alarm(true); |
95 | <<<<<<< alarm_menu.c | ||
96 | splash(HZ*2, true, str(LANG_ALARM_MOD_TIME_TO_GO), | 95 | splash(HZ*2, true, str(LANG_ALARM_MOD_TIME_TO_GO), |
97 | togo / 60, togo % 60); | 96 | togo / 60, togo % 60); |
98 | done = true; | 97 | done = true; |
99 | ======= | ||
100 | lcd_puts(0,1,str(LANG_ALARM_MOD_SHUTDOWN)); | ||
101 | lcd_update(); | ||
102 | sleep(HZ); | ||
103 | done = true; | ||
104 | >>>>>>> 1.7 | ||
105 | } else { | 98 | } else { |
106 | splash(HZ, true, str(LANG_ALARM_MOD_ERROR)); | 99 | splash(HZ, true, str(LANG_ALARM_MOD_ERROR)); |
107 | update = true; | 100 | update = true; |
@@ -152,13 +145,6 @@ bool alarm_screen(void) | |||
152 | case BUTTON_STOP: | 145 | case BUTTON_STOP: |
153 | case BUTTON_MENU: | 146 | case BUTTON_MENU: |
154 | #endif | 147 | #endif |
155 | <<<<<<< alarm_menu.c | ||
156 | ======= | ||
157 | lcd_clear_display(); | ||
158 | lcd_puts(0,0,str(LANG_ALARM_MOD_DISABLE)); | ||
159 | lcd_update(); | ||
160 | sleep(HZ); | ||
161 | >>>>>>> 1.7 | ||
162 | rtc_enable_alarm(false); | 148 | rtc_enable_alarm(false); |
163 | splash(HZ*2, true, str(LANG_ALARM_MOD_DISABLE)); | 149 | splash(HZ*2, true, str(LANG_ALARM_MOD_DISABLE)); |
164 | done = true; | 150 | done = true; |