lbsadmin/ESPUI
1
0
Fork 0
mirror of https://github.com/s00500/ESPUI.git synced 2025-07-11 07:21:00 +00:00
Code Issues Releases Activity

Compare commits

base: lbsadmin:2.2.4
Branches Tags
lbsadmin:master lbsadmin:fix_switcher lbsadmin:fix_littlefs_esp32 lbsadmin:add_method_for_remove_controls lbsadmin:2.0.0 lbsadmin:development
lbsadmin:2.2.4 lbsadmin:2.2.3 lbsadmin:2.2.2 lbsadmin:2.2.1 lbsadmin:2.2.0 lbsadmin:2.1.1 lbsadmin:2.1.0 lbsadmin:2.0.2 lbsadmin:2.0.1 lbsadmin:2.0.0 lbsadmin:1.6.3 lbsadmin:1.6.2 lbsadmin:1.6.1 lbsadmin:1.6.0 lbsadmin:1.5.4 lbsadmin:1.5.3 lbsadmin:1.5.2 lbsadmin:1.5.1 lbsadmin:1.5.0 lbsadmin:1.4.6 lbsadmin:1.4.5 lbsadmin:1.4.4 lbsadmin:1.4.3 lbsadmin:1.4.2 lbsadmin:1.4.1 lbsadmin:1.4.0 lbsadmin:1.3.0 lbsadmin:1.2 lbsadmin:1.1.1 lbsadmin:1.1 lbsadmin:1.0
...
compare: lbsadmin:master
Branches Tags
lbsadmin:master lbsadmin:fix_switcher lbsadmin:fix_littlefs_esp32 lbsadmin:add_method_for_remove_controls lbsadmin:2.0.0 lbsadmin:development
lbsadmin:2.2.4 lbsadmin:2.2.3 lbsadmin:2.2.2 lbsadmin:2.2.1 lbsadmin:2.2.0 lbsadmin:2.1.1 lbsadmin:2.1.0 lbsadmin:2.0.2 lbsadmin:2.0.1 lbsadmin:2.0.0 lbsadmin:1.6.3 lbsadmin:1.6.2 lbsadmin:1.6.1 lbsadmin:1.6.0 lbsadmin:1.5.4 lbsadmin:1.5.3 lbsadmin:1.5.2 lbsadmin:1.5.1 lbsadmin:1.5.0 lbsadmin:1.4.6 lbsadmin:1.4.5 lbsadmin:1.4.4 lbsadmin:1.4.3 lbsadmin:1.4.2 lbsadmin:1.4.1 lbsadmin:1.4.0 lbsadmin:1.3.0 lbsadmin:1.2 lbsadmin:1.1.1 lbsadmin:1.1 lbsadmin:1.0

9 Commits
2.2.4 ... master

Author SHA1 Message Date
Lukas Bachschwell
4e32746159 Merge pull request #324 from nanostra/master 
ESPAsyncWebserver dependencies update
 2025-04-12 12:39:08 +02:00
Frederic.D
027bc9c74a ESPAsyncWebserver dependencies update 
Change from authors "Hristo Gochkov" to "ESP32Async"

Project moved to ESP32Async organization at https://github.com/ESP32Async/AsyncTCP
 2025-01-25 22:13:49 +01:00
Lukas Bachschwell
ceffe2b7b3 Merge pull request #316 from joyfullservice/master 
Update key verification syntax
 2024-11-06 09:32:25 +01:00
joyfullservice
c42c40d881 Update key verification syntax 
Resolve deprecation warnings for changes in ArduinoJson. See: https://arduinojson.org/v7/api/jsondocument/containskey/
 2024-10-04 16:14:41 -05:00
Lukas Bachschwell
0ceb052a2e Merge pull request #315 from joyfullservice/master 
Resolve null pointer exception
 2024-09-28 16:45:28 +02:00
joyfullservice
8c729ee0da Remove unneeded arguments from separator function 
Implement an alternate strategy for avoiding the null pointer exception. This takes the same approach as the function to add a label.
 2024-09-27 09:29:03 -05:00
joyfullservice
8ca8241547 Resolve null pointer exception 
Adding a separator using `ESPUI.separator("Separator name");` triggers an exception when the code tries to access the property of an invalid object.
 2024-09-25 15:07:13 -05:00
Lukas Bachschwell
66340823db Merge pull request #314 from telesyst/Original 
Update ESPUI.cpp
 2024-09-02 21:13:09 +02:00
Nikola Kirov
25250dd026 Update ESPUI.cpp 
Captive Portal memory leak (~2KB) fix
 2024-08-31 20:05:40 +03:00
3 changed files with 5 additions and 6 deletions
Expand all files Collapse all files

2
library.json
View File

@ -17,7 +17,7 @@
"dependencies": [ "dependencies": [
{ {
"name": "ESPAsyncWebServer", "name": "ESPAsyncWebServer",
"authors": "Hristo Gochkov", "authors": "ESP32Async",
"frameworks": "arduino" "frameworks": "arduino"
}, },
{ {

3
src/ESPUI.cpp
View File

@ -660,7 +660,7 @@ uint16_t ESPUIClass::gauge(const char* label, ControlColor color, int number, in
uint16_t ESPUIClass::separator(const char* label) uint16_t ESPUIClass::separator(const char* label)
{ {
return addControl(ControlType::Separator, label, "", ControlColor::Alizarin, Control::noParent, nullptr); return addControl(ControlType::Separator, label, "", ControlColor::Alizarin);
} }
uint16_t ESPUIClass::fileDisplay(const char* label, ControlColor color, String filename) uint16_t ESPUIClass::fileDisplay(const char* label, ControlColor color, String filename)
@ -1264,7 +1264,6 @@ void ESPUIClass::begin(const char* _title, const char* username, const char* pas
responseText += ("</body></html><head><meta http-equiv=\"Refresh\" content=\"0; URL='http://" + WiFi.softAPIP().toString() + "'\" /></head>"); responseText += ("</body></html><head><meta http-equiv=\"Refresh\" content=\"0; URL='http://" + WiFi.softAPIP().toString() + "'\" /></head>");
response->write(responseText.c_str(), responseText.length()); response->write(responseText.c_str(), responseText.length());
request->send(response); request->send(response);
request->redirect("/");
} }
else else
{ {

4
src/ESPUIclient.cpp
View File

@ -310,14 +310,14 @@ uint32_t ESPUIclient::prepareJSONChunk(uint16_t startindex,
break; break;
} }
if(!FragmentRequest.containsKey(F("id"))) if(!FragmentRequest["id"].is<JsonVariant>())
{ {
Serial.println(F("ERROR:prepareJSONChunk:Fragmentation:Request does not contain a control ID")); Serial.println(F("ERROR:prepareJSONChunk:Fragmentation:Request does not contain a control ID"));
break; break;
} }
uint16_t ControlId = uint16_t(FragmentRequest[F("id")]); uint16_t ControlId = uint16_t(FragmentRequest[F("id")]);
if(!FragmentRequest.containsKey(F("offset"))) if(!FragmentRequest["offset"].is<JsonVariant>())
{ {
Serial.println(F("ERROR:prepareJSONChunk:Fragmentation:Request does not contain a starting offset")); Serial.println(F("ERROR:prepareJSONChunk:Fragmentation:Request does not contain a starting offset"));
break; break;