From b828e7f3e6e4861b6f26dd20626639544f1d8f63 Mon Sep 17 00:00:00 2001 From: Philippe G Date: Wed, 2 Feb 2022 11:28:31 -0800 Subject: [PATCH] ensure amp gpio lock, add longpress - release --- build-scripts/Muse-sdkconfig.defaults | 2 +- components/squeezelite/output_i2s.c | 4 ++-- main/Kconfig.projbuild | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/Muse-sdkconfig.defaults b/build-scripts/Muse-sdkconfig.defaults index a2ac10a7..b9951c81 100644 --- a/build-scripts/Muse-sdkconfig.defaults +++ b/build-scripts/Muse-sdkconfig.defaults @@ -27,7 +27,7 @@ CONFIG_JACK_GPIO_LEVEL=0 CONFIG_SPKFAULT_GPIO=-1 CONFIG_DAC_CONTROLSET="{\"init\":[ {\"reg\":0,\"val\":128}, {\"reg\":0,\"val\":0}, {\"reg\":25,\"val\":4}, {\"reg\":1,\"val\":80}, {\"reg\":2,\"val\":0}, {\"reg\":8,\"val\":0}, {\"reg\":4,\"val\":192}, {\"reg\":0,\"val\":18}, {\"reg\":1,\"val\":0}, {\"reg\":23,\"val\":24}, {\"reg\":24,\"val\":2}, {\"reg\":38,\"val\":9}, {\"reg\":39,\"val\":144}, {\"reg\":42,\"val\":144}, {\"reg\":43,\"val\":128}, {\"reg\":45,\"val\":128}, {\"reg\":27,\"val\":0}, {\"reg\":26,\"val\":0}, {\"reg\":2,\"val\":240}, {\"reg\":2,\"val\":0}, {\"reg\":29,\"val\":28}, {\"reg\":4,\"val\":48}, {\"reg\":25,\"val\":0} ]}" -CONFIG_AUDIO_CONTROLS="[{\"gpio\":32, \"pull\":true, \"debounce\":10, \"normal\":{\"pressed\":\"ACTRLS_VOLDOWN\"}}, {\"gpio\":19, \"pull\":true, \"debounce\":40, \"normal\":{\"pressed\":\"ACTRLS_VOLUP\"}}, {\"gpio\":12, \"pull\":true, \"debounce\":40, \"long_press\":1000, \"normal\":{\"pressed\":\"ACTRLS_TOGGLE\"},\"longpress\":{\"pressed\":\"ACTRLS_POWER\"}}]" +CONFIG_AUDIO_CONTROLS="[{\"gpio\":32, \"pull\":true, \"debounce\":50, \"long_press\":1000, \"normal\":{\"pressed\":\"ACTRLS_VOLDOWN\"}, \"longpress\":{\"pressed\":\"ACTRLS_PREV\"}}, {\"gpio\":19, \"pull\":true, \"debounce\":50, \"long_press\":1000, \"normal\":{\"pressed\":\"ACTRLS_VOLUP\"}, \"longpress\":{\"pressed\":\"ACTRLS_NEXT\"}}, {\"gpio\":12, \"pull\":true, \"debounce\":50, \"long_press\":1000, \"normal\":{\"pressed\":\"ACTRLS_TOGGLE\"},\"longpress\":{\"pressed\":\"ACTRLS_POWER\"}}]" CONFIG_BAT_CONFIG="channel=5,scale=1,atten=3,cells=1" CONFIG_I2S_NUM=0 CONFIG_SPDIF_NUM=0 diff --git a/components/squeezelite/output_i2s.c b/components/squeezelite/output_i2s.c index ad65bf19..89a10819 100644 --- a/components/squeezelite/output_i2s.c +++ b/components/squeezelite/output_i2s.c @@ -175,7 +175,7 @@ static void jack_handler(bool inserted) { /**************************************************************************************** * amp GPIO */ -#ifndef AMP_GPIO_LOCKED +#ifndef AMP_LOCKED static void set_amp_gpio(int gpio, char *value) { char *p; @@ -347,7 +347,7 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch jack_handler_chain = jack_handler_svc; jack_handler_svc = jack_handler; -#ifndef AMP_GPIO_LOCKED +#ifndef AMP_LOCKED parse_set_GPIO(set_amp_gpio); #endif diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 5d174b2c..ae05feb6 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -128,7 +128,7 @@ menu "Squeezelite-ESP32" default "" config AUDIO_CONTROLS string - default "[{\"gpio\":32, \"pull\":true, \"debounce\":10, \"normal\":{\"pressed\":\"ACTRLS_VOLDOWN\"}}, {\"gpio\":19, \"pull\":true, \"debounce\":40, \"normal\":{\"pressed\":\"ACTRLS_VOLUP\"}}, {\"gpio\":12, \"pull\":true, \"debounce\":40, \"long_press\":1000, \"normal\":{\"pressed\":\"ACTRLS_TOGGLE\"},\"longpress\":{\"pressed\":\"ACTRLS_POWER\"}}]" if MUSE + default "[{\"gpio\":32, \"pull\":true, \"debounce\":50, \"long_press\":1000, \"normal\":{\"pressed\":\"ACTRLS_VOLDOWN\"}, \"longpress\":{\"pressed\":\"ACTRLS_PREV\"}}, {\"gpio\":19, \"pull\":true, \"debounce\":50, \"long_press\":1000, \"normal\":{\"pressed\":\"ACTRLS_VOLUP\"}, \"longpress\":{\"pressed\":\"ACTRLS_NEXT\"}}, {\"gpio\":12, \"pull\":true, \"debounce\":50, \"long_press\":1000, \"normal\":{\"pressed\":\"ACTRLS_TOGGLE\"},\"longpress\":{\"pressed\":\"ACTRLS_POWER\"}}]" if MUSE default "" config BAT_CONFIG string