From 61fddd0724593dd7410aabe70f43c02c6069383e Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Thu, 8 Sep 2022 22:27:47 +0200
Subject: [PATCH] Fixed button hold handling

---
 main/bobbybuttons.cpp                   | 2 ++
 main/displays/bobbychangevaluedisplay.h | 3 ++-
 main/displays/bobbydisplaywithtitle.cpp | 1 +
 main/displays/bobbygraphdisplay.h       | 3 ++-
 main/displays/bobbymenudisplay.cpp      | 2 +-
 main/displays/bobbypopupdisplay.cpp     | 1 +
 main/displays/bobbysplitgraphdisplay.h  | 1 +
 main/dpad5wire_2out.cpp                 | 5 +++++
 8 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/main/bobbybuttons.cpp b/main/bobbybuttons.cpp
index 54092ab..d7853b7 100644
--- a/main/bobbybuttons.cpp
+++ b/main/bobbybuttons.cpp
@@ -110,6 +110,7 @@ void buttonReleasedCommon(espgui::Button button)
 
 void BobbyButtons::rawButtonPressed(uint8_t button)
 {
+    ESP_LOGI(TAG, "%hhu", button);
     //Base::rawButtonPressed(button);
     if (const auto translated = translateRawButton(button))
         buttonPressed(*translated);
@@ -117,6 +118,7 @@ void BobbyButtons::rawButtonPressed(uint8_t button)
 
 void BobbyButtons::rawButtonReleased(uint8_t button)
 {
+    ESP_LOGI(TAG, "%hhu", button);
     //Base::rawButtonReleased(button);
     if (const auto translated = translateRawButton(button))
         buttonReleased(*translated);
diff --git a/main/displays/bobbychangevaluedisplay.h b/main/displays/bobbychangevaluedisplay.h
index 7ba3065..c3756ad 100644
--- a/main/displays/bobbychangevaluedisplay.h
+++ b/main/displays/bobbychangevaluedisplay.h
@@ -48,5 +48,6 @@ void BobbyChangeValueDisplay<Tvalue>::buttonPressed(espgui::Button button)
 template<typename Tvalue>
 void BobbyChangeValueDisplay<Tvalue>::buttonReleased(espgui::Button button)
 {
-    //Base::buttonReleased(button);
+    Base::buttonReleased(button);
+    buttonReleasedCommon(button);
 }
diff --git a/main/displays/bobbydisplaywithtitle.cpp b/main/displays/bobbydisplaywithtitle.cpp
index 55f8db2..3c9ccdc 100644
--- a/main/displays/bobbydisplaywithtitle.cpp
+++ b/main/displays/bobbydisplaywithtitle.cpp
@@ -26,4 +26,5 @@ void BobbyDisplayWithTitle::buttonPressed(espgui::Button button)
 void BobbyDisplayWithTitle::buttonReleased(espgui::Button button)
 {
     //Base::buttonReleased(button);
+    buttonReleasedCommon(button);
 }
diff --git a/main/displays/bobbygraphdisplay.h b/main/displays/bobbygraphdisplay.h
index 66fefd8..e3dd181 100644
--- a/main/displays/bobbygraphdisplay.h
+++ b/main/displays/bobbygraphdisplay.h
@@ -38,7 +38,7 @@ void BobbyGraphDisplay<COUNT>::rawButtonReleased(uint8_t button)
 template<size_t COUNT>
 void BobbyGraphDisplay<COUNT>::buttonPressed(espgui::Button button)
 {
-    Base::buttonPressed(button);
+    //Base::buttonPressed(button);
     buttonPressedCommon(button);
 }
 
@@ -46,4 +46,5 @@ template<size_t COUNT>
 void BobbyGraphDisplay<COUNT>::buttonReleased(espgui::Button button)
 {
     //Base::buttonReleased(button);
+    buttonReleasedCommon(button);
 }
diff --git a/main/displays/bobbymenudisplay.cpp b/main/displays/bobbymenudisplay.cpp
index 3a75d9c..6a78223 100644
--- a/main/displays/bobbymenudisplay.cpp
+++ b/main/displays/bobbymenudisplay.cpp
@@ -26,6 +26,6 @@ void BobbyMenuDisplay::buttonPressed(espgui::Button button)
 
 void BobbyMenuDisplay::buttonReleased(espgui::Button button)
 {
-    //Base::buttonReleased(button);
+    Base::buttonReleased(button);
     buttonReleasedCommon(button);
 }
diff --git a/main/displays/bobbypopupdisplay.cpp b/main/displays/bobbypopupdisplay.cpp
index 5a3cf38..47df3b8 100644
--- a/main/displays/bobbypopupdisplay.cpp
+++ b/main/displays/bobbypopupdisplay.cpp
@@ -26,4 +26,5 @@ void BobbyPopupDisplay::buttonPressed(espgui::Button button)
 void BobbyPopupDisplay::buttonReleased(espgui::Button button)
 {
     //Base::buttonReleased(button);
+    buttonReleasedCommon(button);
 }
diff --git a/main/displays/bobbysplitgraphdisplay.h b/main/displays/bobbysplitgraphdisplay.h
index 29a9c73..35b14f4 100644
--- a/main/displays/bobbysplitgraphdisplay.h
+++ b/main/displays/bobbysplitgraphdisplay.h
@@ -46,5 +46,6 @@ template<std::size_t COUNT0, std::size_t COUNT1>
 void BobbySplitGraphDisplay<COUNT0, COUNT1>::buttonReleased(espgui::Button button)
 {
     //Base::buttonReleased(button);
+    buttonReleasedCommon(button);
 }
 
diff --git a/main/dpad5wire_2out.cpp b/main/dpad5wire_2out.cpp
index 41bc0c4..0b3eae8 100644
--- a/main/dpad5wire_2out.cpp
+++ b/main/dpad5wire_2out.cpp
@@ -3,6 +3,9 @@
 // system includes
 #include <array>
 
+// esp-idf includes
+#include <esp_log.h>
+
 // Arduino includes
 #include <esp32-hal-gpio.h>
 #include <esp32-hal-misc.h>
@@ -19,6 +22,8 @@
 #include "bobbybuttons.h"
 
 namespace {
+static const constexpr char TAG[] = "DPAD";
+
 template<pin_t OUT, pin_t IN1, pin_t IN2, pin_t IN3, pin_t IN4>
 class Helper
 {