Explorar el Código

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

wizmo2 hace 1 año
padre
commit
37955aac9b
Se han modificado 24 ficheros con 40 adiciones y 30 borrados
  1. 6 4
      components/squeezelite/opus.c
  2. 4 2
      components/squeezelite/vorbis.c
  3. 5 0
      components/wifi-manager/webapp/dist/css/index.99c86edb045064f0ff9e.css
  4. BIN
      components/wifi-manager/webapp/dist/css/index.99c86edb045064f0ff9e.css.gz
  5. 0 5
      components/wifi-manager/webapp/dist/css/index.d1b1b8d25a4e298ac90f.css
  6. BIN
      components/wifi-manager/webapp/dist/css/index.d1b1b8d25a4e298ac90f.css.gz
  7. 0 0
      components/wifi-manager/webapp/dist/dist/js/index.28074a.bundle.d.ts
  8. 0 0
      components/wifi-manager/webapp/dist/dist/js/node_vendors.28074a.bundle.d.ts
  9. 0 0
      components/wifi-manager/webapp/dist/index.html
  10. BIN
      components/wifi-manager/webapp/dist/index.html.gz
  11. 0 0
      components/wifi-manager/webapp/dist/js/index.f2d7ed.bundle.js
  12. BIN
      components/wifi-manager/webapp/dist/js/index.f2d7ed.bundle.js.gz
  13. 0 0
      components/wifi-manager/webapp/dist/js/index.f2d7ed.bundle.js.map
  14. 0 0
      components/wifi-manager/webapp/dist/js/node_vendors.f2d7ed.bundle.js
  15. BIN
      components/wifi-manager/webapp/dist/js/node_vendors.f2d7ed.bundle.js.gz
  16. 0 0
      components/wifi-manager/webapp/dist/js/node_vendors.f2d7ed.bundle.js.map
  17. 6 0
      components/wifi-manager/webapp/dist/src/js/test.d.ts
  18. 3 3
      components/wifi-manager/webapp/webapp.cmake
  19. 15 15
      components/wifi-manager/webapp/webpack.c
  20. 1 1
      components/wifi-manager/webapp/webpack.h
  21. BIN
      server_certs/DigiCertGlobalRootCA.crt.41
  22. BIN
      server_certs/DigiCertGlobalRootCA.crt.42
  23. BIN
      server_certs/r2m01.cer.13
  24. BIN
      server_certs/r2m01.cer.14

+ 6 - 4
components/squeezelite/opus.c

@@ -138,7 +138,9 @@ static int get_opus_packet(void) {
 	size_t bytes = min(_buf_used(streambuf), _buf_cont_read(streambuf));
 	
 	while (!(status = OG(&go, stream_packetout, &u->state, &u->packet)) && bytes) {
-		do {
+        
+        // if sync_pageout (or sync_pageseek) is not called here, sync builds ups
+        while (!(status = OG(&go, sync_pageout, &u->sync, &u->page)) && bytes) {
 			size_t consumed = min(bytes, 4096);
 			char* buffer = OG(&gu, sync_buffer, &u->sync, consumed);
 			memcpy(buffer, streambuf->readp, consumed);
@@ -146,7 +148,7 @@ static int get_opus_packet(void) {
 
 			_buf_inc_readp(streambuf, consumed);
 			bytes -= consumed;
-		} while (!(status = OG(&gu, sync_pageseek, &u->sync, &u->page)) && bytes);
+        }
 
 		// if we have a new page, put it in
 		if (status)	OG(&go, stream_pagein, &u->state, &u->page);
@@ -184,7 +186,7 @@ static int read_opus_header(void) {
 		switch (u->status) {
 		case OGG_SYNC:
 			u->status = OGG_ID_HEADER;
-			OG(&gu, stream_reset_serialno, &u->state, OG(&gu, page_serialno, &u->page));
+			OG(&gu, stream_init, &u->state, OG(&gu, page_serialno, &u->page));
             fetch = false;
 			break;
 		case OGG_ID_HEADER:
@@ -208,7 +210,7 @@ static int read_opus_header(void) {
 			fetch = true;
 			break;
 		case OGG_COMMENT_HEADER:
-			// skip pakets to consume VorbisComment. With opus, header packets align on pages
+			// skip packets to consume VorbisComment. With opus, header packets align on pages
 			status = OG(&gu, page_packets, &u->page);
 			break;
 		default:

+ 4 - 2
components/squeezelite/vorbis.c

@@ -138,7 +138,9 @@ static int get_ogg_packet(void) {
 	size_t bytes = min(_buf_used(streambuf), _buf_cont_read(streambuf));
 
 	while (!(status = OG(&go, stream_packetout, &v->state, &v->packet)) && bytes) {
-		do {
+        
+        // if sync_pageout (or sync_pageseek) is not called first, sync buffers build ups
+        while (!(status = OG(&go, sync_pageout, &v->sync, &v->page)) && bytes) {
 			size_t consumed = min(bytes, 4096);
 			char* buffer = OG(&gv, sync_buffer, &v->sync, consumed);
 			memcpy(buffer, streambuf->readp, consumed);
@@ -146,7 +148,7 @@ static int get_ogg_packet(void) {
 
 			_buf_inc_readp(streambuf, consumed);
 			bytes -= consumed;
-		} while (!(status = OG(&go, sync_pageseek, &v->sync, &v->page)) && bytes);
+        }
 
 		// if we have a new page, put it in
 		if (status)	OG(&go, stream_pagein, &v->state, &v->page);

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 5 - 0
components/wifi-manager/webapp/dist/css/index.99c86edb045064f0ff9e.css


BIN
components/wifi-manager/webapp/dist/css/index.99c86edb045064f0ff9e.css.gz


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 5
components/wifi-manager/webapp/dist/css/index.d1b1b8d25a4e298ac90f.css


BIN
components/wifi-manager/webapp/dist/css/index.d1b1b8d25a4e298ac90f.css.gz


+ 0 - 0
components/wifi-manager/webapp/dist/dist/js/index.d79d44.bundle.d.ts → components/wifi-manager/webapp/dist/dist/js/index.28074a.bundle.d.ts


+ 0 - 0
components/wifi-manager/webapp/dist/dist/js/node_vendors.d79d44.bundle.d.ts → components/wifi-manager/webapp/dist/dist/js/node_vendors.28074a.bundle.d.ts


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
components/wifi-manager/webapp/dist/index.html


BIN
components/wifi-manager/webapp/dist/index.html.gz


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
components/wifi-manager/webapp/dist/js/index.f2d7ed.bundle.js


BIN
components/wifi-manager/webapp/dist/js/index.380f25.bundle.js.gz → components/wifi-manager/webapp/dist/js/index.f2d7ed.bundle.js.gz


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
components/wifi-manager/webapp/dist/js/index.f2d7ed.bundle.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
components/wifi-manager/webapp/dist/js/node_vendors.f2d7ed.bundle.js


BIN
components/wifi-manager/webapp/dist/js/node_vendors.380f25.bundle.js.gz → components/wifi-manager/webapp/dist/js/node_vendors.f2d7ed.bundle.js.gz


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
components/wifi-manager/webapp/dist/js/node_vendors.f2d7ed.bundle.js.map


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

@@ -51,6 +51,9 @@ 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;
 declare function getRadioButton(entry: any): string;
@@ -104,6 +107,9 @@ 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;

+ 3 - 3
components/wifi-manager/webapp/webapp.cmake

@@ -1,5 +1,5 @@
-target_add_binary_data( __idf_wifi-manager webapp/dist/css/index.d1b1b8d25a4e298ac90f.css.gz BINARY)
+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.380f25.bundle.js.gz BINARY)
-target_add_binary_data( __idf_wifi-manager webapp/dist/js/node_vendors.380f25.bundle.js.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)

+ 15 - 15
components/wifi-manager/webapp/webpack.c

@@ -1,34 +1,34 @@
 // Automatically generated. Do not edit manually!.
 #include <inttypes.h>
-extern const uint8_t _index_d1b1b8d25a4e298ac90f_css_gz_start[] asm("_binary_index_d1b1b8d25a4e298ac90f_css_gz_start");
-extern const uint8_t _index_d1b1b8d25a4e298ac90f_css_gz_end[] asm("_binary_index_d1b1b8d25a4e298ac90f_css_gz_end");
+extern const uint8_t _index_99c86edb045064f0ff9e_css_gz_start[] asm("_binary_index_99c86edb045064f0ff9e_css_gz_start");
+extern const uint8_t _index_99c86edb045064f0ff9e_css_gz_end[] asm("_binary_index_99c86edb045064f0ff9e_css_gz_end");
 extern const uint8_t _favicon_32x32_png_start[] asm("_binary_favicon_32x32_png_start");
 extern const uint8_t _favicon_32x32_png_end[] asm("_binary_favicon_32x32_png_end");
 extern const uint8_t _index_html_gz_start[] asm("_binary_index_html_gz_start");
 extern const uint8_t _index_html_gz_end[] asm("_binary_index_html_gz_end");
-extern const uint8_t _index_380f25_bundle_js_gz_start[] asm("_binary_index_380f25_bundle_js_gz_start");
-extern const uint8_t _index_380f25_bundle_js_gz_end[] asm("_binary_index_380f25_bundle_js_gz_end");
-extern const uint8_t _node_vendors_380f25_bundle_js_gz_start[] asm("_binary_node_vendors_380f25_bundle_js_gz_start");
-extern const uint8_t _node_vendors_380f25_bundle_js_gz_end[] asm("_binary_node_vendors_380f25_bundle_js_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");
 const char * resource_lookups[] = {
-	"/css/index.d1b1b8d25a4e298ac90f.css.gz",
+	"/css/index.99c86edb045064f0ff9e.css.gz",
 	"/favicon-32x32.png",
 	"/index.html.gz",
-	"/js/index.380f25.bundle.js.gz",
-	"/js/node_vendors.380f25.bundle.js.gz",
+	"/js/index.f2d7ed.bundle.js.gz",
+	"/js/node_vendors.f2d7ed.bundle.js.gz",
 ""
 };
 const uint8_t * resource_map_start[] = {
-	_index_d1b1b8d25a4e298ac90f_css_gz_start,
+	_index_99c86edb045064f0ff9e_css_gz_start,
 	_favicon_32x32_png_start,
 	_index_html_gz_start,
-	_index_380f25_bundle_js_gz_start,
-	_node_vendors_380f25_bundle_js_gz_start
+	_index_f2d7ed_bundle_js_gz_start,
+	_node_vendors_f2d7ed_bundle_js_gz_start
 };
 const uint8_t * resource_map_end[] = {
-	_index_d1b1b8d25a4e298ac90f_css_gz_end,
+	_index_99c86edb045064f0ff9e_css_gz_end,
 	_favicon_32x32_png_end,
 	_index_html_gz_end,
-	_index_380f25_bundle_js_gz_end,
-	_node_vendors_380f25_bundle_js_gz_end
+	_index_f2d7ed_bundle_js_gz_end,
+	_node_vendors_f2d7ed_bundle_js_gz_end
 };

+ 1 - 1
components/wifi-manager/webapp/webpack.h

@@ -1,6 +1,6 @@
 /***********************************
 webpack_headers
-dist/css/index.d1b1b8d25a4e298ac90f.css.gz,dist/favicon-32x32.png,dist/index.html.gz,dist/js/index.380f25.bundle.js.gz,dist/js/node_vendors.380f25.bundle.js.gz
+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
 ***********************************/
 #pragma once
 #include <inttypes.h>

BIN
server_certs/DigiCertGlobalRootCA.crt.41


BIN
server_certs/DigiCertGlobalRootCA.crt.42


BIN
server_certs/r2m01.cer.13


BIN
server_certs/r2m01.cer.14


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio