Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
More fixes for when both battery PERCENTAGE and VOLTAGE are enabled
Hopefully this fixes the last of the red
Change-Id: I732a595cfda088fb5517a15d83c29427dfc18137
+6
-8
+6
-8
firmware/powermgmt.c
+6
-8
firmware/powermgmt.c
···
302
302
}
303
303
}
304
304
305
-
#if (!(CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE) && \
306
-
(CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE)) || \
307
-
(CONFIG_BATTERY_MEASURE & (PERCENTAGE_MEASURE | VOLTAGE_MEASURE))
305
+
#if CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE
308
306
/* Look into the percent_to_volt_* table and estimate the battery level. */
309
307
static int voltage_to_percent(int voltage, const short* table)
310
308
{
···
352
350
353
351
return level;
354
352
}
355
-
#endif
353
+
#endif /* CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE */
356
354
357
355
/* Update battery percentage and time remaining information.
358
356
*
···
435
433
*voltage = millivolts;
436
434
437
435
if (level) {
438
-
#if (CONFIG_BATTERY_MEASURE & (PERCENTAGE_MEASURE | VOLTAGE_MEASURE))
436
+
#if ((CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE) && (CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE))
439
437
*level = _battery_level();
440
438
if (*level == -1) {
441
439
*level = voltage_to_battery_level(millivolts);
···
488
486
{
489
487
#if defined(NO_LOW_BATTERY_SHUTDOWN)
490
488
return true;
491
-
#elif CONFIG_BATTERY_MEASURE & (PERCENTAGE_MEASURE | VOLTAGE_MEASURE)
492
-
/* if we have both, prefer voltage? */
489
+
#elif ((CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE) && (CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE))
493
490
return voltage_now > battery_level_dangerous[battery_type];
494
491
#elif CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE
495
492
return percent_now > 0;
···
522
519
523
520
#if defined(NO_LOW_BATTERY_SHUTDOWN)
524
521
return false;
525
-
#elif CONFIG_BATTERY_MEASURE & (PERCENTAGE_MEASURE | VOLTAGE_MEASURE)
522
+
#elif ((CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE) && (CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE))
523
+
/* If we have both, prefer voltage */
526
524
return voltage_now < battery_level_shutoff[battery_type];
527
525
#elif CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE
528
526
return percent_now == 0;