Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some interface updates and code policing in the alarm setting screen, take 2

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7038 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2005-07-06 08:30:55 +00:00
parent 50d9e3fba9
commit 5e9f52f6d1
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/alarm_menu.c
View file

@ -92,16 +92,9 @@ bool alarm_screen(void)
rtc_init(); rtc_init();
rtc_set_alarm(h,m); rtc_set_alarm(h,m);
rtc_enable_alarm(true); rtc_enable_alarm(true);
<<<<<<< alarm_menu.c
splash(HZ*2, true, str(LANG_ALARM_MOD_TIME_TO_GO), splash(HZ*2, true, str(LANG_ALARM_MOD_TIME_TO_GO),
togo / 60, togo % 60); togo / 60, togo % 60);
done = true; done = true;
=======
lcd_puts(0,1,str(LANG_ALARM_MOD_SHUTDOWN));
lcd_update();
sleep(HZ);
done = true;
>>>>>>> 1.7
} else { } else {
splash(HZ, true, str(LANG_ALARM_MOD_ERROR)); splash(HZ, true, str(LANG_ALARM_MOD_ERROR));
update = true; update = true;
@ -152,13 +145,6 @@ bool alarm_screen(void)
case BUTTON_STOP: case BUTTON_STOP:
case BUTTON_MENU: case BUTTON_MENU:
#endif #endif
<<<<<<< alarm_menu.c
=======
lcd_clear_display();
lcd_puts(0,0,str(LANG_ALARM_MOD_DISABLE));
lcd_update();
sleep(HZ);
>>>>>>> 1.7
rtc_enable_alarm(false); rtc_enable_alarm(false);
splash(HZ*2, true, str(LANG_ALARM_MOD_DISABLE)); splash(HZ*2, true, str(LANG_ALARM_MOD_DISABLE));
done = true; done = true;