liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

battery info temperature shown in C or F based on settings (#2360)

Browse Source 
* battery Info temperature displays C or F
* PowerSettings: add locale module to dependencies

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Round-Pi 2023-02-06 22:05:52 -05:00 committed by GitHub
parent 147f42a2b7
commit 1ff5843ee6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
applications/settings/power_settings_app/application.fam
View File

@ -6,6 +6,7 @@ App(
requires=[ requires=[
"gui", "gui",
"power", "power",
"locale",
], ],
flags=["InsomniaSafe"], flags=["InsomniaSafe"],
stack_size=1 * 1024, stack_size=1 * 1024,

11
applications/settings/power_settings_app/views/battery_info.c
View File

@ -2,6 +2,7 @@
#include <furi.h> #include <furi.h>
#include <gui/elements.h> #include <gui/elements.h>
#include <assets_icons.h> #include <assets_icons.h>
#include <locale/locale.h>
#define LOW_CHARGE_THRESHOLD 10 #define LOW_CHARGE_THRESHOLD 10
#define HIGH_DRAIN_CURRENT_THRESHOLD 100 #define HIGH_DRAIN_CURRENT_THRESHOLD 100
@ -101,7 +102,15 @@ static void battery_info_draw_callback(Canvas* canvas, void* context) {
char health[10]; char health[10];
snprintf(batt_level, sizeof(batt_level), "%lu%%", (uint32_t)model->charge); snprintf(batt_level, sizeof(batt_level), "%lu%%", (uint32_t)model->charge);
snprintf(temperature, sizeof(temperature), "%lu C", (uint32_t)model->gauge_temperature); if(locale_get_measurement_unit() == LocaleMeasurementUnitsMetric) {
snprintf(temperature, sizeof(temperature), "%lu C", (uint32_t)model->gauge_temperature);
} else {
snprintf(
temperature,
sizeof(temperature),
"%lu F",
(uint32_t)locale_celsius_to_fahrenheit(model->gauge_temperature));
}
snprintf( snprintf(
voltage, voltage,
sizeof(voltage), sizeof(voltage),