webapp rebuild

CMakeLists.txt

@@ -3,13 +3,12 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
 set(PROJECT_VER $ENV{PROJECT_VER})
 add_definitions(-DMODEL_NAME=SqueezeESP32)
-#add_definitions(-DNOPURE=Y) # THIS DOESNT SEEM TO DO ANYHTING!
 #set(NOPURE Y) # This may work (but maybe not!)
 #set(DEPTH 32) # Thies does work (?is it a number vrs string?)
-
+message(STATUS, "main: PURE:${PURE} NOPURE${NOPURE}")
 if (NOT DEFINED NOPURE)
     message(STATUS "*** PURE IS ENABLED ***")
-    set(PURE)
+    set(PURE "Y")
     message(STATUS "All BT, AirPlay, and CSpot must be disabled in menuconfig")
 endif()
 

components/driver_bt/CMakeLists.txt

@@ -1,4 +1,6 @@
-if (DEFINED PURE)
+message(STATUS, "driver_bt: PURE:${PURE} NOPURE${NOPURE}")
+#if (DEFINED PURE)
+if (NOT DEFINED NOPURE)
     message(STATUS "*** PURE: Skipping bluetooth")
     return()
 endif()

components/raop/CMakeLists.txt

@@ -1,4 +1,6 @@
-if (DEFINED PURE)
+message(STATUS, "raop: PURE:${PURE} NOPURE${NOPURE}")
+#if (DEFINED PURE)
+if (NOT DEFINED NOPURE)
     message(STATUS "*** PURE: Skipping airplay (raop) ***")
     return()
 endif()

components/spotify/CMakeLists.txt

@@ -1,5 +1,7 @@
 # this must be set *before* idf_component_register
-if (DEFINED PURE)
+message(STATUS, "spotify: PURE:${PURE} NOPURE${NOPURE}")
+#if (DEFINED PURE)
+if (NOT DEFINED NOPURE)
 	message(STATUS "*** PURE: Skipping spotify (cspot) ***")
 	return()
 endif()

components/squeezelite/CMakeLists.txt

@@ -3,8 +3,8 @@ if(IDF_TARGET STREQUAL "esp32")
     set(bt_requires "driver_bt")
 endif()
 
-# runs prelink with no dfinition, then with definition.
-message(STATUS "*** Squeezelite: NOPURE is ${NOPURE} ***")
+message(STATUS, "squeezelite: PURE:${PURE} NOPURE${NOPURE}")
+# runs prelink with no d3finition, then with definition.
 if (NOT DEFINED PURE)
     message(STATUS "*** Squeezelite: PURE is NOT defined ***")
 	set(cspot_required "spotify")

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

@@ -71,6 +71,8 @@ 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;
 declare function getRadioButton(entry: any): string;
@@ -217,6 +219,7 @@ declare function pushStatus(): void;
 declare function pushStatus(): void;
 declare function pushStatus(): void;
 declare function pushStatus(): void;
+declare function pushStatus(): void;
 declare let sd: {};
 declare let rf: boolean;
 declare function refreshStatus(): void;

components/wifi-manager/webapp/webapp.cmake

@@ -1,5 +1,5 @@
-target_add_binary_data( __idf_wifi-manager webapp/dist/css/index.9de57ccd5f94250a38d0.css.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/css/index.79b066409aae272d620d.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.1d06b9.bundle.js.gz BINARY)
-target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.1d06b9.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/js/index.27f381.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.27f381.bundle.js.gz BINARY)

components/wifi-manager/webapp/webpack.c

@@ -1,34 +1,34 @@
 // Automatically generated. Do not edit manually!.
 #include <inttypes.h>
-extern const uint8_t _index_9de57ccd5f94250a38d0_css_gz_start[] asm("_binary_index_9de57ccd5f94250a38d0_css_gz_start");
-extern const uint8_t _index_9de57ccd5f94250a38d0_css_gz_end[] asm("_binary_index_9de57ccd5f94250a38d0_css_gz_end");
+extern const uint8_t _index_79b066409aae272d620d_css_gz_start[] asm("_binary_index_79b066409aae272d620d_css_gz_start");
+extern const uint8_t _index_79b066409aae272d620d_css_gz_end[] asm("_binary_index_79b066409aae272d620d_css_gz_end");
 extern const uint8_t _favicon_32x32_png_start[] asm("_binary_favicon_32x32_png_start");
 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_1d06b9_bundle_js_gz_start[] asm("_binary_index_1d06b9_bundle_js_gz_start");
-extern const uint8_t _index_1d06b9_bundle_js_gz_end[] asm("_binary_index_1d06b9_bundle_js_gz_end");
-extern const uint8_t _node_vendors_1d06b9_bundle_js_gz_start[] asm("_binary_node_vendors_1d06b9_bundle_js_gz_start");
-extern const uint8_t _node_vendors_1d06b9_bundle_js_gz_end[] asm("_binary_node_vendors_1d06b9_bundle_js_gz_end");
+extern const uint8_t _index_27f381_bundle_js_gz_start[] asm("_binary_index_27f381_bundle_js_gz_start");
+extern const uint8_t _index_27f381_bundle_js_gz_end[] asm("_binary_index_27f381_bundle_js_gz_end");
+extern const uint8_t _node_vendors_27f381_bundle_js_gz_start[] asm("_binary_node_vendors_27f381_bundle_js_gz_start");
+extern const uint8_t _node_vendors_27f381_bundle_js_gz_end[] asm("_binary_node_vendors_27f381_bundle_js_gz_end");
 const char * resource_lookups[] = {
-	"/css/index.9de57ccd5f94250a38d0.css.gz",
+	"/css/index.79b066409aae272d620d.css.gz",
 	"/favicon-32x32.png",
 	"/index.html.gz",
-	"/js/index.1d06b9.bundle.js.gz",
-	"/js/node_vendors.1d06b9.bundle.js.gz",
+	"/js/index.27f381.bundle.js.gz",
+	"/js/node_vendors.27f381.bundle.js.gz",
 ""
 };
 const uint8_t * resource_map_start[] = {
-	_index_9de57ccd5f94250a38d0_css_gz_start,
+	_index_79b066409aae272d620d_css_gz_start,
 	_favicon_32x32_png_start,
 	_index_html_gz_start,
-	_index_1d06b9_bundle_js_gz_start,
-	_node_vendors_1d06b9_bundle_js_gz_start
+	_index_27f381_bundle_js_gz_start,
+	_node_vendors_27f381_bundle_js_gz_start
 };
 const uint8_t * resource_map_end[] = {
-	_index_9de57ccd5f94250a38d0_css_gz_end,
+	_index_79b066409aae272d620d_css_gz_end,
 	_favicon_32x32_png_end,
 	_index_html_gz_end,
-	_index_1d06b9_bundle_js_gz_end,
-	_node_vendors_1d06b9_bundle_js_gz_end
+	_index_27f381_bundle_js_gz_end,
+	_node_vendors_27f381_bundle_js_gz_end
 };

components/wifi-manager/webapp/webpack.h

@@ -1,6 +1,6 @@
 /***********************************
 webpack_headers
-dist/css/index.9de57ccd5f94250a38d0.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.1d06b9.bundle.js.gz,dist/js/node_vendors.1d06b9.bundle.js.gz
+dist/css/index.79b066409aae272d620d.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.27f381.bundle.js.gz,dist/js/node_vendors.27f381.bundle.js.gz
 ***********************************/
 #pragma once
 #include <inttypes.h>

sdkconfig

@@ -149,15 +149,6 @@ CONFIG_LWIP_MAX_SOCKETS=20
 # Squeezelite-ESP32
 #
 
-#
-# Logging
-#
-CONFIG_LOGGING_SLIMPROTO="info"
-CONFIG_LOGGING_STREAM="info"
-CONFIG_LOGGING_DECODE="info"
-CONFIG_LOGGING_OUTPUT="info"
-# end of Logging
-
 #
 # Target
 #
@@ -171,31 +162,32 @@ CONFIG_RELEASE_API="https://api.github.com/repos/sle118/squeezelite-esp32/releas
 CONFIG_SQUEEZELITE_ESP32_RELEASE_URL="https://github.com/sle118/squeezelite-esp32/releases"
 CONFIG_PROJECT_NAME="SqueezeESP32"
 CONFIG_FW_PLATFORM_NAME="ESP32"
+CONFIG_TARGET=""
+CONFIG_TARGET_LOCKED=y
 
 #
 # Factory Configuration
 #
-CONFIG_DAC_LOCKED=y
+CONFIG_AUDIO_CONTROLS=""
+CONFIG_BAT_CONFIG="channel=3,scale=6.5,cells=1,atten=3"
+# CONFIG_BAT_LOCKED is not set
 CONFIG_DAC_CONFIG="model=I2S,bck=7,ws=5,do=6"
+CONFIG_DAC_LOCKED=y
 CONFIG_DAC_CONTROLSET=""
 CONFIG_DAC_I2S_NUM=0
-CONFIG_SPDIF_LOCKED=y
-CONFIG_SPDIF_CONFIG="bck=7,ws=5,do=17"
-CONFIG_DISPLAY_LOCKED=y
 CONFIG_DISPLAY_CONFIG="SPI,width=320,height=170,cs=10,reset=9,back=15,speed=8000000,mode=0,driver=ST7789:x=35,VFlip,rotate"
-# CONFIG_I2C_LOCKED is not set
+CONFIG_DISPLAY_LOCKED=y
+CONFIG_ETH_CONFIG=""
+CONFIG_GPIO_EXP_CONFIG=""
+CONFIG_SPDIF_CONFIG="bck=7,ws=5,do=17"
+CONFIG_SPDIF_LOCKED=y
 CONFIG_I2C_CONFIG=""
-CONFIG_SPI_LOCKED=y
-CONFIG_SPI_CONFIG="data=11,clk=12,dc=13,host=2"
-CONFIG_LED_VU_LOCKED=y
 CONFIG_LED_VU_CONFIG="type=APA102,length=7,gpio=42,clk=45,seq=2106543"
-CONFIG_ROTARY_ENCODER_LOCKED=y
+CONFIG_LED_VU_LOCKED=y
 CONFIG_ROTARY_ENCODER="A=1,B=2,SW=0,knobonly"
-CONFIG_GPIO_EXP_CONFIG=""
-CONFIG_ETH_CONFIG=""
-CONFIG_AUDIO_CONTROLS=""
-CONFIG_BAT_CONFIG="channel=3,scale=6.5,cells=1,atten=3"
-CONFIG_TARGET=""
+CONFIG_ROTARY_ENCODER_LOCKED=y
+CONFIG_SPI_CONFIG="data=11,clk=12,dc=13,host=2"
+CONFIG_SPI_LOCKED=y
 
 #
 # Factory GPIO Configuration
@@ -208,11 +200,13 @@ CONFIG_LED_GREEN_GPIO=-1
 CONFIG_LED_GREEN_GPIO_LEVEL=1
 CONFIG_LED_RED_GPIO=-1
 CONFIG_LED_RED_GPIO_LEVEL=1
+CONFIG_LED_LOCKED=y
 CONFIG_MUTE_GPIO=-1
 CONFIG_MUTE_GPIO_LEVEL=0
 CONFIG_POWER_GPIO=-1
 CONFIG_POWER_GPIO_LEVEL=1
 CONFIG_SPKFAULT_GPIO=-1
+CONFIG_SPKFAULT_LOCKED=y
 CONFIG_SPKFAULT_GPIO_LEVEL=0
 CONFIG_SET_GPIO="46=vcc,16=ir"
 # end of Factory GPIO Configuration
@@ -237,12 +231,12 @@ CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000
 # end of Audio Input
 
 #
-# Command sets
+# Command Sets
 #
 CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30 -W"
 CONFIG_DEFAULT_COMMAND_2_LINE="squeezelite -o spdif  -b 500:2000 -d all=info -C 30"
 CONFIG_DEFAULT_COMMAND_3_LINE="squeezelite -o bt -b 500:2000 -d all=info -C 30 -Z 44100"
-# end of Command sets
+# end of Command Sets
 # end of Squeezelite-ESP32
 
 #