diff options
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/display_menu.c | 8 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index a1067fc333..5dc14ce5b9 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -79,7 +79,7 @@ int flipdisplay_callback(int action,const struct menu_item_ex *this_item) | |||
79 | /* LCD MENU */ | 79 | /* LCD MENU */ |
80 | #ifdef CONFIG_BACKLIGHT | 80 | #ifdef CONFIG_BACKLIGHT |
81 | MENUITEM_SETTING(backlight_timeout, &global_settings.backlight_timeout, NULL); | 81 | MENUITEM_SETTING(backlight_timeout, &global_settings.backlight_timeout, NULL); |
82 | #ifdef CONFIG_CHARGING | 82 | #if CONFIG_CHARGING |
83 | MENUITEM_SETTING(backlight_timeout_plugged, | 83 | MENUITEM_SETTING(backlight_timeout_plugged, |
84 | &global_settings.backlight_timeout_plugged, NULL); | 84 | &global_settings.backlight_timeout_plugged, NULL); |
85 | #endif | 85 | #endif |
@@ -174,7 +174,7 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | |||
174 | NULL, bitmap_icons_6x8[Icon_Display_menu] | 174 | NULL, bitmap_icons_6x8[Icon_Display_menu] |
175 | #ifdef CONFIG_BACKLIGHT | 175 | #ifdef CONFIG_BACKLIGHT |
176 | ,&backlight_timeout | 176 | ,&backlight_timeout |
177 | # ifdef CONFIG_CHARGING | 177 | # if CONFIG_CHARGING |
178 | ,&backlight_timeout_plugged | 178 | ,&backlight_timeout_plugged |
179 | # endif | 179 | # endif |
180 | # ifdef HAS_BUTTON_HOLD | 180 | # ifdef HAS_BUTTON_HOLD |
@@ -218,7 +218,7 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | |||
218 | MENUITEM_SETTING(remote_backlight_timeout, | 218 | MENUITEM_SETTING(remote_backlight_timeout, |
219 | &global_settings.remote_backlight_timeout, NULL); | 219 | &global_settings.remote_backlight_timeout, NULL); |
220 | 220 | ||
221 | #ifdef CONFIG_CHARGING | 221 | #if CONFIG_CHARGING |
222 | MENUITEM_SETTING(remote_backlight_timeout_plugged, | 222 | MENUITEM_SETTING(remote_backlight_timeout_plugged, |
223 | &global_settings.remote_backlight_timeout_plugged, NULL); | 223 | &global_settings.remote_backlight_timeout_plugged, NULL); |
224 | #endif | 224 | #endif |
@@ -260,7 +260,7 @@ MENUITEM_SETTING(remote_reduce_ticking, | |||
260 | MAKE_MENU(lcd_remote_settings, ID2P(LANG_LCD_REMOTE_MENU), | 260 | MAKE_MENU(lcd_remote_settings, ID2P(LANG_LCD_REMOTE_MENU), |
261 | NULL, bitmap_icons_6x8[Icon_Remote_Display_menu], | 261 | NULL, bitmap_icons_6x8[Icon_Remote_Display_menu], |
262 | &remote_backlight_timeout, | 262 | &remote_backlight_timeout, |
263 | #ifdef CONFIG_CHARGING | 263 | #if CONFIG_CHARGING |
264 | &remote_backlight_timeout_plugged, | 264 | &remote_backlight_timeout_plugged, |
265 | #endif | 265 | #endif |
266 | #ifdef HAS_REMOTE_BUTTON_HOLD | 266 | #ifdef HAS_REMOTE_BUTTON_HOLD |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 22bd1d8c09..399002cd14 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -110,7 +110,7 @@ MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, NOICON, | |||
110 | MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL); | 110 | MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL); |
111 | MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL); | 111 | MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL); |
112 | #ifdef HAVE_USB_POWER | 112 | #ifdef HAVE_USB_POWER |
113 | #ifdef CONFIG_CHARGING | 113 | #if CONFIG_CHARGING |
114 | static int usbcharging_callback(int action,const struct menu_item_ex *this_item) | 114 | static int usbcharging_callback(int action,const struct menu_item_ex *this_item) |
115 | { | 115 | { |
116 | (void)this_item; | 116 | (void)this_item; |
@@ -131,7 +131,7 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, NOICON, | |||
131 | &battery_type, | 131 | &battery_type, |
132 | #endif | 132 | #endif |
133 | #ifdef HAVE_USB_POWER | 133 | #ifdef HAVE_USB_POWER |
134 | #ifdef CONFIG_CHARGING | 134 | #if CONFIG_CHARGING |
135 | &usb_charging, | 135 | &usb_charging, |
136 | #endif | 136 | #endif |
137 | #endif | 137 | #endif |
@@ -272,7 +272,7 @@ static int linein_callback(int action,const struct menu_item_ex *this_item) | |||
272 | } | 272 | } |
273 | MENUITEM_SETTING(line_in, &global_settings.line_in, linein_callback); | 273 | MENUITEM_SETTING(line_in, &global_settings.line_in, linein_callback); |
274 | #endif | 274 | #endif |
275 | #ifdef CONFIG_CHARGING | 275 | #if CONFIG_CHARGING |
276 | MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); | 276 | MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); |
277 | #endif | 277 | #endif |
278 | 278 | ||
@@ -296,7 +296,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
296 | #if CONFIG_CODEC == MAS3507D | 296 | #if CONFIG_CODEC == MAS3507D |
297 | &line_in, | 297 | &line_in, |
298 | #endif | 298 | #endif |
299 | #ifdef CONFIG_CHARGING | 299 | #if CONFIG_CHARGING |
300 | &car_adapter_mode, | 300 | &car_adapter_mode, |
301 | #endif | 301 | #endif |
302 | ); | 302 | ); |