From 295663f6a6299207f9ef6554c223b175f23069d3 Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Sun, 21 Nov 2021 14:14:39 +0100 Subject: [PATCH] Removed loadInfo(). Fixed UI when no WS available. --- .../Animated_Staircase/Animated_Staircase.h | 4 +- .../usermod_PIR_sensor_switch.h | 4 +- usermods/multi_relay/usermod_multi_relay.h | 2 +- wled00/data/index.htm | 2 +- wled00/data/index.js | 36 +- wled00/data/simple.htm | 2 +- wled00/data/simple.js | 30 +- wled00/html_simple.h | 2487 ++++----- wled00/html_ui.h | 4499 ++++++++--------- wled00/wled.h | 2 +- wled00/ws.cpp | 1 + 11 files changed, 3543 insertions(+), 3526 deletions(-) diff --git a/usermods/Animated_Staircase/Animated_Staircase.h b/usermods/Animated_Staircase/Animated_Staircase.h index 87b5511d..d2ae0740 100644 --- a/usermods/Animated_Staircase/Animated_Staircase.h +++ b/usermods/Animated_Staircase/Animated_Staircase.h @@ -512,10 +512,10 @@ class Animated_Staircase : public Usermod { JsonArray usermodEnabled = staircase.createNestedArray(F("Staircase")); // name String btn = F(""); diff --git a/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h b/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h index 6fac7aba..8e683a49 100644 --- a/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h +++ b/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h @@ -279,10 +279,10 @@ public: uiDomString += F(":{"); uiDomString += FPSTR(_enabled); if (enabled) { - uiDomString += F(":false}});loadInfo();\">"); + uiDomString += F(":false}});\">"); uiDomString += F("PIR "); } else { - uiDomString += F(":true}});loadInfo();\">"); + uiDomString += F(":true}});\">"); uiDomString += F("PIR "); } uiDomString += F(""); diff --git a/usermods/multi_relay/usermod_multi_relay.h b/usermods/multi_relay/usermod_multi_relay.h index 786461ab..9a92d4e2 100644 --- a/usermods/multi_relay/usermod_multi_relay.h +++ b/usermods/multi_relay/usermod_multi_relay.h @@ -414,7 +414,7 @@ class MultiRelay : public Usermod { uiDomString += i; uiDomString += F(",on:"); uiDomString += _relay[i].state ? "false" : "true"; - uiDomString += F("}});loadInfo();\">"); + uiDomString += F("}});\">"); uiDomString += F("Relay "); uiDomString += i; uiDomString += F(" "); diff --git a/wled00/data/index.htm b/wled00/data/index.htm index 1b3d3358..877c245d 100644 --- a/wled00/data/index.htm +++ b/wled00/data/index.htm @@ -235,7 +235,7 @@