diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-09-01 23:49:28 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-09-01 23:49:28 +0000 |
commit | 24424bab2ae1a7a781b727a94501a75eaa218c56 (patch) | |
tree | f76e447932ae3407b36c4a0fc5b76cd9036e980c | |
parent | 8ec51135b6733491e4980925a919e926609674fe (diff) | |
download | rockbox-24424bab2ae1a7a781b727a94501a75eaa218c56.tar.gz rockbox-24424bab2ae1a7a781b727a94501a75eaa218c56.zip |
Fix reds. The battery_capacity setting is used even for fixed-battery targets.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27976 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/menus/settings_menu.c | 2 | ||||
-rw-r--r-- | apps/settings.c | 1 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_list.c | 10 |
4 files changed, 12 insertions, 3 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index f619bb7db7..b49a8a813d 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -156,7 +156,7 @@ static int usbcharging_callback(int action,const struct menu_item_ex *this_item) | |||
156 | MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callback); | 156 | MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callback); |
157 | #endif /* HAVE_USB_CHARGING_ENABLE */ | 157 | #endif /* HAVE_USB_CHARGING_ENABLE */ |
158 | MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, | 158 | MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, |
159 | #if BATTERY_CAPACITY_INC > 0 | 159 | #if defined(BATTERY_CAPACITY_INC) && BATTERY_CAPACITY_INC > 0 |
160 | &battery_capacity, | 160 | &battery_capacity, |
161 | #endif | 161 | #endif |
162 | #if BATTERY_TYPES_COUNT > 1 | 162 | #if BATTERY_TYPES_COUNT > 1 |
diff --git a/apps/settings.c b/apps/settings.c index e9f0dc9330..3b12274eae 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -853,6 +853,7 @@ void settings_apply(bool read_disk) | |||
853 | set_poweroff_timeout(global_settings.poweroff); | 853 | set_poweroff_timeout(global_settings.poweroff); |
854 | 854 | ||
855 | #if defined(BATTERY_CAPACITY_INC) && BATTERY_CAPACITY_INC > 0 | 855 | #if defined(BATTERY_CAPACITY_INC) && BATTERY_CAPACITY_INC > 0 |
856 | /* only call if it's really exchangable */ | ||
856 | set_battery_capacity(global_settings.battery_capacity); | 857 | set_battery_capacity(global_settings.battery_capacity); |
857 | #endif | 858 | #endif |
858 | 859 | ||
diff --git a/apps/settings.h b/apps/settings.h index 3ba8fe9868..24ff9ef62a 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -619,7 +619,7 @@ struct user_settings | |||
619 | 619 | ||
620 | /* power settings */ | 620 | /* power settings */ |
621 | int poweroff; /* idle power off timer */ | 621 | int poweroff; /* idle power off timer */ |
622 | #if defined(BATTERY_CAPACITY_INC) && BATTERY_CAPACITY_INC > 0 | 622 | #ifdef BATTERY_CAPACITY_DEFAULT |
623 | int battery_capacity; /* in mAh */ | 623 | int battery_capacity; /* in mAh */ |
624 | #endif | 624 | #endif |
625 | 625 | ||
diff --git a/apps/settings_list.c b/apps/settings_list.c index 5a9eeb90ce..7dfa62e105 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -763,7 +763,15 @@ const struct settings_list settings[] = { | |||
763 | #endif | 763 | #endif |
764 | "max files in dir", UNIT_INT, 50, 10000, 50, | 764 | "max files in dir", UNIT_INT, 50, 10000, 50, |
765 | NULL, NULL, NULL), | 765 | NULL, NULL, NULL), |
766 | #if defined(BATTERY_CAPACITY_INC) && BATTERY_CAPACITY_INC > 0 | 766 | /* use this setting for user code even if there's no exchangable battery |
767 | * support enabled */ | ||
768 | #ifdef BATTERY_CAPACITY_DEFAULT | ||
769 | /* define min/max/inc for this file if there's only one battery */ | ||
770 | #ifndef BATTERY_CAPACITY_MIN | ||
771 | #define BATTERY_CAPACITY_MIN BATTERY_CAPACITY_DEFAULT | ||
772 | #define BATTERY_CAPACITY_MAX BATTERY_CAPACITY_DEFAULT | ||
773 | #define BATTERY_CAPACITY_INC 0 | ||
774 | #endif | ||
767 | INT_SETTING(0, battery_capacity, LANG_BATTERY_CAPACITY, | 775 | INT_SETTING(0, battery_capacity, LANG_BATTERY_CAPACITY, |
768 | BATTERY_CAPACITY_DEFAULT, "battery capacity", UNIT_MAH, | 776 | BATTERY_CAPACITY_DEFAULT, "battery capacity", UNIT_MAH, |
769 | BATTERY_CAPACITY_MIN, BATTERY_CAPACITY_MAX, | 777 | BATTERY_CAPACITY_MIN, BATTERY_CAPACITY_MAX, |