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

Fix reds. The battery_capacity setting is used even for fixed-battery targets.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27976 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-09-01 23:49:28 +00:00
parent 8ec51135b6
commit 24424bab2a
4 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/menus/settings_menu.c
View file

@ -156,7 +156,7 @@ static int usbcharging_callback(int action,const struct menu_item_ex *this_item)
MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callback); MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callback);
#endif /* HAVE_USB_CHARGING_ENABLE */ #endif /* HAVE_USB_CHARGING_ENABLE */
MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
#if BATTERY_CAPACITY_INC > 0 #if defined(BATTERY_CAPACITY_INC) && BATTERY_CAPACITY_INC > 0
&battery_capacity, &battery_capacity,
#endif #endif
#if BATTERY_TYPES_COUNT > 1 #if BATTERY_TYPES_COUNT > 1

1
apps/settings.c
View file

@ -853,6 +853,7 @@ void settings_apply(bool read_disk)
set_poweroff_timeout(global_settings.poweroff); set_poweroff_timeout(global_settings.poweroff);
#if defined(BATTERY_CAPACITY_INC) && BATTERY_CAPACITY_INC > 0 #if defined(BATTERY_CAPACITY_INC) && BATTERY_CAPACITY_INC > 0
/* only call if it's really exchangable */
set_battery_capacity(global_settings.battery_capacity); set_battery_capacity(global_settings.battery_capacity);
#endif #endif

2
apps/settings.h
View file

@ -619,7 +619,7 @@ struct user_settings
/* power settings */ /* power settings */
int poweroff; /* idle power off timer */ int poweroff; /* idle power off timer */
#if defined(BATTERY_CAPACITY_INC) && BATTERY_CAPACITY_INC > 0 #ifdef BATTERY_CAPACITY_DEFAULT
int battery_capacity; /* in mAh */ int battery_capacity; /* in mAh */
#endif #endif

10
apps/settings_list.c
View file

@ -763,7 +763,15 @@ const struct settings_list settings[] = {
#endif #endif
"max files in dir", UNIT_INT, 50, 10000, 50, "max files in dir", UNIT_INT, 50, 10000, 50,
NULL, NULL, NULL), NULL, NULL, NULL),
#if defined(BATTERY_CAPACITY_INC) && BATTERY_CAPACITY_INC > 0 /* use this setting for user code even if there's no exchangable battery
* support enabled */
#ifdef BATTERY_CAPACITY_DEFAULT
/* define min/max/inc for this file if there's only one battery */
#ifndef BATTERY_CAPACITY_MIN
#define BATTERY_CAPACITY_MIN BATTERY_CAPACITY_DEFAULT
#define BATTERY_CAPACITY_MAX BATTERY_CAPACITY_DEFAULT
#define BATTERY_CAPACITY_INC 0
#endif
INT_SETTING(0, battery_capacity, LANG_BATTERY_CAPACITY, INT_SETTING(0, battery_capacity, LANG_BATTERY_CAPACITY,
BATTERY_CAPACITY_DEFAULT, "battery capacity", UNIT_MAH, BATTERY_CAPACITY_DEFAULT, "battery capacity", UNIT_MAH,
BATTERY_CAPACITY_MIN, BATTERY_CAPACITY_MAX, BATTERY_CAPACITY_MIN, BATTERY_CAPACITY_MAX,