Return button action instead of pushing messages

src/buttonhandler/ButtonActions.h

@@ -0,0 +1,7 @@
+#pragma once
+
+namespace Pinetime {
+  namespace Controllers {
+    enum class ButtonActions { None, Click, DoubleClick, LongPress, LongerPress };
+  }
+}

src/buttonhandler/ButtonHandler.cpp

@@ -3,27 +3,19 @@
 using namespace Pinetime::Controllers;
 
 void ButtonTimerCallback(TimerHandle_t xTimer) {
-  auto* buttonHandler = static_cast<ButtonHandler*>(pvTimerGetTimerID(xTimer));
-  buttonHandler->HandleEvent(ButtonHandler::Events::Timer);
+  auto* sysTask = static_cast<Pinetime::System::SystemTask*>(pvTimerGetTimerID(xTimer));
+  sysTask->PushMessage(Pinetime::System::Messages::HandleButtonTimerEvent);
 }
 
 void ButtonHandler::Init(Pinetime::System::SystemTask* systemTask) {
-  this->systemTask = systemTask;
-  buttonTimer = xTimerCreate("buttonTimer", 0, pdFALSE, this, ButtonTimerCallback);
+  buttonTimer = xTimerCreate("buttonTimer", 0, pdFALSE, systemTask, ButtonTimerCallback);
 }
 
-void ButtonHandler::HandleEvent(Events event) {
+ButtonActions ButtonHandler::HandleEvent(Events event) {
   static constexpr TickType_t doubleClickTime = pdMS_TO_TICKS(200);
   static constexpr TickType_t longPressTime = pdMS_TO_TICKS(400);
   static constexpr TickType_t longerPressTime = pdMS_TO_TICKS(2000);
 
-  if (systemTask->IsSleeping()) {
-    // This is for faster wakeup, sacrificing special longpress and doubleclick handling while sleeping
-    systemTask->PushMessage(System::Messages::GoToRunning);
-  } else {
-    systemTask->PushMessage(System::Messages::ReloadIdleTimer);
-  }
-
   if (event == Events::Press) {
     buttonPressed = true;
   } else if (event == Events::Release) {
@@ -42,9 +34,9 @@ void ButtonHandler::HandleEvent(Events event) {
     case States::Pressed:
       if (event == Events::Press) {
         if (xTaskGetTickCount() - releaseTime < doubleClickTime) {
-          systemTask->PushMessage(System::Messages::OnButtonDoubleClicked);
           xTimerStop(buttonTimer, 0);
           state = States::Idle;
+          return ButtonActions::DoubleClick;
         }
       } else if (event == Events::Release) {
         xTimerChangePeriod(buttonTimer, doubleClickTime, 0);
@@ -55,21 +47,21 @@ void ButtonHandler::HandleEvent(Events event) {
           xTimerStart(buttonTimer, 0);
           state = States::Holding;
         } else {
-          systemTask->PushMessage(System::Messages::OnButtonPushed);
           state = States::Idle;
+          return ButtonActions::Click;
         }
       }
       break;
     case States::Holding:
       if (event == Events::Release) {
-        systemTask->PushMessage(System::Messages::OnButtonPushed);
         xTimerStop(buttonTimer, 0);
         state = States::Idle;
+        return ButtonActions::Click;
       } else if (event == Events::Timer) {
         xTimerChangePeriod(buttonTimer, longerPressTime - longPressTime - doubleClickTime, 0);
         xTimerStart(buttonTimer, 0);
-        systemTask->PushMessage(System::Messages::OnButtonLongPressed);
         state = States::LongHeld;
+        return ButtonActions::LongPress;
       }
       break;
     case States::LongHeld:
@@ -77,9 +69,10 @@ void ButtonHandler::HandleEvent(Events event) {
         xTimerStop(buttonTimer, 0);
         state = States::Idle;
       } else if (event == Events::Timer) {
-        systemTask->PushMessage(System::Messages::OnButtonLongerPressed);
         state = States::Idle;
+        return ButtonActions::LongerPress;
       }
       break;
   }
+  return ButtonActions::None;
 }

src/buttonhandler/ButtonHandler.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "ButtonActions.h"
 #include "systemtask/SystemTask.h"
 #include <FreeRTOS.h>
 #include <timers.h>
@@ -10,11 +11,10 @@ namespace Pinetime {
     public:
       enum class Events : uint8_t { Press, Release, Timer };
       void Init(Pinetime::System::SystemTask* systemTask);
-      void HandleEvent(Events event);
+      ButtonActions HandleEvent(Events event);
 
     private:
       enum class States : uint8_t { Idle, Pressed, Holding, LongHeld };
-      Pinetime::System::SystemTask* systemTask = nullptr;
       TickType_t releaseTime = 0;
       TimerHandle_t buttonTimer;
       bool buttonPressed = false;