From cf4ed64eb0c2773832ceaa94e08e725f6994a886 Mon Sep 17 00:00:00 2001 From: Philippe G Date: Mon, 24 Jan 2022 16:08:00 -0800 Subject: [PATCH] muse long_press & battery read at boot --- build-scripts/Muse-sdkconfig.defaults | 2 +- components/targets/muse/muse.c | 18 +++++++++++++----- main/Kconfig.projbuild | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/build-scripts/Muse-sdkconfig.defaults b/build-scripts/Muse-sdkconfig.defaults index ddbe0a78..faba225d 100644 --- a/build-scripts/Muse-sdkconfig.defaults +++ b/build-scripts/Muse-sdkconfig.defaults @@ -198,7 +198,7 @@ CONFIG_SPI_CONFIG="" CONFIG_DISPLAY_CONFIG="" CONFIG_ETH_CONFIG="" 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, \"longpress\":1000, \"normal\":{\"pressed\":\"ACTRLS_TOGGLE\"},\"longpress\":{\"pressed\":\"ACTRLS_POWER\"}}]" +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_BAT_CONFIG="channel=5,scale=1,atten=3,cells=1" CONFIG_AMP_GPIO=21 CONFIG_JACK_GPIO=34 diff --git a/components/targets/muse/muse.c b/components/targets/muse/muse.c index b2a180e1..6a7676ae 100644 --- a/components/targets/muse/muse.c +++ b/components/targets/muse/muse.c @@ -46,30 +46,38 @@ static const char TAG[] = "muse"; static void (*battery_handler_chain)(float value); static void battery_svc(float value); static bool init(void); +static void set_battery_led(float value); const struct target_s target_muse = { "muse", init }; static bool init(void) { battery_handler_chain = battery_handler_svc; battery_handler_svc = battery_svc; + ws2812_control_init(); - ESP_LOGI(TAG, "Initializing for Muse"); + float value = battery_value_svc(); + + ESP_LOGI(TAG, "Initializing for Muse %f", value); + return true; } #define VGREEN 4.0 #define VRED 3.6 -static void battery_svc(float value) { +static void set_battery_led(float value) { struct led_state new_state; - - ESP_LOGI(TAG, "Called for battery service with %f", value); - + if (value > VGREEN) new_state.leds[0] = GREEN; else if (value < VRED) new_state.leds[0] = RED; else new_state.leds[0] = YELLOW; ws2812_write_leds(new_state); +} + +static void battery_svc(float value) { + set_battery_led(value); + ESP_LOGI(TAG, "Called for battery service with %f", value); if (battery_handler_chain) battery_handler_chain(value); } diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 8209a124..fd353cde 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -133,7 +133,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, \"longpress\":1000, \"normal\":{\"pressed\":\"ACTRLS_TOGGLE\"},\"longpress\":{\"pressed\":\"ACTRLS_POWER\"}}]" if MUSE + 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 "" config BAT_CONFIG string