diff options
author | JF <JF002@users.noreply.github.com> | 2021-11-06 10:55:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-06 10:55:37 +0100 |
commit | 4a5b5f954f12de1574af8e3efec094bb4bdbb542 (patch) | |
tree | c9de7a49ffd8af620c1dfab3145cd7ffeaad370d /src/systemtask/SystemTask.h | |
parent | cfc11ea83b5b864810a87387f68f53c017bc20db (diff) | |
parent | 60a717b1a2272e61dfc4d297998da1c7672a8316 (diff) |
Merge pull request #782 from Riksu9000/newer_buttonhandler
Newer ButtonHandler
Diffstat (limited to 'src/systemtask/SystemTask.h')
-rw-r--r-- | src/systemtask/SystemTask.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h index 879c1be8..412878b1 100644 --- a/src/systemtask/SystemTask.h +++ b/src/systemtask/SystemTask.h @@ -20,6 +20,8 @@ #include "components/alarm/AlarmController.h" #include "components/fs/FS.h" #include "touchhandler/TouchHandler.h" +#include "buttonhandler/ButtonHandler.h" +#include "buttonhandler/ButtonActions.h" #ifdef PINETIME_IS_RECOVERY #include "displayapp/DisplayAppRecovery.h" @@ -45,6 +47,7 @@ namespace Pinetime { } namespace Controllers { class TouchHandler; + class ButtonHandler; } namespace System { class SystemTask { @@ -71,12 +74,12 @@ namespace Pinetime { Pinetime::Applications::DisplayApp& displayApp, Pinetime::Applications::HeartRateTask& heartRateApp, Pinetime::Controllers::FS& fs, - Pinetime::Controllers::TouchHandler& touchHandler); + Pinetime::Controllers::TouchHandler& touchHandler, + Pinetime::Controllers::ButtonHandler& buttonHandler); void Start(); void PushMessage(Messages msg); - void OnButtonPushed(); void OnTouchEvent(); void OnIdle(); @@ -123,6 +126,7 @@ namespace Pinetime { Pinetime::Applications::HeartRateTask& heartRateApp; Pinetime::Controllers::FS& fs; Pinetime::Controllers::TouchHandler& touchHandler; + Pinetime::Controllers::ButtonHandler& buttonHandler; Pinetime::Controllers::NimbleController nimbleController; static void Process(void* instance); @@ -135,6 +139,9 @@ namespace Pinetime { TimerHandle_t measureBatteryTimer; bool doNotGoToSleep = false; + void HandleButtonAction(Controllers::ButtonActions action); + bool fastWakeUpDone = false; + void GoToRunning(); void UpdateMotion(); bool stepCounterMustBeReset = false; |