diff options
Diffstat (limited to 'apps/menus/settings_menu.c')
-rw-r--r-- | apps/menus/settings_menu.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 6bb032d169..d05726ea44 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -144,8 +144,7 @@ MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL); | |||
144 | #if BATTERY_TYPES_COUNT > 1 | 144 | #if BATTERY_TYPES_COUNT > 1 |
145 | MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL); | 145 | MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL); |
146 | #endif | 146 | #endif |
147 | #ifdef HAVE_USB_POWER | 147 | #ifdef HAVE_USB_CHARGING_ENABLE |
148 | #if CONFIG_CHARGING | ||
149 | static int usbcharging_callback(int action,const struct menu_item_ex *this_item) | 148 | static int usbcharging_callback(int action,const struct menu_item_ex *this_item) |
150 | { | 149 | { |
151 | (void)this_item; | 150 | (void)this_item; |
@@ -158,8 +157,7 @@ static int usbcharging_callback(int action,const struct menu_item_ex *this_item) | |||
158 | return action; | 157 | return action; |
159 | } | 158 | } |
160 | MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callback); | 159 | MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callback); |
161 | #endif | 160 | #endif /* HAVE_USB_CHARGING_ENABLE */ |
162 | #endif | ||
163 | MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, | 161 | MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, |
164 | #if BATTERY_CAPACITY_INC > 0 | 162 | #if BATTERY_CAPACITY_INC > 0 |
165 | &battery_capacity, | 163 | &battery_capacity, |
@@ -167,11 +165,9 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, | |||
167 | #if BATTERY_TYPES_COUNT > 1 | 165 | #if BATTERY_TYPES_COUNT > 1 |
168 | &battery_type, | 166 | &battery_type, |
169 | #endif | 167 | #endif |
170 | #ifdef HAVE_USB_POWER | 168 | #ifdef HAVE_USB_CHARGING_ENABLE |
171 | #if CONFIG_CHARGING | ||
172 | &usb_charging, | 169 | &usb_charging, |
173 | #endif | 170 | #endif |
174 | #endif | ||
175 | ); | 171 | ); |
176 | /* Disk */ | 172 | /* Disk */ |
177 | #ifdef HAVE_DISK_STORAGE | 173 | #ifdef HAVE_DISK_STORAGE |