Git-Mirrors
/
portapack-mayhem
mirror of https://github.com/eried/portapack-mayhem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tryfix

This commit is contained in:
HTotoo 2024-04-25 12:21:51 +02:00
parent 6f981579f4
commit 212fb79443
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/common/battery.cpp
View File

@ -8,7 +8,7 @@
#define EMULATOR_VOLTAGE 3987
#define EMULATOR_CURRENT 40
#define EMULATOR_CHARGING 0
#define EMULATOR_PERCENT 61
#define EMULATOR_PERCENT 99
extern I2C portapack::i2c0;
@ -108,7 +108,7 @@ msg_t BatteryManagement::timer_fn(void* arg) {
}
void BatteryManagement::create_thread() {
thread = chThdCreateFromHeap(NULL, 1024, NORMALPRIO, BatteryManagement::timer_fn, nullptr);
thread = chThdCreateFromHeap(NULL, 512, NORMALPRIO, BatteryManagement::timer_fn, nullptr);
}
} // namespace battery

10
firmware/common/ui_widget.cpp
View File

@ -2082,8 +2082,8 @@ bool BatteryIcon::on_touch(TouchEvent event) {
return false;
}
void BatteryIcon::paint(Painter& painter) {
ui::Rect rect = screen_rect(); // 10, 1 * 16
painter.fill_rectangle(rect, highlighted() ? Color::light_grey() : Color::dark_grey()); // clear
ui::Rect rect = screen_rect(); // 10, 1 * 16
painter.fill_rectangle(rect, has_focus() || highlighted() ? Color::light_grey() : Color::dark_grey()); // clear
ui::Color battColor = (charge_) ? Color::cyan() : Color::green();
// batt body:
painter.draw_vline({rect.left() + 1, rect.top() + 2}, rect.height() - 4, battColor);
@ -2107,7 +2107,7 @@ void BatteryIcon::paint(Painter& painter) {
else
battColor = Color::red();
// fill the bars
for (int y = pp; y <= ppx; y++) {
for (int y = pp; y < ppx; y++) {
painter.draw_hline({rect.left() + 2, rect.top() + 3 + y}, rect.width() - 4, battColor);
}
}
@ -2121,11 +2121,11 @@ BatteryTextField::BatteryTextField(Rect parent_rect, uint8_t percent)
}
void BatteryTextField::paint(Painter& painter) {
Color bg = highlighted() ? Color::light_grey() : Color::dark_grey();
Color bg = has_focus() || highlighted() ? Color::light_grey() : Color::dark_grey();
ui::Rect rect = screen_rect(); // 2 * 8, 1 * 16
painter.fill_rectangle(rect, bg); // clear
std::string txt_batt = to_string_dec_uint(percent_);
if (txt_batt.length() == 1)
if (txt_batt.length() <= 2)
txt_batt = " " + txt_batt;
painter.draw_string({rect.left(), rect.top()}, font::fixed_5x8, Color::white(), bg, txt_batt);
painter.draw_string({rect.left(), rect.top() + 8}, font::fixed_5x8, Color::white(), bg, (charge_) ? "+%" : " %");