drum roll. V1 release

Merge remote-tracking branch 'origin/master-cmake' into master-cmake
update to version 1
2025-12-16 00:17:03 +03:00 · 2021-04-21 14:06:16 -04:00 · 2021-04-21 14:01:27 -04:00 · 2021-04-21 14:01:23 -04:00 · 2021-04-21 10:55:46 -07:00 · 2021-04-21 13:27:36 -04:00
73 changed files with 2596 additions and 1532 deletions
--- a/.github/workflows/CrossBuild.yml
+++ b/.github/workflows/CrossBuild.yml
@@ -1,5 +1,4 @@
 # This is a basic workflow to help you get started with Actions
-
 name: Cross-Build

 on:
@@ -58,7 +57,7 @@ jobs:
        echo "tag=${tag}" >> $GITHUB_ENV
        last_commit="$(git log --pretty=format:'%s' --max-count=1)"
        if [[ "$last_commit" =~ .*"Release".* ]]; then echo "release_flag=1" >> $GITHUB_ENV; else echo "release_flag=0" >> $GITHUB_ENV; fi
-        name="dev.${BUILD_NUMBER}-${{matrix.depth}}#v4.0#${TARGET_BUILD_NAME}#${branch_name}"
+        name="1.${BUILD_NUMBER}-${{matrix.depth}}#v4.0#${TARGET_BUILD_NAME}#${branch_name}"
        artifact_prefix="squeezelite-esp32-${branch_name}-${TARGET_BUILD_NAME}-${{matrix.depth}}-${build_version_prefix}${BUILD_NUMBER}"
        artifact_file_name="${artifact_prefix}.zip"
        artifact_bin_file_name="${artifact_prefix}.bin"
--- a/.gitignore
+++ b/.gitignore
@@ -98,3 +98,5 @@ test/.vscode/

 node_modules/*
 esp-dsp/
+
+
--- a/.pydevproject
+++ b/.pydevproject
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?><pydev_project>
-    <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-    <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
-</pydev_project>
--- a/README.md
+++ b/README.md
@@ -123,6 +123,7 @@ The NVS parameter "i2c_config" set the i2c's gpio used for generic purpose (e.g.
 ```
 sda=<gpio>,scl=<gpio>[,port=0|1][,speed=<speed>]
 ```
+<strong>Please note that you can not use the same GPIO or port as the DAC</strong>
 ### SPI
 The NVS parameter "spi_config" set the spi's gpio used for generic purpose (e.g. display). Leave it blank to disable SPI usage. The DC parameter is needed for displays. Syntax is
 ```
@@ -144,6 +145,8 @@ The parameter "dac_controlset" allows definition of simple commands to be sent o
 This is standard JSON notation, so if you are not familiar with it, Google is your best friend. Be aware that the '...' means you can have as many entries as you want, it's not part of the syntax. Every section is optional, but it does not make sense to set i2c in the 'dac_config' parameter and not setting anything here. The parameter 'mode' allows to *or* the register with the value or to *and* it. Don't set 'mode' if you simply want to write. **Note that all values must be decimal**. You can use a validator like [this](https://jsonlint.com) to verify your syntax

 NB: For well-known configuration, this is ignored
+
+<strong>Please note that you can not use the same GPIO or port as the I2C</strong>
 ### SPDIF
 The NVS parameter "spdif_config" sets the i2s's gpio needed for SPDIF. 

--- a/build-scripts/ESP32-A1S-sdkconfig.defaults
+++ b/build-scripts/ESP32-A1S-sdkconfig.defaults
@@ -29,7 +29,10 @@ CONFIG_SPDIF_DO_IO=-1
 CONFIG_DAC_CONFIG="model=AC101,bck=27,ws=26,do=25,di=35,sda=33,scl=32"
 CONFIG_MUTE_GPIO=-1
 CONFIG_MUTE_GPIO_LEVEL=-1
-
+CONFIG_RELEASE_API="https://api.github.com/repos/sle118/squeezelite-esp32/releases"
+CONFIG_SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases"
+CONFIG_PROJECT_NAME="Squeezelite ESP32-A1S"
+CONFIG_FW_PLATFORM_NAME="ESP32-A1S"
 CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
--- a/build-scripts/I2S-4MFlash-sdkconfig.defaults
+++ b/build-scripts/I2S-4MFlash-sdkconfig.defaults
@@ -34,7 +34,10 @@ CONFIG_SPDIF_WS_IO=-1
 CONFIG_SPDIF_DO_IO=-1
 CONFIG_MUTE_GPIO=-1
 CONFIG_MUTE_GPIO_LEVEL=-1
-
+CONFIG_RELEASE_API="https://api.github.com/repos/sle118/squeezelite-esp32/releases"
+CONFIG_SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases"
+CONFIG_PROJECT_NAME="Squeezelite-ESP32"
+CONFIG_FW_PLATFORM_NAME="I2S-4MFlash"
 #
 # SDK tool configuration
 #
--- a/build-scripts/SqueezeAmp-sdkconfig.defaults
+++ b/build-scripts/SqueezeAmp-sdkconfig.defaults
@@ -32,7 +32,10 @@ CONFIG_SPDIF_NUM=0
 CONFIG_SPDIF_CONFIG="bck=33,ws=25,do=15"
 CONFIG_DAC_CONFIG="model=TAS57xx,bck=33,ws=25,do=32,sda=27,scl=26,mute=14:0"
 CONFIG_MUTE_GPIO_LEVEL=-1
-
+CONFIG_PROJECT_NAME="SqueezeAmp"
+CONFIG_FW_PLATFORM_NAME="SqueezeAmp"
+CONFIG_RELEASE_API="https://api.github.com/repos/sle118/squeezelite-esp32/releases"
+CONFIG_SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases"
 #
 # SDK tool configuration
 #
--- a/components/driver_bt/bt_app_sink.c
+++ b/components/driver_bt/bt_app_sink.c
@@ -62,7 +62,7 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param);
 static void bt_av_hdl_avrc_ct_evt(uint16_t event, void *p_param);
 /* avrc TG event handler */
 static void bt_av_hdl_avrc_tg_evt(uint16_t event, void *p_param);
-static void volume_set_by_local_host(uint8_t volume);
+static void volume_set_by_local_host(int value, bool is_step);
 static void bt_av_notify_evt_handler(uint8_t event_id, esp_avrc_rn_param_t *event_parameter);

 static const char *s_a2d_conn_state_str[] = {"Disconnected", "Connecting", "Connected", "Disconnecting"};
@@ -70,7 +70,7 @@ static const char *s_a2d_audio_state_str[] = {"Suspended", "Stopped", "Started"}
 static esp_avrc_rn_evt_cap_mask_t s_avrc_peer_rn_cap;

 static _lock_t s_volume_lock;
-static uint8_t s_volume = 0;
+static int s_volume, abs_volume, sink_volume;
 static bool s_volume_notify;
 static enum { AUDIO_IDLE, AUDIO_CONNECTED, AUDIO_PLAYING } s_audio = AUDIO_IDLE;

@@ -90,16 +90,14 @@ static EXT_RAM_ATTR struct {

 static void bt_volume_up(bool pressed) {
 	if (!pressed) return;
-	// volume UP/DOWN buttons are not supported by iPhone/Android
-	volume_set_by_local_host(s_volume < 127-3 ? s_volume + 3 : 127);
+	volume_set_by_local_host(+3, true);
 	(*bt_app_a2d_cmd_cb)(BT_SINK_VOLUME, s_volume);
 	ESP_LOGD(BT_AV_TAG, "BT volume up %u", s_volume);
 }

 static void bt_volume_down(bool pressed) {
 	if (!pressed) return;
-	// volume UP/DOWN buttons are not supported by iPhone/Android
-	volume_set_by_local_host(s_volume > 3 ? s_volume - 3 : 0);
+	volume_set_by_local_host(-3, true);
 	(*bt_app_a2d_cmd_cb)(BT_SINK_VOLUME, s_volume);
 }

@@ -284,6 +282,8 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param)
            esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
 			(*bt_app_a2d_cmd_cb)(BT_SINK_DISCONNECTED);
        } else if (a2d->conn_stat.state == ESP_A2D_CONNECTION_STATE_CONNECTED){
+			abs_volume = -1;
+			s_volume = sink_volume;
            esp_bt_gap_set_scan_mode(ESP_BT_NON_CONNECTABLE, ESP_BT_NON_DISCOVERABLE);
 			(*bt_app_a2d_cmd_cb)(BT_SINK_CONNECTED);
        }
@@ -491,20 +491,29 @@ static void bt_av_hdl_avrc_ct_evt(uint16_t event, void *p_param)

 static void volume_set_by_controller(uint8_t volume)
 {
-    ESP_LOGD(BT_RC_TG_TAG, "Volume is set by remote controller %d%%\n", (uint32_t)volume * 100 / 0x7f);
+	// do not modified NVS volume
    _lock_acquire(&s_volume_lock);
-    s_volume = volume;
+    s_volume = abs_volume = (volume * 100) / 127;
    _lock_release(&s_volume_lock);
-	(*bt_app_a2d_cmd_cb)(BT_SINK_VOLUME, volume);
+	(*bt_app_a2d_cmd_cb)(BT_SINK_VOLUME, s_volume);
 }

-static void volume_set_by_local_host(uint8_t volume)
+static void volume_set_by_local_host(int value, bool is_step)
 {
-    ESP_LOGD(BT_RC_TG_TAG, "Volume is set locally to: %d%%", (uint32_t)volume * 100 / 0x7f);
-    _lock_acquire(&s_volume_lock);
-    s_volume = volume;
-    _lock_release(&s_volume_lock);
+	_lock_acquire(&s_volume_lock);
+	s_volume = is_step ? s_volume + value : value;
+	if (s_volume > 127) s_volume = 127;
+	else if (s_volume < 0) s_volume = 0;	
+	if (abs_volume >= 0) abs_volume = s_volume;
+	else sink_volume = s_volume;
+	_lock_release(&s_volume_lock);

+	// volume has been set by controller, do not store it in NVS	
+	if (abs_volume < 0) {
+		char p[4];
+		config_set_value(NVS_TYPE_STR, "bt_sink_volume", itoa(s_volume, p, 10));					
+	}
+	
    if (s_volume_notify) {
        esp_avrc_rn_param_t rn_param;
        rn_param.volume = s_volume;
@@ -529,7 +538,7 @@ static void bt_av_hdl_avrc_tg_evt(uint16_t event, void *p_param)
        break;
    }
    case ESP_AVRC_TG_SET_ABSOLUTE_VOLUME_CMD_EVT: {
-        ESP_LOGD(BT_RC_TG_TAG, "AVRC set absolute volume: %d%%", (int)rc->set_abs_vol.volume * 100/ 0x7f);
+        ESP_LOGD(BT_RC_TG_TAG, "AVRC set absolute volume: %d%%", (rc->set_abs_vol.volume * 100) / 127);
        volume_set_by_controller(rc->set_abs_vol.volume);
        break;
    }
@@ -597,6 +606,10 @@ void bt_sink_init(bt_cmd_vcb_t cmd_cb, bt_data_cb_t data_cb)
    esp_bt_gap_set_security_param(param_type, &iocap, sizeof(uint8_t));
 #endif

+	char *item = config_alloc_get_default(NVS_TYPE_STR, "bt_sink_volume", "127", 0);
+	sink_volume = atol(item);
+	free(item);
+
    /*
     * Set default parameters for Legacy Pairing
     */
@@ -630,6 +643,7 @@ void bt_sink_init(bt_cmd_vcb_t cmd_cb, bt_data_cb_t data_cb)
    	esp_pin_code[3]='4';
    }
    esp_bt_gap_set_pin(pin_type, strlen(pin_code), esp_pin_code);
+	free(pin_code);
 }

 void bt_sink_deinit(void)
--- a/components/platform_console/app_recovery/CMakeLists.txt
+++ b/components/platform_console/app_recovery/CMakeLists.txt
@@ -5,5 +5,6 @@ idf_component_register( SRC_DIRS .
 
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=esp_app_desc")	
 idf_build_get_property(project_ver PROJECT_VER)
+message("******************* ${project_ver}")
 string(SUBSTRING "${project_ver}" 0 31 PROJECT_VER_CUT)
-set_source_files_properties(recovery.c PROPERTIES COMPILE_DEFINITIONS "PROJECT_VER=\"${PROJECT_VER_CUT}\"; PROJECT_NAME=\"recovery\"")
+set_source_files_properties(recovery.c PROPERTIES COMPILE_DEFINITIONS "PROJECT_VER=\"${PROJECT_VER_CUT}\"")
--- a/components/platform_console/app_recovery/application_name.h
+++ b/components/platform_console/app_recovery/application_name.h
@@ -1,2 +1,6 @@
 #pragma once
-#define PROJECT_NAME "recovery"
+#include "sdkconfig.h"
+#ifndef CONFIG_PROJECT_NAME
+#pragma message "Defaulting project name."
+#define CONFIG_PROJECT_NAME "Squeezelite-ESP32"
+#endif
--- a/components/platform_console/app_recovery/recovery.c
+++ b/components/platform_console/app_recovery/recovery.c
@@ -1,13 +1,15 @@
 #include <stdio.h>
 #include <string.h>
+#include "application_name.h"
 #include "esp_err.h"
 #include "esp_app_format.h"
+
 extern esp_err_t process_recovery_ota(const char * bin_url, char * bin_buffer, uint32_t length);

 const __attribute__((section(".rodata_desc"))) esp_app_desc_t esp_app_desc = {
    .magic_word = ESP_APP_DESC_MAGIC_WORD,
    .version = PROJECT_VER,
-    .project_name = PROJECT_NAME,
+    .project_name = CONFIG_PROJECT_NAME,
    .idf_ver = IDF_VER,

 #ifdef CONFIG_BOOTLOADER_APP_SECURE_VERSION
--- a/components/platform_console/app_squeezelite/CMakeLists.txt
+++ b/components/platform_console/app_squeezelite/CMakeLists.txt
@@ -1,4 +1,4 @@
- idf_build_get_property(idf_path IDF_PATH)
+idf_build_get_property(idf_path IDF_PATH)
 idf_component_register( SRCS cmd_squeezelite.c 
 						INCLUDE_DIRS . 
 						PRIV_REQUIRES spi_flash bootloader_support  partition_table bootloader_support console codecs squeezelite newlib pthread tools platform_config display )
@@ -13,7 +13,8 @@ target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=lround")
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=esp_app_desc")

 idf_build_get_property(project_ver PROJECT_VER)
+message("******************* ${project_ver}")
 string(SUBSTRING "${project_ver}" 0 31 PROJECT_VER_CUT)
-set_source_files_properties(cmd_squeezelite.c PROPERTIES COMPILE_DEFINITIONS "PROJECT_VER=\"${PROJECT_VER_CUT}\"; PROJECT_NAME=\"squeezelite\"")
+set_source_files_properties(cmd_squeezelite.c PROPERTIES COMPILE_DEFINITIONS "PROJECT_VER=\"${PROJECT_VER_CUT}\" ")


--- a/components/platform_console/app_squeezelite/application_name.h
+++ b/components/platform_console/app_squeezelite/application_name.h
@@ -1,2 +1,6 @@
 #pragma once
-#define PROJECT_NAME "squeezelite"
+#include "sdkconfig.h"
+#ifndef CONFIG_PROJECT_NAME
+#pragma message "Defaulting project name."
+#define CONFIG_PROJECT_NAME "Squeezelite-ESP32"
+#endif
--- a/components/platform_console/app_squeezelite/cmd_squeezelite.c
+++ b/components/platform_console/app_squeezelite/cmd_squeezelite.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <string.h>
-
+#include "application_name.h"
 #include "esp_log.h"
 #include "esp_console.h"
 #include "esp_pthread.h"
@@ -22,7 +22,7 @@ const __attribute__((section(".rodata_desc"))) esp_app_desc_t esp_app_desc = {

    .magic_word = ESP_APP_DESC_MAGIC_WORD,
    .version = PROJECT_VER,
-    .project_name = PROJECT_NAME,
+    .project_name = CONFIG_PROJECT_NAME,
    .idf_ver = IDF_VER,

 #ifdef CONFIG_BOOTLOADER_APP_SECURE_VERSION
--- a/components/platform_console/cmd_config.c
+++ b/components/platform_console/cmd_config.c
@@ -24,6 +24,7 @@ const char * desc_dac= "DAC Options";
 const char * desc_spdif= "SPDIF Options";
 const char * desc_audio= "General Audio Options";
 const char * desc_bt_source= "Bluetooth Audio Output Options";
+const char * desc_rotary= "Rotary Control";


 #define CODECS_BASE "flac|pcm|mp3|ogg"
@@ -85,6 +86,19 @@ static struct {
    struct arg_end *end;
 } i2s_args;

+static struct {
+	struct arg_rem * rem;
+	struct arg_int * A;
+	struct arg_int * B;
+	struct arg_int * SW;
+	struct arg_lit * volume_lock;
+	struct arg_lit * longpress;
+	struct arg_lit * knobonly;
+	struct arg_int * timer;
+	struct arg_lit * clear;
+	struct arg_end * end;
+} rotary_args;
+//config_rotary_get
 static struct{
 		struct arg_str *sink_name;
 		struct arg_str *pin_code;
@@ -142,7 +156,7 @@ static struct {
    struct arg_end *end;
 } squeezelite_args;

-int is_output_gpio(struct arg_int * gpio, FILE * f, int * gpio_out, bool mandatory){
+int is_gpio(struct arg_int * gpio, FILE * f, int * gpio_out, bool mandatory, bool output){
 	int res = 0;
 	const char * name = gpio->hdr.longopts?gpio->hdr.longopts:gpio->hdr.glossary;
 	*gpio_out=-1;
@@ -152,7 +166,7 @@ int is_output_gpio(struct arg_int * gpio, FILE * f, int * gpio_out, bool mandato
 			fprintf(f,"Missing: %s\n", name);
 			res++;
 		}
-	} else  if(!GPIO_IS_VALID_OUTPUT_GPIO(t_gpio)){
+	} else  if((output && !GPIO_IS_VALID_OUTPUT_GPIO(t_gpio)) || (!GPIO_IS_VALID_GPIO(t_gpio))){
 		fprintf(f,"Invalid %s gpio: [%d] %s\n",name, t_gpio, GPIO_IS_VALID_GPIO(t_gpio)?NOT_OUTPUT:NOT_GPIO );
 		res++;
 	}
@@ -161,7 +175,9 @@ int is_output_gpio(struct arg_int * gpio, FILE * f, int * gpio_out, bool mandato
 	}
 	return res;
 }
-
+int is_output_gpio(struct arg_int * gpio, FILE * f, int * gpio_out, bool mandatory){
+	return is_gpio(gpio,f,gpio_out,mandatory,true);
+}
 int check_missing_parm(struct arg_int * int_parm, FILE * f){
 	int res=0;
 	const char * name = int_parm->hdr.longopts?int_parm->hdr.longopts:int_parm->hdr.glossary;
@@ -482,6 +498,60 @@ static int do_spdif_cmd(int argc, char **argv){
 	return (nerrors==0 && err==ESP_OK)?0:1;
 }

+static int do_rotary_cmd(int argc, char **argv){
+	rotary_struct_t rotary={  .A = -1, .B = -1, .SW = -1, .longpress = 0, .knobonly=0,.volume_lock=false};
+	esp_err_t err=ESP_OK;
+	int nerrors = arg_parse(argc, argv,(void **)&rotary_args);
+	if (rotary_args.clear->count) {
+		cmd_send_messaging(argv[0],MESSAGING_WARNING,"rotary config cleared\n");
+		config_set_value(NVS_TYPE_STR, "rotary_config", "");
+		return 0;
+	}
+
+	char *buf = NULL;
+	size_t buf_size = 0;
+	FILE *f = open_memstream(&buf, &buf_size);
+	if (f == NULL) {
+		cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.\n");
+		return 1;
+	}
+	if(nerrors >0){
+		arg_print_errors(f,rotary_args.end,desc_rotary);
+		return 1;
+	}
+	nerrors+=is_gpio(rotary_args.A, f, &rotary.A, true,false);
+	nerrors+=is_gpio(rotary_args.B, f, &rotary.B, true,false);
+	nerrors+=is_gpio(rotary_args.SW, f, &rotary.SW,false,false);
+
+
+	if(rotary_args.knobonly->count>0 && (rotary_args.volume_lock->count>0 || rotary_args.longpress->count>0)){
+		fprintf(f,"error: Cannot use volume lock or longpress option when knob only option selected\n");
+		nerrors++;
+	}
+	if(rotary_args.timer->count>0 && rotary_args.timer->ival[0]<0){
+		fprintf(f,"error: knob only timer should be greater than or equal to zero.\n");
+		nerrors++;
+	}
+	else {
+		rotary.timer = rotary_args.timer->count>0?rotary_args.timer->ival[0]:0;
+	}
+	rotary.knobonly = rotary_args.knobonly->count>0;
+	rotary.volume_lock= rotary_args.volume_lock->count>0;
+	rotary.longpress = rotary_args.longpress->count>0;
+	if(!nerrors ){
+		fprintf(f,"Storing rotary parameters.\n");
+		nerrors+=(config_rotary_set(&rotary )!=ESP_OK);
+	}
+	if(!nerrors ){
+		fprintf(f,"Done.\n");
+	}
+	fflush (f);
+	cmd_send_messaging(argv[0],nerrors>0?MESSAGING_ERROR:MESSAGING_INFO,"%s", buf);
+	fclose(f);
+	FREE_AND_NULL(buf);
+	return (nerrors==0 && err==ESP_OK)?0:1;
+}
+
 static int do_i2s_cmd(int argc, char **argv)
 {
 	i2s_platform_config_t i2s_dac_pin = {
@@ -624,6 +694,23 @@ cJSON * spdif_cb(){
 		
 	return values;
 }
+cJSON * rotary_cb(){
+	cJSON * values = cJSON_CreateObject();
+	const rotary_struct_t *rotary= config_rotary_get();
+	
+	if(GPIO_IS_VALID_GPIO(rotary->A ) && rotary->A>=0 && GPIO_IS_VALID_GPIO(rotary->B) && rotary->B>=0){
+		cJSON_AddNumberToObject(values,"A",rotary->A);
+		cJSON_AddNumberToObject(values,"B",rotary->B);
+		if(GPIO_IS_VALID_GPIO(rotary->SW ) && rotary->SW>=0 ){
+			cJSON_AddNumberToObject(values,"SW",rotary->SW);
+		}
+		cJSON_AddBoolToObject(values,"volume_lock",rotary->volume_lock);
+		cJSON_AddBoolToObject(values,"longpress",rotary->longpress);
+		cJSON_AddBoolToObject(values,"knobonly",rotary->knobonly);
+		cJSON_AddNumberToObject(values,"timer",rotary->timer);
+	}
+	return values;
+}
 cJSON * audio_cb(){
 	cJSON * values = cJSON_CreateObject();
 	char * 	p = config_alloc_get_default(NVS_TYPE_STR, "jack_mutes_amp", "n", 0);
@@ -815,6 +902,27 @@ static void register_bt_source_config(void){
    ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
 }

+static void register_rotary_config(void){
+	rotary_args.rem = arg_rem("remark","One rotary encoder is supported, quadrature shift with press. Such encoders usually have 2 pins for encoders (A and B), and common C that must be set to ground and an optional SW pin for press. A, B and SW must be pulled up, so automatic pull-up is provided by ESP32, but you can add your own resistors. A bit of filtering on A and B (~470nF) helps for debouncing which is not made by software.\r\nEncoder is normally hard-coded to respectively knob left, right and push on LMS and to volume down/up/play toggle on BT and AirPlay.");
+	rotary_args.A = arg_int1(NULL,"A","gpio","A/DT gpio");
+	rotary_args.B = arg_int1(NULL,"B","gpio","B/CLK gpio");
+	rotary_args.SW = arg_int0(NULL,"SW","gpio","Switch gpio");
+	rotary_args.knobonly = arg_lit0(NULL,"knobonly","Single knob full navigation. Left, Right and Press is navigation, with Press always going to lower submenu item. Longpress is 'Play', Double press is 'Back', a quick left-right movement on the encoder is 'Pause'");
+	rotary_args.timer = arg_int0(NULL,"timer","ms","The speed of double click (or left-right) when knob only option is enabled. Be aware that the longer you set double click speed, the less responsive the interface will be. ");
+	rotary_args.volume_lock = arg_lit0(NULL,"volume_lock", "Force Volume down/up/play toggle all the time (even in LMS). ");
+	rotary_args.longpress = arg_lit0(NULL,"longpress","Enable alternate mode mode on long-press. In that mode, left is previous, right is next and press is toggle. Every long press on SW alternates between modes (the main mode actual behavior depends on 'volume').");
+	rotary_args.clear = arg_lit0(NULL, "clear", "Clear configuration");
+	rotary_args.end = arg_end(3);
+	const esp_console_cmd_t cmd = {
+        .command = CFG_TYPE_HW("rotary"),
+        .help = desc_rotary,
+        .hint = NULL,
+        .func = &do_rotary_cmd,
+        .argtable = &rotary_args
+    };
+    cmd_to_json_with_cb(&cmd,&rotary_cb);
+    ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
+}

 static void register_audio_config(void){
 	audio_args.jack_behavior = arg_str0("j", "jack_behavior","Headphones|Subwoofer","On supported DAC, determines the audio jack behavior. Selecting headphones will cause the external amp to be muted on insert, while selecting Subwoofer will keep the amp active all the time.");
@@ -828,7 +936,9 @@ static void register_audio_config(void){
    };
    cmd_to_json_with_cb(&cmd,&audio_cb);
    ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
-}static void register_spdif_config(void){
+}
+
+static void register_spdif_config(void){
 	spdif_args.clear = arg_lit0(NULL, "clear", "Clear configuration");
    spdif_args.clock = arg_int1(NULL,"clock","<n>","Clock GPIO. e.g. 33");
    spdif_args.wordselect = arg_int1(NULL,"wordselect","<n>","Word Select GPIO. e.g. 25");
@@ -891,7 +1001,12 @@ void register_config_cmd(void){
 	register_audio_config();
 //	register_squeezelite_config();
 	register_bt_source_config();
-	register_i2s_config();
-	register_spdif_config();
+	if(!is_dac_config_locked()){
+		register_i2s_config();
+	}
+	if(!is_spdif_config_locked()){
+		register_spdif_config();
+	}
+	register_rotary_config();
 }

--- a/components/platform_console/cmd_i2ctools.c
+++ b/components/platform_console/cmd_i2ctools.c
@@ -906,7 +906,7 @@ static void register_i2c_set_display(){
 	i2cdisp_args.cs = 		arg_int0("b", "cs", "<n>","SPI Only. CS GPIO (for SPI displays)");
 	i2cdisp_args.speed = 	arg_int0("s", "speed", "<n>","SPI Only. Bus Speed (Default 8000000). SPI interface can work up to 26MHz~40MHz");
 	i2cdisp_args.back = 	arg_int0("b", "back", "<n>","Backlight GPIO (if applicable)");
-	i2cdisp_args.depth = 	arg_int0("p", "depth", "1|4", "Bit Depth (only for SSD1326 displays)");
+	i2cdisp_args.depth = 	arg_int0("p", "depth", "-1|1|4", "Bit Depth (only for SSD1326 displays)");
 	i2cdisp_args.type = 	arg_str0("t", "type", "<I2C|SPI>", "Interface (default I2C)");
 	i2cdisp_args.rotate = 	arg_lit0("r", "rotate", "Rotate 180 degrees");
 	i2cdisp_args.clear = 	arg_lit0(NULL, "clear", "clear configuration and return");
--- a/components/platform_console/platform_console.c
+++ b/components/platform_console/platform_console.c
@@ -97,7 +97,8 @@ cJSON * ParmsToJSON(struct arg_hdr * * argtable){
 		ADD_TO_JSON(entry,table[tabindex],glossary);
 		ADD_TO_JSON(entry,table[tabindex],longopts);
 		ADD_TO_JSON(entry,table[tabindex],shortopts);
-		cJSON_AddBoolToObject(entry, "checkbox", (table[tabindex]->flag & ARG_HASOPTVALUE)==0 && (table[tabindex]->flag & ARG_HASVALUE)==0);
+		cJSON_AddBoolToObject(entry, "checkbox", (table[tabindex]->flag & ARG_HASOPTVALUE)==0 && (table[tabindex]->flag & ARG_HASVALUE)==0 && (table[tabindex]->longopts || table[tabindex]->shortopts) );
+		cJSON_AddBoolToObject(entry, "remark", (table[tabindex]->flag & ARG_HASOPTVALUE)==0 && (table[tabindex]->flag & ARG_HASVALUE)==0 && (!table[tabindex]->longopts && !table[tabindex]->shortopts));
 		cJSON_AddBoolToObject(entry, "hasvalue", table[tabindex]->flag & ARG_HASVALUE);
 		cJSON_AddNumberToObject(entry,"mincount",table[tabindex]->mincount);
 		cJSON_AddNumberToObject(entry,"maxcount",table[tabindex]->maxcount);
--- a/components/services/accessors.c
+++ b/components/services/accessors.c
@@ -183,6 +183,47 @@ esp_err_t config_i2c_set(const i2c_config_t * config, int port){
 	return err;
 }

+/****************************************************************************************
+ * 
+ */
+esp_err_t config_rotary_set(rotary_struct_t * config){
+	int buffer_size=512;
+	esp_err_t err=ESP_OK;
+	char * config_buffer=calloc(buffer_size,1);
+	char * config_buffer2=calloc(buffer_size,1);	
+	if(config_buffer && config_buffer2)  {
+		snprintf(config_buffer,buffer_size,"A=%i,B=%i",config->A, config->B);
+		if(config->SW >=0 ){
+			snprintf(config_buffer2,buffer_size,"%s,SW=%i",config_buffer,config->SW);
+			strcpy(config_buffer,config_buffer2);
+		}
+		if(config->knobonly){
+			strncat(config_buffer,",knobonly",buffer_size);
+			if(config->timer>0){
+				snprintf(config_buffer2,buffer_size,"%s=%i",config_buffer,config->timer);
+				strcpy(config_buffer,config_buffer2);
+			}
+		}
+		if(config->volume_lock){
+			strncat(config_buffer,",volume",buffer_size);
+		}
+		if(config->longpress){
+			strncat(config_buffer,",longpress",buffer_size);
+		}
+			log_send_messaging(MESSAGING_INFO,"Updating rotary configuration to %s",config_buffer);
+		err = config_set_value(NVS_TYPE_STR, "rotary_config", config_buffer);
+		if(err!=ESP_OK){
+			log_send_messaging(MESSAGING_ERROR,"Error: %s",esp_err_to_name(err));
+		}
+	} 
+	else {
+		err = ESP_ERR_NO_MEM;
+	}
+	FREE_AND_NULL(config_buffer);
+	FREE_AND_NULL(config_buffer2);	
+	return err;	
+}
+
 /****************************************************************************************
 * 
 */
@@ -192,7 +233,7 @@ esp_err_t config_display_set(const display_config_t * config){
 	char * config_buffer=calloc(buffer_size,1);
 	char * config_buffer2=calloc(buffer_size,1);
 	if(config_buffer && config_buffer2)  {
-		snprintf(config_buffer,buffer_size,"%s:width=%i,height=%i",config->type,config->width,config->height);
+		snprintf(config_buffer,buffer_size,"%s,width=%i,height=%i",config->type,config->width,config->height);
 		if(strcasecmp("I2C",config->type)==0){
 			if(config->address>0 ){
 				snprintf(config_buffer2,buffer_size,"%s,address=%i",config_buffer,config->address);
@@ -510,6 +551,36 @@ void parse_set_GPIO(void (*cb)(int gpio, char *value)) {
 	free(nvs_item);
 }	

+/****************************************************************************************
+ * 
+ */
+const rotary_struct_t * config_rotary_get() {
+
+	static rotary_struct_t rotary={  .A = -1, .B = -1, .SW = -1, .longpress = false, .knobonly=false,.timer=0,.volume_lock=false};
+	char *config = config_alloc_get_default(NVS_TYPE_STR, "rotary_config", NULL, 0);
+	if (config && *config) {
+		char *p;
+		
+		// parse config
+		if ((p = strcasestr(config, "A")) != NULL) rotary.A = atoi(strchr(p, '=') + 1);
+		if ((p = strcasestr(config, "B")) != NULL) rotary.B = atoi(strchr(p, '=') + 1);
+		if ((p = strcasestr(config, "SW")) != NULL) rotary.SW = atoi(strchr(p, '=') + 1);
+		if ((p = strcasestr(config, "knobonly")) != NULL) {
+			p = strchr(p, '=');
+			rotary.knobonly = true;
+			rotary.timer = p ? atoi(p + 1) : 350;
+			rotary.longpress = false;
+		} else {
+			rotary.knobonly = false;
+			rotary.timer = 0;
+			if ((p = strcasestr(config, "volume")) != NULL) rotary.volume_lock = true;
+			if ((p = strcasestr(config, "longpress")) != NULL) rotary.longpress = true;
+		}	
+		free(config);
+	}
+	return &rotary;
+}
+
 /****************************************************************************************
 *
 */
@@ -522,6 +593,17 @@ cJSON * get_gpio_entry(const char * name, const char * prefix, int gpio, bool fi
 	return entry;
 }

+/****************************************************************************************
+ *
+ */
+cJSON * add_gpio_for_value(cJSON * list,const char * name,int gpio, const char * prefix, bool fixed){
+	cJSON * llist = list?list:cJSON_CreateArray();
+	if(GPIO_IS_VALID_GPIO(gpio) && gpio>0){
+		cJSON_AddItemToArray(llist,get_gpio_entry(name,prefix,gpio,fixed));
+	}
+	return llist;
+}
+
 /****************************************************************************************
 *
 */
@@ -657,13 +739,11 @@ cJSON * get_SPDIF_GPIO(cJSON * list, bool fixed){
 */
 cJSON * get_Rotary_GPIO(cJSON * list){
 	cJSON * llist = list?list:cJSON_CreateArray();
-	char *config = config_alloc_get_default(NVS_TYPE_STR, "rotary_config", NULL, 0);
-	if(config){
-		llist = add_gpio_for_name(llist,config,"A", "rotary", false);
-		llist = add_gpio_for_name(llist,config,"B", "rotary", false);
-		llist = add_gpio_for_name(llist,config,"SW", "rotary", false);
-		free(config);	
-	}	
+
+	const rotary_struct_t *rotary= config_rotary_get();
+	add_gpio_for_value(llist,"A",rotary->A, "rotary", false);
+	add_gpio_for_value(llist,"B",rotary->B, "rotary", false);
+	add_gpio_for_value(llist,"SW",rotary->SW, "rotary", false);
 	return llist;
 }

--- a/components/services/accessors.h
+++ b/components/services/accessors.h
@@ -57,6 +57,16 @@ typedef struct {
 	gpio_with_level_t spkfault;	
 } set_GPIO_struct_t;

+typedef struct {
+	int A;
+	int B;
+	int SW;
+	bool knobonly;
+	bool volume_lock;
+	bool longpress;
+	int timer;
+} rotary_struct_t;
+
 typedef struct {
 	bool fixed;
 	char * name;
@@ -81,4 +91,6 @@ gpio_entry_t * 				get_gpio_by_name(char * name,char * group, bool refresh);
 gpio_entry_t * 				get_gpio_by_no(int gpionum, bool refresh);
 cJSON * 					get_gpio_list(bool refresh);
 bool 						is_dac_config_locked();
-bool 						are_statistics_enabled();
+bool 						are_statistics_enabled();
+const rotary_struct_t * 	config_rotary_get();
+esp_err_t 					config_rotary_set(rotary_struct_t * rotary);
--- a/components/squeezelite-ota/squeezelite-ota.c
+++ b/components/squeezelite-ota/squeezelite-ota.c
@@ -38,6 +38,8 @@
 #include "gds_text.h"
 #include "gds_draw.h"
 #include "platform_esp32.h"
+#include "lwip/sockets.h"
+

 extern const char * get_certificate();
 #define IF_DISPLAY(x) if(display) { x; }
@@ -92,6 +94,7 @@ ota_status_t * ota_status;
 struct timeval tv;
 static esp_http_client_config_t http_client_config;

+
 void _printMemStats(){
 	ESP_LOGD(TAG,"Heap internal:%zu (min:%zu) external:%zu (min:%zu)",
 			heap_caps_get_free_size(MALLOC_CAP_INTERNAL),
@@ -276,8 +279,8 @@ esp_err_t _http_event_handler(esp_http_client_event_t *evt)
 //	int data_len - data length of data
 //	void *user_data -- user_data context, from esp_http_client_config_t user_data

-//	char *header_key For HTTP_EVENT_ON_HEADER event_id, it<69>s store current http header key
-//	char *header_value For HTTP_EVENT_ON_HEADER event_id, it<69>s store current http header value
+//	char *header_key For HTTP_EVENT_ON_HEADER event_id, it<69>s store current http header key
+//	char *header_value For HTTP_EVENT_ON_HEADER event_id, it<69>s store current http header value
 // --------------
    switch (evt->event_id) {
    case HTTP_EVENT_ERROR:
@@ -630,7 +633,7 @@ void ota_task(void *pvParameter)
 				gettimeofday(&tv, NULL);
 				uint32_t elapsed_ms= (tv.tv_sec-ota_status->OTA_start.tv_sec )*1000+(tv.tv_usec-ota_status->OTA_start.tv_usec)/1000;
 				ESP_LOGI(TAG,"OTA progress : %d/%.0f (%d pct), %d KB/s", ota_status->actual_image_len, ota_status->total_image_len, ota_status->newpct, elapsed_ms>0?ota_status->actual_image_len*1000/elapsed_ms/1024:0);
-				sendMessaging(MESSAGING_INFO,"Writing binary file %%%3d.",ota_status->newpct);
+				sendMessaging(MESSAGING_INFO,"Writing binary file %3d %%.",ota_status->newpct);
 				ota_status->lastpct=ota_status->newpct;
 			}
 			taskYIELD();
@@ -659,7 +662,7 @@ void ota_task(void *pvParameter)
    	ESP_LOGI(TAG,"OTA Process completed successfully!");
    	sendMessaging(MESSAGING_INFO,"Success!");
    	IF_DISPLAY(GDS_TextLine(display, 2, GDS_TEXT_LEFT, GDS_TEXT_CLEAR | GDS_TEXT_UPDATE, "Success!"));
-    	vTaskDelay(1500/ portTICK_PERIOD_MS);  // wait here to give the UI a chance to refresh
+    	vTaskDelay(3500/ portTICK_PERIOD_MS);  // wait here to give the UI a chance to refresh
    	IF_DISPLAY(GDS_Clear(display,GDS_COLOR_BLACK));
        esp_restart();
    } else {
@@ -721,5 +724,66 @@ esp_err_t process_recovery_ota(const char * bin_url, char * bin_buffer, uint32_t
    return ESP_OK;
 }

+extern void set_lms_server_details(in_addr_t ip, u16_t hport, u16_t cport);

+in_addr_t discover_ota_server(int max) {
+	struct sockaddr_in d;
+	struct sockaddr_in s;
+	char buf[32], port_d[] = "JSON", clip_d[] = "CLIP";
+	struct pollfd pollinfo;
+	uint8_t len;
+	uint16_t hport=9000;
+	uint16_t cport=9090;
+
+	int disc_sock = socket(AF_INET, SOCK_DGRAM, 0);
+
+	socklen_t enable = 1;
+	setsockopt(disc_sock, SOL_SOCKET, SO_BROADCAST, (const void *)&enable, sizeof(enable));
+
+	len = sprintf(buf,"e%s%c%s", port_d, '\0', clip_d) + 1;
+
+	memset(&d, 0, sizeof(d));
+	d.sin_family = AF_INET;
+	d.sin_port = htons(3483);
+	d.sin_addr.s_addr = htonl(INADDR_BROADCAST);
+
+	pollinfo.fd = disc_sock;
+	pollinfo.events = POLLIN;
+
+	do {
+
+		ESP_LOGI(TAG,"sending LMS discovery");
+		memset(&s, 0, sizeof(s));
+
+		if (sendto(disc_sock, buf, len, 0, (struct sockaddr *)&d, sizeof(d)) < 0) {
+			ESP_LOGE(TAG,"error sending discovery");
+		}
+		else {
+
+			if (poll(&pollinfo, 1, 5000) == 1) {
+				char readbuf[64], *p;
+				socklen_t slen = sizeof(s);
+				memset(readbuf, 0, sizeof(readbuf));
+				recvfrom(disc_sock, readbuf, sizeof(readbuf) - 1, 0, (struct sockaddr *)&s, &slen);
+				ESP_LOGI(TAG,"got response from: %s:%d - %s", inet_ntoa(s.sin_addr), ntohs(s.sin_port),readbuf);
+
+				if ((p = strstr(readbuf, port_d)) != NULL) {
+					p += strlen(port_d);
+					hport = atoi(p + 1);
+				}
+
+				if ((p = strstr(readbuf, clip_d)) != NULL) {
+					p += strlen(clip_d);
+					cport = atoi(p + 1);
+				}
+				server_notify(s.sin_addr.s_addr, hport, cport);
+			}
+		}
+
+	} while (s.sin_addr.s_addr == 0 && (!max || --max));
+
+	closesocket(disc_sock);
+
+	return s.sin_addr.s_addr;
+}

--- a/components/squeezelite-ota/squeezelite-ota.h
+++ b/components/squeezelite-ota/squeezelite-ota.h
@@ -31,4 +31,4 @@ const char * ota_get_status();
 uint8_t ota_get_pct_complete();

 esp_err_t start_ota(const char * bin_url, char * bin_buffer, uint32_t length);
-
+in_addr_t discover_ota_server(int max);
--- a/components/squeezelite/external/dac_external.c
+++ b/components/squeezelite/external/dac_external.c
@@ -39,7 +39,7 @@ static bool init(char *config, int i2c_port_num, i2s_config_t *i2s_config) {
 	char *p;	
 	
 	i2c_addr = adac_init(config, i2c_port_num);
-	if (!i2c_addr) return false;
+	if (!i2c_addr) return true;
 	
 	ESP_LOGI(TAG, "DAC on I2C @%d", i2c_addr);
 	
--- a/components/squeezelite/helix-aac.c
+++ b/components/squeezelite/helix-aac.c
@@ -152,20 +152,28 @@ static int read_mp4_header(unsigned long *samplerate_p, unsigned char *channels_
 				return -1;
 			}
 			int desc_len = mp4_desc_length(&ptr);
-			info.profile = *ptr >> 3;
+			int AOT = *ptr >> 3;
+			info.profile = AAC_PROFILE_LC;
 			info.sampRateCore = (*ptr++ & 0x07) << 1;
 			info.sampRateCore |= (*ptr >> 7) & 0x01;
 			info.sampRateCore = rates[info.sampRateCore];								
-			info.nChans = (*ptr++ & 0x7f) >> 3;
-			*channels_p = info.nChans;						
-			if (desc_len > 2 && ((ptr[0] << 3) | (ptr[1] >> 5)) == 0x2b7 && (ptr[1] & 0x1f) == 0x05 && (ptr[2] & 0x80)) {
-				*samplerate_p = rates[(ptr[2] & 0x78) >> 3];
-				LOG_WARN("AAC SBR mode activated => high CPU consumption expected, please use LMS proxy to mitigate");						
-			} else {
+			info.nChans = (*ptr & 0x7f) >> 3;
+			*channels_p = info.nChans;				
+			// Note that 24 bits frequencies are not handled	
+			if (AOT == 5 || AOT == 29) {
+				*samplerate_p = rates[((ptr[0] & 0x03) << 1) | (ptr[1] >> 7)];
+				LOG_WARN("AAC stream with SBR => high CPU required (use LMS proxied mode)");									
+			} else if (desc_len > 2 && ((ptr[1] << 3) | (ptr[2] >> 5)) == 0x2b7 && (ptr[2] & 0x1f) == 0x05 && (ptr[3] & 0x80)) {
+				*samplerate_p = rates[(ptr[3] & 0x78) >> 3];
+				LOG_WARN("AAC stream with extended SBR => high CPU required (use LMS proxied mode)");									
+			} else if (AOT == 2) {
 				*samplerate_p = info.sampRateCore;
+			} else {	
+				*samplerate_p = 44100;
+				LOG_ERROR("AAC audio object type %d not handled", AOT);									
 			}	
 			HAAC(a, SetRawBlockParams, a->hAac, 0, &info); 
-			LOG_DEBUG("playable aac track: %u (p:%x, r:%d, c:%d)", trak, info.profile, info.sampRateCore, info.nChans);
+			LOG_DEBUG("playable aac track: %u (p:%x, r:%d, c:%d, desc_len:%d)", trak, AOT, info.sampRateCore, info.nChans, desc_len);
 			play = trak;
 		}

--- a/components/squeezelite/squeezelite.h
+++ b/components/squeezelite/squeezelite.h
@@ -24,7 +24,7 @@

 // make may define: PORTAUDIO, SELFPIPE, RESAMPLE, RESAMPLE_MP, VISEXPORT, GPIO, IR, DSD, LINKALL to influence build

-#define MAJOR_VERSION "0"
+#define MAJOR_VERSION "1"
 #define MINOR_VERSION "0"
 #define MICRO_VERSION ""

--- a/components/tools/platform_esp32.h
+++ b/components/tools/platform_esp32.h
@@ -33,3 +33,4 @@ extern void console_start();
 extern pthread_cond_t wifi_connect_suspend_cond;
 extern pthread_t wifi_connect_suspend_mutex;

+extern void (*server_notify)(in_addr_t ip, uint16_t hport, uint16_t cport);
--- a/components/wifi-manager/webapp/.eslintcache
+++ b/components/wifi-manager/webapp/.eslintcache
@@ -1 +1 @@
-[{"C:\\Users\\sle11\\Documents\\VSCode\\squeezelite-esp32\\components\\wifi-manager\\webapp\\src\\js\\test.js":"1","C:\\Users\\sle11\\Documents\\VSCode\\squeezelite-esp32\\components\\wifi-manager\\webapp\\src\\js\\custom.js":"2"},{"size":4775,"mtime":1608244817341,"results":"3","hashOfConfig":"4"},{"size":52524,"mtime":1608525668984,"results":"5","hashOfConfig":"4"},{"filePath":"6","messages":"7","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"8"},"1lj4yrw",{"filePath":"9","messages":"10","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"C:\\Users\\sle11\\Documents\\VSCode\\squeezelite-esp32\\components\\wifi-manager\\webapp\\src\\js\\test.js",[],[],"C:\\Users\\sle11\\Documents\\VSCode\\squeezelite-esp32\\components\\wifi-manager\\webapp\\src\\js\\custom.js",[]]
+[{"C:\\Users\\sle11\\Documents\\VSCode\\squeezelite-esp32\\components\\wifi-manager\\webapp\\src\\js\\test.js":"1","C:\\Users\\sle11\\Documents\\VSCode\\squeezelite-esp32\\components\\wifi-manager\\webapp\\src\\js\\custom.js":"2"},{"size":4775,"mtime":1608244817341,"results":"3","hashOfConfig":"4"},{"size":61704,"mtime":1618438544167,"results":"5","hashOfConfig":"4"},{"filePath":"6","messages":"7","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"8"},"1275pne",{"filePath":"9","messages":"10","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"C:\\Users\\sle11\\Documents\\VSCode\\squeezelite-esp32\\components\\wifi-manager\\webapp\\src\\js\\test.js",[],[],"C:\\Users\\sle11\\Documents\\VSCode\\squeezelite-esp32\\components\\wifi-manager\\webapp\\src\\js\\custom.js",[]]
--- a/components/wifi-manager/webapp/.vscode/tasks.json
+++ b/components/wifi-manager/webapp/.vscode/tasks.json
@@ -1,42 +1,63 @@
 {
    "version": "2.0.0",
    "tasks": [
-        // {
-        //     "label": "build",
-        //     "command": "webpack --config webpack/webpack.prod.js",
-        //     "type": "shell",
-        //     "group": { "kind": "build", "isDefault": true },
-        //     "isBackground": true
-        // },
-          
-        {
-            "type": "npm",
-            "label": "webpack: dev server",
-            "script": "dev",
-            "promptOnClose": true,
-            "isBackground": true,
-            "problemMatcher": {
-              "owner": "webpack",
-              "severity": "error",
-              "fileLocation": "absolute",
-              "pattern": [
-                {
-                  "regexp": "ERROR in (.*)",
-                  "file": 1
-                },
-                {
-                  "regexp": "\\((\\d+),(\\d+)\\):(.*)",
-                  "line": 1,
-                  "column": 2,
-                  "message": 3
-                }
-              ],
-              "background": {
-                "activeOnStart": true,
-                "beginsPattern": "Compiling\\.\\.\\.",
-                "endsPattern": "Compiled successfully\\."
-              }
+      {
+        "type": "npm",
+        "label": "webpack: dev server",
+        "script": "dev",
+        "promptOnClose": true,
+        "isBackground": true,
+        "problemMatcher": {
+          "owner": "webpack",
+          "severity": "error",
+          "fileLocation": "absolute",
+          "pattern": [
+            {
+              "regexp": "ERROR in (.*)",
+              "file": 1
+            },
+            {
+              "regexp": "\\((\\d+),(\\d+)\\):(.*)",
+              "line": 1,
+              "column": 2,
+              "message": 3
            }
-          }        
+          ],
+          "background": {
+            "activeOnStart": true,
+            "beginsPattern": "Compiling\\.\\.\\.",
+            "endsPattern": "Compiled successfully\\."
+          }
+        }
+      },
+      {
+        "type": "npm",
+        "label": "webpack: build",
+        "script": "build",
+        "promptOnClose": true,
+        "isBackground": true,
+        "problemMatcher": {
+          "owner": "webpack",
+          "severity": "error",
+          "fileLocation": "absolute",
+          "pattern": [
+            {
+              "regexp": "ERROR in (.*)",
+              "file": 1
+            },
+            {
+              "regexp": "\\((\\d+),(\\d+)\\):(.*)",
+              "line": 1,
+              "column": 2,
+              "message": 3
+            }
+          ],
+          "background": {
+            "activeOnStart": true,
+            "beginsPattern": "Compiling\\.\\.\\.",
+            "endsPattern": "Compiled successfully\\."
+          }
+        }
+      }
    ]
 }
--- a/components/wifi-manager/webapp/mock/config.json
+++ b/components/wifi-manager/webapp/mock/config.json
@@ -338,6 +338,11 @@
 			"type": 33,
 			"value": "D",
 			"chg": false
+		},
+		"rel_api": {
+			"type": 33,
+			"value": "https://api.github.com/repos/sle118/squeezelite-esp32/releases",
+			"chg": false
 		}
-	}
+  	}
 }
--- a/components/wifi-manager/webapp/mock/messages.json
+++ b/components/wifi-manager/webapp/mock/messages.json
@@ -67,7 +67,14 @@
 		"sent_time":	6245,
 		"current_time":	6364
 	}, {
-		"message":	"[{\n\t\t\"name\":\t\"SMSL BT4.2\",\n\t\t\"rssi\":\t-129\n\t}]",
+		"message":	"[{\n\t\t\"name\":\t\"BOSE BT\",\n\t\t\"rssi\":\t-129\n\t}]",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_BT",
+		"sent_time":	6259,
+		"current_time":	6364
+	}
+	, {
+		"message":	"[{\n\t\t\"name\":\t\"BOSE2 BT\",\n\t\t\"rssi\":\t-50\n\t}]",
 		"type":	"MESSAGING_INFO",
 		"class":	"MESSAGING_CLASS_BT",
 		"sent_time":	6259,
--- a/components/wifi-manager/webapp/mock/messages_ota.json
+++ b/components/wifi-manager/webapp/mock/messages_ota.json
@@ -0,0 +1,123 @@
+[
+	{
+		"message":	"Save Success",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_SYSTEM",
+		"sent_time":	14084,
+		"current_time":	16958
+	}, {
+		"message":	"{\"ota_dsc\":\"Initializing...\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	14110,
+		"current_time":	16958
+	}, {
+		"message":	"{\"ota_dsc\":\"Starting OTA...\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	14146,
+		"current_time":	16958
+	}, {
+		"message":	"{\"ota_dsc\":\"Downloading firmware\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	15208,
+		"current_time":	16958
+	},
+	{
+		"message":	"{\"ota_dsc\":\"Download success\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	18825,
+		"current_time":	22219
+	}, {
+		"message":	"{\"ota_dsc\":\"New version is : mock version \",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	18849,
+		"current_time":	22220
+	}, {
+		"message":	"{\"ota_dsc\":\"Formatting OTA partition\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	18850,
+		"current_time":	22220
+	}, {
+		"message":	"{\"ota_dsc\":\"Erasing flash (1/11)\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	22217,
+		"current_time":	22220
+	},
+	{
+		"message":	"{\"ota_dsc\":\"Erasing flash (5/11)\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	29896,
+		"current_time":	29902
+	},
+	{
+		"message":	"{\"ota_dsc\":\"Erasing flash (7/11)\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	33395,
+		"current_time":	33408
+	},
+	{
+		"message":	"{\"ota_dsc\":\"Erasing flash (9/11)\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	36843,
+		"current_time":	54597
+	}, {
+		"message":	"{\"ota_dsc\":\"Erasing flash complete.\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	39463,
+		"current_time":	54597
+	}, {
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":5}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	41862,
+		"current_time":	54597
+	}, {
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":10}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	44003,
+		"current_time":	54597
+	}, {
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":40}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	56678,
+		"current_time":	65185
+	},  {
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":70}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	69407,
+		"current_time":	77858
+	}, {
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":95}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	80010,
+		"current_time":	82592
+	}, {
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":100}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	82084,
+		"current_time":	82592
+	},
+	{
+		"message":	"{\"ota_dsc\":\"Success!\",\"ota_pct\":100}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	119255,
+		"current_time":	121838
+	}
+
+	]
--- a/components/wifi-manager/webapp/mock/messages_ota_fail.json
+++ b/components/wifi-manager/webapp/mock/messages_ota_fail.json
@@ -0,0 +1,21 @@
+[{
+		"message":	"{\"ota_dsc\":\"Initializing...\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	119203,
+		"current_time":	121837
+	}, {
+		"message":	"{\"ota_dsc\":\"Starting OTA...\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	119255,
+		"current_time":	121838
+	},
+	{
+		"message":	"{\"ota_dsc\":\"Error: Failed to execute HTTP download. ERROR\",\"ota_pct\":0}",
+		"type":	"MESSAGING_ERROR",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	121954,
+		"current_time":	124911
+	}
+	]
--- a/components/wifi-manager/webapp/mock/messages_ota_flash.json
+++ b/components/wifi-manager/webapp/mock/messages_ota_flash.json
@@ -0,0 +1,117 @@
+[
+	{
+		"message":	"{\"ota_dsc\":\"Initializing...\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	14110,
+		"current_time":	16958
+	}, {
+		"message":	"{\"ota_dsc\":\"Starting OTA...\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	14146,
+		"current_time":	16958
+	}, {
+		"message":	"{\"ota_dsc\":\"New version is : mock version \",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	18849,
+		"current_time":	22220
+	}, {
+		"message":	"{\"ota_dsc\":\"Formatting OTA partition\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	18850,
+		"current_time":	22220
+	}, {
+		"message":	"{\"ota_dsc\":\"Erasing flash (1/11)\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	22217,
+		"current_time":	22220
+	},
+	{
+		"message":	"{\"ota_dsc\":\"Erasing flash (5/11)\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	29896,
+		"current_time":	29902
+	},
+	{
+		"message":	"{\"ota_dsc\":\"Erasing flash (7/11)\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	33395,
+		"current_time":	33408
+	},
+	{
+		"message":	"{\"ota_dsc\":\"Erasing flash (9/11)\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	36843,
+		"current_time":	54597
+	}, {
+		"message":	"{\"ota_dsc\":\"Erasing flash complete.\",\"ota_pct\":0}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	39463,
+		"current_time":	54597
+	}, {
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":5}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	41862,
+		"current_time":	54597
+	}, {
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":25}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	50307,
+		"current_time":	54598
+	}, {
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":30}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	52455,
+		"current_time":	54598
+	},
+	{
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":35}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	54603,
+		"current_time":	65184
+	}, {
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":55}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	63042,
+		"current_time":	65185
+	},
+	{
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":60}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	65190,
+		"current_time":	77858
+	}, {
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":95}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	80010,
+		"current_time":	82592
+	}, {
+		"message":	"{\"ota_dsc\":\"Writing binary file\",\"ota_pct\":100}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	82084,
+		"current_time":	82592
+	},
+	{
+		"message":	"{\"ota_dsc\":\"Success!\",\"ota_pct\":100}",
+		"type":	"MESSAGING_INFO",
+		"class":	"MESSAGING_CLASS_OTA",
+		"sent_time":	119255,
+		"current_time":	121838
+	}
+	]
--- a/components/wifi-manager/webapp/mock/status.json
+++ b/components/wifi-manager/webapp/mock/status.json
@@ -1,6 +1,6 @@
 {
-	"project_name": "dev-server",
-	"version": "webpack",
+	"project_name": "SqueezeAMP",
+	"version": "local.500.cmake-master",
 	"recovery": 1,
 	"Jack": "1",
 	"Voltage": 0,
@@ -16,6 +16,11 @@
 	"netmask": "255.255.255.0",
 	"gw": "192.168.10.1",
 	"lms_cport": 9090,
-	"lms_port": 9000,
-	"lms_ip": "127.0.0.1"
+	"lms_port": 9100,
+	"lms_ip": "127.0.0.1",
+	"platform_name": "SqueezeAmp",
+	"mock_plugin_has_proxy": "x",
+	"mock_fail_fw_update":"",
+	"mock_fail_recovery":"",
+	"mock_old_recovery":""
 }
--- a/components/wifi-manager/webapp/package.json
+++ b/components/wifi-manager/webapp/package.json
@@ -38,6 +38,7 @@
    "popper": "^1.0.1",
    "react": "^17.0.1",
    "remixicon": "^2.5.0",
+    "string-argv": "^0.3.1",
    "stylelint-config-standard": "^20.0.0",
    "svgo": "^1.3.2",
    "webpack-icons-installer": "^2.0.0"
--- a/components/wifi-manager/webapp/src/index.ejs
+++ b/components/wifi-manager/webapp/src/index.ejs
@@ -8,16 +8,16 @@
 	<title>SqueezeESP32</title>

 </head>
- 
-<body>
+
+<body class="d-flex flex-column">
 	<div style="display:none">
-        <% if (htmlWebpackPlugin.files.sprites) { %>
-            <% for (var spriteFileName in htmlWebpackPlugin.files.sprites) { %>
-              <%= htmlWebpackPlugin.files.sprites[spriteFileName] %>
-            <% } %>
-          <% }  %>
-        </div>          
-	<nav class="navbar navbar-expand-sm navbar-dark bg-primary" id="mainnav">
+		<% if (htmlWebpackPlugin.files.sprites) { %>
+			<% for (var spriteFileName in htmlWebpackPlugin.files.sprites) { %>
+				<%= htmlWebpackPlugin.files.sprites[spriteFileName] %>
+					<% } %>
+						<% } %>
+	</div>
+	<header class="navbar navbar-expand-sm navbar-dark  bg-primary sticky-top border-bottom border-dark" id="mainnav">
 		<a class="navbar-brand" id="navtitle" href="#">SqueezeESP32</a>
 		<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
 			aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
@@ -26,11 +26,11 @@
 		<div class="collapse navbar-collapse" id="navbarSupportedContent">
 			<ul class="nav navbar-nav mr-auto">
 				<li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#tab-wifi">WiFi</a></li>
-				<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-syslog">Status<span
+				<li class="nav-item omsg"><a class="nav-link" data-toggle="tab" href="#tab-syslog">Status<span
 							class="badge badge-pill badge-success" id="msgcnt"></span></a></li>
-				<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-cfg-audio">Audio</a></li>
-				<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-cfg-syst">System</a></li>
-				<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-cfg-hw">Hardware</a></li>
+				<li class="nav-item orec"><a class="nav-link" data-toggle="tab" href="#tab-cfg-audio">Audio</a></li>
+				<li class="nav-item orec"><a class="nav-link" data-toggle="tab" href="#tab-cfg-syst">System</a></li>
+				<li class="nav-item orec"><a class="nav-link" data-toggle="tab" href="#tab-cfg-hw">Hardware</a></li>
 				<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-cfg-fw">Updates</a></li>
 				<div class="dropdown-divider"></div>
 				<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-nvs">NVS Editor</a></li>
@@ -40,19 +40,19 @@

 		</div>
 		<div class="info navbar-right" style="display: inline-flex;">
-			<svg class="recovery_element bg-primary" style="fill:orange; width:1.5rem; height: 1.5rem;">
+			<svg class="recovery_element " style="fill:orange; width:1.5rem; height: 1.5rem;">
 				<use xlink:href="#device-recover-fill"></use>
 			</svg>

 			<svg style="fill:white; width:1.5rem; height: 1.5rem;">
 				<use id="battery" xlink:href="#battery-fill"></use>
 			</svg>
-			<svg  id="o_jack"  style="fill:white; width:1.5rem; height: 1.5rem;">
-				<use  xlink:href="#headphone-fill"></use>
+			<svg id="o_jack" style="fill:white; width:1.5rem; height: 1.5rem;">
+				<use xlink:href="#headphone-fill"></use>
+			</svg>
+			<svg style="fill:white; width:1.5rem; height: 1.5rem;">
+				<use id="o_bt" xlink:href="#bluetooth-fill"></use>
 			</svg>
-			<svg   style="fill:white; width:1.5rem; height: 1.5rem;">
-				<use id="o_bt"   xlink:href="#bluetooth-fill"></use>
-			</svg>	
 			<span data-toggle="tooltip" id="o_type" data-placement="top" title=""><svg
 					xmlns="http://www.w3.org/2000/svg" id="output" width="24" height="24" viewBox="0 0 24 24">
 					<g id="o_i2s" display="none">
@@ -70,370 +70,440 @@
 							d="M3 14L3 15L3 16L3 17L3 18L3 19L3 20L3 21L3 22L4 22L5 22L6 22L7 22L7 21L8 21L8 20L9 20L9 19L9 18L9 17L9 16L8 16L8 15L7 15L7 14L6 14L5 14L3 14z" />
 					</g>
 				</svg></span>
-				<svg   style="fill:white; width:1.5rem; height: 1.5rem;">
-					<use id="wifiStsIcon"   xlink:href="#signal-wifi-fill"></use>
-				</svg>	
-				
+			<svg style="fill:white; width:1.5rem; height: 1.5rem;">
+				<use id="wifiStsIcon" xlink:href="#signal-wifi-fill"></use>
+			</svg>
+


 		</div>
-	</nav>
-	<div id="message"></div>
-	<div id="content">
-		<div id="myTabContent" class="tab-content mt-3">
+	</header>
+	<main role="main" class="flex-grow mt-1 mb-12" style="margin-bottom: 7rem;" id="content">
+		<!-- Button trigger modal -->
+  
+  <!-- Modal -->
+  <div class="modal fade" id="otadiv" tabindex="-1" role="dialog" aria-labelledby="fwProgressLabel" aria-hidden="true">
+	<div class="modal-dialog" role="document">
+	  <div class="modal-content">
+		<div class="modal-header">
+		  <h5 class="modal-title" id="fwProgressLabel">Upgrade Progress</h5>
+		  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+			<span aria-hidden="true">&times;</span>
+		  </button>
+		</div>
+		<div class="modal-body">
+			<span id="flash-status"></span>
+			<div class="progress" id="progress">
+				<div class="progress-bar" role="progressbar" aria-valuemin="0" aria-valuemax="100" style="width:0%">
+					0%
+				</div>
+			</div>
+		</div>
+		<div class="modal-footer">
+		  <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+		</div>
+	  </div>
+	</div>
+  </div>
+		
+		<div id="myTabContent" class="tab-content">
+
 			<div class="tab-pane fade" id="tab-cfg-hw"></div>
 			<div class="tab-pane fade" id="tab-cfg-syst"></div>
 			<div class="tab-pane fade" id="tab-cfg-gen"></div>
 			<div class="tab-pane fade" id="tab-cfg-fw">
-				<div id="boot-div">
-					<form id="boot-form" action="/recovery.json" method="post" target="dummyframe">
-						<button id="boot-button" type="submit" class="btn btn-primary">Recovery</button>
-					</form>
-				</div>
-				<h1>Check for firmware upgrade</h1>
-				<div class="buttons">
-					<input type="button" id="fwcheck" class="btn btn-info" value="Check for updates" />
-				</div>
-				<div id="searchfw" class="form-group">
-					<select class="custom-select" id="fwbranch">
-						<option selected="">Choose FW branch</option>
-					</select>
-					<input class="form-control form-control-sm" id="searchinput" type="text"
-						placeholder="search releases" id="inputSmall">
-				</div>
-				<table class="table table-hover">
-					<thead>
-						<tr>
-							<th scope="col">Firmware version</th>
-							<th scope="col">Release date/time</th>
-							<th scope="col">HW platform</th>
-							<th scope="col">IDF version</th>
-							<th scope="col">Branch</th>
-							<th scope="col">Flash this FW</th>
-						</tr>
-					</thead>
-					<tbody id="releaseTable">
-					</tbody>
-				</table>
-				<h2>Firmware URL:</h2>
-				<textarea id="fwurl" maxlength="1000"></textarea>
-				<div class="buttons">
-					<input type="button" id="flash" class="btn btn-danger" value="Flash!" /><span
-						id="flash-status"></span>
-				</div>
-				<div id="uploaddiv" class="recovery_element">
-					<p>OR</p>
-					<div class="form-group">
-						<input type="file" class="form-control-file" id="flashfilename" aria-describedby="fileHelp">
-						<div class="buttons">
-							<button type="button" class="btn btn-danger" id="fwUpload">Upload!</button>
-						</div>
-					</div>
-				</div>
-				<div id="otadiv" class="recovery_element">
-					<div class="progress" id="progress">
-						<div class="progress-bar" role="progressbar" aria-valuemin="0" aria-valuemax="100"
-							style="width:0%">
-							0%
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="tab-pane fade" id="tab-nvs">
-				<table class="table table-hover">
-					<thead>
-						<tr>
-							<th scope="col">Key</th>
-							<th scope="col">Value</th>
-						</tr>
-					</thead>
-					<tbody id="nvsTable">
-					</tbody>
-				</table>
-				<div class="buttons">
-					<div id="boot-div">
-						<form id="reboot-form" action="/reboot.json" method="post" target="dummyframe">
-							<button id="reboot-button" type="submit" class="btn btn-primary">Reboot</button>
-						</form>
-					</div>
-					<input id="save-nvs" type="button" class="btn btn-success" value="Commit">
-					<input id="save-as-nvs" type="button" class="btn btn-success" value="Download config">
-					<input id="load-nvs" type="button" class="btn btn-success" value="Load File">
-					<input aria-describedby="fileHelp" onchange="onChooseFile(event, onFileLoad.bind(this))"
-						id="nvsfilename" type="file" style="display:none">
-				</div>
-			</div>
-
-			<div class="tab-pane fade" id="tab-cfg-audio">
-				<div class="card text-white bg-primary mb-3">
-					<div class="card-header">Usage Templates</div>
+				
+				<div class="card text-white  mb-3">
+					<div class="card-header">Software Updates</div>
 					<div class="card-body">
-						<fieldset>
-							<fieldset class="form-group" id="output-tmpl">
-								<legend>Output</legend>
-								<div class="form-check">
-									<label class="form-check-label">
-										<input type="radio" class="form-check-input" name="output-tmpl" id="i2s">
-										I2S Dac
-									</label>
-								</div>
-								<div class="form-check">
-									<label class="form-check-label">
-										<input type="radio" class="form-check-input" name="output-tmpl" id="spdif">
-										SPDIF
-									</label>
-								</div>
-								<div class="form-check">
-									<label class="form-check-label">
-										<input type="radio" class="form-check-input" name="output-tmpl" id="bt">
-										Bluetooth
-									</label>
-								</div>
-							</fieldset>
-							<div class="form-group"><label for="player">Player Name</label><input type="text"
-									class="form-control " placeholder="Squeezelite" id="player"></div>
-							<div class="form-group"><label for="optional">Optional setting (e.g. for LMS IP
-									address)</label><input type="text" class="form-control" id="optional"></div>
-							<div class="form-group">
-								<div class="form-check">
-									<label class="form-check-label">
-										<input class="form-check-input" type="checkbox" id="disable-squeezelite"
-											value="" checked="">
-										Disable Squeezelite
-									</label>
-								</div>
-							</div>
-							<div class="toast show" role="alert" aria-live="assertive" aria-atomic="true"
-								style="display: none;" id="toast_cfg-audio-tmpl">
-								<div class="toast-header"><strong class="mr-auto">Result</strong><button type="button"
-										class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close"
-										onclick="hideSurrounding(this)"><span aria-hidden="true">×</span></button></div>
-								<div class="toast-body" id="msg_cfg-audio-tmpl"></div>
-							</div>
-							<button id="save-autoexec1" type="submit" class="btn btn-info" cmdname="cfg-audio-tmpl"
-								onclick="saveAutoexec1(false)">Save</button>
-							<button id="commit-autoexec1" type="submit" class="btn btn-warning" cmdname="cfg-audio-tmpl"
-								onclick="saveAutoexec1(true)">Apply</button>
-						</fieldset>
-					</div>
-				</div>
-			</div>
-			<div class="tab-pane fade active show" id="tab-wifi">
-				<div class="card text-white bg-primary mb-3">
-					<div class="card-header">WiFi Status</div>
-					<div class="card-body">
-						<table class="table table-hover">
+						<table class="table table-hover table-striped table-dark">
 							<thead>
 								<tr>
-									<th scope="col">Joined</th>
-									<th scope="col">Name</th>
-									<th scope="col">Signal</th>
-									<th scope="col">Security</th>
+									<th class="border-bottom-0 pb-0" scope="col">Version</th>
+									<th class="border-bottom-0 pb-0" scope="col">Date/Time</th>
+									<th class="border-bottom-0 pb-0" scope="col">Platform</th>
+									<th class="border-bottom-0 pb-0" scope="col">Branch</th>
+									<th class="border-bottom-0 pb-0" scope="col">Bit Depth</th>
+								</tr>
+								<tr>
+									<th class="border-top-0 pt-0" scope="col"><input class="form-control-sm upSrch"
+											id="svrs" type="text" placeholder="search releases"></th>
+									<th class="border-top-0 pt-0" scope="col"></th>
+									<th class="border-top-0 pt-0" scope="col"><input class="form-control-sm  upSrch"
+											id="splf" type="text" placeholder="search platform"></th>
+									<th class="border-top-0 pt-0" scope="col"><select class="form-control-sm  upSrch"
+											id="fwbranch">
+											<option selected="">Choose FW branch</option>
+										</select>
+									<th class="border-top-0 pt-0" scope="col"><input class="form-control-sm upSrch"
+											id="bits" type="text" placeholder="search bit depth"></th>
+									</th>
 								</tr>
 							</thead>
-							<tbody id="wifiTable"></tbody>
+							<tbody id="rTable"></tbody>
 						</table>
-						<button type="button" id="updateAP" class="btn btn-info btn-sm">Scan</button>
+
+						<div class="form-group row">
+							<div class="col-auto">
+								<button type="button" id="chkUpdates" class="btn btn-info btn-sm">Check for
+									updates</button>
+							</div>
+							<label class="col-auto col-form-label" for="fw-url-input">Firmware URL</label>
+							<div class="col">
+								<input type="text" class="form-control"
+									placeholder="select entry from list or enter known url" id="fw-url-input">
+							</div>
+							<div class="col-auto">
+								<button type="button" id='start-flash' data-toggle="modal" data-target="#uCnfrm"
+									class="btn btn-warning btn-sm" style="display: none;">Flash Firmware</button>
+							</div>
+							
+							<div class="col-auto">
+								<button class="btn-warning ota_element" type="submit" onclick="handleReboot('recovery');" >Recovery</button>
+							</div>
+						</div>

 					</div>
-					<div class="modal" id="WiFiDisconnectConfirm">
-						<div class="modal-dialog modal-dialog-centered" role="document">
-							<div class="modal-content">
-								<div class="modal-header">
-									<h5 class="modal-title">Disconnect</h5>
-									<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-										<span aria-hidden="true">&times;</span>
-									</button>
-								</div>
-								<div class="modal-body">
-									<p>Disconnect from network? After disconnecting, the system won't be accessible from the current address and will expose itself as access point name <span id="apName"></span> with password <span id="apPass"></span>  </p>
-								</div>
-								<div class="modal-footer connecting-success connecting-status">
-									<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-									<button type="button" class="btn btn-warning" data-dismiss="modal"
-										onclick="handleDisconnect();">Ok</button>
-								</div>
+				</div>
+				<div class="modal" id="uCnfrm">
+					<div class="modal-dialog modal-dialog-centered" role="document">
+						<div class="modal-content">
+							<div class="modal-header">
+								<h5 class="modal-title">Firmware Flash</h5>
+								<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+									<span aria-hidden="true">&times;</span>
+								</button>
+							</div>
+							<div class="modal-body">
+								<p>Flash URL <span id="selectedFWURL" class="text-break"></span> to device?</p>
+							</div>
+							<div class="modal-footer  ">
+								<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+								<button type="button" class="btn btn-warning" data-dismiss="modal"
+									onclick="hFlash();">Ok</button>
 							</div>
 						</div>
 					</div>
-					<div class="modal" id="WifiConnectDialog">
-						<div class="modal-dialog modal-dialog-centered" role="document">
-							<div class="modal-content">
-								<div class="modal-header">
-									<h5 class="modal-title connecting connecting-init connecting-fail">Connect to WiFi</h5>
-									<h5 class="modal-title connecting-status connecting-success">Status</h5>
-									<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-										<span aria-hidden="true">&times;</span>
-									</button>
+				</div>
+				<div class="card text-white mb-3" >
+					<div class="card-header">Local Firmware Upload</div>
+					<div class="card-body">
+							<div id="uploaddiv" class="form-group row">
+									<label for="flashfilename" class="col-auto col-form-label">Local File</label>
+									<div class="col">
+										<input type="file" class="form-control-file" id="flashfilename" aria-describedby="fileHelp">
 								</div>
-								<div class="modal-body">
-									<fieldset class="connecting-init connecting-fail">
-										<div class="form-group"><label for="manual_ssid">Wifi Name</label><input
-												type="text" class="form-control" placeholder="Enter Name"
-												id="manual_ssid"></div>
-										<div class="form-group"><label for="manual_pwd">Password</label><input
-												type="password" class="form-control" placeholder="Enter Name"
-												id="manual_pwd"></div>
-									</fieldset>
-									<div id="connect-wait" class="connecting">
-										<div>Connecting to <span id="ssid-wait"></span> </div>
-									<div>
-												You may lose wifi access while the esp32 recalibrates
-													its radio. Please
-													wait until your device automatically reconnects. This can take up to
-													30s.
-												</div>
-									</div>
-									<div id="connect-success" class="connecting-success connecting-status">
-										<div> Connected to Access Point : <span id="connectedToSSID"></span></div>
-										<div> Device IP address : <span id="ipAddress"></span></div>
-										<div>Subnet Mask:<span id="netmask"></span></div>
-										<div>Default Gateway:<span id="gateway"></span></div>
-									</div>
-									<div id="connect-fail" class="connecting-fail">
-										<h3 class="text-error">Connection failed</h3>
-										<p >Please double-check wifi password if any and make sure the access point has good signal.</p>
+								<div class="col-auto">
+									<div class="buttons">
+										<button type="button" class="btn btn-danger" id="fwUpload">Upload!</button>
 									</div>
 								</div>
-								<div class="modal-footer ">
-									<button type="button" class="btn btn-secondary connecting-init connecting-fail connecting" data-dismiss="modal">Close</button>
-									<button type="button" id="btnJoin" class="btn btn-primary connecting-init connecting-fail"
-										onclick="handleConnect();">Join</button>
-									<button type="button" class="connecting btn btn-primary" disabled>
-										<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
-											<span class="sr-only">Connecting...</span></button>
-								</div>
-
-								<div class="modal-footer connecting-success connecting-status">
-									<button type="button" class="btn btn-warning" data-toggle="modal"
-										data-dismiss="modal" data-target="#WiFiDisconnectConfirm">Disconnect</button>
-									<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-								</div>
-
 							</div>
-						</div>
 					</div>
+				</div>
+			</div>
+		

-				</div>
+
+
+		<div class="tab-pane fade" id="tab-nvs">
+			<table class="table table-hover">
+				<thead>
+					<tr>
+						<th scope="col">Key</th>
+						<th scope="col">Value</th>
+					</tr>
+				</thead>
+				<tbody id="nvsTable">
+				</tbody>
+			</table>
+			<div class="buttons">
+				<button button id="reboot-button"  class="btn btn-primary" style="float:right" type="submit" onclick="handleReboot('reboot');" >Reboot</button>
+				
+				<input id="save-nvs" type="button" class="btn btn-success" value="Commit">
+				<input id="save-as-nvs" type="button" class="btn btn-success" value="Download config">
+				<input id="load-nvs" type="button" class="btn btn-success" value="Load File">
+				<input aria-describedby="fileHelp" onchange="onChooseFile(event, onFileLoad.bind(this))"
+					id="nvsfilename" type="file" style="display:none">
 			</div>
-			<div class="tab-pane fade " id="tab-commands">
-				<fieldset id="commands-list"></fieldset>
-			</div>
-			<!-- Status -->
-			<div class="tab-pane fade " id="tab-syslog">
-				<div class="card border-primary mb-3">
-					<div class="card-header">Logs</div>
-					<div class="card-body">
-						<table class="table table-hover">
-							<thead>
-								<tr>
-									<th scope="col">Timestamp</th>
-									<th scope="col">Message</th>
-								</tr>
-							</thead>
-							<tbody id="syslogTable">
-							</tbody>
-						</table>
-						<div class="buttons">
-							<input id="clear-syslog" type="button" class="btn btn-danger btn-sm" value="Clear" />
-						</div>
-					</div>
-				</div>
-				<div class="card border-primary mb-3">
-					<div class="card-header">Pin Assignments</div>
-					<div class="card-body">
-						<table class="table table-hover">
-							<thead>
-								<tr>
-									<th scope="col">Device</th>
-									<th scope="col">Pin Name</th>
-									<th scope="col">GPIO Number</th>
-									<th scope="col">Type</th>
-								</tr>
-							</thead>
-							<tbody id="gpiotable"></tbody>
-						</table>
-					</div>
-				</div>
-				<div class="card border-primary mb-3" style="visibility: collapse;" id="tasks_sect">
-					<div class="card-header">Tasks</div>
-					<div class="card-body">
-						<table class="table table-hover">
-							<!-- console.log(msg_time.toLocaleString() + '\tname' + '\tcpu' + '\tstate' + '\tminstk' + '\tbprio' + '\tcprio' + '\tnum'); -->
-							<thead>
-								<tr>
-									<th scope="col">#</th>
-									<th scope="col">Task Name</th>
-									<th scope="col">CPU</th>
-									<th scope="col">State</th>
-									<th scope="col">Min Stack</th>
-									<th scope="col">Base Priority</th>
-									<th scope="col">Cur Priority</th>
-								</tr>
-							</thead>
-							<tbody id="tasks"></tbody>
-						</table>
-					</div>
-				</div>
-			</div>
-			<!-- syslog -->
-			<div class="tab-pane fade " id="tab-credits">
-				<div class="card text-white bg-primary mb-3">
-					<div class="card-header">Credits</div>
-					<div class="card-body">
-						<p><strong><a
-									href="https://github.com/sle118/squeezelite-esp32">squeezelite-esp32</a><br></strong>&copy;
-							2020, philippe44, sle118, daduke<br /><a href="https://opensource.org/licenses/MIT">This
-								software is released under the MIT License.</a></p>
-						<p>
-							This app would not be possible without the following libraries:
-						</p>
-						<ul>
-							<li>squeezelite, &copy; 2012-2019, Adrian Smith and Ralph Irving. Licensed under the GPL
-								License.</li>
-							<li>esp32-wifi-manager, &copy; 2017-2019, Tony Pottier. Licensed under the MIT License.</li>
-							<li>SpinKit, &copy; 2015, Tobias Ahlin. Licensed under the MIT License.</li>
-							<li>jQuery, The jQuery Foundation. Licensed under the MIT License.</li>
-							<li>cJSON, &copy; 2009-2017, Dave Gamble and cJSON contributors. Licensed under the MIT
-								License.
-							</li>
-							<li>esp32-rotary-encoder, &copy; 2011-2019, David Antliff and Ben Buxton. Licensed under the
-								GPL
-								License.</li>
-							<li>tarablessd1306, &copy; 2017-2018, Tara Keeling. Licensed under the MIT license.</li>
-						</ul>
-					</div>
-				</div>
-				<div class="card text-white bg-primary mb-3">
-					<div class="card-header">Extras/Overrides</div>
-					<div class="card-body">
-						<fieldset>
-							<div class="form-check">
-								<label class="form-check-label"><input type="checkbox" id="show-nvs"
-										class="form-check-input " value="">Show NVS Editor</label>
-							</div>
-						</fieldset>
-						<fieldset>
-							<div class="form-check">
-								<label class="form-check-label"><input type="checkbox" id="show-commands"
-										class="form-check-input " value="">Show Advanced Commands</label>
-							</div>
-						</fieldset>
-					</div>
-				</div>
-			</div>
-			<!-- credits -->
 		</div>

+		<div class="tab-pane fade" id="tab-cfg-audio">
+			<div class="card text-white  mb-3">
+				<div class="card-header">Usage Templates</div>
+				<div class="card-body">
+					<fieldset>
+						<fieldset class="form-group" id="output-tmpl">
+							<legend>Output</legend>
+							<div class="form-check">
+								<label class="form-check-label">
+									<input type="radio" class="form-check-input" name="output-tmpl" id="i2s">
+									I2S Dac
+								</label>
+							</div>
+							<div class="form-check">
+								<label class="form-check-label">
+									<input type="radio" class="form-check-input" name="output-tmpl" id="spdif">
+									SPDIF
+								</label>
+							</div>
+							<div class="form-check">
+								<label class="form-check-label">
+									<input type="radio" class="form-check-input" name="output-tmpl" id="bt">
+									Bluetooth
+								</label>
+							</div>
+						</fieldset>
+						<div class="form-group"><label for="player">Player Name</label><input type="text"
+								class="form-control " placeholder="Squeezelite" id="player"></div>
+						<div class="form-group"><label for="optional">Optional setting (e.g. for LMS IP
+								address)</label><input type="text" class="form-control" id="optional"></div>
+						<div class="form-group">
+							<div class="form-check">
+								<label class="form-check-label">
+									<input class="form-check-input" type="checkbox" id="disable-squeezelite" value=""
+										checked="">
+									Disable Squeezelite
+								</label>
+							</div>
+						</div>
+						<div class="toast show" role="alert" aria-live="assertive" aria-atomic="true"
+							style="display: none;" id="toast_cfg-audio-tmpl">
+							<div class="toast-header"><strong class="mr-auto">Result</strong><button type="button"
+									class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close"
+									onclick="hideSurrounding(this)"><span aria-hidden="true">×</span></button></div>
+							<div class="toast-body" id="msg_cfg-audio-tmpl"></div>
+						</div>
+						<button id="save-autoexec1" type="submit" class="btn btn-info" cmdname="cfg-audio-tmpl"
+							onclick="saveAutoexec1(false)">Save</button>
+						<button id="commit-autoexec1" type="submit" class="btn btn-warning" cmdname="cfg-audio-tmpl"
+							onclick="saveAutoexec1(true)">Apply</button>
+					</fieldset>
+				</div>
+			</div>
+		</div>
+		<div class="tab-pane fade active show" id="tab-wifi">
+			<div class="card text-white  mb-3">
+				<div class="card-header">WiFi Status</div>
+				<div class="card-body">
+					<table class="table table-hover">
+						<thead>
+							<tr>
+								<th scope="col">Joined</th>
+								<th scope="col">Name</th>
+								<th scope="col">Signal</th>
+								<th scope="col">Security</th>
+							</tr>
+						</thead>
+						<tbody id="wifiTable"></tbody>
+					</table>
+					<button type="button" id="updateAP" class="btn btn-info btn-sm">Scan</button>
+
+				</div>
+				<div class="modal" id="WiFiDisconnectConfirm">
+					<div class="modal-dialog modal-dialog-centered" role="document">
+						<div class="modal-content">
+							<div class="modal-header">
+								<h5 class="modal-title">Disconnect</h5>
+								<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+									<span aria-hidden="true">&times;</span>
+								</button>
+							</div>
+							<div class="modal-body">
+								<p>Disconnect from network? After disconnecting, the system won't be accessible from
+									the current address and will expose itself as access point name <span
+										id="apName"></span> with password <span id="apPass"></span> </p>
+							</div>
+							<div class="modal-footer connecting-success connecting-status">
+								<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+								<button type="button" class="btn btn-warning" data-dismiss="modal"
+									onclick="handleDisconnect();">Ok</button>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="modal" id="WifiConnectDialog">
+					<div class="modal-dialog modal-dialog-centered" role="document">
+						<div class="modal-content">
+							<div class="modal-header">
+								<h5 class="modal-title connecting connecting-init connecting-fail">Connect to WiFi
+								</h5>
+								<h5 class="modal-title connecting-status connecting-success">Status</h5>
+								<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+									<span aria-hidden="true">&times;</span>
+								</button>
+							</div>
+							<div class="modal-body">
+								<fieldset class="connecting-init connecting-fail">
+									<div class="form-group"><label for="manual_ssid">Wifi Name</label><input type="text"
+											class="form-control" placeholder="Enter Name" id="manual_ssid"></div>
+									<div class="form-group"><label for="manual_pwd">Password</label><input
+											type="password" class="form-control" placeholder="Enter Name"
+											id="manual_pwd"></div>
+								</fieldset>
+								<div id="connect-wait" class="connecting">
+									<div>Connecting to <span id="ssid-wait"></span> </div>
+									<div>
+										You may lose wifi access while the esp32 recalibrates
+										its radio. Please
+										wait until your device automatically reconnects. This can take up to
+										30s.
+									</div>
+								</div>
+								<div id="connect-success" class="connecting-success connecting-status">
+									<div> Connected to Access Point : <span id="connectedToSSID"></span></div>
+									<div> Device IP address : <span id="ipAddress"></span></div>
+									<div>Subnet Mask:<span id="netmask"></span></div>
+									<div>Default Gateway:<span id="gateway"></span></div>
+								</div>
+								<div id="connect-fail" class="connecting-fail">
+									<h3 class="text-error">Connection failed</h3>
+									<p>Please double-check wifi password if any and make sure the access point has
+										good signal.</p>
+								</div>
+							</div>
+							<div class="modal-footer ">
+								<button type="button"
+									class="btn btn-secondary connecting-init connecting-fail connecting"
+									data-dismiss="modal">Close</button>
+								<button type="button" id="btnJoin"
+									class="btn btn-primary connecting-init connecting-fail"
+									onclick="handleConnect();">Join</button>
+								<button type="button" class="connecting btn btn-primary" disabled>
+									<span class="spinner-border spinner-border-sm" role="status"
+										aria-hidden="true"></span>
+									<span class="sr-only">Connecting...</span></button>
+							</div>
+
+							<div class="modal-footer connecting-success connecting-status justify-content-between" style=""><button type="button"
+									class="btn btn-primary" data-dismiss="modal">Ok</button><button type="button" class="btn btn-danger"
+									data-toggle="modal" data-dismiss="modal" data-target="#WiFiDisconnectConfirm">Disconnect</button> 
+							</div>
+						</div>
+					</div>
+				</div>
+
+			</div>
+		</div>
+		<div class="tab-pane fade " id="tab-commands">
+			<fieldset id="commands-list"></fieldset>
+		</div>
+		<!-- Status -->
+		<div class="tab-pane fade " id="tab-syslog">
+			<div class="card border-primary mb-3">
+				<div class="card-header">Logs</div>
+				<div class="card-body">
+					<table class="table table-hover">
+						<thead>
+							<tr>
+								<th scope="col">Timestamp</th>
+								<th scope="col">Message</th>
+							</tr>
+						</thead>
+						<tbody id="syslogTable">
+						</tbody>
+					</table>
+					<div class="buttons">
+						<input id="clear-syslog" type="button" class="btn btn-danger btn-sm" value="Clear" />
+					</div>
+				</div>
+			</div>
+			<div class="card border-primary mb-3" id="pins" style="display: none;">
+				<div class="card-header">Pin Assignments</div>
+				<div class="card-body">
+					<table class="table table-hover">
+						<thead>
+							<tr>
+								<th scope="col">Device</th>
+								<th scope="col">Pin Name</th>
+								<th scope="col">GPIO Number</th>
+								<th scope="col">Type</th>
+							</tr>
+						</thead>
+						<tbody id="gpiotable"></tbody>
+					</table>
+				</div>
+			</div>
+			<div class="card border-primary mb-3" style="visibility: collapse;" id="tasks_sect">
+				<div class="card-header">Tasks</div>
+				<div class="card-body">
+					<table class="table table-hover">
+						<!-- console.log(msg_time.toLocaleString() + '\tname' + '\tcpu' + '\tstate' + '\tminstk' + '\tbprio' + '\tcprio' + '\tnum'); -->
+						<thead>
+							<tr>
+								<th scope="col">#</th>
+								<th scope="col">Task Name</th>
+								<th scope="col">CPU</th>
+								<th scope="col">State</th>
+								<th scope="col">Min Stack</th>
+								<th scope="col">Base Priority</th>
+								<th scope="col">Cur Priority</th>
+							</tr>
+						</thead>
+						<tbody id="tasks"></tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+		<!-- syslog -->
+		<div class="tab-pane fade " id="tab-credits">
+			<div class="card text-white  mb-3">
+				<div class="card-header">Credits</div>
+				<div class="card-body">
+					<p><strong><a
+								href="https://github.com/sle118/squeezelite-esp32">squeezelite-esp32</a><br></strong>&copy;
+						2020, philippe44, sle118, daduke<br /><a href="https://opensource.org/licenses/MIT">This
+							software is released under the MIT License.</a></p>
+					<p>
+						This app would not be possible without the following libraries:
+					</p>
+					<ul>
+						<li>squeezelite, &copy; 2012-2019, Adrian Smith and Ralph Irving. Licensed under the GPL
+							License.</li>
+						<li>esp32-wifi-manager, &copy; 2017-2019, Tony Pottier. Licensed under the MIT License.</li>
+						<li>SpinKit, &copy; 2015, Tobias Ahlin. Licensed under the MIT License.</li>
+						<li>jQuery, The jQuery Foundation. Licensed under the MIT License.</li>
+						<li>cJSON, &copy; 2009-2017, Dave Gamble and cJSON contributors. Licensed under the MIT
+							License.
+						</li>
+						<li>esp32-rotary-encoder, &copy; 2011-2019, David Antliff and Ben Buxton. Licensed under the
+							GPL
+							License.</li>
+						<li>tarablessd1306, &copy; 2017-2018, Tara Keeling. Licensed under the MIT license.</li>
+					</ul>
+				</div>
+			</div>
+			<div class="card text-white  mb-3">
+				<div class="card-header">Extras/Overrides</div>
+				<div class="card-body">
+					<fieldset>
+						<div class="form-check">
+							<label class="form-check-label"><input type="checkbox" id="show-nvs"
+									class="form-check-input " value="">Show NVS Editor</label>
+						</div>
+					</fieldset>
+					<fieldset>
+						<div class="form-check">
+							<label class="form-check-label"><input type="checkbox" id="show-commands"
+									class="form-check-input " value="">Show Advanced Commands</label>
+						</div>
+					</fieldset>
+				</div>
+			</div>
+		</div>
+		<!-- credits -->
+		</div>
 	</div>
-	<footer class="footer bg-primary text.primary">
-		<button class="btn-warning ota_element" id="reboot_nav" type="submit" onclick="handleReboot(false);"
-			style="display: none;">Reboot</button>
-		<button class="btn-danger recovery_element" id="reboot_ota_nav" type="submit" onclick="handleReboot(true);"
-			style="display: none;">Exit Recovery</button><br>
-		<span id="foot-fw"></span><span id="foot-wifi"></span>
+	</main>
+	<footer>
+		<div class="fixed-bottom d-flex justify-content-between  border-top border-dark p-3 bg-primary">
+			<span class="text-center" id="foot-fw"></span><button class="btn-warning ota_element " id="reboot_nav"
+				type="submit" onclick="handleReboot('reboot');" style="display: none;">Reboot</button>
+			<button class="btn-warning recovery_element" id="reboot_ota_nav" type="submit" onclick="handleReboot('reboot_ota');"
+				style="display: none;">Exit Recovery</button><span class="text-center" id="foot-wifi"></span>
+		</div>
+
 	</footer>
-	</div>
 </body>

 </html>
--- a/components/wifi-manager/webapp/src/index.ts
+++ b/components/wifi-manager/webapp/src/index.ts
@@ -19,6 +19,6 @@ import '../node_modules/remixicon/icons/Media/play-circle-fill.svg';
 import '../node_modules/remixicon/icons/Media/pause-circle-fill.svg';
 import '../node_modules/remixicon/icons/System/lock-fill.svg';
 import '../node_modules/remixicon/icons/System/lock-unlock-fill.svg';
-
+import './assets/images/favicon-32x32.png';
 import './js/custom.js'; 
 // <%= `<svg><use xlink:href="#${htmlWebpackPlugin.files.sprites.svg.defs.symbol[s].id}"></use></svg>` %>
--- a/components/wifi-manager/webapp/src/js/custom.js
+++ b/components/wifi-manager/webapp/src/js/custom.js
--- a/components/wifi-manager/webapp/src/sass/layout/_features.scss
+++ b/components/wifi-manager/webapp/src/sass/layout/_features.scss
@@ -1,34 +1,34 @@
-.features:hover {
-  cursor: pointer;
-  animation: jello-horizontal 1.2s;
-}
+// .features:hover {
+//   cursor: pointer;
+//   animation: jello-horizontal 1.2s;
+// }

-@keyframes jello-horizontal {
-  0% {
-    transform: scale3d(1, 1, 1);
-  }
+// @keyframes jello-horizontal {
+//   0% {
+//     transform: scale3d(1, 1, 1);
+//   }

-  30% {
-    transform: scale3d(1.25, .75, 1);
-  }
+//   30% {
+//     transform: scale3d(1.25, .75, 1);
+//   }

-  40% {
-    transform: scale3d(.75, 1.25, 1);
-  }
+//   40% {
+//     transform: scale3d(.75, 1.25, 1);
+//   }

-  50% {
-    transform: scale3d(1.15, .85, 1);
-  }
+//   50% {
+//     transform: scale3d(1.15, .85, 1);
+//   }

-  65% {
-    transform: scale3d(.95, 1.05, 1);
-  }
+//   65% {
+//     transform: scale3d(.95, 1.05, 1);
+//   }

-  75% {
-    transform: scale3d(1.05, .95, 1);
-  }
+//   75% {
+//     transform: scale3d(1.05, .95, 1);
+//   }

-  100% {
-    transform: scale3d(1, 1, 1);
-  }
-}
+//   100% {
+//     transform: scale3d(1, 1, 1);
+//   }
+// }
--- a/components/wifi-manager/webapp/src/sass/setup/_normalize.scss
+++ b/components/wifi-manager/webapp/src/sass/setup/_normalize.scss
@@ -1,348 +1,348 @@
-/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
-
-/* Document
-   ========================================================================== */
-
-/**
- * 1. Correct the line height in all browsers.
- * 2. Prevent adjustments of font size after orientation changes in iOS.
- */
-
-html {
-  line-height: 1.15; /* 1 */
-  -webkit-text-size-adjust: 100%; /* 2 */
-}
-
-/* Sections
-   ========================================================================== */
-
-/**
- * Remove the margin in all browsers.
- */
-
-body {
-  margin: 0;
-}
-
-/**
- * Render the `main` element consistently in IE.
- */
-
-main {
-  display: block;
-}
-
-/**
- * Correct the font size and margin on `h1` elements within `section` and
- * `article` contexts in Chrome, Firefox, and Safari.
- */
-
-h1 {
-  font-size: 2em;
-  margin: .67em 0;
-}
-
-/* Grouping content
-   ========================================================================== */
-
-/**
- * 1. Add the correct box sizing in Firefox.
- * 2. Show the overflow in Edge and IE.
- */
-
-hr {
-  box-sizing: content-box; /* 1 */
-  height: 0; /* 1 */
-  overflow: visible; /* 2 */
-}
-
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-pre {
-  font-family: monospace; /* 1 */
-  font-size: 1em; /* 2 */
-}
-
-/* Text-level semantics
-   ========================================================================== */
-
-/**
- * Remove the gray background on active links in IE 10.
- */
-
-a {
-  background-color: transparent;
-}
-
-/**
- * 1. Remove the bottom border in Chrome 57-
- * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
- */
-
-abbr[title] {
-  border-bottom: none; /* 1 */
-  text-decoration: underline; /* 2 */
-}
-
-/**
- * Add the correct font weight in Chrome, Edge, and Safari.
- */
-
-b,
-strong {
-  font-weight: bolder;
-}
-
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-code,
-kbd,
-samp {
-  font-family: monospace; /* 1 */
-  font-size: 1em; /* 2 */
-}
-
-/**
- * Add the correct font size in all browsers.
- */
-
-small {
-  font-size: 80%;
-}
-
-/**
- * Prevent `sub` and `sup` elements from affecting the line height in
- * all browsers.
- */
-
-sub,
-sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline;
-}
-
-sub {
-  bottom: -.25em;
-}
-
-sup {
-  top: -.5em;
-}
-
-/* Embedded content
-   ========================================================================== */
-
-/**
- * Remove the border on images inside links in IE 10.
- */
-
-img {
-  border-style: none;
-}
-
-/* Forms
-   ========================================================================== */
-
-/**
- * 1. Change the font styles in all browsers.
- * 2. Remove the margin in Firefox and Safari.
- */
-
-button,
-input,
-optgroup,
-select,
-textarea {
-  font-family: inherit; /* 1 */
-  font-size: 100%; /* 1 */
-  line-height: 1.15; /* 1 */
-  margin: 0; /* 2 */
-}
-
-/**
- * Show the overflow in IE.
- * 1. Show the overflow in Edge.
- */
-
-button,
-input { /* 1 */
-  overflow: visible;
-}
-
-/**
- * Remove the inheritance of text transform in Edge, Firefox, and IE.
- * 1. Remove the inheritance of text transform in Firefox.
- */
-
-button,
-select { /* 1 */
-  text-transform: none;
-}
-
-/**
- * Correct the inability to style clickable types in iOS and Safari.
- */
-
-button,
-[type="button"],
-[type="reset"],
-[type="submit"] {
-  -webkit-appearance: button;
-}
-
-/**
- * Remove the inner border and padding in Firefox.
- */
-
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0;
-}
-
-/**
- * Restore the focus styles unset by the previous rule.
- */
-
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText;
-}
-
-/**
- * Correct the padding in Firefox.
- */
-
-fieldset {
-  padding: .35em .75em .625em;
-}
-
-/**
- * 1. Correct the text wrapping in Edge and IE.
- * 2. Correct the color inheritance from `fieldset` elements in IE.
- * 3. Remove the padding so developers are not caught out when they zero out
- *    `fieldset` elements in all browsers.
- */
-
-legend {
-  box-sizing: border-box; /* 1 */
-  color: inherit; /* 2 */
-  display: table; /* 1 */
-  max-width: 100%; /* 1 */
-  padding: 0; /* 3 */
-  white-space: normal; /* 1 */
-}
-
-/**
- * Add the correct vertical alignment in Chrome, Firefox, and Opera.
- */
-
-progress {
-  vertical-align: baseline;
-}
-
-/**
- * Remove the default vertical scrollbar in IE 10+.
- */
-
-textarea {
-  overflow: auto;
-}
-
-/**
- * 1. Add the correct box sizing in IE 10.
- * 2. Remove the padding in IE 10.
- */
-
-[type="checkbox"],
-[type="radio"] {
-  box-sizing: border-box; /* 1 */
-  padding: 0; /* 2 */
-}
-
-/**
- * Correct the cursor style of increment and decrement buttons in Chrome.
- */
-
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
-  height: auto;
-}
-
-/**
- * 1. Correct the odd appearance in Chrome and Safari.
- * 2. Correct the outline style in Safari.
- */
-
-[type="search"] {
-  -webkit-appearance: textfield; /* 1 */
-  outline-offset: -2px; /* 2 */
-}
-
-/**
- * Remove the inner padding in Chrome and Safari on macOS.
- */
-
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-/**
- * 1. Correct the inability to style clickable types in iOS and Safari.
- * 2. Change font properties to `inherit` in Safari.
- */
-
-::-webkit-file-upload-button {
-  -webkit-appearance: button; /* 1 */
-  font: inherit; /* 2 */
-}
-
-/* Interactive
-   ========================================================================== */
-
-/*
- * Add the correct display in Edge, IE 10+, and Firefox.
- */
-
-details {
-  display: block;
-}
-
-/*
- * Add the correct display in all browsers.
- */
-
-summary {
-  display: list-item;
-}
-
-/* Misc
-   ========================================================================== */
-
-/**
- * Add the correct display in IE 10+.
- */
-
-template {
-  display: none;
-}
-
-/**
- * Add the correct display in IE 10.
- */
-
-[hidden] {
-  display: none;
-}
+// /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+
+// /* Document
+//    ========================================================================== */
+
+// /**
+//  * 1. Correct the line height in all browsers.
+//  * 2. Prevent adjustments of font size after orientation changes in iOS.
+//  */
+
+// html {
+//   line-height: 1.15; /* 1 */
+//   -webkit-text-size-adjust: 100%; /* 2 */
+// }
+
+// /* Sections
+//    ========================================================================== */
+
+// /**
+//  * Remove the margin in all browsers.
+//  */
+
+// body {
+//   margin: 0;
+// }
+
+// /**
+//  * Render the `main` element consistently in IE.
+//  */
+
+// main {
+//   display: block;
+// }
+
+// /**
+//  * Correct the font size and margin on `h1` elements within `section` and
+//  * `article` contexts in Chrome, Firefox, and Safari.
+//  */
+
+// h1 {
+//   font-size: 2em;
+//   margin: .67em 0;
+// }
+
+// /* Grouping content
+//    ========================================================================== */
+
+// /**
+//  * 1. Add the correct box sizing in Firefox.
+//  * 2. Show the overflow in Edge and IE.
+//  */
+
+// hr {
+//   box-sizing: content-box; /* 1 */
+//   height: 0; /* 1 */
+//   overflow: visible; /* 2 */
+// }
+
+// /**
+//  * 1. Correct the inheritance and scaling of font size in all browsers.
+//  * 2. Correct the odd `em` font sizing in all browsers.
+//  */
+
+// pre {
+//   font-family: monospace; /* 1 */
+//   font-size: 1em; /* 2 */
+// }
+
+// /* Text-level semantics
+//    ========================================================================== */
+
+// /**
+//  * Remove the gray background on active links in IE 10.
+//  */
+
+// a {
+//   background-color: transparent;
+// }
+
+// /**
+//  * 1. Remove the bottom border in Chrome 57-
+//  * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+//  */
+
+// abbr[title] {
+//   border-bottom: none; /* 1 */
+//   text-decoration: underline; /* 2 */
+// }
+
+// /**
+//  * Add the correct font weight in Chrome, Edge, and Safari.
+//  */
+
+// b,
+// strong {
+//   font-weight: bolder;
+// }
+
+// /**
+//  * 1. Correct the inheritance and scaling of font size in all browsers.
+//  * 2. Correct the odd `em` font sizing in all browsers.
+//  */
+
+// code,
+// kbd,
+// samp {
+//   font-family: monospace; /* 1 */
+//   font-size: 1em; /* 2 */
+// }
+
+// /**
+//  * Add the correct font size in all browsers.
+//  */
+
+// small {
+//   font-size: 80%;
+// }
+
+// /**
+//  * Prevent `sub` and `sup` elements from affecting the line height in
+//  * all browsers.
+//  */
+
+// sub,
+// sup {
+//   font-size: 75%;
+//   line-height: 0;
+//   position: relative;
+//   vertical-align: baseline;
+// }
+
+// sub {
+//   bottom: -.25em;
+// }
+
+// sup {
+//   top: -.5em;
+// }
+
+// /* Embedded content
+//    ========================================================================== */
+
+// /**
+//  * Remove the border on images inside links in IE 10.
+//  */
+
+// img {
+//   border-style: none;
+// }
+
+// /* Forms
+//    ========================================================================== */
+
+// /**
+//  * 1. Change the font styles in all browsers.
+//  * 2. Remove the margin in Firefox and Safari.
+//  */
+
+// button,
+// input,
+// optgroup,
+// select,
+// textarea {
+//   font-family: inherit; /* 1 */
+//   font-size: 100%; /* 1 */
+//   line-height: 1.15; /* 1 */
+//   margin: 0; /* 2 */
+// }
+
+// /**
+//  * Show the overflow in IE.
+//  * 1. Show the overflow in Edge.
+//  */
+
+// button,
+// input { /* 1 */
+//   overflow: visible;
+// }
+
+// /**
+//  * Remove the inheritance of text transform in Edge, Firefox, and IE.
+//  * 1. Remove the inheritance of text transform in Firefox.
+//  */
+
+// button,
+// select { /* 1 */
+//   text-transform: none;
+// }
+
+// /**
+//  * Correct the inability to style clickable types in iOS and Safari.
+//  */
+
+// button,
+// [type="button"],
+// [type="reset"],
+// [type="submit"] {
+//   -webkit-appearance: button;
+// }
+
+// /**
+//  * Remove the inner border and padding in Firefox.
+//  */
+
+// button::-moz-focus-inner,
+// [type="button"]::-moz-focus-inner,
+// [type="reset"]::-moz-focus-inner,
+// [type="submit"]::-moz-focus-inner {
+//   border-style: none;
+//   padding: 0;
+// }
+
+// /**
+//  * Restore the focus styles unset by the previous rule.
+//  */
+
+// button:-moz-focusring,
+// [type="button"]:-moz-focusring,
+// [type="reset"]:-moz-focusring,
+// [type="submit"]:-moz-focusring {
+//   outline: 1px dotted ButtonText;
+// }
+
+// /**
+//  * Correct the padding in Firefox.
+//  */
+
+// fieldset {
+//   padding: .35em .75em .625em;
+// }
+
+// /**
+//  * 1. Correct the text wrapping in Edge and IE.
+//  * 2. Correct the color inheritance from `fieldset` elements in IE.
+//  * 3. Remove the padding so developers are not caught out when they zero out
+//  *    `fieldset` elements in all browsers.
+//  */
+
+// legend {
+//   box-sizing: border-box; /* 1 */
+//   color: inherit; /* 2 */
+//   display: table; /* 1 */
+//   max-width: 100%; /* 1 */
+//   padding: 0; /* 3 */
+//   white-space: normal; /* 1 */
+// }
+
+// /**
+//  * Add the correct vertical alignment in Chrome, Firefox, and Opera.
+//  */
+
+// progress {
+//   vertical-align: baseline;
+// }
+
+// /**
+//  * Remove the default vertical scrollbar in IE 10+.
+//  */
+
+// textarea {
+//   overflow: auto;
+// }
+
+// /**
+//  * 1. Add the correct box sizing in IE 10.
+//  * 2. Remove the padding in IE 10.
+//  */
+
+// [type="checkbox"],
+// [type="radio"] {
+//   box-sizing: border-box; /* 1 */
+//   padding: 0; /* 2 */
+// }
+
+// /**
+//  * Correct the cursor style of increment and decrement buttons in Chrome.
+//  */
+
+// [type="number"]::-webkit-inner-spin-button,
+// [type="number"]::-webkit-outer-spin-button {
+//   height: auto;
+// }
+
+// /**
+//  * 1. Correct the odd appearance in Chrome and Safari.
+//  * 2. Correct the outline style in Safari.
+//  */
+
+// [type="search"] {
+//   -webkit-appearance: textfield; /* 1 */
+//   outline-offset: -2px; /* 2 */
+// }
+
+// /**
+//  * Remove the inner padding in Chrome and Safari on macOS.
+//  */
+
+// [type="search"]::-webkit-search-decoration {
+//   -webkit-appearance: none;
+// }
+
+// /**
+//  * 1. Correct the inability to style clickable types in iOS and Safari.
+//  * 2. Change font properties to `inherit` in Safari.
+//  */
+
+// ::-webkit-file-upload-button {
+//   -webkit-appearance: button; /* 1 */
+//   font: inherit; /* 2 */
+// }
+
+// /* Interactive
+//    ========================================================================== */
+
+// /*
+//  * Add the correct display in Edge, IE 10+, and Firefox.
+//  */
+
+// details {
+//   display: block;
+// }
+
+// /*
+//  * Add the correct display in all browsers.
+//  */
+
+// summary {
+//   display: list-item;
+// }
+
+// /* Misc
+//    ========================================================================== */
+
+// /**
+//  * Add the correct display in IE 10+.
+//  */
+
+// template {
+//   display: none;
+// }
+
+// /**
+//  * Add the correct display in IE 10.
+//  */
+
+// [hidden] {
+//   display: none;
+// }
--- a/components/wifi-manager/webapp/src/sass/utils/_mixins.scss
+++ b/components/wifi-manager/webapp/src/sass/utils/_mixins.scss
@@ -1,24 +1,24 @@

-/* Device = Most of the Smartphones Mobiles (Portrait) */
-$screen-xxs-min: 320px;
-$screen-xxs-max: 480px;
+// /* Device = Most of the Smartphones Mobiles (Portrait) */
+// $screen-xxs-min: 320px;
+// $screen-xxs-max: 480px;

-/* Device = Low Resolution Tablets, Mobiles (Landscape) */
-$screen-xs-min: 481px;
-$screen-xs-max: 767px;
+// /* Device = Low Resolution Tablets, Mobiles (Landscape) */
+// $screen-xs-min: 481px;
+// $screen-xs-max: 767px;

-/* Device = Tablets, Ipads (portrait) */
-$screen-sm-min: 768px;
-$screen-sm-max: 1024px;
+// /* Device = Tablets, Ipads (portrait) */
+// $screen-sm-min: 768px;
+// $screen-sm-max: 1024px;

-/* Device = Laptops, Desktops */
-$screen-md-min: 1025px;
-$screen-md-max: 1280px;
+// /* Device = Laptops, Desktops */
+// $screen-md-min: 1025px;
+// $screen-md-max: 1280px;

-/* Device = Desktops */
-$screen-lg-min: 1281px;
-$screen-lg-max: 1440px;
+// /* Device = Desktops */
+// $screen-lg-min: 1281px;
+// $screen-lg-max: 1440px;

-/* Higher Resolution Screens */
-$screen-xlg-min: 1441px;
-$screen-xlg-max: 2560px;
+// /* Higher Resolution Screens */
+// $screen-xlg-min: 1441px;
+// $screen-xlg-max: 2560px;
--- a/components/wifi-manager/webapp/src/sass/utils/_style.css
+++ b/components/wifi-manager/webapp/src/sass/utils/_style.css
@@ -1,4 +1,28 @@
+
+
 body {
+    min-height: 100vh; 
+  }
+.border-bottom  {
+    border-width:3px !important;
+}
+
+.border-top {
+    border-width:3px !important;
+}
+tr.hide {
+    display: none;
+}
+.rebooting {
+    display: none;
+}
+td.value {
+    width: 80%;
+}
+#boot-div {
+    float: right;
+}
+/* body {
    border: 0;
    margin: 0;
    margin-bottom:50px;
@@ -136,7 +160,7 @@ h3 {
 .fr {
    float: right;
    margin-right: 20px;
-}
+} */
 /* .w0 {
    background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAZdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuMTJDBGvsAAABzUlEQVRIS+WUTShEURTH3zyRhjQ+8hWxmCJMoSzEwsbCgi1LZRYW9pONptiwka9iI81CWFpYaEqNMkVKmpWN1IhYKN9ZDL/z3p3mxZh5g9X4168799xz/vPefedeLeuVC+3gdTgc07CsmCQ2DI2gg21Jci30wSpGt/CeghickTsHPVACDkgqp67rPgpO4E0ZZMIj7OHhxSvPtEyomcVDeFXJv+EZNvEsNa01rZfAuSUhThR2wU+ObJkbyhRNMMDaDIThBqy1MdZ3wAPawqfFC2Lj0Ab5kpBGxdAJs9TeW72ITUhCPZMjFYwwbwXpnkwlDzOIx50yXwP5c0MeggHGanNqSDqqBqQ7/Kxvg2zHAfMN8IE8uZhYO6eBnBXGKnOakLWfaQZ9jMRjSPXhZUuC5A9JjVFpKkeNSVVA0Tq8KJN0yFl4gilqbW2tm+SQKoybXIG8jcT34RSsh1Byt6iVg2ZLlRCg6JpROqEDpFheXZ5S9rcLFsl5YJwHad+MVA5y13w5lRY5oRsKjdm/Vz/7LR86zG+5wr+9NX+iOowjEO+aELEic+lv1ILppeUPosRst6QduTANgnE2mC+BnYswI1VwfYzCCL9dZij7pWkf6UeSTYAuE/QAAAAASUVORK5CYII=') no-repeat left top;
    height: 24px;
@@ -158,7 +182,7 @@ h3 {
    height: 24px;
 } */
 /* SpinKit is licensed under the MIT License. Copyright (c) 2015 Tobias Ahlin */
-.spinner {
+/* .spinner {
    width: 40px;
    height: 40px;
  
@@ -198,11 +222,11 @@ h3 {
      transform: scale(1.0);
      -webkit-transform: scale(1.0);
    }
-  }
+  } */
 /* end of SpinKit */

 /* daduke stuff */
-input[type='text'], input[type='password'], textarea, select, option {
+/* input[type='text'], input[type='password'], textarea, select, option {
  background: #999;
  border: 0;
  padding: 4px;
@@ -230,8 +254,8 @@ input[type='text'], input[type='password'], textarea, select, option {
  pointer-events: all;
  border-radius: 1rem;
  background-color: #f00;
-}
-
+} */
+/* 
 .custom-switch .custom-control-label::after {
  top: calc(0.25rem + 2px);
  left: calc(-2.25rem + 2px);
@@ -247,8 +271,8 @@ input[type='text'], input[type='password'], textarea, select, option {
  .custom-switch .custom-control-label::after {
    transition: none;
  }
-}
-
+} */
+/* 
 .custom-switch .custom-control-input:checked ~ .custom-control-label::before {
  background-color: #0f0;
 }
@@ -308,7 +332,7 @@ input, textarea {
 span#flash-status {
    padding-left: 15px;
    font-size: 120%;
-}
+} */

 /* #info {
    padding-top: 7px;
@@ -343,7 +367,7 @@ ul#navbar {
    border-top: 1px solid black;
 } */

-.footer {
+/* .footer {
  position: fixed;
  left: 0;
  bottom: 0;
@@ -351,8 +375,8 @@ ul#navbar {
  background-color: #555;
  color: white;
  text-align: center;
-}
-
+} */
+/* 
 .sl {
    background-color: #053c1e;
 }
@@ -360,13 +384,9 @@ ul#navbar {
    background-color: #3c0505;
 }

-td.value {
-    width: 80%;
-}

-#boot-div {
-    float: right;
-}
+
+
 div#message {
    display: none;
    color: #000;
@@ -378,23 +398,21 @@ div#message {
    width:20em;
    height:4em;
    text-align: center;
-    margin-left: -10em; /*set to a negative number 1/2 of your width*/
-    margin-top: -2em; /*set to a negative number 1/2 of your height*/
+    margin-left: -10em; 
+    margin-top: -2em; 
    border-radius: 8px;
    box-shadow: 0px 5px 2px -5px rgba(255, 255, 255, 0.5) inset, 0px 10px 20px -5px rgba(255, 255, 255, 0.1) inset, 0 0px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 3px 1px rgba(0, 0, 0, 0.12), 0 1px 10px 0 rgba(0, 0, 0, 0.3);
    z-index: 20;
-}
-
-tr.hide {
-    display: none;
-}
-
+} */
+/* 
+ */
+/* 
 #searchfw {
    float: right;
    display: none;
-}
+} */

-button#updateAP {
+/* button#updateAP {
    float: right;
    display: inline;
-}
+} */
--- a/components/wifi-manager/webapp/src/test.ejs
+++ b/components/wifi-manager/webapp/src/test.ejs
@@ -17,6 +17,7 @@
                        <% } %>
    </div>
    <div id="allIcons"></div>
+    
    <div class="card border-primary mb-3">
        <div class="card-header">Status Variables</div>
        <div class="card-body">
--- a/components/wifi-manager/webapp/webapp.cmake
+++ b/components/wifi-manager/webapp/webapp.cmake
@@ -1,5 +1,5 @@
 target_add_binary_data( __idf_wifi-manager ./webapp/webpack/dist/favicon-32x32.png BINARY)
 target_add_binary_data( __idf_wifi-manager ./webapp/webpack/dist/index.html.gz BINARY)
-target_add_binary_data( __idf_wifi-manager ./webapp/webpack/dist/js/index.0b6890.bundle.js.gz BINARY)
-target_add_binary_data( __idf_wifi-manager ./webapp/webpack/dist/js/node-modules.0b6890.bundle.js.gz BINARY)
-target_add_binary_data( __idf_wifi-manager ./webapp/webpack/dist/js/runtime.0b6890.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager ./webapp/webpack/dist/js/index.18c3b7.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager ./webapp/webpack/dist/js/node-modules.18c3b7.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager ./webapp/webpack/dist/js/runtime.18c3b7.bundle.js.gz BINARY)
--- a/components/wifi-manager/webapp/webpack.c
+++ b/components/wifi-manager/webapp/webpack.c
@@ -4,31 +4,31 @@ 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_0b6890_bundle_js_gz_start[] asm("_binary_index_0b6890_bundle_js_gz_start");
-extern const uint8_t _index_0b6890_bundle_js_gz_end[] asm("_binary_index_0b6890_bundle_js_gz_end");
-extern const uint8_t _node_modules_0b6890_bundle_js_gz_start[] asm("_binary_node_modules_0b6890_bundle_js_gz_start");
-extern const uint8_t _node_modules_0b6890_bundle_js_gz_end[] asm("_binary_node_modules_0b6890_bundle_js_gz_end");
-extern const uint8_t _runtime_0b6890_bundle_js_gz_start[] asm("_binary_runtime_0b6890_bundle_js_gz_start");
-extern const uint8_t _runtime_0b6890_bundle_js_gz_end[] asm("_binary_runtime_0b6890_bundle_js_gz_end");
+extern const uint8_t _index_18c3b7_bundle_js_gz_start[] asm("_binary_index_18c3b7_bundle_js_gz_start");
+extern const uint8_t _index_18c3b7_bundle_js_gz_end[] asm("_binary_index_18c3b7_bundle_js_gz_end");
+extern const uint8_t _node_modules_18c3b7_bundle_js_gz_start[] asm("_binary_node_modules_18c3b7_bundle_js_gz_start");
+extern const uint8_t _node_modules_18c3b7_bundle_js_gz_end[] asm("_binary_node_modules_18c3b7_bundle_js_gz_end");
+extern const uint8_t _runtime_18c3b7_bundle_js_gz_start[] asm("_binary_runtime_18c3b7_bundle_js_gz_start");
+extern const uint8_t _runtime_18c3b7_bundle_js_gz_end[] asm("_binary_runtime_18c3b7_bundle_js_gz_end");
 const char * resource_lookups[] = {
-	"/dist/favicon-32x32.png",
-	"/dist/index.html.gz",
-	"/js/index.0b6890.bundle.js.gz",
-	"/js/node-modules.0b6890.bundle.js.gz",
-	"/js/runtime.0b6890.bundle.js.gz",
+	"/favicon-32x32.png",
+	"/index.html.gz",
+	"/js/index.18c3b7.bundle.js.gz",
+	"/js/node-modules.18c3b7.bundle.js.gz",
+	"/js/runtime.18c3b7.bundle.js.gz",
 ""
 };
 const uint8_t * resource_map_start[] = {
 	_favicon_32x32_png_start,
 	_index_html_gz_start,
-	_index_0b6890_bundle_js_gz_start,
-	_node_modules_0b6890_bundle_js_gz_start,
-	_runtime_0b6890_bundle_js_gz_start
+	_index_18c3b7_bundle_js_gz_start,
+	_node_modules_18c3b7_bundle_js_gz_start,
+	_runtime_18c3b7_bundle_js_gz_start
 };
 const uint8_t * resource_map_end[] = {
 	_favicon_32x32_png_end,
 	_index_html_gz_end,
-	_index_0b6890_bundle_js_gz_end,
-	_node_modules_0b6890_bundle_js_gz_end,
-	_runtime_0b6890_bundle_js_gz_end
+	_index_18c3b7_bundle_js_gz_end,
+	_node_modules_18c3b7_bundle_js_gz_end,
+	_runtime_18c3b7_bundle_js_gz_end
 };
--- a/components/wifi-manager/webapp/webpack.h
+++ b/components/wifi-manager/webapp/webpack.h
@@ -1,56 +1,56 @@
 /***********************************
 webpack_headers
-Hash: 0b6890f4337e767921f7
+Hash: 18c3b78fe9dd6db2c31d
 Version: webpack 4.46.0
-Time: 273269ms
-Built at: 2021-04-03 1:28:56
+Time: 8782ms
+Built at: 2021-04-21 12 h 01 min 40 s
                                Asset       Size  Chunks                                Chunk Names
-          ./js/index.0b6890.bundle.js    231 KiB       0  [emitted] [immutable]         index
-       ./js/index.0b6890.bundle.js.br   31.5 KiB          [emitted]                     
-       ./js/index.0b6890.bundle.js.gz   41.1 KiB          [emitted]                     
-   ./js/node-modules.0b6890.bundle.js    266 KiB       1  [emitted] [immutable]  [big]  node-modules
-./js/node-modules.0b6890.bundle.js.br   76.3 KiB          [emitted]                     
-./js/node-modules.0b6890.bundle.js.gz   88.7 KiB          [emitted]                     
-        ./js/runtime.0b6890.bundle.js   1.46 KiB       2  [emitted] [immutable]         runtime
-     ./js/runtime.0b6890.bundle.js.br  644 bytes          [emitted]                     
-     ./js/runtime.0b6890.bundle.js.gz  722 bytes          [emitted]                     
+          ./js/index.18c3b7.bundle.js    232 KiB       0  [emitted] [immutable]         index
+       ./js/index.18c3b7.bundle.js.br   32.5 KiB          [emitted]                     
+       ./js/index.18c3b7.bundle.js.gz   41.9 KiB          [emitted]                     
+   ./js/node-modules.18c3b7.bundle.js    266 KiB       1  [emitted] [immutable]  [big]  node-modules
+./js/node-modules.18c3b7.bundle.js.br   76.3 KiB          [emitted]                     
+./js/node-modules.18c3b7.bundle.js.gz   88.7 KiB          [emitted]                     
+        ./js/runtime.18c3b7.bundle.js   1.46 KiB       2  [emitted] [immutable]         runtime
+     ./js/runtime.18c3b7.bundle.js.br  644 bytes          [emitted]                     
+     ./js/runtime.18c3b7.bundle.js.gz  722 bytes          [emitted]                     
                    favicon-32x32.png  634 bytes          [emitted]                     
-                           index.html   19.5 KiB          [emitted]                     
-                        index.html.br   4.48 KiB          [emitted]                     
-                        index.html.gz   5.46 KiB          [emitted]                     
+                           index.html   21.7 KiB          [emitted]                     
+                        index.html.br   4.74 KiB          [emitted]                     
+                        index.html.gz   5.75 KiB          [emitted]                     
                           sprite.svg    4.4 KiB          [emitted]                     
-                        sprite.svg.br  912 bytes          [emitted]                     
-Entrypoint index [big] = ./js/runtime.0b6890.bundle.js ./js/node-modules.0b6890.bundle.js ./js/index.0b6890.bundle.js
+                        sprite.svg.br  898 bytes          [emitted]                     
+Entrypoint index [big] = ./js/runtime.18c3b7.bundle.js ./js/node-modules.18c3b7.bundle.js ./js/index.18c3b7.bundle.js
 [6] ./node_modules/bootstrap/dist/js/bootstrap-exposed.js 437 bytes {1} [built]
 [11] ./src/sass/main.scss 1.55 KiB {0} [built]
-[16] ./node_modules/remixicon/icons/Device/signal-wifi-fill.svg 323 bytes {1} [built]
-[17] ./node_modules/remixicon/icons/Device/signal-wifi-3-fill.svg 327 bytes {1} [built]
-[18] ./node_modules/remixicon/icons/Device/signal-wifi-2-fill.svg 327 bytes {1} [built]
-[19] ./node_modules/remixicon/icons/Device/signal-wifi-1-fill.svg 327 bytes {1} [built]
-[20] ./node_modules/remixicon/icons/Device/signal-wifi-line.svg 323 bytes {1} [built]
-[21] ./node_modules/remixicon/icons/Device/battery-line.svg 315 bytes {1} [built]
-[22] ./node_modules/remixicon/icons/Device/battery-low-line.svg 323 bytes {1} [built]
-[23] ./node_modules/remixicon/icons/Device/battery-fill.svg 315 bytes {1} [built]
-[24] ./node_modules/remixicon/icons/Media/headphone-fill.svg 318 bytes {1} [built]
-[25] ./node_modules/remixicon/icons/Device/device-recover-fill.svg 329 bytes {1} [built]
-[26] ./node_modules/remixicon/icons/Device/bluetooth-fill.svg 319 bytes {1} [built]
-[27] ./node_modules/remixicon/icons/Device/bluetooth-connect-fill.svg 335 bytes {1} [built]
-[37] ./src/index.ts + 1 modules 53.3 KiB {0} [built]
-     | ./src/index.ts 1.36 KiB [built]
-     | ./src/js/custom.js 51.8 KiB [built]
-    + 23 hidden modules
+[16] ./node_modules/remixicon/icons/Device/signal-wifi-fill.svg 340 bytes {1} [built]
+[17] ./node_modules/remixicon/icons/Device/signal-wifi-3-fill.svg 344 bytes {1} [built]
+[18] ./node_modules/remixicon/icons/Device/signal-wifi-2-fill.svg 344 bytes {1} [built]
+[19] ./node_modules/remixicon/icons/Device/signal-wifi-1-fill.svg 344 bytes {1} [built]
+[20] ./node_modules/remixicon/icons/Device/signal-wifi-line.svg 340 bytes {1} [built]
+[21] ./node_modules/remixicon/icons/Device/battery-line.svg 332 bytes {1} [built]
+[22] ./node_modules/remixicon/icons/Device/battery-low-line.svg 340 bytes {1} [built]
+[23] ./node_modules/remixicon/icons/Device/battery-fill.svg 332 bytes {1} [built]
+[24] ./node_modules/remixicon/icons/Media/headphone-fill.svg 335 bytes {1} [built]
+[25] ./node_modules/remixicon/icons/Device/device-recover-fill.svg 346 bytes {1} [built]
+[26] ./node_modules/remixicon/icons/Device/bluetooth-fill.svg 336 bytes {1} [built]
+[27] ./node_modules/remixicon/icons/Device/bluetooth-connect-fill.svg 352 bytes {1} [built]
+[38] ./src/index.ts + 1 modules 62.5 KiB {0} [built]
+     | ./src/index.ts 1.4 KiB [built]
+     | ./src/js/custom.js 61 KiB [built]
+    + 24 hidden modules

 WARNING in asset size limit: The following asset(s) exceed the recommended size limit (244 KiB).
 This can impact web performance.
 Assets: 
-  ./js/node-modules.0b6890.bundle.js (266 KiB)
+  ./js/node-modules.18c3b7.bundle.js (266 KiB)

 WARNING in entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (244 KiB). This can impact web performance.
 Entrypoints:
  index (499 KiB)
-      ./js/runtime.0b6890.bundle.js
-      ./js/node-modules.0b6890.bundle.js
-      ./js/index.0b6890.bundle.js
+      ./js/runtime.18c3b7.bundle.js
+      ./js/node-modules.18c3b7.bundle.js
+      ./js/index.18c3b7.bundle.js


 WARNING in webpack performance recommendations: 
@@ -58,9 +58,9 @@ You can limit the size of your bundles by using import() or require.ensure to la
 For more info visit https://webpack.js.org/guides/code-splitting/
 Child html-webpack-plugin for "index.html":
         Asset     Size  Chunks  Chunk Names
-    index.html  556 KiB       0  
+    index.html  560 KiB       0  
    Entrypoint undefined = index.html
-    [0] ./node_modules/html-webpack-plugin/lib/loader.js!./src/index.ejs 20.3 KiB {0} [built]
+    [0] ./node_modules/html-webpack-plugin/lib/loader.js!./src/index.ejs 23.9 KiB {0} [built]
    [1] ./node_modules/lodash/lodash.js 531 KiB {0} [built]
    [2] (webpack)/buildin/global.js 472 bytes {0} [built]
    [3] (webpack)/buildin/module.js 497 bytes {0} [built]
--- a/components/wifi-manager/webapp/webpack/dist/index.html
+++ b/components/wifi-manager/webapp/webpack/dist/index.html
--- a/components/wifi-manager/webapp/webpack/dist/index.html.br
+++ b/components/wifi-manager/webapp/webpack/dist/index.html.br
--- a/components/wifi-manager/webapp/webpack/dist/index.html.gz
+++ b/components/wifi-manager/webapp/webpack/dist/index.html.gz
--- a/components/wifi-manager/webapp/webpack/dist/js/index.0b6890.bundle.js.br
+++ b/components/wifi-manager/webapp/webpack/dist/js/index.0b6890.bundle.js.br
--- a/components/wifi-manager/webapp/webpack/dist/js/index.0b6890.bundle.js.gz
+++ b/components/wifi-manager/webapp/webpack/dist/js/index.0b6890.bundle.js.gz
--- a/components/wifi-manager/webapp/webpack/dist/js/index.18c3b7.bundle.js
+++ b/components/wifi-manager/webapp/webpack/dist/js/index.18c3b7.bundle.js
--- a/components/wifi-manager/webapp/webpack/dist/js/index.18c3b7.bundle.js.br
+++ b/components/wifi-manager/webapp/webpack/dist/js/index.18c3b7.bundle.js.br
--- a/components/wifi-manager/webapp/webpack/dist/js/index.18c3b7.bundle.js.gz
+++ b/components/wifi-manager/webapp/webpack/dist/js/index.18c3b7.bundle.js.gz
--- a/components/wifi-manager/webapp/webpack/dist/js/node-modules.0b6890.bundle.js.br
+++ b/components/wifi-manager/webapp/webpack/dist/js/node-modules.0b6890.bundle.js.br
--- a/components/wifi-manager/webapp/webpack/dist/js/node-modules.0b6890.bundle.js.gz
+++ b/components/wifi-manager/webapp/webpack/dist/js/node-modules.0b6890.bundle.js.gz
--- a/components/wifi-manager/webapp/webpack/dist/js/node-modules.18c3b7.bundle.js
+++ b/components/wifi-manager/webapp/webpack/dist/js/node-modules.18c3b7.bundle.js
--- a/components/wifi-manager/webapp/webpack/dist/js/node-modules.18c3b7.bundle.js.br
+++ b/components/wifi-manager/webapp/webpack/dist/js/node-modules.18c3b7.bundle.js.br
--- a/components/wifi-manager/webapp/webpack/dist/js/node-modules.18c3b7.bundle.js.gz
+++ b/components/wifi-manager/webapp/webpack/dist/js/node-modules.18c3b7.bundle.js.gz
--- a/components/wifi-manager/webapp/webpack/dist/js/runtime.18c3b7.bundle.js
+++ b/components/wifi-manager/webapp/webpack/dist/js/runtime.18c3b7.bundle.js
--- a/components/wifi-manager/webapp/webpack/dist/js/runtime.18c3b7.bundle.js.br
+++ b/components/wifi-manager/webapp/webpack/dist/js/runtime.18c3b7.bundle.js.br
--- a/components/wifi-manager/webapp/webpack/dist/js/runtime.18c3b7.bundle.js.gz
+++ b/components/wifi-manager/webapp/webpack/dist/js/runtime.18c3b7.bundle.js.gz
--- a/components/wifi-manager/webapp/webpack/dist/sprite.svg.br
+++ b/components/wifi-manager/webapp/webpack/dist/sprite.svg.br
--- a/components/wifi-manager/webapp/webpack/webpack.common.js
+++ b/components/wifi-manager/webapp/webpack/webpack.common.js
@@ -11,6 +11,8 @@ const ESLintPlugin = require('eslint-webpack-plugin');
 const SpriteLoaderPlugin = require('svg-sprite-loader/plugin');
 // Linting
 const TSLintPlugin = require('tslint-webpack-plugin');
+const ImageminPlugin = require('imagemin-webpack-plugin').default;
+const imageminMozjpeg = require('imagemin-mozjpeg');


 module.exports = {
@@ -97,9 +99,10 @@ module.exports = {
                        loader: 'url-loader',
                        options: {
                           // publicPath: '../',
-                            name: './assets/images/' + '[name].[ext]',
+                            //name: './assets/images/' + '[name].[ext]',
                            limit: 10000,
-                            publicPath: '../'
+                            //limit:false,
+                            //publicPath: '../'
                        }

                    },
@@ -177,6 +180,22 @@ module.exports = {

    plugins: [
      new CleanWebpackPlugin(),
+      new ImageminPlugin({
+          test: /\.(jpe?g|png|gif|svg)$/i,
+          // lossLess gif compressor
+          gifsicle: {
+              optimizationLevel: 9
+          },
+          // lossy png compressor, remove for default lossLess
+          pngquant: ({
+              quality: '75'
+          }),
+          // lossy jpg compressor
+          plugins: [imageminMozjpeg({
+              quality: '75'
+          })],
+          destination: './webpack',
+      }),       
        new ESLintPlugin({
            cache: true,
            ignore: true,
@@ -203,6 +222,7 @@ module.exports = {
              useShortDoctype                : true
            },
            favicon: "./src/assets/images/favicon-32x32.png",
+            
            excludeChunks: ['test'],
        }),
        
--- a/components/wifi-manager/webapp/webpack/webpack.dev.js
+++ b/components/wifi-manager/webapp/webpack/webpack.dev.js
@@ -9,15 +9,24 @@ const HtmlWebPackPlugin = require('html-webpack-plugin');
 const SpriteLoaderPlugin = require('svg-sprite-loader/plugin');
 const { Command } = require('commander');
 let  cmdLines= { };
+var { parseArgsStringToArgv } = require('string-argv');
+
 const data = {
    messages: require("../mock/messages.json"),
    messagequeue: require("../mock/messages.json"),
+    message_queue_sequence: [],
+    status_queue_sequence:[],
+    message_queue_sequence_post_empty: null,
+    status_queue_sequence_post_empty: null,
    commands: require("../mock/commands.json"),
    scan: require("../mock/scan.json"),
    ap: require("../mock/ap.json"),
    config: require("../mock/config.json"),
    statusdefinition: require("../mock/statusdefinition.json"),
-    status: require("../mock/status.json")
+    status: require("../mock/status.json"),
+    messages_ota_fail: require("../mock/messages_ota_fail.json"),
+    messages_ota_flash: require("../mock/messages_ota_flash.json"),
+    messages_ota: require("../mock/messages_ota.json")
 };
 const messagingTypes= {
 	MESSAGING_INFO : 'MESSAGING_INFO',
@@ -32,6 +41,7 @@ const messagingClass= {
 	MESSAGING_CLASS_BT: 'MESSAGING_CLASS_BT'
 } ;
 function requeueMessages(){
+    data.messagequeue = [];
    data.messagequeue.push(...data.messages);
    console.log(`Re-queued ${data.messages.length} messages. Total queue length is: ${data.messagequeue.length}`);
 }
@@ -70,7 +80,7 @@ for(const cmdIdx in data.commands.commands){
        cmd: new Command(),
    };
    cmdLines[cmd.name].cmd
-        .storeOptionsAsProperties(false)
+        .storeOptionsAsProperties(true)
        .name(cmd.name)
        .exitOverride();
    for(const argIdx in cmd.argtable){
@@ -107,6 +117,8 @@ module.exports = merge(common, {
        port: 9100,
        host: '127.0.0.1',//your ip address
        disableHostCheck: true,
+        headers: {'Access-Control-Allow-Origin': '*',
+    'Accept-Encoding': 'identity'},
        overlay: true,

        before: function(app) {
@@ -114,22 +126,96 @@ module.exports = merge(common, {
            app.use(bodyParser.urlencoded({ extended: true })) // for parsing application/x-www-form-urlencoded
            app.get('/ap.json', function(req, res) { res.json( data.ap ); });
            app.get('/scan.json', function(req, res) { res.json( data.scan ); });
-            app.get('/config.json', function(req, res) { res.json( data.config ); });
-            app.get('/status.json', function(req, res) { res.json( data.status ); });
+            app.get('/config.json', function(req, res) { 
+                if(data.status.recovery==1 && (data.status.mock_old_recovery??'')!==''){
+                    res.json( data.config.config ); 
+                    console.log('Mock old recovery - return config structure without gpio');
+                }
+                else {
+                    res.json( data.config ); 
+                }
+            });
+
+            app.get('/status.json', function(req, res) { 
+                if(data.status_queue_sequence.length>0){
+                    const curstatus = JSON.parse(data.status_queue_sequence_queue_sequence.shift());
+                    data.status.ota_pct=curstatus.ota_pct??0;
+                    data.status.ota_dsc=curstatus.ota_dsc??'';
+                    console.log(`Mock firmware update @${data.status.ota_pct}%, ${data.status.ota_dsc}`)
+                }
+                else if (data.status_queue_sequence_post_empty){
+                    data.status_queue_sequence_post_emptyy();
+                    console.log(`Mock old firmware update: simulating a restart`);
+                    data.status_queue_sequence_post_empty = null;
+                }
+                else if(data.status.ota_pct!=undefined || data.status.ota_dsc!=undefined) {
+                    if(data.status.ota_pct!=undefined) delete data.status.ota_pct;
+                    if(data.status.ota_dsc!=undefined) delete data.status.ota_dsc;
+                }
+                if(data.status.message) delete data.status.message;
+                if(data.status.recovery==1 && (data.status.mock_old_recovery??'')!==''){
+                    if(data.message_queue_sequence.length>0){
+                        
+                        const msgpayload = JSON.parse(data.message_queue_sequence.shift());
+                        data.status.message = msgpayload.message??'';
+                        console.log(`Mocking recovery, setting status message to ${data.status.message}`)
+                    }
+                    else if (data.message_queue_sequence_post_empty){
+                        data.message_queue_sequence_post_empty();
+                        data.message_queue_sequence_post_empty = null;
+                    }
+                }                                
+                res.json( data.status ); 
+            });
+            app.get('/plugins/SqueezeESP32/firmware/-99', function(req, res) { 
+                let has_proxy=  data.status.mock_plugin_has_proxy ?? 'n';
+                const statusCode='xy'.includes((has_proxy).toLowerCase())?200:500;
+                console.log(`Checking if plugin has proxy enabled with option mock_plugin_has_proxy = ${data.status.mock_plugin_has_proxy}. Returning status ${statusCode} `);
+                res.status(statusCode ).json(); 
+            });
            app.get('/messages.json', function(req, res) { 
+                if(data.status.recovery==1 && (data.status.mock_old_recovery??'')!==''){
+                    console.log('Mocking old recovery, with no commands backend' );
+                    res.status(404).end(); 
+                    return;
+                }
+                if(data.message_queue_sequence.length>0){
+                    data.messagequeue.push(data.message_queue_sequence.shift());
+                }
+                else if (data.message_queue_sequence_post_empty){
+                    data.message_queue_sequence_post_empty();
+                    data.message_queue_sequence_post_empty = null;
+                }
                res.json( data.messagequeue ) ; 
                data.messagequeue=[];
            });
            
            app.get('/statusdefinition.json', function(req, res) { res.json( data.statusdefinition ); });
-            app.get('/commands.json', function(req, res) { res.json( data.commands ); });
+            app.get('/commands.json', function(req, res) { 
+                if(data.status.recovery==1 && (data.status.mock_old_recovery??'')!==''){
+                    console.log('Mocking old recovery, with no commands backend' );
+                    res.status(404).end(); 
+                }
+                else {
+                    res.json( data.commands ); 
+                }
+                
+            });
            app.post('/commands.json', function(req, res) { 
+                if(data.status.recovery==1 && (data.status.mock_old_recovery??'')!==''){
+                    console.log('Mocking old recovery, with no commands backend' );
+                    res.status(404).end(); 
+                    return;
+                }
                console.log(req.body.command);
                try {
                    const cmdName=req.body.command.split(" ")[0];
-                    const args=('node '+req.body.command).split(" ");
+                    const args=parseArgsStringToArgv(req.body.command,'node ');
                    let cmd=cmdLines[cmdName].cmd;
                    if(cmd){
+                        for (const property in cmd.opts()) {
+                            delete cmd[property];
+                        }
                        cmd.parse(args);
                        const msg=`Received Options: ${JSON.stringify(cmd.opts())}\n`;
                        console.log('Options: ', cmd.opts());
@@ -142,20 +228,53 @@ module.exports = merge(common, {
                res.json( { 'Result' : 'Success' } ); 
            });
            app.post('/config.json', function(req, res) { 
-                console.log(req.body);
+                var fwurl='';
+                console.log(`Processing config.json with request body: ${req.body}`);
                console.log(data.config);
                for (const property in req.body.config) {
                    console.log(`${property}: ${req.body.config[property].value}`);
-                    if(data.config[property]=== undefined){
-                        console.log(`Added config value ${property} [${req.body.config[property].value}]`);
-                        data.config[property] = {value: req.body.config[property].value};
+                    if(property=='fwurl'){
+                        fwurl=req.body.config[property].value;
                    }
-                    else if (data.config[property].value!=req.body.config[property].value){
-                        console.log(`Updated config value ${property}\nFrom: ${data.config[property].value}\nTo: ${req.body.config[property].value}]`);
-                        data.config[property].value=req.body.config[property].value;
+                    else {
+                        if(data.config[property]=== undefined){
+                            console.log(`Added config value ${property} [${req.body.config[property].value}]`);
+                            data.config[property] = {value: req.body.config[property].value};
+                        }
+                        else if (data.config[property].value!=req.body.config[property].value){
+                            console.log(`Updated config value ${property}\nFrom: ${data.config[property].value}\nTo: ${req.body.config[property].value}]`);
+                            data.config[property].value=req.body.config[property].value;
+                        }
                    }
+
                  }
                res.json( {} ); 
+                if(fwurl!=='' ){
+                    const ota_msg_list= ((data.status.mock_fail_fw_update ?? '')!=='')?data.messages_ota_fail:data.messages_ota;
+                    if(data.status.recovery!=1) {
+                        // we're not yet in recovery. Simulate reboot to recovery 
+                        data.status.recovery=1;
+                        if((data.status.mock_old_recovery??'')===''){
+                            // older recovery partitions possibly aren't 
+                            // sending messages
+                            requeueMessages();
+                        }
+                        
+                    }
+                    var targetQueue='message_queue_sequence';
+                    var targetPostEmpty='message_queue_sequence_post_empty';
+                    if((data.status.mock_old_recovery??'')!==''){
+                            console.log('Mocking old firmware flashing mechanism.  Starting!');
+                            targetQueue='status_queue_sequence';
+                            targetPostEmpty='status_queue_sequence_post_empty';
+                    }
+                    console.log(`queuing ${ota_msg_list.length} ota messages `);
+                    data[targetQueue].push(...ota_msg_list);
+                    data[targetPostEmpty] = function(){
+                        data.status.recovery=0;
+                        requeueMessages();
+                    }
+                }
            });
            app.post('/status.json', function(req, res) { 

@@ -168,7 +287,7 @@ module.exports = merge(common, {
                        console.log(`Updated status value ${property}\nFrom: ${data.status[property]}\nTo: ${req.body.status[property]}`);
                        data.status[property]=req.body.status[property];
                    }
-                  }
+                }
                res.json( {} ); 
            });            
            app.post('/connect.json', function(req, res) { 
@@ -199,17 +318,37 @@ module.exports = merge(common, {
                requeueMessages();
            });
            app.post('/recovery.json', function(req, res) { 
-                data.status.recovery=1;
-                requeueMessages();
-                res.json( { } ); 
+                if((data.status.mock_fail_recovery ?? '')!==''){
+                    res.status(404).end(); 
+                }
+                else {
+                    data.status.recovery=1;
+                    requeueMessages();
+                    res.json( { } ); 
+                }                
            });
            app.post('/flash.json', function(req, res) { 
+                
                if(data.status.recovery>0){
-                    res.json({});
-                  }
-                  else {
+                    if((data.status.mock_fail_fw_update ?? '')!=='' || (data.status.mock_old_recovery??'')!==''){
+                        console.log('Old recovery mock, or fw fail requested' );
+                        res.status(404).end(); 
+                    }
+                    else {
+                        console.log(`queuing ${data.messages_ota_flash.length} flash ota messages `);
+                        data.message_queue_sequence.push(...data.messages_ota_flash);
+                        data.message_queue_sequence_post_empty = function(){
+                            data.status.recovery=0;
+                            requeueMessages();
+                            
+                        }   
+                        res.json({});                  
+                    }
+                    
+                }
+                else {
                    res.status(404).end(); 
-                  }  
+                }  
            });                  
            app.delete('/connect.json', function(req, res) { 
                data.status.ssid='';
--- a/components/wifi-manager/webapp/webpack/webpack.prod.js
+++ b/components/wifi-manager/webapp/webpack/webpack.prod.js
@@ -11,8 +11,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const CompressionPlugin = require('compression-webpack-plugin');
-const ImageminPlugin = require('imagemin-webpack-plugin').default;
-const imageminMozjpeg = require('imagemin-mozjpeg');
+
 const fs = require('fs');
 const glob = require('glob');
 var WebpackOnBuildPlugin = require('on-build-webpack');
@@ -83,21 +82,7 @@ module.exports = merge(common, {
            threshold: 100,
            minRatio: 0.8,
        }),
-        new ImageminPlugin({
-            test: /\.(jpe?g|png|gif|svg)$/i,
-            // lossLess gif compressor
-            gifsicle: {
-                optimizationLevel: 9
-            },
-            // lossy png compressor, remove for default lossLess
-            pngquant: ({
-                quality: '75'
-            }),
-            // lossy jpg compressor
-            plugins: [imageminMozjpeg({
-                quality: '75'
-            })]
-        }), 
+
        // new FaviconsWebpackPlugin({
        //     // Your source logo
        //     logo: './src/assets/images/200px-ControllerAppIcon.png',
@@ -125,58 +110,79 @@ module.exports = merge(common, {
        //     }
        // }),
        new WebpackOnBuildPlugin(function(stats) {
-                var getDirectories = function (src, callback) {
-                    glob(`${src}/**/*(*.gz|favicon-32x32.png)`, callback);
-                  };
-                getDirectories('./webpack/dist', function (err, list) {
-                    if (err) {
-                        console.log('Error', err);
-                    } else {
-                        const regex = /^(.*\/)([^\/]*)$/
-                        const relativeRegex = /(\w+\/[^\/]*)$/
-                        const makePathRegex = /([^\.].*)$/
-                        let exportDefHead=
-                        '/***********************************\n'+
-                        'webpack_headers\n'+
-                        stats+'\n'+
-                        '***********************************/\n'+
-                        '#pragma once\n'+
-                        '#include <inttypes.h>\n'+
-                        'extern const char * resource_lookups[];\n'+
-                        'extern const uint8_t * resource_map_start[];\n'+
-                        'extern const uint8_t * resource_map_end[];\n';
-                        let exportDef=  '// Automatically generated. Do not edit manually!.\n'+
-                                        '#include <inttypes.h>\n';
-                        let lookupDef='const char * resource_lookups[] = {\n';
-                        let lookupMapStart='const uint8_t * resource_map_start[] = {\n';
-                        let lookupMapEnd='const uint8_t * resource_map_end[] = {\n';
-                        let cMake='';
-                        list.forEach(fileName=>{
-                              let exportName=fileName.match(regex)[2].replace(/[\. \-]/gm,'_');
-                              let relativeName=fileName.match(relativeRegex)[1];
-                              exportDef+=	'extern const uint8_t _'+exportName+'_start[] asm("_binary_'+exportName+'_start");\n'+
-                                        'extern const uint8_t _'+exportName+'_end[] asm("_binary_'+exportName+'_end");\n';
-                              lookupDef+='\t"/'+relativeName+'",\n';
-                              lookupMapStart+='\t_'+ exportName+'_start,\n';
-                              lookupMapEnd+= '\t_'+ exportName+'_end,\n';
-                              cMake+='target_add_binary_data( __idf_wifi-manager ./webapp'+fileName.match(makePathRegex)[1]+' BINARY)\n';
-                        });

-                        lookupDef+='""\n};\n';
-                        lookupMapStart=lookupMapStart.substring(0,lookupMapStart.length-2)+'\n};\n';
-                        lookupMapEnd=lookupMapEnd.substring(0,lookupMapEnd.length-2)+'\n};\n';
+            var getDirectories = function (src, callback) {
+                glob(`${src}/**/*(*.gz|favicon-32x32.png)`, callback);
+                };
+            console.log('Cleaning up previous builds');
+            glob(`../../../build/*.S`, function (err, list) {                  
+                if (err) {
+                    console.error('Error', err);
+                } else {
+                    list.forEach(fileName=>{
                        try {
-                            fs.writeFileSync('webapp.cmake', cMake);
-                            fs.writeFileSync('webpack.c', exportDef+lookupDef+lookupMapStart+lookupMapEnd);
-                            fs.writeFileSync('webpack.h', exportDefHead);
-                            //file written successfully
-                          } catch (e) {
-                            console.error(e);
-                          }        
-                    }
-                    });                
-               }),
-               new BundleAnalyzerPlugin()               
+                            console.log(`Purging old binary file ${fileName} from C project.`);
+                            fs.unlinkSync(fileName)
+                            //file removed
+                            } catch(ferr) {
+                            console.error(ferr)
+                            }
+                    });
+                }
+            }
+            );
+            console.log('Generating C include files from webpack build output');
+            getDirectories('./webpack/dist', function (err, list) {
+                if (err) {
+                    console.log('Error', err);
+                } else {
+                    const regex = /^(.*\/)([^\/]*)$/
+                    const relativeRegex = /((\w+(?<!dist)\/){0,1}[^\/]*)$/
+                    const makePathRegex = /([^\.].*)$/
+                    let exportDefHead=
+                    '/***********************************\n'+
+                    'webpack_headers\n'+
+                    stats+'\n'+
+                    '***********************************/\n'+
+                    '#pragma once\n'+
+                    '#include <inttypes.h>\n'+
+                    'extern const char * resource_lookups[];\n'+
+                    'extern const uint8_t * resource_map_start[];\n'+
+                    'extern const uint8_t * resource_map_end[];\n';
+                    let exportDef=  '// Automatically generated. Do not edit manually!.\n'+
+                                    '#include <inttypes.h>\n';
+                    let lookupDef='const char * resource_lookups[] = {\n';
+                    let lookupMapStart='const uint8_t * resource_map_start[] = {\n';
+                    let lookupMapEnd='const uint8_t * resource_map_end[] = {\n';
+                    let cMake='';
+                    list.forEach(fileName=>{
+                            let exportName=fileName.match(regex)[2].replace(/[\. \-]/gm,'_');
+                            let relativeName=fileName.match(relativeRegex)[1];
+                            exportDef+=	'extern const uint8_t _'+exportName+'_start[] asm("_binary_'+exportName+'_start");\n'+
+                                    'extern const uint8_t _'+exportName+'_end[] asm("_binary_'+exportName+'_end");\n';
+                            lookupDef+='\t"/'+relativeName+'",\n';
+                            lookupMapStart+='\t_'+ exportName+'_start,\n';
+                            lookupMapEnd+= '\t_'+ exportName+'_end,\n';
+                            cMake+='target_add_binary_data( __idf_wifi-manager ./webapp'+fileName.match(makePathRegex)[1]+' BINARY)\n';
+                    });
+
+                    lookupDef+='""\n};\n';
+                    lookupMapStart=lookupMapStart.substring(0,lookupMapStart.length-2)+'\n};\n';
+                    lookupMapEnd=lookupMapEnd.substring(0,lookupMapEnd.length-2)+'\n};\n';
+                    try {
+                        fs.writeFileSync('webapp.cmake', cMake);
+                        fs.writeFileSync('webpack.c', exportDef+lookupDef+lookupMapStart+lookupMapEnd);
+                        fs.writeFileSync('webpack.h', exportDefHead);
+                        //file written successfully
+                        } catch (e) {
+                        console.error(e);
+                        }        
+                }
+            });
+            console.log('Post build completed.');
+
+        }),
+        new BundleAnalyzerPlugin()               
    ]
 });

--- a/components/wifi-manager/wifi_manager.c
+++ b/components/wifi-manager/wifi_manager.c
@@ -69,8 +69,10 @@ Contains the freeRTOS task and all necessary support
 #include "monitor.h"
 #include "globdefs.h"

-#ifndef SQUEEZELITE_ESP32_RELEASE_URL
-#define SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases"
+
+#ifndef CONFIG_SQUEEZELITE_ESP32_RELEASE_URL
+#pragma message "Defaulting release url"
+#define CONFIG_SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases"
 #endif

 #define STR_OR_BLANK(p) p==NULL?"":p
@@ -90,11 +92,13 @@ char *ip_info_json = NULL;
 char * release_url=NULL;
 cJSON * ip_info_cjson=NULL;
 wifi_config_t* wifi_manager_config_sta = NULL;
-
-
+static void	(*chained_notify)(in_addr_t, u16_t, u16_t);	
 static int32_t total_connected_time=0;
 static int64_t last_connected=0;
 static uint16_t num_disconnect=0;
+static char lms_server_ip[IP4ADDR_STRLEN_MAX]={0};
+static uint16_t lms_server_port=0;
+static uint16_t lms_server_cport=0;

 void (**cb_ptr_arr)(void*) = NULL;

@@ -296,6 +300,22 @@ void wifi_manager_init_wifi(){
    taskYIELD();
    ESP_LOGD(TAG,   "Initializing wifi. done");
 }
+
+void set_lms_server_details(in_addr_t ip, u16_t hport, u16_t cport){
+	strncpy(lms_server_ip,inet_ntoa(ip),sizeof(lms_server_ip));
+	ESP_LOGI(TAG,"LMS IP: %s, hport: %d, cport: %d",lms_server_ip, hport, cport);
+	lms_server_port = hport;
+	lms_server_cport = cport;
+
+}
+
+static void connect_notify(in_addr_t ip, u16_t hport, u16_t cport) {
+	set_lms_server_details(ip,hport,cport);
+	if (chained_notify) (*chained_notify)(ip, hport, cport);
+	wifi_manager_update_status();
+}
+
+
 void wifi_manager_start(){


@@ -330,14 +350,15 @@ void wifi_manager_start(){
 	wifi_manager_safe_update_sta_ip_string(NULL);

 	ESP_LOGD(TAG,   "Getting release url ");
-	char * release_url = (char * )config_alloc_get_default(NVS_TYPE_STR, "release_url", QUOTE(SQUEEZELITE_ESP32_RELEASE_URL), 0);
+	char * release_url = (char * )config_alloc_get_default(NVS_TYPE_STR, "release_url", QUOTE(CONFIG_SQUEEZELITE_ESP32_RELEASE_URL), 0);
 	if(release_url == NULL){
 		ESP_LOGE(TAG,  "Unable to retrieve the release url from nvs");
 	}
 	else {
 		ESP_LOGD(TAG,   "Found release url %s", release_url);
 	}
-
+	chained_notify = server_notify;
+	server_notify = connect_notify;
 	ESP_LOGD(TAG,   "About to call init wifi");
 	wifi_manager_init_wifi();

@@ -494,6 +515,35 @@ void wifi_manager_update_basic_info(){
 		if(avg_conn_time){
 			cJSON_SetNumberValue(avg_conn_time,	num_disconnect>0?(total_connected_time/num_disconnect):0);
 		}	
+		if(lms_server_cport>0){
+			cJSON * value = cJSON_GetObjectItemCaseSensitive(ip_info_cjson, "lms_cport");
+			if(value){
+				cJSON_SetNumberValue(value,lms_server_cport);
+			}			
+			else {
+				cJSON_AddNumberToObject(ip_info_cjson,"lms_cport",lms_server_cport);
+			}
+		}
+
+		if(lms_server_port>0){
+			cJSON * value = cJSON_GetObjectItemCaseSensitive(ip_info_cjson, "lms_port");
+			if(value){
+				cJSON_SetNumberValue(value,lms_server_port);
+			}			
+			else {
+				cJSON_AddNumberToObject(ip_info_cjson,"lms_port",lms_server_port);
+			}
+		}
+
+
+		if(strlen(lms_server_ip) >0){
+			cJSON * value = cJSON_GetObjectItemCaseSensitive(ip_info_cjson, "lms_ip");
+			if(!value){
+				// only create if it does not exist. Since we're creating a reference 
+				// to a char buffer, updates to cJSON aren't needed
+				cJSON_AddItemToObject(ip_info_cjson, "lms_ip", cJSON_CreateStringReference(lms_server_ip));
+			}			
+		}		
 		wifi_manager_unlock_json_buffer();
 	}
 }
@@ -503,6 +553,9 @@ cJSON * wifi_manager_get_basic_info(cJSON **old){
 	ESP_LOGV(TAG,  "wifi_manager_get_basic_info called");
 	cJSON *root = wifi_manager_get_new_json(old);
 	cJSON_AddItemToObject(root, "project_name", cJSON_CreateString(desc->project_name));
+	#ifdef CONFIG_FW_PLATFORM_NAME
+		cJSON_AddItemToObject(root, "platform_name", cJSON_CreateString(CONFIG_FW_PLATFORM_NAME));
+	#endif
 	cJSON_AddItemToObject(root, "version", cJSON_CreateString(desc->version));
 	if(release_url !=NULL) cJSON_AddItemToObject(root, "release_url", cJSON_CreateString(release_url));
 	cJSON_AddNumberToObject(root,"recovery",	is_recovery_running?1:0);
@@ -517,6 +570,7 @@ cJSON * wifi_manager_get_basic_info(cJSON **old){
 #else
 	cJSON_AddFalseToObject(root, "is_i2c_locked");
 #endif
+
 	ESP_LOGV(TAG,  "wifi_manager_get_basic_info done");
 	return root;
 }
--- a/components/wifi-manager/wifi_manager_http_server.c
+++ b/components/wifi-manager/wifi_manager_http_server.c
@@ -44,6 +44,8 @@ void register_common_handlers(httpd_handle_t server){
 	httpd_register_uri_handler(server, &js_get);
 	httpd_uri_t icon_get = { .uri = "/icons*", .method = HTTP_GET, .handler = resource_filehandler, .user_ctx = rest_context };
 	httpd_register_uri_handler(server, &icon_get);	
+	httpd_uri_t png_get = { .uri = "/favicon*", .method = HTTP_GET, .handler = resource_filehandler, .user_ctx = rest_context };
+	httpd_register_uri_handler(server, &png_get);	

 }
 void register_regular_handlers(httpd_handle_t server){
--- a/eclipse_make_wrapper.py
+++ b/eclipse_make_wrapper.py
@@ -1,113 +0,0 @@
-#!/usr/bin/env python
-#
-# Wrapper to run make and preprocess any paths in the output from MSYS Unix-style paths
-# to Windows paths, for Eclipse
-from __future__ import print_function, division
-import sys
-import subprocess
-import os.path
-import os
-import re
-import glob
-from test import test_cmd_line
-
-#UNIX_PATH_RE = re.compile(r'(([a-zA-Z]{1}[:]{1}){0,1}[/\\][^\s\'\"\t\[\(]+)+')
-UNIX_PATH_RE = re.compile(r'(([a-zA-Z]{1}[:]{1}){0,1}[/\\][^\s\'\"\t\[\(]+(?![^\\/\n]*$)[/\\]?)')
-INCLUDE_PATH_RE = re.compile(r'-I[\s"]{0,}(.+?)["]{0,}(?=\s-\S)')
-INCLUDE_PATH_ADJ_RE = re.compile(r'^([/]opt[/]esp-idf[/]){1}(.*)')
-INCLUDE_PATH_ADJ2_RE = re.compile(r'^([/]c[/]){1}(.*)')
-
-paths = {}
-names = []
-idf_path= os.environ.get('IDF_PATH').replace("/", "\\")
-cwd_path= os.environ.get('CWD')
-pwd_path= os.environ.get('PWD')         
-         
-def check_path(path):
-    try:
-        return paths[path]
-    except KeyError:
-        pass
-    paths[path] = path
-    winpath =path
-    
-    if not os.path.exists(winpath):
-          # cache as failed, replace with success if it works
-        if re.match(INCLUDE_PATH_ADJ2_RE, path) is not None:
-                winpath = INCLUDE_PATH_ADJ2_RE.sub(r'c:/\2',path) #replace /c/ 
-        try:
-            winpath = subprocess.check_output(["cygpath", "-w", winpath]).strip()
-        except subprocess.CalledProcessError:
-            return path  # something went wrong running cygpath, assume this is not a path!
-    if not os.path.exists(winpath):
-        if not os.path.exists(winpath):
-            winpath=idf_path  + '\\' + re.sub(r'^[/\\]opt[/\\](esp-idf[/\\]){0,}', '', path, 1)
-            try:
-                winpath = subprocess.check_output(["cygpath", "-w", winpath]).strip()
-            except subprocess.CalledProcessError:
-                return path  # something went wrong running cygpath, assume this is not a path!
-            if not os.path.exists(winpath):
-                return path  # not actually a valid path
-    
-    winpath = winpath.replace("/", "\\")  # make consistent with forward-slashes used elsewhere
-    paths[path] = winpath
-    
-    
-    #print("In path: {0}, out path: {1}".format(path,winpath) )
-    return winpath
-def fix_paths(filename):
-    if re.match(r'.*[\\](.*$)',filename) is not None:
-        filename = re.findall(r'.*[\\](.*$)',filename)[0].replace("\\", "/")
-    
-    return filename.rstrip()
-
-def print_paths(path_list, file_name, source_file):
-    
-    new_path_list = list(set(path_list))
-    new_path_list.sort()
-    last_n = ''
-    cmd_line='xtensa-esp32-elf-gcc '
-    for n in new_path_list:
-        if re.match(INCLUDE_PATH_ADJ_RE, n) is not None:
-            n = INCLUDE_PATH_ADJ_RE.sub(idf_path+r"\2",n )
-        if re.match(INCLUDE_PATH_ADJ2_RE, n) is not None:
-            n = INCLUDE_PATH_ADJ2_RE.sub(r'c:/\2',n)
-        if last_n != n:
-            cmd_line = cmd_line + ' -I ' + n.rstrip()
-        last_n = n
-    if source_file:
-        cmd_line = cmd_line + ' -c ' + fix_paths(source_file)
-    cmd_line = cmd_line + ' -o ' + fix_paths(file_name)
-    print(cmd_line)
-def extract_includes():
-    
-    for filename in [y for x in os.walk('build') for y in glob.glob(os.path.join(x[0], '*.d'))]:
-        lines = []
-        source=''
-        with open(filename) as file_in:
-            for line in file_in:
-                if re.match(r'\S*(?=/[^/]*\.[h][p]?)',line) is not None:
-                    lines.extend(re.findall(r'\S*(?=/[^/]*\.[h][p]?)/',line))
-                if re.match(r'\S*(?=\.[cC][pP]{0,})[^\\\s]*',line) is not None:
-                    source = re.findall(r'\S*(?=\.[cC][pP]{0,})[^\\\s]*',line)[0]
-        
-        print_paths(lines,filename,source )
-            
-def main():
-    cwd_path=check_path(os.getcwd())
-    os.environ['CWD']= cwd_path
-    os.environ['PWD']= cwd_path
-    idf_path= os.environ.get('IDF_PATH').replace("/", "\\")
-    cwd_path= os.environ.get('CWD')
-    pwd_path= os.environ.get('PWD')
-    print('Running custom script make in {}, IDF_PATH={}, CWD={}, PWD={}'.format(cwd_path,idf_path,cwd_path,pwd_path))
-    
-    make = subprocess.Popen(["make"] + sys.argv[1:] + ["BATCH_BUILD=1"], stdout=subprocess.PIPE)
-    for line in iter(make.stdout.readline, ''):
-        line = re.sub(UNIX_PATH_RE, lambda m: check_path(m.group(0)), line)
-        names.extend(INCLUDE_PATH_RE.findall(line))
-        print(line.rstrip())
-    sys.exit(make.wait())
-
-if __name__ == "__main__":
-    main()
--- a/main/Kconfig.projbuild
+++ b/main/Kconfig.projbuild
@@ -21,7 +21,6 @@ menu "Squeezelite-ESP32"
        	help
        		Set logging level info|debug|sdebug 	
 	endmenu
-	
 	config JACK_LOCKED
 		bool
 	config BAT_LOCKED	
@@ -37,55 +36,82 @@ menu "Squeezelite-ESP32"
 	config MUTE_GPIO_LEVEL
 		int 
 		default 0
-		
-# AGGREGATES - begin
-# these parameters are "aggregates"	that take precedence. The must have a default value	
-	config DAC_CONFIG
-		string 
-		default "model=TAS57xx,bck=33,ws=25,do=32,sda=27,scl=26,mute=14:0" if SQUEEZEAMP
-		default "model=AC101,bck=27,ws=26,do=25,di=35,sda=33,scl=32" if A1S
-		default "model=I2S,bck=26,ws=25,do=33,i2c=53,sda=21,scl=22" if TWATCH2020
-		default ""
-	config SPDIF_CONFIG		
-		string
-		default "bck=33,ws=25,do=15" if SQUEEZEAMP
-		default	""
-	config SPI_CONFIG
-		string
-		default "dc=27,data=19,clk=18" if TWATCH2020		
-		default	""
-	config DISPLAY_CONFIG
-		string
-		default "SPI,driver=ST7789,width=240,height=240,cs=5,back=12,speed=16000000,HFlip,VFlip" if TWATCH2020
-		default ""
-	config DAC_CONTROLSET
-		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 ""		
-# AGGREGATES - end		
-		
-	choice OUTPUT_TYPE
-		prompt "Main system"
-	       default BASIC_I2C_BT
-	       help
-	           Type of hardware platform
-	       config SQUEEZEAMP 
-			bool "SqueezeAMP"
-			select JACK_LOCKED
-			select BAT_LOCKED
-			select I2C_LOCKED
-			select LED_LOCKED
-			select SPKFAULT_LOCKED
-		config A1S
-	           bool "ESP32-A1S module"				
-			select I2C_LOCKED
-		config TWATCH2020	
-			bool "T-WATCH2020 by LilyGo"				
-			select I2C_LOCKED				
-	       config BASIC_I2C_BT
-	           bool "Generic I2S & Bluetooth"
-	endchoice		
-
+	menu "Target"
+		choice OUTPUT_TYPE
+			prompt "Main system"
+			   default BASIC_I2C_BT
+			   help
+				   Type of hardware platform
+			config SQUEEZEAMP 
+				bool "SqueezeAMP"
+				select JACK_LOCKED
+				select BAT_LOCKED
+				select I2C_LOCKED
+				select LED_LOCKED
+				select SPKFAULT_LOCKED
+			config A1S
+				   bool "ESP32-A1S module"				
+				select I2C_LOCKED
+			config DAC32
+					bool "DAC32 module"				
+			config TWATCH2020	
+				bool "T-WATCH2020 by LilyGo"				
+				select I2C_LOCKED				
+			   config BASIC_I2C_BT
+				   bool "Generic I2S & Bluetooth"
+		endchoice	
+		config RELEASE_API
+        	string "Software update URL"
+			default "https://api.github.com/repos/sle118/squeezelite-esp32/releases" if !DAC32
+			default "https://yourdomain/api/releases" if DAC32
+        	help
+        		Set the URL of the API that the front-end UI will use to fetch software updates 
+		config SQUEEZELITE_ESP32_RELEASE_URL
+			string "Release URL"
+			default "https://github.com/sle118/squeezelite-esp32/releases" if !DAC32
+			default "https://yourdomain/releases" if DAC32
+			help
+				Set the URL where users can see a list of releases
+		config PROJECT_NAME
+			string "Project Name"
+			default "Squeezelite-A1S" if A1S
+			default "SqueezeAMP" if SQUEEZEAMP
+			default "DAC32" if DAC32
+			default "Squeezelite-TWATCH" if TWATCH2020
+			default "Squeezelite-ESP32" if !A1S && !SQUEEZEAMP && !DAC32 && !TWATCH2020
+		config FW_PLATFORM_NAME
+			string "Hardware Platform Name"
+			default "SqueezeAmp" if SQUEEZEAMP
+			default "DAC32" if DAC32
+			default "ESP32-A1S" if A1S
+			default "TWATCH" if TWATCH2020
+			default "I2S-4MFlash" if !A1S && !SQUEEZEAMP && !DAC32 && !TWATCH2020
+		# AGGREGATES - begin
+		# these parameters are "aggregates"	that take precedence. They must have a default value	
+		config DAC_CONFIG
+			string 
+			default "model=TAS57xx,bck=33,ws=25,do=32,sda=27,scl=26,mute=14:0" if SQUEEZEAMP
+			default "model=AC101,bck=27,ws=26,do=25,di=35,sda=33,scl=32" if A1S
+			default "model=I2S,bck=26,ws=25,do=33,i2c=53,sda=21,scl=22" if TWATCH2020
+			default ""
+		config SPDIF_CONFIG		
+			string
+			default "bck=33,ws=25,do=15" if SQUEEZEAMP
+			default	""
+		config SPI_CONFIG
+			string
+			default "dc=27,data=19,clk=18" if TWATCH2020		
+			default	""
+		config DISPLAY_CONFIG
+			string
+			default "SPI,driver=ST7789,width=240,height=240,cs=5,back=12,speed=16000000,HFlip,VFlip" if TWATCH2020
+			default ""
+		config DAC_CONTROLSET
+			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 ""		
+		# AGGREGATES - end				
+	endmenu
 	menu "Audio settings"
 		menu "DAC settings" 
 			visible if BASIC_I2C_BT
--- a/main/esp_app_main.c
+++ b/main/esp_app_main.c
@@ -20,7 +20,6 @@
 #include "esp_system.h"
 #include "esp_spi_flash.h"
 #include "esp_wifi.h"
-#include "esp_system.h"
 #include <esp_event.h>
 #include "nvs_flash.h"
 #include "esp_log.h"
@@ -86,11 +85,18 @@ void cb_connection_got_ip(void *pvParameter){
 		esp_restart();
 	}
 	ip.addr = ipInfo.ip.addr;
-	ESP_LOGI(TAG, "I have a connection!");
+	ESP_LOGI(TAG, "Wifi connected!");
 	messaging_post_message(MESSAGING_INFO,MESSAGING_CLASS_SYSTEM,"Wifi connected");
 	xEventGroupSetBits(wifi_event_group, CONNECTED_BIT);
 	bWifiConnected=true;
 	led_unpush(LED_GREEN);
+		if(is_recovery_running){
+		// when running in recovery, send a LMS discovery message 
+		// to find a running instance. This is to enable using 
+		// the plugin's proxy mode for FW download and avoid
+		// expired certificate issues.
+		discover_ota_server(5);
+	}
 }
 void cb_connection_sta_disconnected(void *pvParameter){
 	led_blink_pushed(LED_GREEN, 250, 250);
@@ -280,33 +286,43 @@ void register_default_nvs(){

 	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "autoexec", "1");
 	config_set_default(NVS_TYPE_STR,"autoexec","1", 0);
+
 	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "autoexec1",default_command_line);
 	config_set_default(NVS_TYPE_STR,"autoexec1",default_command_line,0);
+
 	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "a2dp_sink_name", CONFIG_A2DP_SINK_NAME);
 	config_set_default(NVS_TYPE_STR, "a2dp_sink_name", CONFIG_A2DP_SINK_NAME, 0);
-	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bt_sink_pin", STR(CONFIG_BT_SINK_PIN));
-	config_set_default(NVS_TYPE_STR, "a2dp_ctmt", STR(CONFIG_A2DP_CONNECT_TIMEOUT_MS), 0);
-	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bt_sink_pin", STR(CONFIG_A2DP_CONNECT_TIMEOUT_MS));
-	config_set_default(NVS_TYPE_STR, "a2dp_ctrld", STR(CONFIG_A2DP_CONTROL_DELAY_MS), 0);
-	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bt_sink_pin", STR(CONFIG_A2DP_CONTROL_DELAY_MS));

-	config_set_default(NVS_TYPE_STR, "bt_sink_pin", STR(CONFIG_BT_SINK_PIN), 0);
-	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "release_url", SQUEEZELITE_ESP32_RELEASE_URL);
-	config_set_default(NVS_TYPE_STR, "release_url", SQUEEZELITE_ESP32_RELEASE_URL, 0);
+	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "a2dp_sink_name", STR(CONFIG_A2DP_SINK_NAME));
+	config_set_default(NVS_TYPE_STR, "a2dp_ctmt", STR(CONFIG_A2DP_CONNECT_TIMEOUT_MS), 0);
+	
+	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "a2dp_ctmt", STR(CONFIG_A2DP_CONNECT_TIMEOUT_MS));
+	config_set_default(NVS_TYPE_STR, "a2dp_ctrld", STR(CONFIG_A2DP_CONTROL_DELAY_MS), 0);
+	
+	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "release_url", CONFIG_SQUEEZELITE_ESP32_RELEASE_URL);
+	config_set_default(NVS_TYPE_STR, "release_url", CONFIG_SQUEEZELITE_ESP32_RELEASE_URL, 0);
+	
 	ESP_LOGD(TAG,"Registering default value for key %s, value %s","ap_ip_address",CONFIG_DEFAULT_AP_IP );
 	config_set_default(NVS_TYPE_STR, "ap_ip_address",CONFIG_DEFAULT_AP_IP , 0);
+
 	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "ap_ip_gateway",CONFIG_DEFAULT_AP_GATEWAY );
 	config_set_default(NVS_TYPE_STR, "ap_ip_gateway",CONFIG_DEFAULT_AP_GATEWAY , 0);
+
 	ESP_LOGD(TAG,"Registering default value for key %s, value %s","ap_ip_netmask",CONFIG_DEFAULT_AP_NETMASK );
 	config_set_default(NVS_TYPE_STR, "ap_ip_netmask",CONFIG_DEFAULT_AP_NETMASK , 0);
+
 	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "ap_channel",STR(CONFIG_DEFAULT_AP_CHANNEL));
 	config_set_default(NVS_TYPE_STR, "ap_channel",STR(CONFIG_DEFAULT_AP_CHANNEL) , 0);
+
 	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "ap_pwd", CONFIG_DEFAULT_AP_PASSWORD);
 	config_set_default(NVS_TYPE_STR, "ap_pwd", CONFIG_DEFAULT_AP_PASSWORD, 0);
+
 	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "airplay_port", CONFIG_AIRPLAY_PORT);
 	config_set_default(NVS_TYPE_STR, "airplay_port", CONFIG_AIRPLAY_PORT, 0);
+
 	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "a2dp_dev_name", CONFIG_A2DP_DEV_NAME);
 	config_set_default(NVS_TYPE_STR, "a2dp_dev_name", CONFIG_A2DP_DEV_NAME, 0);
+
 	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bypass_wm", "0");
 	config_set_default(NVS_TYPE_STR, "bypass_wm", "0", 0);

@@ -334,6 +350,12 @@ void register_default_nvs(){

 	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "enable_bt_sink", STR(CONFIG_BT_SINK));
 	config_set_default(NVS_TYPE_STR, "enable_bt_sink", STR(CONFIG_BT_SINK), 0);
+
+	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bt_sink_pin", STR(CONFIG_BT_SINK_PIN));
+	config_set_default(NVS_TYPE_STR, "bt_sink_pin", STR(CONFIG_BT_SINK_PIN), 0);
+	
+	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bt_sink_volume", "127");
+	config_set_default(NVS_TYPE_STR, "bt_sink_volume", "127", 0);
 	
 	ESP_LOGD(TAG,"Registering default value for key %s, value %s", "enable_airplay", STR(CONFIG_AIRPLAY_SINK));
 	config_set_default(NVS_TYPE_STR, "enable_airplay", STR(CONFIG_AIRPLAY_SINK), 0);
@@ -382,6 +404,10 @@ void register_default_nvs(){
 	
 	ESP_LOGD(TAG,"Registering default value for key %s", "stats");
 	config_set_default(NVS_TYPE_STR, "stats", "n", 0);
+
+	ESP_LOGD(TAG,"Registering default value for key %s", "rel_api");
+	config_set_default(NVS_TYPE_STR, "rel_api", CONFIG_RELEASE_API, 0);
+
 	wait_for_commit();
 	ESP_LOGD(TAG,"Done setting default values in nvs.");
 }
--- a/main/platform_esp32.h
+++ b/main/platform_esp32.h
@@ -12,8 +12,8 @@
 #pragma once

 #include "esp_pthread.h"
-#ifndef SQUEEZELITE_ESP32_RELEASE_URL
-#define SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases"
+#ifndef CONFIG_SQUEEZELITE_ESP32_RELEASE_URL
+#define CONFIG_SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases"
 #endif

 extern void run_command(char * line);
--- a/19
+++ b/19
@@ -75,21 +75,26 @@ CONFIG_LOGGING_SLIMPROTO="info"
 CONFIG_LOGGING_STREAM="info"
 CONFIG_LOGGING_DECODE="info"
 CONFIG_LOGGING_OUTPUT="info"
+CONFIG_I2C_LOCKED=y
 CONFIG_MUTE_GPIO_LEVEL=0
-CONFIG_DAC_CONFIG=""
+# CONFIG_SQUEEZEAMP is not set
+CONFIG_A1S=y
+# CONFIG_DAC32 is not set
+# CONFIG_TWATCH2020 is not set
+# CONFIG_BASIC_I2C_BT is not set
+CONFIG_RELEASE_API="https://api.github.com/repos/sle118/squeezelite-esp32/releases"
+CONFIG_SQUEEZELITE_ESP32_RELEASE_URL="https://github.com/sle118/squeezelite-esp32/releases"
+CONFIG_PROJECT_NAME="Squeezelite ESP32-A1S"
+CONFIG_FW_PLATFORM_NAME="ESP32-A1S"
+CONFIG_DAC_CONFIG="model=AC101,bck=27,ws=26,do=25,di=35,sda=33,scl=32"
 CONFIG_SPDIF_CONFIG=""
 CONFIG_SPI_CONFIG=""
 CONFIG_DISPLAY_CONFIG=""
 CONFIG_DAC_CONTROLSET=""
-# CONFIG_SQUEEZEAMP is not set
-# CONFIG_A1S is not set
-# CONFIG_TWATCH2020 is not set
-CONFIG_BASIC_I2C_BT=y
 CONFIG_I2S_NUM=0
 CONFIG_I2S_BCK_IO=-1
 CONFIG_I2S_WS_IO=-1
 CONFIG_I2S_DO_IO=-1
-CONFIG_I2S_DI_IO=-1
 CONFIG_I2C_SDA=-1
 CONFIG_I2C_SCL=-1
 CONFIG_MUTE_GPIO=-1
@@ -612,7 +617,7 @@ CONFIG_LOG_DEFAULT_LEVEL_INFO=y
 # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
 CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_LOG_COLORS=y
-CONFIG_LWIP_LOCAL_HOSTNAME="squeezelite-esp32"
+CONFIG_LWIP_LOCAL_HOSTNAME="esp32a1s"
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
 # CONFIG_LWIP_IRAM_OPTIMIZATION is not set
 CONFIG_LWIP_TIMERS_ONDEMAND=y
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-custom.build
+local.500.cmake-master
Author	SHA1	Message	Date
Sébastien	87b8c46263	drum roll. V1 release	2021-04-21 14:06:16 -04:00
Sebastien	d7aef11856	Merge remote-tracking branch 'origin/master-cmake' into master-cmake	2021-04-21 14:01:27 -04:00
Sebastien	be842d235d	update to version 1	2021-04-21 14:01:23 -04:00
Philippe G	d49ad66177	version 1	2021-04-21 10:55:46 -07:00
Sebastien	ca28669b0a	Merge remote-tracking branch 'origin/master-cmake' into master-cmake	2021-04-21 13:27:36 -04:00
Sebastien	45f480d948	NVS ui fine-tuning, site icon now works	2021-04-21 13:27:32 -04:00
Philippe G	852e312879	Correct AAC handling of different AOT	2021-04-20 19:38:01 -07:00
Philippe G	c79cf5b58f	more AAC SBR combinations	2021-04-19 22:47:35 -07:00
Philippe G	ec7982dbfc	Merge branch 'master-cmake' of https://github.com/sle118/squeezelite-esp32 into master-cmake	2021-04-16 11:44:44 -07:00
Philippe G	afd76bdfbb	do not fail when external dac has no I2C!	2021-04-16 11:43:02 -07:00
philippe44	89ecd19d32	Update README.md	2021-04-15 15:56:34 -07:00
Philippe G	8904ec1afd	remove extra bt_sink NVS initialization	2021-04-14 23:56:25 -07:00
Sebastien	5120029643	Firmware update improvements - include webpack build files	2021-04-14 21:09:45 -04:00
Sebastien	4a529d6fbd	Firmware update UI revamp with support for local proxy	2021-04-14 18:16:18 -04:00
Sebastien	afe697e4b1	Merge remote-tracking branch 'origin/master-cmake' into master-cmake	2021-04-14 18:15:38 -04:00
Philippe G	879b1f9107	handle abs & local BT volume - release	2021-04-13 18:04:23 -07:00
Sebastien	5a7d4fd535	Merge remote-tracking branch 'origin/master-cmake' into master-cmake	2021-04-12 12:12:00 -04:00
Sebastien	d61c650f39	UI change of the update mechanism	2021-04-12 12:11:54 -04:00
Sebastien	a105f7fd99	Merge remote-tracking branch 'origin/master-cmake' into master-cmake	2021-04-09 13:45:59 -04:00
Sebastien	4444fed343	Merge with LMS OTA proxy	2021-04-03 21:16:00 -04:00
Sebastien	2b59c38b4b	Merge remote-tracking branch 'origin/master-cmake' into master-cmake	2021-04-03 11:11:10 -04:00
Sebastien	7457632990	Auto stash before merge of "master-cmake" and "origin/master-cmake"	2021-03-25 10:15:37 -04:00