Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Device Charging popup to keep screen on or turn off #2514

Merged
merged 10 commits into from
Feb 8, 2025
Merged

Device Charging popup to keep screen on or turn off #2514

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8ba13d2
Merge pull request #1225 from eried/next
jLynx Jun 30, 2023
c9eb2b1
Merge pull request #1341 from eried/next
jLynx Aug 1, 2023
becb02f
Merge pull request #1505 from eried/next
jLynx Oct 17, 2023
f65de2f
Merge pull request #1661 from eried/next
jLynx Dec 21, 2023
da003be
Merge pull request #1692 from eried/next
jLynx Dec 29, 2023
28c52f3
Merge pull request #1909 from portapack-mayhem/next
jLynx Feb 16, 2024
f00b83c
Merge pull request #2091 from portapack-mayhem/next
jLynx Apr 7, 2024
22f490e
Merge pull request #2261 from portapack-mayhem/next
jLynx Sep 23, 2024
18e89d2
Merge pull request #2438 from portapack-mayhem/next
jLynx Dec 20, 2024
92f7dd1
Add modal to turn off screen when charging is detected
RocketGod-git Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion firmware/application/ui_navigation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,29 @@ void SystemStatusView::on_battery_data(const BatteryStateMessage* msg) {
batt_was_inited = true;
refresh();
}

// Check if charging state changed to charging
static bool was_charging = false;
if (msg->on_charger && !was_charging) {
// Only show charging modal when transitioning to charging state
nav_.display_modal(
"CHARGING",
"Screen on while charging?",
YESNO,
[this](bool keep_screen_on) {
if (!keep_screen_on) {
EventDispatcher::set_display_sleep(true);
}
});
}
was_charging = msg->on_charger;

if (!pmem::ui_hide_numeric_battery()) {
battery_text.set_battery(msg->valid_mask, msg->percent, msg->on_charger);
}
if (!pmem::ui_hide_battery_icon()) {
battery_icon.set_battery(msg->valid_mask, msg->percent, msg->on_charger);
};
}
}

void SystemStatusView::refresh() {
Expand Down