devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Changed the behaviour of F2, and simplified the version string handling

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4816 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2004-06-30 06:01:19 +00:00
parent 7eb4692e0e
commit 058302a480
1 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
apps/plugins/clock.c
View file

@ -21,6 +21,11 @@
RELEASE NOTES ******************* RELEASE NOTES *******************
********************************* *********************************
*********************************
VERSION 2.21 * STABLE ***********
*********************************
Changed the behaviour of F2
******************************** ********************************
VERSION 2.2 * STABLE *********** VERSION 2.2 * STABLE ***********
******************************** ********************************
@ -80,6 +85,8 @@ and a few options.
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
#define CLOCK_VERSION "2.21"
/* prototypes */ /* prototypes */
void show_logo(bool animate, bool show_clock_text); void show_logo(bool animate, bool show_clock_text);
void exit_logo(void); void exit_logo(void);
@ -526,7 +533,7 @@ void load_settings(void)
rb->lcd_setfont(FONT_SYSFIXED); rb->lcd_setfont(FONT_SYSFIXED);
rb->lcd_puts(0, 6, "Clock v2.2"); rb->lcd_puts(0, 6, "Clock " CLOCK_VERSION);
if(fd >= 0) /* does file exist? */ if(fd >= 0) /* does file exist? */
{ {
@ -536,7 +543,7 @@ void load_settings(void)
rb->read(fd, &settings, sizeof(struct saved_settings)); rb->read(fd, &settings, sizeof(struct saved_settings));
rb->close(fd); rb->close(fd);
show_logo(true, true); show_logo(true, true);
rb->lcd_puts(0, 6, "Clock v2.2"); rb->lcd_puts(0, 6, "Clock " CLOCK_VERSION);
rb->lcd_puts(0, 7, "Loaded settings"); rb->lcd_puts(0, 7, "Loaded settings");
} }
else /* bail out */ else /* bail out */
@ -559,7 +566,7 @@ void load_settings(void)
} }
/************************************************************** /**************************************************************
* 7-Segment LED/LCD imitation code, by Linus Nielson Feltzing * 7-Segment LED/LCD imitation code, by Linus Nielsen Feltzing
**************************************************************/ **************************************************************/
/* /*
a 0 b a 0 b
@ -997,7 +1004,7 @@ void show_logo(bool animate, bool show_clock_text)
rb->lcd_clearline(0, x_position/2+38, 111, x_position/2+38); rb->lcd_clearline(0, x_position/2+38, 111, x_position/2+38);
rb->lcd_bitmap(clogo, 0, x_position/2, 112, 37, true); rb->lcd_bitmap(clogo, 0, x_position/2, 112, 37, true);
if(show_clock_text) if(show_clock_text)
rb->lcd_puts(0, 6, "Clock v2.2"); rb->lcd_puts(0, 6, "Clock " CLOCK_VERSION);
rb->lcd_update(); rb->lcd_update();
} }
/* bounce back up a little */ /* bounce back up a little */
@ -1007,7 +1014,7 @@ void show_logo(bool animate, bool show_clock_text)
rb->lcd_clearline(0, x_position/2+38, 111, x_position/2+38); rb->lcd_clearline(0, x_position/2+38, 111, x_position/2+38);
rb->lcd_bitmap(clogo, 0, x_position/2, 112, 37, true); rb->lcd_bitmap(clogo, 0, x_position/2, 112, 37, true);
if(show_clock_text) if(show_clock_text)
rb->lcd_puts(0, 6, "Clock v2.2"); rb->lcd_puts(0, 6, "Clock " CLOCK_VERSION);
rb->lcd_update(); rb->lcd_update();
} }
/* and go back down again */ /* and go back down again */
@ -1017,7 +1024,7 @@ void show_logo(bool animate, bool show_clock_text)
rb->lcd_clearline(0, x_position/2+38, 111, x_position/2+38); rb->lcd_clearline(0, x_position/2+38, 111, x_position/2+38);
rb->lcd_bitmap(clogo, 0, x_position/2, 112, 37, true); rb->lcd_bitmap(clogo, 0, x_position/2, 112, 37, true);
if(show_clock_text) if(show_clock_text)
rb->lcd_puts(0, 6, "Clock v2.2"); rb->lcd_puts(0, 6, "Clock " CLOCK_VERSION);
rb->lcd_update(); rb->lcd_update();
} }
} }
@ -1167,7 +1174,7 @@ bool show_credits(void)
rb->lcd_clear_display(); rb->lcd_clear_display();
/* show the logo with an animation and the clock 2.2 text */ /* show the logo with an animation and the clock version text */
show_logo(true, true); show_logo(true, true);
rb->lcd_puts(0, 7, "Credit Roll..."); rb->lcd_puts(0, 7, "Credit Roll...");
@ -1204,7 +1211,7 @@ bool f1_screen(void)
/* page one */ /* page one */
if(screen == 1) if(screen == 1)
{ {
rb->lcd_puts(0, 0, "Using Clock v2.2:"); rb->lcd_puts(0, 0, "Using Clock " CLOCK_VERSION ":");
rb->lcd_puts(0, 1, "To navigate this"); rb->lcd_puts(0, 1, "To navigate this");
rb->lcd_puts(0, 2, "help, use LEFT and"); rb->lcd_puts(0, 2, "help, use LEFT and");
rb->lcd_puts(0, 3, "RIGHT. F1 returns"); rb->lcd_puts(0, 3, "RIGHT. F1 returns");
@ -2087,6 +2094,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
/* poweroff activated or not? */ /* poweroff activated or not? */
bool reset_timer = false; bool reset_timer = false;
bool f2_held = false;
struct tm* current_time; struct tm* current_time;
TEST_PLUGIN_API(api); TEST_PLUGIN_API(api);
@ -2334,8 +2343,11 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
f1_screen(); f1_screen();
break; break;
case BUTTON_F2: /* start/stop counter */ case BUTTON_F2|BUTTON_REL: /* start/stop counter */
if(settings.clock != 5) if(settings.clock != 5)
{
/* Ignore if the counter was reset */
if(!f2_held)
{ {
if(counting) if(counting)
{ {
@ -2348,10 +2360,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
start_tick = *rb->current_tick; start_tick = *rb->current_tick;
} }
} }
f2_held = false;
}
break; break;
case BUTTON_F2 | BUTTON_REPEAT: /* reset counter */ case BUTTON_F2 | BUTTON_REPEAT: /* reset counter */
f2_held = true; /* Ignore the release event */
counter = 0; counter = 0;
start_tick = *rb->current_tick;
break; break;
case BUTTON_F3: /* options */ case BUTTON_F3: /* options */