diff options
Diffstat (limited to 'firmware/backlight.c')
-rw-r--r-- | firmware/backlight.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index d7c22956fb..9d48f0d660 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -409,7 +409,11 @@ static void backlight_tick(void) | |||
409 | { | 409 | { |
410 | #ifdef HAVE_CHARGING | 410 | #ifdef HAVE_CHARGING |
411 | static bool charger_was_inserted = false; | 411 | static bool charger_was_inserted = false; |
412 | bool charger_is_inserted = charger_inserted(); | 412 | bool charger_is_inserted = charger_inserted() |
413 | #ifdef HAVE_USB_POWER | ||
414 | || usb_powered() | ||
415 | #endif | ||
416 | ; | ||
413 | 417 | ||
414 | if( charger_was_inserted != charger_is_inserted ) | 418 | if( charger_was_inserted != charger_is_inserted ) |
415 | { | 419 | { |
@@ -483,7 +487,14 @@ void backlight_off(void) | |||
483 | int backlight_get_current_timeout(void) | 487 | int backlight_get_current_timeout(void) |
484 | { | 488 | { |
485 | #ifdef HAVE_CHARGING | 489 | #ifdef HAVE_CHARGING |
486 | return charger_inserted() ? backlight_timeout_plugged : backlight_timeout; | 490 | if (charger_inserted() |
491 | #ifdef HAVE_USB_POWER | ||
492 | || usb_powered() | ||
493 | #endif | ||
494 | ) | ||
495 | return backlight_timeout_plugged; | ||
496 | else | ||
497 | return backlight_timeout; | ||
487 | #else | 498 | #else |
488 | return backlight_timeout; | 499 | return backlight_timeout; |
489 | #endif | 500 | #endif |