len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

More fixes for when both battery PERCENTAGE and VOLTAGE are enabled

Browse source 
Hopefully this fixes the last of the red

Change-Id: I732a595cfda088fb5517a15d83c29427dfc18137
This commit is contained in:
Solomon Peachy 2025-01-20 08:15:38 -05:00
parent 07b0015d17
commit 46eb089f97
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
firmware/powermgmt.c
View file

@ -302,9 +302,7 @@ static void send_battery_level_event(int percent)
} }
} }
#if (!(CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE) && \ #if CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE
(CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE)) || \
(CONFIG_BATTERY_MEASURE & (PERCENTAGE_MEASURE | VOLTAGE_MEASURE))
/* Look into the percent_to_volt_* table and estimate the battery level. */ /* Look into the percent_to_volt_* table and estimate the battery level. */
static int voltage_to_percent(int voltage, const short* table) static int voltage_to_percent(int voltage, const short* table)
{ {
@ -352,7 +350,7 @@ static int voltage_to_battery_level(int millivolts)
return level; return level;
} }
#endif #endif /* CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE */
/* Update battery percentage and time remaining information. /* Update battery percentage and time remaining information.
* *
@ -435,7 +433,7 @@ void battery_read_info(int *voltage, int *level)
*voltage = millivolts; *voltage = millivolts;
if (level) { if (level) {
#if (CONFIG_BATTERY_MEASURE & (PERCENTAGE_MEASURE | VOLTAGE_MEASURE)) #if ((CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE) && (CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE))
*level = _battery_level(); *level = _battery_level();
if (*level == -1) { if (*level == -1) {
*level = voltage_to_battery_level(millivolts); *level = voltage_to_battery_level(millivolts);
@ -488,8 +486,7 @@ bool battery_level_safe(void)
{ {
#if defined(NO_LOW_BATTERY_SHUTDOWN) #if defined(NO_LOW_BATTERY_SHUTDOWN)
return true; return true;
#elif CONFIG_BATTERY_MEASURE & (PERCENTAGE_MEASURE | VOLTAGE_MEASURE) #elif ((CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE) && (CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE))
/* if we have both, prefer voltage? */
return voltage_now > battery_level_dangerous[battery_type]; return voltage_now > battery_level_dangerous[battery_type];
#elif CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE #elif CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE
return percent_now > 0; return percent_now > 0;
@ -522,7 +519,8 @@ bool query_force_shutdown(void)
#if defined(NO_LOW_BATTERY_SHUTDOWN) #if defined(NO_LOW_BATTERY_SHUTDOWN)
return false; return false;
#elif CONFIG_BATTERY_MEASURE & (PERCENTAGE_MEASURE | VOLTAGE_MEASURE) #elif ((CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE) && (CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE))
/* If we have both, prefer voltage */
return voltage_now < battery_level_shutoff[battery_type]; return voltage_now < battery_level_shutoff[battery_type];
#elif CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE #elif CONFIG_BATTERY_MEASURE & PERCENTAGE_MEASURE
return percent_now == 0; return percent_now == 0;