TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-04 23:45:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove warn text too from batt (#2377)

Browse Source
This commit is contained in:
Totoo 2024-11-20 15:02:02 +01:00 committed by GitHub
parent e88e0b5f8f
commit 07cae4a298
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/application/apps/ui_battinfo.cpp
View File

@ -53,7 +53,7 @@ void BattinfoView::update_result() {
// text_cycles.set("-"); // text_cycles.set("-");
text_ttef.set("-"); text_ttef.set("-");
text_method.set("-"); text_method.set("-");
text_warn.set(""); // text_warn.set("");
return; return;
} }
bool uichg = false; bool uichg = false;
@ -98,9 +98,9 @@ void BattinfoView::update_result() {
text_charge.hidden(true); text_charge.hidden(true);
// text_cycles.hidden(true); // text_cycles.hidden(true);
text_ttef.hidden(true); text_ttef.hidden(true);
text_warn.set(""); // text_warn.set("");
} }
if ((valid_mask & battery::BatteryManagement::BATT_VALID_CYCLES) == battery::BatteryManagement::BATT_VALID_CYCLES) { /* if ((valid_mask & battery::BatteryManagement::BATT_VALID_CYCLES) == battery::BatteryManagement::BATT_VALID_CYCLES) {
// text_cycles.hidden(false); // text_cycles.hidden(false);
uint16_t cycles = 0; // battery::BatteryManagement::get_cycles(); uint16_t cycles = 0; // battery::BatteryManagement::get_cycles();
if (cycles < 2) if (cycles < 2)
@ -111,7 +111,7 @@ void BattinfoView::update_result() {
} else { } else {
// text_cycles.hidden(true); // text_cycles.hidden(true);
text_warn.set(""); text_warn.set("");
} } */
if ((valid_mask & battery::BatteryManagement::BATT_VALID_TTEF) == battery::BatteryManagement::BATT_VALID_TTEF) { if ((valid_mask & battery::BatteryManagement::BATT_VALID_TTEF) == battery::BatteryManagement::BATT_VALID_TTEF) {
text_ttef.hidden(false); text_ttef.hidden(false);
float ttef = 0; float ttef = 0;
@ -161,7 +161,7 @@ BattinfoView::BattinfoView(NavigationView& nav)
&button_mode, &button_mode,
&button_exit, &button_exit,
// &text_cycles, // &text_cycles,
&text_warn, // &text_warn,
&text_ttef}); &text_ttef});
button_exit.on_select = [this, &nav](Button&) { button_exit.on_select = [this, &nav](Button&) {

4
firmware/application/apps/ui_battinfo.hpp
View File

@ -87,11 +87,11 @@ class BattinfoView : public View {
"-"}; "-"};
/* Text text_cycles{ /* Text text_cycles{
{13 * 8, 7 * 16, 10 * 16, 16}, {13 * 8, 7 * 16, 10 * 16, 16},
"-"}; */ "-"};
Text text_warn{ Text text_warn{
{1 * 8, 8 * 16, 30 * 8, 2 * 16}, {1 * 8, 8 * 16, 30 * 8, 2 * 16},
""}; ""}; */
Button button_mode{ Button button_mode{
{2 * 8, 11 * 16 + 5, 5 * 16, 32}, {2 * 8, 11 * 16 + 5, 5 * 16, 32},