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

More refactoring

Browse Source 
- Display is a separated entity
- Make battery configuration consistent with others
- Led config part of led.c
- Jack config moved to monitor.c
This commit is contained in:
philippe44
2020-02-09 11:36:58 -08:00
parent 0cb807b023
commit 64fcc0edec
49 changed files with 141 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
components/services/monitor.c
View File

@@ -88,24 +88,23 @@ bool spkfault_svc (void) {
*
*/
void set_jack_gpio(int gpio, char *value) {
bool low = false;
char *p;
int active = 1;
if (!strcasecmp(value, "jack_l")) {
jack_gpio = gpio;
low = true;
} else if (!strcasecmp(value, "jack_h")) {
if (strcasestr(value, "jack")) {
jack_gpio = gpio;
if ((p = strchr(value, ':')) != NULL) active = atoi(p + 1);
}
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);
gpio_set_pull_mode(jack_gpio, active ? GPIO_PULLDOWN_ONLY : GPIO_PULLUP_ONLY);
ESP_LOGI(TAG,"Adding jack (%s) detection GPIO %d", low ? "low" : "high", gpio);
ESP_LOGI(TAG,"Adding jack (%s) detection GPIO %d", active ? "high" : "low", gpio);
// re-use button management for jack handler, it's a GPIO after all
button_create(NULL, jack_gpio, low ? BUTTON_LOW : BUTTON_HIGH, false, 250, jack_handler_default, 0, -1);
button_create(NULL, jack_gpio, active ? BUTTON_HIGH : BUTTON_LOW, false, 250, jack_handler_default, 0, -1);
}
}
@@ -115,14 +114,12 @@ void set_jack_gpio(int gpio, char *value) {
void monitor_svc_init(void) {
ESP_LOGI(TAG, "Initializing monitoring");
#ifdef CONFIG_JACK_GPIO
jack_gpio = CONFIG_JACK_GPIO;
#if CONFIG_JACK_GPIO_LEVEL == 1
set_jack_gpio(CONFIG_JACK_GPIO, "jack_h");
set_jack_gpio(CONFIG_JACK_GPIO, "jack:1");
#else
set_jack_gpio(CONFIG_JACK_GPIO, "jack_l");
#endif
set_jack_gpio(CONFIG_JACK_GPIO, "jack:0");
#endif
#ifndef CONFIG_JACK_LOCKED
parse_set_GPIO(set_jack_gpio);
#endif