diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/settings.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/apps/settings.c b/apps/settings.c index dab44fe229..122f1109fb 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -275,15 +275,9 @@ int settings_save( void ) | |||
275 | 275 | ||
276 | config_block[0xa] = (unsigned char)global_settings.contrast; | 276 | config_block[0xa] = (unsigned char)global_settings.contrast; |
277 | 277 | ||
278 | #ifdef HAVE_CHARGE_CTRL | 278 | config_block[0xb] = (unsigned char) |
279 | if( global_settings.backlight_on_when_charging ) { | 279 | ((global_settings.backlight_on_when_charging?0x40:0) | |
280 | config_block[0xb] = (unsigned char) (global_settings.backlight_timeout + 128); | 280 | (global_settings.backlight_timeout & 0x3f)); |
281 | } else { | ||
282 | config_block[0xb] = (unsigned char)global_settings.backlight_timeout; | ||
283 | } | ||
284 | #else | ||
285 | config_block[0xb] = (unsigned char)global_settings.backlight_timeout; | ||
286 | #endif | ||
287 | config_block[0xc] = (unsigned char)global_settings.poweroff; | 281 | config_block[0xc] = (unsigned char)global_settings.poweroff; |
288 | config_block[0xd] = (unsigned char)global_settings.resume; | 282 | config_block[0xd] = (unsigned char)global_settings.resume; |
289 | 283 | ||
@@ -408,15 +402,14 @@ void settings_load(void) | |||
408 | if ( global_settings.contrast < MIN_CONTRAST_SETTING ) | 402 | if ( global_settings.contrast < MIN_CONTRAST_SETTING ) |
409 | global_settings.contrast = DEFAULT_CONTRAST_SETTING; | 403 | global_settings.contrast = DEFAULT_CONTRAST_SETTING; |
410 | } | 404 | } |
411 | #ifdef HAVE_CHARGE_CTRL | 405 | |
412 | if (config_block[0xb] != 0xFF) { | 406 | if (config_block[0xb] != 0xFF) { |
413 | global_settings.backlight_timeout = config_block[0xb] & 127; | 407 | /* Bit 7 is unused to be able to detect uninitialized entry */ |
414 | global_settings.backlight_on_when_charging = config_block[0xb] & 128 ? 1 : 0; | 408 | global_settings.backlight_timeout = config_block[0xb] & 0x3f; |
409 | global_settings.backlight_on_when_charging = | ||
410 | config_block[0xb] & 0x40 ? true : false; | ||
415 | } | 411 | } |
416 | #else | 412 | |
417 | if (config_block[0xb] != 0xFF) | ||
418 | global_settings.backlight_timeout = config_block[0xb]; | ||
419 | #endif | ||
420 | if (config_block[0xc] != 0xFF) | 413 | if (config_block[0xc] != 0xFF) |
421 | global_settings.poweroff = config_block[0xc]; | 414 | global_settings.poweroff = config_block[0xc]; |
422 | if (config_block[0xd] != 0xFF) | 415 | if (config_block[0xd] != 0xFF) |