mirror of
https://github.com/s00500/ESPUI.git
synced 2025-07-11 07:21:00 +00:00
Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
4e32746159 | |||
027bc9c74a | |||
ceffe2b7b3 | |||
c42c40d881 | |||
0ceb052a2e | |||
8c729ee0da | |||
8ca8241547 | |||
66340823db | |||
25250dd026 |
@ -17,7 +17,7 @@
|
|||||||
"dependencies": [
|
"dependencies": [
|
||||||
{
|
{
|
||||||
"name": "ESPAsyncWebServer",
|
"name": "ESPAsyncWebServer",
|
||||||
"authors": "Hristo Gochkov",
|
"authors": "ESP32Async",
|
||||||
"frameworks": "arduino"
|
"frameworks": "arduino"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -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
|
||||||
{
|
{
|
||||||
|
@ -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;
|
||||||
|
Reference in New Issue
Block a user