From 3135ae800874657f6c3325227b13396db78cf2a6 Mon Sep 17 00:00:00 2001 From: Daniel Rieper Date: Sun, 14 Feb 2021 19:07:50 +0100 Subject: [PATCH] Custom Button Layouts --- src/main.cpp | 33 +++++---------------------------- src/settings.h | 41 ++++++++++++++++++----------------------- src/values.h | 6 +++--- 3 files changed, 26 insertions(+), 54 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index eb97cd0..5dd2728 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -78,6 +78,8 @@ #include "freertos/ringbuf.h" +#include "values.h" + #include "values.h" // Serial-logging buffer @@ -577,16 +579,6 @@ void doButtonActions(void) { doCmdAction(BUTTON_3_LONG); buttons[i].isPressed = false; break; - - case 4: - doCmdAction(BUTTON_4_LONG); - buttons[i].isPressed = false; - break; - - case 5: - doCmdAction(BUTTON_5_LONG); - buttons[i].isPressed = false; - break; } } else { switch (i) // Short-press-actions @@ -609,17 +601,6 @@ void doButtonActions(void) { case 3: doCmdAction(BUTTON_3_SHORT); buttons[i].isPressed = false; - break; - - case 4: - doCmdAction(BUTTON_4_SHORT); - buttons[i].isPressed = false; - break; - - case 5: - doCmdAction(BUTTON_5_SHORT); - buttons[i].isPressed = false; - break; } } } @@ -2530,7 +2511,7 @@ void doRfidCardModifications(const uint32_t mod) { } #endif - doCmdAction(mod); + doAction(mod); } void doCmdAction(const uint32_t mod) { @@ -2550,11 +2531,7 @@ void doCmdAction(const uint32_t mod) { #ifdef MQTT_ENABLE publishMqtt((char *) FPSTR(topicLockControlsState), "OFF", false); #endif - #ifdef NEOPIXEL_ENABLE - showLedOk = true; - #endif } - break; case SLEEP_TIMER_MOD_15: // Enables/disables sleep after 15 minutes if (sleepTimerStartTimestamp && sleepTimer == 15) { @@ -2926,10 +2903,10 @@ void doCmdAction(const uint32_t mod) { case CMD_NEXTTRACK: trackControlToQueueSender(NEXTTRACK); break; - case CMD_FIRSTTRACK: + case CMD_FIRSTRACK: trackControlToQueueSender(FIRSTTRACK); break; - case CMD_LASTTRACK: + case CMD_LASTRACK: trackControlToQueueSender(LASTTRACK); break; case CMD_VOLUMEINIT: diff --git a/src/settings.h b/src/settings.h index 975e5dd..5c9a34a 100644 --- a/src/settings.h +++ b/src/settings.h @@ -151,30 +151,25 @@ float voltageIndicatorHigh = 4.2; // Upper range for Neopixel- // Button Layout -#define BUTTON_MULTI_01 TOGGLE_WIFI_STATUS -#define BUTTON_MULTI_02 ENABLE_FTP_SERVER -#define BUTTON_MULTI_03 CMD_NOTHING -#define BUTTON_MULTI_12 CMD_MEASUREBATTERY -#define BUTTON_MULTI_13 CMD_NOTHING -#define BUTTON_MULTI_23 CMD_NOTHING - -#define BUTTON_0_SHORT CMD_NEXTTRACK -#define BUTTON_1_SHORT CMD_PREVTRACK -#define BUTTON_2_SHORT CMD_PLAYPAUSE -#define BUTTON_3_SHORT CMD_MEASUREBATTERY -#define BUTTON_3_LONG CMD_SLEEPMODE - -#define BUTTON_4_SHORT CMD_VOLUMEDOWN -#define BUTTON_4_LONG CMD_VOLUMEDOWN -#define BUTTON_5_SHORT CMD_VOLUMEUP -#define BUTTON_5_LONG CMD_VOLUMEUP +#define BUTTON_MULTI_01 = TOGGLE_WIFI_STATUS +#define BUTTON_MULTI_02 = ENABLE_FTP_SERVER +#define BUTTON_MULTI_03 = CMD_NOTHING +#define BUTTON_MULTI_12 = CMD_MEASUREBATTERY +#define BUTTON_MULTI_13 = CMD_NOTHING +#define BUTTON_MULTI_23 = CMD_NOTHING + +#define BUTTON_0_SHORT = CMD_NEXTTRACK +#define BUTTON_1_SHORT = CMD_PREVTRACK +#define BUTTON_2_SHORT = CMD_PLAYPAUSE +#define BUTTON_3_SHORT = CMD_MEASUREBATTERY +#define BUTTON_3_LONG = CMD_SLEEPMODE #ifdef USEROTARY_ENABLE - #define BUTTON_0_LONG CMD_LASTTRACK - #define BUTTON_1_LONG CMD_FIRSTTRACK - #define BUTTON_2_LONG CMD_PLAYPAUSE + #define BUTTON_0_LONG = CMD_LASTTRACK + #define BUTTON_1_LONG = CMD_FIRSTTRACK + #define BUTTON_2_LONG = CMD_PLAYPAUSE #else - #define BUTTON_0_LONG CMD_VOLUMEDOWN - #define BUTTON_1_LONG CMD_VOLUMEUP - #define BUTTON_2_LONG CMD_SLEEPMODE + #define BUTTON_0_LONG = CMD_VOLUMEDOWN + #define BUTTON_1_LONG = CMD_VOLUMEUP + #define BUTTON_2_LONG = CMD_SLEEPMODE #endif diff --git a/src/values.h b/src/values.h index fb54324..f742961 100644 --- a/src/values.h +++ b/src/values.h @@ -47,9 +47,9 @@ #define CMD_PLAYPAUSE 170 // Admin-Cmd Play/Pause #define CMD_PREVTRACK 171 // Admin-Cmd Prev Track -#define CMD_NEXTTRACK 172 // Admin-Cmd Next Track +#define CMD_NEXTTACK 172 // Admin-Cmd Next Track #define CMD_FIRSTTRACK 173 // Admin-Cmd Prev Track -#define CMD_LASTTRACK 174 // Admin-Cmd Next Track +#define CMD_LASTTACK 174 // Admin-Cmd Next Track #define CMD_VOLUMEINIT 175 // Set Volume to Initial #define CMD_VOLUMEUP 176 // Set Volume up #define CMD_VOLUMEDOWN 177 // Set Volume down @@ -62,4 +62,4 @@ #define PLAYLIST 2 // Repeat whole playlist (infinite loop) #define TRACK_N_PLAYLIST 3 // Repeat both (infinite loop) -#endif \ No newline at end of file +#endif \ No newline at end of file