3 files changed, 109 insertions, 0 deletions
diff --git a/src/buttonhandler/ButtonActions.h b/src/buttonhandler/ButtonActions.h
new file mode 100644
index 00000000..21be441b
--- /dev/null
+++ b/src/buttonhandler/ButtonActions.h
@@ -0,0 +1,7 @@
+#pragma once
+
+namespace Pinetime {
+  namespace Controllers {
+    enum class ButtonActions { None, Click, DoubleClick, LongPress, LongerPress };
+  }
+}
diff --git a/src/buttonhandler/ButtonHandler.cpp b/src/buttonhandler/ButtonHandler.cpp
new file mode 100644
index 00000000..91e8bbd0
--- /dev/null
+++ b/src/buttonhandler/ButtonHandler.cpp
@@ -0,0 +1,78 @@
+#include "ButtonHandler.h"
+
+using namespace Pinetime::Controllers;
+
+void ButtonTimerCallback(TimerHandle_t xTimer) {
+  auto* sysTask = static_cast<Pinetime::System::SystemTask*>(pvTimerGetTimerID(xTimer));
+  sysTask->PushMessage(Pinetime::System::Messages::HandleButtonTimerEvent);
+}
+
+void ButtonHandler::Init(Pinetime::System::SystemTask* systemTask) {
+  buttonTimer = xTimerCreate("buttonTimer", 0, pdFALSE, systemTask, ButtonTimerCallback);
+}
+
+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 (event == Events::Press) {
+    buttonPressed = true;
+  } else if (event == Events::Release) {
+    releaseTime = xTaskGetTickCount();
+    buttonPressed = false;
+  }
+
+  switch (state) {
+    case States::Idle:
+      if (event == Events::Press) {
+        xTimerChangePeriod(buttonTimer, doubleClickTime, 0);
+        xTimerStart(buttonTimer, 0);
+        state = States::Pressed;
+      }
+      break;
+    case States::Pressed:
+      if (event == Events::Press) {
+        if (xTaskGetTickCount() - releaseTime < doubleClickTime) {
+          xTimerStop(buttonTimer, 0);
+          state = States::Idle;
+          return ButtonActions::DoubleClick;
+        }
+      } else if (event == Events::Release) {
+        xTimerChangePeriod(buttonTimer, doubleClickTime, 0);
+        xTimerStart(buttonTimer, 0);
+      } else if (event == Events::Timer) {
+        if (buttonPressed) {
+          xTimerChangePeriod(buttonTimer, longPressTime - doubleClickTime, 0);
+          xTimerStart(buttonTimer, 0);
+          state = States::Holding;
+        } else {
+          state = States::Idle;
+          return ButtonActions::Click;
+        }
+      }
+      break;
+    case States::Holding:
+      if (event == Events::Release) {
+        xTimerStop(buttonTimer, 0);
+        state = States::Idle;
+        return ButtonActions::Click;
+      } else if (event == Events::Timer) {
+        xTimerChangePeriod(buttonTimer, longerPressTime - longPressTime - doubleClickTime, 0);
+        xTimerStart(buttonTimer, 0);
+        state = States::LongHeld;
+        return ButtonActions::LongPress;
+      }
+      break;
+    case States::LongHeld:
+      if (event == Events::Release) {
+        xTimerStop(buttonTimer, 0);
+        state = States::Idle;
+      } else if (event == Events::Timer) {
+        state = States::Idle;
+        return ButtonActions::LongerPress;
+      }
+      break;
+  }
+  return ButtonActions::None;
+}
diff --git a/src/buttonhandler/ButtonHandler.h b/src/buttonhandler/ButtonHandler.h
new file mode 100644
index 00000000..44b20f19
--- /dev/null
+++ b/src/buttonhandler/ButtonHandler.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "ButtonActions.h"
+#include "systemtask/SystemTask.h"
+#include <FreeRTOS.h>
+#include <timers.h>
+
+namespace Pinetime {
+  namespace Controllers {
+    class ButtonHandler {
+    public:
+      enum class Events : uint8_t { Press, Release, Timer };
+      void Init(Pinetime::System::SystemTask* systemTask);
+      ButtonActions HandleEvent(Events event);
+
+    private:
+      enum class States : uint8_t { Idle, Pressed, Holding, LongHeld };
+      TickType_t releaseTime = 0;
+      TimerHandle_t buttonTimer;
+      bool buttonPressed = false;
+      States state = States::Idle;
+    };
+  }
+}