From f015227fc8aa34cd511d8b1c9d91cd0a5c5c9067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Kristan?= Date: Tue, 27 Jun 2023 01:51:24 +0200 Subject: [PATCH 01/17] Missing WS connection fallback for liveview (#3267) * Missing WS connection fallback for liveview - fix for #3250 Remove (conditional WLED_ENABLE_LEGACY) legacy URI Replace /sliders with /?sliders * Merge liveview and liveviewws pages Remove /url string subpage Enable /json/live by default * WS retry count Removed appended ws from URL * Also reset WS retries on successful WS connection --------- Co-authored-by: Christian Schwinne --- tools/cdata.js | 6 - wled00/data/404.htm | 2 +- wled00/data/index.htm | 4 +- wled00/data/index.js | 29 +- wled00/data/liveview.htm | 57 +- wled00/data/liveviewws.htm | 68 - wled00/data/welcome.htm | 2 +- wled00/html_other.h | 1911 +++++++++-------- wled00/html_ui.h | 3976 ++++++++++++++++++------------------ wled00/wled.h | 2 +- wled00/wled_server.cpp | 43 +- wled00/xml.cpp | 49 - 12 files changed, 3008 insertions(+), 3141 deletions(-) delete mode 100644 wled00/data/liveviewws.htm diff --git a/tools/cdata.js b/tools/cdata.js index 011cedd8..90619ba6 100644 --- a/tools/cdata.js +++ b/tools/cdata.js @@ -390,12 +390,6 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()====="; method: "gzip", filter: "html-minify", }, - { - file: "liveviewws.htm", - name: "PAGE_liveviewws", - method: "gzip", - filter: "html-minify", - }, { file: "liveviewws2D.htm", name: "PAGE_liveviewws2D", diff --git a/wled00/data/404.htm b/wled00/data/404.htm index 803faeb6..ff41fa6e 100644 --- a/wled00/data/404.htm +++ b/wled00/data/404.htm @@ -42,6 +42,6 @@

404 Not Found

Akemi does not know where you are headed...

- + \ No newline at end of file diff --git a/wled00/data/index.htm b/wled00/data/index.htm index b8c0df85..0cf48d6e 100644 --- a/wled00/data/index.htm +++ b/wled00/data/index.htm @@ -379,8 +379,8 @@ -