release

Merge branch 'master-cmake' of https://github.com/sle118/squeezelite-esp32 into master-cmake
ensure amp gpio lock, add longpress - release
2025-12-16 08:27:01 +03:00 · 2022-02-02 11:30:59 -08:00 · 2022-02-02 11:28:34 -08:00 · 2022-02-02 11:28:31 -08:00 · 2022-01-30 13:13:05 -08:00
4 changed files with 6 additions and 6 deletions
--- a/README.md
+++ b/README.md
@@ -425,11 +425,11 @@ buttons
 ]
 ```
 **IMPORTANT NOTE**: LMS also supports the possibility to send 'raw' button codes. It's a bit complicated, so bear with me. Buttons can either be processed by SqueezeESP32 and mapped to a "function" like play/pause or they can be just sent to LMS as plain (raw) code and the full logic of press/release/longpress is handled by LMS, you don't have any control on that.
+	
+When buttons are mapped to a "function" (non "raw" mode) a *command* is sent to LMS using the CLI (Command Line Interface) but this only works if LMS does not have a password set. In "raw" mode, a button *code* is sent using the always-openn control socket between LMS and the player.

 The benefit of the "raw" mode is that you can build a player which is as close as possible to a Boom (e.g.) but you can't use the remapping function nor longress or shift logics to do your own mapping when you have a limited set of buttons. In 'raw' mode, all you really need to define is the mapping between the gpio and the button. As far as LMS is concerned, any other option in these JSON payloads does not matter. Now, when you use BT or AirPlay, the full JSON construct described above fully applies, so the shift, longpress, remapping options still work.

-**Be aware that when using non "raw" mode, the CLI (Command Line Interface) of LMS is used and *must* be available without password**
-
 There is no good or bad option, it's your choice. Use the NVS parameter "lms_ctrls_raw" to change that option
 	
 **Note that gpio 36 and 39 are input only and cannot use interrupt. When using them for a button, a 100ms polling is started which is expensive. Long press is also likely to not work very well**
--- 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
--- 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

--- 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
Author	SHA1	Message	Date
Philippe G	c0bd080ea1	release	2022-02-02 11:30:59 -08:00
Philippe G	29d4214e28	Merge branch 'master-cmake' of https://github.com/sle118/squeezelite-esp32 into master-cmake	2022-02-02 11:28:34 -08:00
Philippe G	b828e7f3e6	ensure amp gpio lock, add longpress - release	2022-02-02 11:28:31 -08:00
philippe44	6843d4b1ef	Update README.md	2022-01-30 13:13:05 -08:00