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

adding rotary encoder + better jack gpio handling

Browse Source
This commit is contained in:
philippe44
2020-02-05 00:17:48 -08:00
parent 5f84dc3cb0
commit ed4eb6a42e
12 changed files with 752 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
components/services/monitor.c
View File

@@ -20,12 +20,17 @@
#include "led.h"
#include "globdefs.h"
#include "config.h"
#include "accessors.h"
#define MONITOR_TIMER (10*1000)
static const char *TAG = "monitor";
static TimerHandle_t monitor_timer;
#ifdef JACK_GPIO
static int jack_gpio = JACK_GPIO;
#else
static int jack_gpio = -1;
#endif
void (*jack_handler_svc)(bool inserted);
bool jack_inserted_svc(void);
@@ -56,11 +61,8 @@ static void jack_handler_default(void *id, button_event_e event, button_press_e
*
*/
bool jack_inserted_svc (void) {
#ifdef JACK_GPIO
return !gpio_get_level(JACK_GPIO);
#else
return false;
#endif
if (jack_gpio != -1) return button_is_pressed(jack_gpio, NULL);
else return false;
}
/****************************************************************************************
@@ -88,15 +90,25 @@ bool spkfault_svc (void) {
*
*/
void set_jack_gpio(int gpio, char *value) {
if (!strcasecmp(value, "jack")) {
ESP_LOGI(TAG,"Adding jack detection GPIO %d", gpio);
bool low = false;
if (!strcasecmp(value, "jack_l")) {
jack_gpio = gpio;
low = true;
} else if (!strcasecmp(value, "jack_h")) {
jack_gpio = gpio;
}
if (jack_gpio != -1) {
gpio_pad_select_gpio(jack_gpio);
gpio_set_direction(jack_gpio, GPIO_MODE_INPUT);
gpio_set_pull_mode(jack_gpio, low ? GPIO_PULLUP_ONLY : GPIO_PULLDOWN_ONLY);
ESP_LOGI(TAG,"Adding jack (%s) detection GPIO %d", low ? "low" : "high", gpio);
gpio_pad_select_gpio(JACK_GPIO);
gpio_set_direction(JACK_GPIO, GPIO_MODE_INPUT);
// re-use button management for jack handler, it's a GPIO after all
button_create(NULL, JACK_GPIO, BUTTON_LOW, false, 250, jack_handler_default, 0, -1);
}
button_create(NULL, jack_gpio, low ? BUTTON_LOW : BUTTON_HIGH, false, 250, jack_handler_default, 0, -1);
}
}
/****************************************************************************************
@@ -104,12 +116,17 @@ void set_jack_gpio(int gpio, char *value) {
*/
void monitor_svc_init(void) {
ESP_LOGI(TAG, "Initializing monitoring");
#if !defined(JACK_GPIO) || JACK_GPIO == -1
parse_set_GPIO(set_jack_gpio);
#else
set_jack_gpio(JACK_GPIO, "jack");
// if JACK_GPIO is compiled-time defined set it there
if (jack_gpio != -1) {
#if JACK_GPIO_LEVEL == 1
set_jack_gpio(JACK_GPIO, "jack_h");
#else
set_jack_gpio(JACK_GPIO, "jack_l");
#endif
} else {
parse_set_GPIO(set_jack_gpio);
}
#ifdef SPKFAULT_GPIO
gpio_pad_select_gpio(SPKFAULT_GPIO);