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

Merge pull request #521 from RASPIAUDIO/master-v4.3

Browse Source 
Raspiaudio Muse Luxe 2025/11/26
This commit is contained in:
philippe44
2025-12-25 12:13:29 +01:00
committed by GitHub
parent f64c09cf30 23234f7189
commit f6763ebead
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/services/monitor.c
View File

@@ -248,7 +248,8 @@ void monitor_svc_init(void) {
// re-use button management for jack handler, it's a GPIO after all // re-use button management for jack handler, it's a GPIO after all
if (jack.gpio != -1) { if (jack.gpio != -1) {
ESP_LOGI(TAG,"Adding jack (%s) detection GPIO %d", jack.active ? "high" : "low", jack.gpio); ESP_LOGI(TAG,"Adding jack (%s) detection GPIO %d", jack.active ? "high" : "low", jack.gpio);
button_create(NULL, jack.gpio, jack.active ? BUTTON_HIGH : BUTTON_LOW, false, 250, jack_handler_default, 0, -1); // Use GPIO pull so the line does not float (Muse jack detect is active-low and needs pull-up)
button_create(NULL, jack.gpio, jack.active ? BUTTON_HIGH : BUTTON_LOW, true, 250, jack_handler_default, 0, -1);
} }
#ifdef CONFIG_SPKFAULT_GPIO_LEVEL #ifdef CONFIG_SPKFAULT_GPIO_LEVEL
@@ -297,4 +298,4 @@ void monitor_svc_init(void) {
*/ */
monitor_gpio_t * get_jack_insertion_gpio(){ monitor_gpio_t * get_jack_insertion_gpio(){
return &jack; return &jack;
} }

7
main/Kconfig.projbuild
View File

@@ -129,7 +129,7 @@ menu "Squeezelite-ESP32"
config DAC_CONTROLSET config DAC_CONTROLSET
string string
default "{ \"init\": [ {\"reg\":41, \"val\":128}, {\"reg\":18, \"val\":255} ], \"poweron\": [ {\"reg\":18, \"val\":64, \"mode\":\"or\"} ], \"poweroff\": [ {\"reg\":18, \"val\":191, \"mode\":\"and\"} ] }" if TWATCH2020 default "{ \"init\": [ {\"reg\":41, \"val\":128}, {\"reg\":18, \"val\":255} ], \"poweron\": [ {\"reg\":18, \"val\":64, \"mode\":\"or\"} ], \"poweroff\": [ {\"reg\":18, \"val\":191, \"mode\":\"and\"} ] }" if TWATCH2020
default "{\"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}, {\"reg\":46,\"val\":33}, {\"reg\":47,\"val\":33} ]}" if MUSE default "{\"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\":60}, {\"reg\":25,\"val\":0}, {\"reg\":46,\"val\":33}, {\"reg\":47,\"val\":33} , {\"reg\":48,\"val\":33}, {\"reg\":49,\"val\":33}]}" if MUSE
default "" default ""
config AUDIO_CONTROLS config AUDIO_CONTROLS
string string
@@ -153,7 +153,8 @@ menu "Squeezelite-ESP32"
default -1 default -1
config JACK_GPIO config JACK_GPIO
int int
default 34 if SQUEEZEAMP || MUSE default 27 if MUSE
default 34 if SQUEEZEAMP
default -1 default -1
config SPKFAULT_GPIO config SPKFAULT_GPIO
int int
@@ -463,4 +464,4 @@ menu "Squeezelite-ESP32"
default "squeezelite -o I2S -b 500:2000 -d all=info -C 30" default "squeezelite -o I2S -b 500:2000 -d all=info -C 30"
help help
This is the command to run when starting the device This is the command to run when starting the device
endmenu endmenu