Return button action instead of pushing messages

1 files changed, 44 insertions, 26 deletions

diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 8a4f894..85cefb6 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -335,33 +335,25 @@ void SystemTask::Work() {
           ReloadIdleTimer();
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::TouchEvent);
           break;
-        case Messages::OnButtonPushed:
-          if (!isSleeping && !isGoingToSleep) {
-            displayApp.PushMessage(Pinetime::Applications::Display::Messages::ButtonPushed);
-          }
-          break;
-        case Messages::OnButtonLongPressed:
-          if (!isSleeping) {
-            displayApp.PushMessage(Pinetime::Applications::Display::Messages::ButtonLongPressed);
-          }
-          break;
-        case Messages::OnButtonLongerPressed:
-          if (!isSleeping) {
-            displayApp.PushMessage(Pinetime::Applications::Display::Messages::ButtonLongerPressed);
-          }
-          break;
-        case Messages::OnButtonDoubleClicked:
-          if (!isSleeping) {
-            displayApp.PushMessage(Pinetime::Applications::Display::Messages::ButtonDoubleClicked);
+        case Messages::HandleButtonEvent: {
+          // This is for faster wakeup, sacrificing special longpress and doubleclick handling while sleeping
+          if (IsSleeping()) {
+            GoToRunning();
+            break;
           }
-          break;
-        case Messages::HandleButtonEvent:
+
+          Controllers::ButtonActions action;
           if (nrf_gpio_pin_read(Pinetime::PinMap::Button) == 0) {
-            buttonHandler.HandleEvent(Pinetime::Controllers::ButtonHandler::Events::Release);
+            action = buttonHandler.HandleEvent(Controllers::ButtonHandler::Events::Release);
           } else {
-            buttonHandler.HandleEvent(Pinetime::Controllers::ButtonHandler::Events::Press);
+            action = buttonHandler.HandleEvent(Controllers::ButtonHandler::Events::Press);
           }
-          break;
+          HandleButtonAction(action);
+        } break;
+        case Messages::HandleButtonTimerEvent: {
+          auto action = buttonHandler.HandleEvent(Controllers::ButtonHandler::Events::Timer);
+          HandleButtonAction(action);
+        } break;
         case Messages::OnDisplayTaskSleeping:
           if (BootloaderVersion::IsValid()) {
             // First versions of the bootloader do not expose their version and cannot initialize the SPI NOR FLASH
@@ -398,9 +390,6 @@ void SystemTask::Work() {
         case Messages::BatteryPercentageUpdated:
           nimbleController.NotifyBatteryLevel(batteryController.PercentRemaining());
           break;
-        case Messages::ReloadIdleTimer:
-          ReloadIdleTimer();
-          break;
 
         default:
           break;
@@ -449,6 +438,35 @@ void SystemTask::UpdateMotion() {
   }
 }
 
+void SystemTask::HandleButtonAction(Controllers::ButtonActions action) {
+  if (IsSleeping()) {
+    return;
+  }
+
+  ReloadIdleTimer();
+
+  using Actions = Controllers::ButtonActions;
+
+  switch (action) {
+    case Actions::Click:
+      if (!isGoingToSleep) {
+        displayApp.PushMessage(Applications::Display::Messages::ButtonPushed);
+      }
+      break;
+    case Actions::DoubleClick:
+      displayApp.PushMessage(Applications::Display::Messages::ButtonDoubleClicked);
+      break;
+    case Actions::LongPress:
+      displayApp.PushMessage(Applications::Display::Messages::ButtonLongPressed);
+      break;
+    case Actions::LongerPress:
+      displayApp.PushMessage(Applications::Display::Messages::ButtonLongerPressed);
+      break;
+    default:
+      break;
+  }
+}
+
 void SystemTask::GoToRunning() {
   if (isGoingToSleep or (not isSleeping) or isWakingUp)
     return;