Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-09 13:07:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

process_button fix + option for remap

Browse Source
This commit is contained in:
philippe44
2020-01-15 16:17:22 -08:00
parent 7c5e212878
commit f0a4233b39
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
components/services/audio_controls.c
View File

@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
//#define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@@ -68,18 +68,18 @@ static const char * TAG = "audio controls";
static actrls_config_t *json_config; static actrls_config_t *json_config;
static actrls_t default_controls, current_controls; static actrls_t default_controls, current_controls;
static void control_handler(void *id, button_event_e event, button_press_e press, bool long_press) { static void control_handler(void *client, button_event_e event, button_press_e press, bool long_press) {
actrls_config_t *key = (actrls_config_t*) id; actrls_config_t *key = (actrls_config_t*) client;
actrls_action_e action; actrls_action_e action;
switch(press) { switch(press) {
case BUTTON_NORMAL: case BUTTON_NORMAL:
if (long_press) action = key->longpress[event == BUTTON_PRESSED ? 0 : 1]; if (long_press) action = key->longpress[event == BUTTON_PRESSED ? 0 : 1].action;
else action = key->normal[event == BUTTON_PRESSED ? 0 : 1]; else action = key->normal[event == BUTTON_PRESSED ? 0 : 1].action;
break; break;
case BUTTON_SHIFTED: case BUTTON_SHIFTED:
if (long_press) action = key->longshifted[event == BUTTON_PRESSED ? 0 : 1]; if (long_press) action = key->longshifted[event == BUTTON_PRESSED ? 0 : 1].action;
else action = key->shifted[event == BUTTON_PRESSED ? 0 : 1]; else action = key->shifted[event == BUTTON_PRESSED ? 0 : 1].action;
break; break;
default: default:
action = ACTRLS_NONE; action = ACTRLS_NONE;
@@ -88,8 +88,11 @@ static void control_handler(void *id, button_event_e event, button_press_e press
ESP_LOGD(TAG, "control gpio:%u press:%u long:%u event:%u action:%u", key->gpio, press, long_press, event, action); ESP_LOGD(TAG, "control gpio:%u press:%u long:%u event:%u action:%u", key->gpio, press, long_press, event, action);
if (action != ACTRLS_NONE) { if (action > ACTRLS_MAX) {
ESP_LOGD(TAG, " calling action %u", action); // need to do the remap here
ESP_LOGD(TAG, "remapping buttons");
} else if (action != ACTRLS_NONE) {
ESP_LOGD(TAG, "calling action %u", action);
if (current_controls[action]) (*current_controls[action])(); if (current_controls[action]) (*current_controls[action])();
} }
} }
@@ -227,7 +230,7 @@ esp_err_t actrls_process_member(const cJSON * member, actrls_config_t *cur_confi
} }
esp_err_t actrls_process_button(const cJSON * button, actrls_config_t *cur_config) { esp_err_t actrls_process_button(const cJSON * button, actrls_config_t *cur_config) {
esp_err_t err= ESP_FAIL; esp_err_t err= ESP_OK;
const cJSON *member; const cJSON *member;
cJSON_ArrayForEach(member, button) cJSON_ArrayForEach(member, button)

7
components/services/audio_controls.h
View File

@@ -31,14 +31,17 @@ typedef void (*actrls_handler)(void);
typedef actrls_handler actrls_t[ACTRLS_MAX - ACTRLS_NONE - 1]; typedef actrls_handler actrls_t[ACTRLS_MAX - ACTRLS_NONE - 1];
// BEWARE any change to struct below must be mapped to actrls_config_map // BEWARE any change to struct below must be mapped to actrls_config_map
typedef struct { typedef struct actrl_config_s {
int gpio; int gpio;
int type; int type;
bool pull; bool pull;
int debounce; int debounce;
int long_press; int long_press;
int shifter_gpio; int shifter_gpio;
actrls_action_e normal[2], longpress[2], shifted[2], longshifted[2]; // [0] keypressed, [1] keyreleased union {
actrls_action_e action;
struct actrl_config_s *config;
} normal[2], longpress[2], shifted[2], longshifted[2]; // [0] keypressed, [1] keyreleased
} actrls_config_t; } actrls_config_t;
esp_err_t actrls_init(int n, const actrls_config_t *config); esp_err_t actrls_init(int n, const actrls_config_t *config);