diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-07-15 03:56:04 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-07-15 03:56:04 +0000 |
| commit | b43bf7e6397fe79ce99530fd10c0eb34b192c253 (patch) | |
| tree | ec88c44920f83e58484bf043bf614aaa99fccf8e /apps | |
| parent | ba0a9c418cba30575c9282a2bc5aa5c0a4b6a89b (diff) | |
| download | rockbox-b43bf7e6397fe79ce99530fd10c0eb34b192c253.zip rockbox-b43bf7e6397fe79ce99530fd10c0eb34b192c253.tar.gz rockbox-b43bf7e6397fe79ce99530fd10c0eb34b192c253.tar.bz2 rockbox-b43bf7e6397fe79ce99530fd10c0eb34b192c253.tar.xz | |
e200 doesnt have multiple batt capacities, so remove the option.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13900 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/menus/settings_menu.c | 8 | ||||
| -rw-r--r-- | apps/settings_list.c | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index a11a7f0..302a742 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -123,8 +123,12 @@ MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu, /* Battery */ #ifndef SIMULATOR +#if BATTERY_CAPACITY_INC > 0 MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL); +#endif +#if BATTERY_TYPES_COUNT > 1 MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL); +#endif #ifdef HAVE_USB_POWER #if CONFIG_CHARGING static int usbcharging_callback(int action,const struct menu_item_ex *this_item) @@ -142,7 +146,9 @@ MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callba #endif #endif MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, - &battery_capacity, +#if BATTERY_CAPACITY_INC > 0 + &battery_capacity, +#endif #if BATTERY_TYPES_COUNT > 1 &battery_type, #endif diff --git a/apps/settings_list.c b/apps/settings_list.c index c1c0f6a..ae32735 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -483,12 +483,13 @@ const struct settings_list settings[] = { #endif "max files in dir", UNIT_INT,50,10000,50,NULL,NULL,NULL), #ifndef SIMULATOR - +#if BATTERY_CAPACITY_INC > 0 INT_SETTING(0, battery_capacity, LANG_BATTERY_CAPACITY, BATTERY_CAPACITY_DEFAULT, "battery capacity", UNIT_MAH, BATTERY_CAPACITY_MIN, BATTERY_CAPACITY_MAX, BATTERY_CAPACITY_INC, NULL, NULL, NULL), #endif +#endif #if CONFIG_CHARGING OFFON_SETTING(NVRAM(1), car_adapter_mode, LANG_CAR_ADAPTER_MODE, false, "car adapter mode", NULL), |