phschoen
/
ESPuino
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Custom Button Layouts

master
Daniel Rieper 4 years ago
committed by Torsten Stauder
parent
33d249ab13
commit
3135ae8008
3 changed files with 26 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      src/main.cpp
  2. 41
      src/settings.h
  3. 4
      src/values.h

33
src/main.cpp
View File

@ -78,6 +78,8 @@
#include "freertos/ringbuf.h" #include "freertos/ringbuf.h"
#include "values.h"
#include "values.h" #include "values.h"
// Serial-logging buffer // Serial-logging buffer
@ -577,16 +579,6 @@ void doButtonActions(void) {
doCmdAction(BUTTON_3_LONG); doCmdAction(BUTTON_3_LONG);
buttons[i].isPressed = false; buttons[i].isPressed = false;
break; break;
case 4:
doCmdAction(BUTTON_4_LONG);
buttons[i].isPressed = false;
break;
case 5:
doCmdAction(BUTTON_5_LONG);
buttons[i].isPressed = false;
break;
} }
} else { } else {
switch (i) // Short-press-actions switch (i) // Short-press-actions
@ -609,17 +601,6 @@ void doButtonActions(void) {
case 3: case 3:
doCmdAction(BUTTON_3_SHORT); doCmdAction(BUTTON_3_SHORT);
buttons[i].isPressed = false; 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 #endif
doCmdAction(mod);
doAction(mod);
} }
void doCmdAction(const uint32_t mod) { void doCmdAction(const uint32_t mod) {
@ -2550,11 +2531,7 @@ void doCmdAction(const uint32_t mod) {
#ifdef MQTT_ENABLE #ifdef MQTT_ENABLE
publishMqtt((char *) FPSTR(topicLockControlsState), "OFF", false); publishMqtt((char *) FPSTR(topicLockControlsState), "OFF", false);
#endif #endif
#ifdef NEOPIXEL_ENABLE
showLedOk = true;
#endif
} }
break;
case SLEEP_TIMER_MOD_15: // Enables/disables sleep after 15 minutes case SLEEP_TIMER_MOD_15: // Enables/disables sleep after 15 minutes
if (sleepTimerStartTimestamp && sleepTimer == 15) { if (sleepTimerStartTimestamp && sleepTimer == 15) {
@ -2926,10 +2903,10 @@ void doCmdAction(const uint32_t mod) {
case CMD_NEXTTRACK: case CMD_NEXTTRACK:
trackControlToQueueSender(NEXTTRACK); trackControlToQueueSender(NEXTTRACK);
break; break;
case CMD_FIRSTTRACK:
case CMD_FIRSTRACK:
trackControlToQueueSender(FIRSTTRACK); trackControlToQueueSender(FIRSTTRACK);
break; break;
case CMD_LASTTRACK:
case CMD_LASTRACK:
trackControlToQueueSender(LASTTRACK); trackControlToQueueSender(LASTTRACK);
break; break;
case CMD_VOLUMEINIT: case CMD_VOLUMEINIT:

41
src/settings.h
View File

@ -151,30 +151,25 @@ float voltageIndicatorHigh = 4.2; // Upper range for Neopixel-
// Button Layout // 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 #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 #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 #endif

4
src/values.h
View File

@ -47,9 +47,9 @@
#define CMD_PLAYPAUSE 170 // Admin-Cmd Play/Pause #define CMD_PLAYPAUSE 170 // Admin-Cmd Play/Pause
#define CMD_PREVTRACK 171 // Admin-Cmd Prev Track #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_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_VOLUMEINIT 175 // Set Volume to Initial
#define CMD_VOLUMEUP 176 // Set Volume up #define CMD_VOLUMEUP 176 // Set Volume up
#define CMD_VOLUMEDOWN 177 // Set Volume down #define CMD_VOLUMEDOWN 177 // Set Volume down

Write Preview
Loading…
Cancel
Save