Merge branch 'sle118:master-v4.3' into led_visu-v4.3

components/platform_console/platform_console.c

@@ -313,8 +313,8 @@ void initialize_console() {
 	vfs.open = stdin_dummy;
 	vfs.read = stdin_read;
 
-	ESP_ERROR_CHECK(esp_vfs_register("/dev/console", &vfs, NULL));
-	freopen("/dev/console", "r", stdin);
+	ESP_ERROR_CHECK(esp_vfs_register("/dev/redirect", &vfs, NULL));
+    freopen("/dev/redirect", "r", stdin);
 
 	/* Disable buffering on stdin */
 	setvbuf(stdin, NULL, _IONBF, 0);

components/squeezelite/slimproto.c

@@ -825,7 +825,7 @@ in_addr_t discover_server(char *default_server, int max) {
 
 	do {
 
-		LOG_INFO("sending discovery");
+		LOG_INFO("sending discovery %u", max);
 		memset(&s, 0, sizeof(s));
 
 		if (sendto(disc_sock, buf, len, 0, (struct sockaddr *)&d, sizeof(d)) < 0) {
@@ -885,7 +885,13 @@ void slimproto(log_level level, char *server, u8_t mac[6], const char *name, con
 	}
 
 	if (!slimproto_ip) {
-		slimproto_ip = discover_server(server, 0);
+#if EMBEDDED        
+        // on first attempt, try really hard to connect before exiting (and only exit if we are not on another sink)
+		slimproto_ip = discover_server(server, MAX_SERVER_RETRIES * 5);
+        if (!slimproto_ip && !output.external) return;
+#else        
+    	slimproto_ip = discover_server(server, 0);
+#endif    
 	}
 
 	if (!slimproto_port) {
@@ -970,7 +976,7 @@ void slimproto(log_level level, char *server, u8_t mac[6], const char *name, con
 
 #if EMBEDDED
 			// in embedded we give up after a while no matter what
-			if (++failed_connect > 5 && !server) {
+			if (++failed_connect > MAX_SERVER_RETRIES && !server) {
 				slimproto_ip = serv_addr.sin_addr.s_addr = discover_server(NULL, MAX_SERVER_RETRIES);
 				if (!slimproto_ip) return;
 			} else if (reconnect && MAX_SERVER_RETRIES && failed_connect > 5 * MAX_SERVER_RETRIES) return;

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

@@ -53,6 +53,8 @@ declare function getStatus(): {};
 declare function getStatus(): {};
 declare function getStatus(): {};
 declare function getStatus(): {};
+declare function getStatus(): {};
+declare function getStatus(): {};
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
@@ -108,6 +110,10 @@ declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
 declare function getRadioButton(entry: any): string;
+declare function getRadioButton(entry: any): string;
+declare function getRadioButton(entry: any): string;
+declare function pushStatus(): void;
+declare function pushStatus(): void;
 declare function pushStatus(): void;
 declare function pushStatus(): void;
 declare function pushStatus(): void;

components/wifi-manager/webapp/webapp.cmake

@@ -1,5 +1,5 @@
 target_add_binary_data( __idf_wifi-manager webapp/dist/css/index.99c86edb045064f0ff9e.css.gz BINARY)
 target_add_binary_data( __idf_wifi-manager webapp/dist/favicon-32x32.png BINARY)
 target_add_binary_data( __idf_wifi-manager webapp/dist/index.html.gz BINARY)
-target_add_binary_data( __idf_wifi-manager webapp/dist/js/index.f2d7ed.bundle.js.gz BINARY)
-target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.f2d7ed.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/js/index.b5eac1.bundle.js.gz BINARY)
+target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.b5eac1.bundle.js.gz BINARY)

components/wifi-manager/webapp/webpack.c

@@ -6,29 +6,29 @@ extern const uint8_t _favicon_32x32_png_start[] asm("_binary_favicon_32x32_png_s
 extern const uint8_t _favicon_32x32_png_end[] asm("_binary_favicon_32x32_png_end");
 extern const uint8_t _index_html_gz_start[] asm("_binary_index_html_gz_start");
 extern const uint8_t _index_html_gz_end[] asm("_binary_index_html_gz_end");
-extern const uint8_t _index_f2d7ed_bundle_js_gz_start[] asm("_binary_index_f2d7ed_bundle_js_gz_start");
-extern const uint8_t _index_f2d7ed_bundle_js_gz_end[] asm("_binary_index_f2d7ed_bundle_js_gz_end");
-extern const uint8_t _node_vendors_f2d7ed_bundle_js_gz_start[] asm("_binary_node_vendors_f2d7ed_bundle_js_gz_start");
-extern const uint8_t _node_vendors_f2d7ed_bundle_js_gz_end[] asm("_binary_node_vendors_f2d7ed_bundle_js_gz_end");
+extern const uint8_t _index_b5eac1_bundle_js_gz_start[] asm("_binary_index_b5eac1_bundle_js_gz_start");
+extern const uint8_t _index_b5eac1_bundle_js_gz_end[] asm("_binary_index_b5eac1_bundle_js_gz_end");
+extern const uint8_t _node_vendors_b5eac1_bundle_js_gz_start[] asm("_binary_node_vendors_b5eac1_bundle_js_gz_start");
+extern const uint8_t _node_vendors_b5eac1_bundle_js_gz_end[] asm("_binary_node_vendors_b5eac1_bundle_js_gz_end");
 const char * resource_lookups[] = {
 	"/css/index.99c86edb045064f0ff9e.css.gz",
 	"/favicon-32x32.png",
 	"/index.html.gz",
-	"/js/index.f2d7ed.bundle.js.gz",
-	"/js/node_vendors.f2d7ed.bundle.js.gz",
+	"/js/index.b5eac1.bundle.js.gz",
+	"/js/node_vendors.b5eac1.bundle.js.gz",
 ""
 };
 const uint8_t * resource_map_start[] = {
 	_index_99c86edb045064f0ff9e_css_gz_start,
 	_favicon_32x32_png_start,
 	_index_html_gz_start,
-	_index_f2d7ed_bundle_js_gz_start,
-	_node_vendors_f2d7ed_bundle_js_gz_start
+	_index_b5eac1_bundle_js_gz_start,
+	_node_vendors_b5eac1_bundle_js_gz_start
 };
 const uint8_t * resource_map_end[] = {
 	_index_99c86edb045064f0ff9e_css_gz_end,
 	_favicon_32x32_png_end,
 	_index_html_gz_end,
-	_index_f2d7ed_bundle_js_gz_end,
-	_node_vendors_f2d7ed_bundle_js_gz_end
+	_index_b5eac1_bundle_js_gz_end,
+	_node_vendors_b5eac1_bundle_js_gz_end
 };

components/wifi-manager/webapp/webpack.h

@@ -1,6 +1,6 @@
 /***********************************
 webpack_headers
-dist/css/index.99c86edb045064f0ff9e.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.f2d7ed.bundle.js.gz,dist/js/node_vendors.f2d7ed.bundle.js.gz
+dist/css/index.99c86edb045064f0ff9e.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.b5eac1.bundle.js.gz,dist/js/node_vendors.b5eac1.bundle.js.gz
 ***********************************/
 #pragma once
 #include <inttypes.h>