diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2021-07-22 19:57:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 19:57:45 (GMT) |
| commit | 0a0f28fff4be4c9fd9030d9375459fb7b5fdd004 (patch) | |
| tree | 5e6383350f57dec4c4b14d0393020cdc472e33a0 /src/displayapp/DisplayApp.cpp | |
| parent | 57b339707861c5688f5d432f1506a99df6bb0fce (diff) | |
Make firmware updating more foolproof (#469)
* Make firmware updating more foolproof and fix bugs
* No need to manually handle overflow
* Make startTime TickType_t
* Don't process TouchEvents::None
* Fix sleep getting re-enabled issue more directly
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 071af0c..4d32a7e 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -177,9 +177,13 @@ void DisplayApp::Refresh() { } break; case Messages::TouchEvent: { - if (state != States::Running) + if (state != States::Running) { break; + } auto gesture = OnTouchEvent(); + if (gesture == TouchEvents::None) { + break; + } if (!currentScreen->OnTouchEvent(gesture)) { if (currentApp == Apps::Clock) { switch (gesture) { @@ -286,6 +290,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) break; case Apps::FirmwareUpdate: currentScreen = std::make_unique<Screens::FirmwareUpdate>(this, bleController); + ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None); break; case Apps::Notifications: |