From 8a670cf60893f8d95227ab3a1a789b098612b4a9 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Thu, 24 Mar 2022 22:45:57 +0100 Subject: [PATCH] Implemented buttonReleased() --- main/changevaluedisplay_bobbyquickactions.cpp | 8 +++++++- main/displays/bobbydisplay.cpp | 1 + main/displays/bobbymenudisplay.cpp | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/main/changevaluedisplay_bobbyquickactions.cpp b/main/changevaluedisplay_bobbyquickactions.cpp index 610b399..e164f3b 100644 --- a/main/changevaluedisplay_bobbyquickactions.cpp +++ b/main/changevaluedisplay_bobbyquickactions.cpp @@ -23,6 +23,8 @@ constexpr char TEXT_QUICKACTION_HANDBREMSE[] = "Handbremse"; constexpr char TEXT_QUICKACTION_OPEN_GARAGE[] = "Open Garage"; constexpr char TEXT_QUICKACTION_WIFI_SCAN[] = "Wifi Scan"; constexpr char TEXT_QUICKACTION_TEMPOMAT[] = "Toggle PWM-Omat"; +constexpr char TEXT_QUICKACTION_COMPRESSOR[] = "Remote-Compressor"; +constexpr char TEXT_QUICKACTION_HUPE[] = "Remote-Hupe"; constexpr char TEXT_BACK[] = "Back"; } // namespace @@ -35,6 +37,8 @@ ChangeValueDisplay::ChangeValueDisplay() constructMenuItem, StaticText>>(BobbyQuickActions::OPEN_GARAGE, *this, *this, *this); constructMenuItem, StaticText>>(BobbyQuickActions::WIFI_SCAN, *this, *this, *this); constructMenuItem, StaticText>>(BobbyQuickActions::PWMOMAT, *this, *this, *this); + constructMenuItem, StaticText>>(BobbyQuickActions::COMPRESSOR_TOGGLE, *this, *this, *this); + constructMenuItem, StaticText>>(BobbyQuickActions::HUPE, *this, *this, *this); constructMenuItem, StaticMenuItemIcon<&espgui::icons::back>>>(*this); } @@ -51,9 +55,11 @@ void ChangeValueDisplay::start() case BobbyQuickActions::OPEN_GARAGE: setSelectedIndex(4); break; case BobbyQuickActions::WIFI_SCAN: setSelectedIndex(5); break; case BobbyQuickActions::PWMOMAT: setSelectedIndex(6); break; + case BobbyQuickActions::COMPRESSOR_TOGGLE: setSelectedIndex(7); break; + case BobbyQuickActions::HUPE: setSelectedIndex(8); break; default: ESP_LOGW(TAG, "Unknown BobbyQuickActions: %i", std::to_underlying(value)); - setSelectedIndex(7); + setSelectedIndex(9); } } diff --git a/main/displays/bobbydisplay.cpp b/main/displays/bobbydisplay.cpp index dda2469..562882b 100644 --- a/main/displays/bobbydisplay.cpp +++ b/main/displays/bobbydisplay.cpp @@ -26,4 +26,5 @@ void BobbyDisplay::buttonPressed(espgui::Button button) void BobbyDisplay::buttonReleased(espgui::Button button) { //Base::buttonReleased(button); + buttonReleasedCommon(button); } diff --git a/main/displays/bobbymenudisplay.cpp b/main/displays/bobbymenudisplay.cpp index 2066720..3a75d9c 100644 --- a/main/displays/bobbymenudisplay.cpp +++ b/main/displays/bobbymenudisplay.cpp @@ -1,6 +1,7 @@ #include "bobbymenudisplay.h" // local includes +#include "esp_log.h" #include "bobbybuttons.h" void BobbyMenuDisplay::rawButtonPressed(uint8_t button) @@ -26,4 +27,5 @@ void BobbyMenuDisplay::buttonPressed(espgui::Button button) void BobbyMenuDisplay::buttonReleased(espgui::Button button) { //Base::buttonReleased(button); + buttonReleasedCommon(button); }