|
osdir.com mailing list archive |
|
Subject: cvs: apps/recorder icons.c,1.34,1.35 - msg#00132List: systems.archos.rockbox.cvsIn directory sc8-pr-cvs1:/tmp/cvs-serv11679/apps/recorder Modified Files: icons.c Log Message: display graphic batt. animation instead of numerical 0,34,68,100 when charging Index: icons.c =================================================================== RCS file: /cvsroot/rockbox/apps/recorder/icons.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -b -r1.34 -r1.35 --- icons.c 29 Oct 2002 13:59:51 -0000 1.34 +++ icons.c 18 Dec 2002 18:47:11 -0000 1.35 @@ -22,6 +22,7 @@ #include "kernel.h" #include "sprintf.h" #include "rtc.h" +#include "powermgmt.h" #include "settings.h" @@ -162,7 +163,8 @@ if (fill > 100) fill = 100; - if (global_settings.battery_type) { + /* show graphical animation when charging instead of numbers */ + if ((global_settings.battery_type) && (charge_state != 1)) { /* Numeric display */ snprintf(buffer, sizeof(buffer), "%3d", percent); Thread at a glance:
Previous Message by Date: click to view message previewcvs: apps status.c,1.35,1.36 status.h,1.4,1.5 tree.c,1.149,1.150Update of /cvsroot/rockbox/apps In directory sc8-pr-cvs1:/tmp/cvs-serv18284/apps Modified Files: status.c status.h tree.c Log Message: Killed a dozen global variables Index: status.c =================================================================== RCS file: /cvsroot/rockbox/apps/status.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -b -r1.35 -r1.36 --- status.c 14 Dec 2002 15:46:23 -0000 1.35 +++ status.c 18 Dec 2002 14:57:44 -0000 1.36 @@ -35,11 +35,13 @@ static enum playmode current_mode = STATUS_STOP; -long switch_tick; -int battery_charge_step = 0; -#ifdef HAVE_LCD_BITMAP -bool plug_state; -bool battery_state; +#if defined(HAVE_LCD_CHARCELLS) || defined(HAVE_CHARGE_CTRL) +static long switch_tick; +static int battery_charge_step = 0; +#ifdef HAVE_CHARGE_CTRL +static bool plug_state; +static bool battery_state; +#endif #endif void status_init(void) Index: status.h =================================================================== RCS file: /cvsroot/rockbox/apps/status.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- status.h 15 Oct 2002 12:53:12 -0000 1.4 +++ status.h 18 Dec 2002 14:57:44 -0000 1.5 @@ -33,7 +33,6 @@ void status_init(void); void status_set_playmode(enum playmode mode); #ifdef HAVE_LCD_BITMAP -extern bool statusbar_enabled; bool statusbar(bool state); #endif void status_draw(void); Index: tree.c =================================================================== RCS file: /cvsroot/rockbox/apps/tree.c,v retrieving revision 1.149 retrieving revision 1.150 diff -u -b -r1.149 -r1.150 --- tree.c 18 Dec 2002 14:14:24 -0000 1.149 +++ tree.c 18 Dec 2002 14:57:44 -0000 1.150 @@ -56,8 +56,8 @@ #define NAME_BUFFER_SIZE (AVERAGE_FILENAME_LENGTH * MAX_FILES_IN_DIR) -char name_buffer[NAME_BUFFER_SIZE]; -int name_buffer_length; +static char name_buffer[NAME_BUFFER_SIZE]; +static int name_buffer_length; struct entry { short attr; /* FAT attributes + file type flags */ char *name; Next Message by Date: click to view message previewcvs: apps debug_menu.c,1.40,1.41Update of /cvsroot/rockbox/apps In directory sc8-pr-cvs1:/tmp/cvs-serv14735/apps Modified Files: debug_menu.c Log Message: battery level 100% when trickle chg, only 1% per minute change allowed, ignore 25 min. after charge start/stop, get rid of old lazyness table (I hope this makes the battery display less confusing to the user, charging algo. is not affected\!) Index: debug_menu.c =================================================================== RCS file: /cvsroot/rockbox/apps/debug_menu.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -b -r1.40 -r1.41 --- debug_menu.c 15 Dec 2002 18:10:19 -0000 1.40 +++ debug_menu.c 18 Dec 2002 18:55:49 -0000 1.41 @@ -815,13 +815,7 @@ power_history[POWER_HISTORY_LEN-1] % 100); lcd_puts(0, 3, buf); - snprintf(buf, 30, "Lazy time amount: %d%%", - (powermgmt_last_cycle_startstop_min < 20) - ? battery_lazyness[powermgmt_last_cycle_startstop_min] - : 0); - lcd_puts(0, 4, buf); - - snprintf(buf, 30, "resulting act.lev: %d%%", battery_level()); + snprintf(buf, 30, "battery level: %d%%", battery_level()); lcd_puts(0, 5, buf); snprintf(buf, 30, "Est. remaining: %d m", battery_time()); Previous Message by Thread: click to view message previewcvs: apps status.c,1.35,1.36 status.h,1.4,1.5 tree.c,1.149,1.150Update of /cvsroot/rockbox/apps In directory sc8-pr-cvs1:/tmp/cvs-serv18284/apps Modified Files: status.c status.h tree.c Log Message: Killed a dozen global variables Index: status.c =================================================================== RCS file: /cvsroot/rockbox/apps/status.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -b -r1.35 -r1.36 --- status.c 14 Dec 2002 15:46:23 -0000 1.35 +++ status.c 18 Dec 2002 14:57:44 -0000 1.36 @@ -35,11 +35,13 @@ static enum playmode current_mode = STATUS_STOP; -long switch_tick; -int battery_charge_step = 0; -#ifdef HAVE_LCD_BITMAP -bool plug_state; -bool battery_state; +#if defined(HAVE_LCD_CHARCELLS) || defined(HAVE_CHARGE_CTRL) +static long switch_tick; +static int battery_charge_step = 0; +#ifdef HAVE_CHARGE_CTRL +static bool plug_state; +static bool battery_state; +#endif #endif void status_init(void) Index: status.h =================================================================== RCS file: /cvsroot/rockbox/apps/status.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- status.h 15 Oct 2002 12:53:12 -0000 1.4 +++ status.h 18 Dec 2002 14:57:44 -0000 1.5 @@ -33,7 +33,6 @@ void status_init(void); void status_set_playmode(enum playmode mode); #ifdef HAVE_LCD_BITMAP -extern bool statusbar_enabled; bool statusbar(bool state); #endif void status_draw(void); Index: tree.c =================================================================== RCS file: /cvsroot/rockbox/apps/tree.c,v retrieving revision 1.149 retrieving revision 1.150 diff -u -b -r1.149 -r1.150 --- tree.c 18 Dec 2002 14:14:24 -0000 1.149 +++ tree.c 18 Dec 2002 14:57:44 -0000 1.150 @@ -56,8 +56,8 @@ #define NAME_BUFFER_SIZE (AVERAGE_FILENAME_LENGTH * MAX_FILES_IN_DIR) -char name_buffer[NAME_BUFFER_SIZE]; -int name_buffer_length; +static char name_buffer[NAME_BUFFER_SIZE]; +static int name_buffer_length; struct entry { short attr; /* FAT attributes + file type flags */ char *name; Next Message by Thread: click to view message previewcvs: apps debug_menu.c,1.40,1.41Update of /cvsroot/rockbox/apps In directory sc8-pr-cvs1:/tmp/cvs-serv14735/apps Modified Files: debug_menu.c Log Message: battery level 100% when trickle chg, only 1% per minute change allowed, ignore 25 min. after charge start/stop, get rid of old lazyness table (I hope this makes the battery display less confusing to the user, charging algo. is not affected\!) Index: debug_menu.c =================================================================== RCS file: /cvsroot/rockbox/apps/debug_menu.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -b -r1.40 -r1.41 --- debug_menu.c 15 Dec 2002 18:10:19 -0000 1.40 +++ debug_menu.c 18 Dec 2002 18:55:49 -0000 1.41 @@ -815,13 +815,7 @@ power_history[POWER_HISTORY_LEN-1] % 100); lcd_puts(0, 3, buf); - snprintf(buf, 30, "Lazy time amount: %d%%", - (powermgmt_last_cycle_startstop_min < 20) - ? battery_lazyness[powermgmt_last_cycle_startstop_min] - : 0); - lcd_puts(0, 4, buf); - - snprintf(buf, 30, "resulting act.lev: %d%%", battery_level()); + snprintf(buf, 30, "battery level: %d%%", battery_level()); lcd_puts(0, 5, buf); snprintf(buf, 30, "Est. remaining: %d m", battery_time()); Loading Comments...
|
|
