Fix protocol generation - release

Dockerfile

@@ -15,7 +15,7 @@ ENV GCC_TOOLS_BASE=/opt/esp/tools/xtensa-esp32-elf/esp-2021r2-8.4.0/xtensa-esp32
 # To run the image interactive (windows): 
 # docker run --rm -v %cd%:/project -w /project -it sle118/squeezelite-esp32-idfv43
 # To run the image interactive (linux):
-# docker run --rm -v `pwd`:/project -w /project -it sle118/squeezelite-esp32-idfv4-master
+# docker run --rm -v `pwd`:/project -w /project -it sle118/squeezelite-esp32-idfv43
 # to build the web app inside of the interactive session
 # pushd components/wifi-manager/webapp/ && npm install && npm run-script build && popd
 #
@@ -90,7 +90,7 @@ RUN : \
   && pip show pygit2 \ 
   && python --version \  
   && pip --version \
-  && pip3 install protobuf grpcio-tools \
+  && pip install protobuf  grpcio-tools \
   && rm -rf $IDF_TOOLS_PATH/dist \
   && :
 

build-scripts/SqueezeAmp-sdkconfig.defaults

@@ -259,7 +259,7 @@ CONFIG_CSPOT_SINK=y
 # Various I/O
 #
 CONFIG_I2C_CONFIG=""
-CONFIG_SET_GPIO=""
+CONFIG_SET_GPIO="0=ir"
 CONFIG_ROTARY_ENCODER=""
 # end of Various I/O
 

components/services/buttons.c

@@ -415,7 +415,7 @@ bool create_rotary(void *id, int A, int B, int SW, int long_press, rotary_handle
 	// create companion button if rotary has a switch
 	if (SW != -1) button_create(id, SW, BUTTON_LOW, true, 0, rotary_button_handler, long_press, -1);
 	
-	ESP_LOGI(TAG, "Creating rotary encoder A:%d B:%d, SW:%d", A, B, SW);
+	ESP_LOGI(TAG, "Created rotary encoder A:%d B:%d, SW:%d", A, B, SW);
 	
 	return true;
 }	
@@ -432,5 +432,7 @@ bool create_infrared(int gpio, infrared_handler handler) {
 	common_task_init();
 	xRingbufferAddToQueueSetRead(infrared.rb, common_queue_set);
 	
+	ESP_LOGI(TAG, "Created infrared receiver using GPIO %u", gpio);	
+	
 	return (infrared.rb != NULL);
 }	

components/spotify/cspot/CMakeLists.txt

@@ -36,7 +36,7 @@ if(UNIX AND NOT APPLE)
 endif()
 
 # Build protobuf code
-if(0)
+if(1)
 set(NANOPB_OPTIONS "-I${CMAKE_CURRENT_SOURCE_DIR}")
 file(GLOB PROTOS protobuf/*.proto)
 nanopb_generate_cpp(PROTO_SRCS PROTO_HDRS RELPATH ${CMAKE_CURRENT_SOURCE_DIR} ${PROTOS})

components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb

@@ -10,5 +10,4 @@
 # --plugin= on the command line.
 
 MYPATH=$(dirname "$0")
-echo "Executing $MYPATH/nanopb_generator.py "
 exec "$MYPATH/nanopb_generator.py" --protoc-plugin

components/wifi-manager/webapp/dist/src/js/test.d.ts

@@ -20,6 +20,7 @@ declare function getStatus(): {};
 declare function getStatus(): {};
 declare function getStatus(): {};
 declare function getStatus(): {};
+declare function getStatus(): {};
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
@@ -42,6 +43,8 @@ declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
+declare function getRadioButton(entry: any): string;
+declare function pushStatus(): void;
 declare function pushStatus(): void;
 declare function pushStatus(): void;
 declare function pushStatus(): void;

components/wifi-manager/webapp/webapp.cmake

@@ -1,5 +1,5 @@
 target_add_binary_data( __idf_wifi-manager webapp/dist/css/index.7964a13ec910c36040b8.css.gz BINARY)
 target_add_binary_data( __idf_wifi-manager webapp/dist/favicon-32x32.png BINARY)
 target_add_binary_data( __idf_wifi-manager webapp/dist/index.html.gz BINARY)
-target_add_binary_data( __idf_wifi-manager webapp/dist/js/index.d78ba9.bundle.js.gz BINARY)
-target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.d78ba9.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/js/index.6ae91e.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.6ae91e.bundle.js.gz BINARY)

components/wifi-manager/webapp/webpack.c

@@ -6,29 +6,29 @@ extern const uint8_t _favicon_32x32_png_start[] asm("_binary_favicon_32x32_png_s
 extern const uint8_t _favicon_32x32_png_end[] asm("_binary_favicon_32x32_png_end");
 extern const uint8_t _index_html_gz_start[] asm("_binary_index_html_gz_start");
 extern const uint8_t _index_html_gz_end[] asm("_binary_index_html_gz_end");
-extern const uint8_t _index_d78ba9_bundle_js_gz_start[] asm("_binary_index_d78ba9_bundle_js_gz_start");
-extern const uint8_t _index_d78ba9_bundle_js_gz_end[] asm("_binary_index_d78ba9_bundle_js_gz_end");
-extern const uint8_t _node_vendors_d78ba9_bundle_js_gz_start[] asm("_binary_node_vendors_d78ba9_bundle_js_gz_start");
-extern const uint8_t _node_vendors_d78ba9_bundle_js_gz_end[] asm("_binary_node_vendors_d78ba9_bundle_js_gz_end");
+extern const uint8_t _index_6ae91e_bundle_js_gz_start[] asm("_binary_index_6ae91e_bundle_js_gz_start");
+extern const uint8_t _index_6ae91e_bundle_js_gz_end[] asm("_binary_index_6ae91e_bundle_js_gz_end");
+extern const uint8_t _node_vendors_6ae91e_bundle_js_gz_start[] asm("_binary_node_vendors_6ae91e_bundle_js_gz_start");
+extern const uint8_t _node_vendors_6ae91e_bundle_js_gz_end[] asm("_binary_node_vendors_6ae91e_bundle_js_gz_end");
 const char * resource_lookups[] = {
 	"/css/index.7964a13ec910c36040b8.css.gz",
 	"/favicon-32x32.png",
 	"/index.html.gz",
-	"/js/index.d78ba9.bundle.js.gz",
-	"/js/node_vendors.d78ba9.bundle.js.gz",
+	"/js/index.6ae91e.bundle.js.gz",
+	"/js/node_vendors.6ae91e.bundle.js.gz",
 ""
 };
 const uint8_t * resource_map_start[] = {
 	_index_7964a13ec910c36040b8_css_gz_start,
 	_favicon_32x32_png_start,
 	_index_html_gz_start,
-	_index_d78ba9_bundle_js_gz_start,
-	_node_vendors_d78ba9_bundle_js_gz_start
+	_index_6ae91e_bundle_js_gz_start,
+	_node_vendors_6ae91e_bundle_js_gz_start
 };
 const uint8_t * resource_map_end[] = {
 	_index_7964a13ec910c36040b8_css_gz_end,
 	_favicon_32x32_png_end,
 	_index_html_gz_end,
-	_index_d78ba9_bundle_js_gz_end,
-	_node_vendors_d78ba9_bundle_js_gz_end
+	_index_6ae91e_bundle_js_gz_end,
+	_node_vendors_6ae91e_bundle_js_gz_end
 };

components/wifi-manager/webapp/webpack.h

@@ -1,6 +1,6 @@
 /***********************************
 webpack_headers
-dist/css/index.7964a13ec910c36040b8.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.d78ba9.bundle.js.gz,dist/js/node_vendors.d78ba9.bundle.js.gz
+dist/css/index.7964a13ec910c36040b8.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.6ae91e.bundle.js.gz,dist/js/node_vendors.6ae91e.bundle.js.gz
 ***********************************/
 #pragma once
 #include <inttypes.h>

main/Kconfig.projbuild

@@ -168,6 +168,9 @@ menu "Squeezelite-ESP32"
 			int
 			default 13 if SQUEEZEAMP
 			default -1
+		config SET_GPIO
+			string
+			default "0=ir" if SQUEEZEAMP
 	endmenu
 
 	menu "Audio settings"
@@ -342,14 +345,15 @@ menu "Squeezelite-ESP32"
 				data=<gpio>,clk=<gpio>[,d/c=<num>][,host=<0|1|2>]
 		config SET_GPIO
 			string "Special GPIO configuration"
-			default ""
 			help
 				Set parameters of shared GPIO with special values.
-				<gpio_1>=Vcc|GND|amp[:0|1]|jack[:0|1][,<gpio_n>=Vcc|GND|amp[:0|1]|jack[:0|1]]
+				<gpio_1>=Vcc|GND|amp[:0|1]|jack[:0|1][ir][spkfault[:0|1][,<gpio_n>=Vcc|GND|amp[:0|1]|jack[:0|1]]
 				'amp'  => GPIO that is set when playback starts
 				'jack' => GPIO used for audio jack detection
 				'green', 'red' => GPIO for status LED
-				'[:0|1] means set the active value for that GPIO can be low or high
+				'spkfault' => GPIO used for speaker fault detection
+				'ir' => GPIO used for Infrared Receiver
+				[:0|1] means set the active value for that GPIO can be low or high
 		config ROTARY_ENCODER
 			string "Rotary Encoder configuration"
 			default ""

sdkconfig.defaults

@@ -262,7 +262,7 @@ CONFIG_AIRPLAY_PORT="5000"
 # Various I/O
 #
 CONFIG_I2C_CONFIG=""
-CONFIG_SET_GPIO=""
+# CONFIG_SET_GPIO= is not set
 CONFIG_ROTARY_ENCODER=""
 # end of Various I/O