lbsadmin/ESPUI
1
0
Fork 0
mirror of https://github.com/s00500/ESPUI.git synced 2024-11-22 04:00:55 +00:00
Code Issues Releases Activity

minor fixes for emulation on host

Browse Source 
(https://github.com/d-a-v/emuAsync)
This commit is contained in:
david gauchard 2022-02-02 11:19:43 +01:00
parent 7dcf6a10f4
commit f06781bc03
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ESPUI.cpp
View File

@ -783,9 +783,9 @@ void ESPUIClass::updateControl(Control* control, int clientId)
root["id"] = control->id; root["id"] = control->id;
root["visible"] = control->visible; root["visible"] = control->visible;
root["color"] = (int)control->color; root["color"] = (int)control->color;
if (control->panelStyle != 0) if (control->panelStyle.length())
root["panelStyle"] = control->panelStyle; root["panelStyle"] = control->panelStyle;
if (control->elementStyle != 0) if (control->elementStyle.length())
root["elementStyle"] = control->elementStyle; root["elementStyle"] = control->elementStyle;
serializeJson(document, json); serializeJson(document, json);
@ -811,7 +811,7 @@ void ESPUIClass::updateControl(Control* control, int clientId)
// function like this and it's clients array is private // function like this and it's clients array is private
int tryId = 0; int tryId = 0;
for (size_t count = 0; count < this->ws->count();) for (size_t count = 0; tryId < (int)this->ws->count() && count < this->ws->count();)
{ {
if (this->ws->hasClient(tryId)) if (this->ws->hasClient(tryId))
{ {
@ -1003,7 +1003,7 @@ void ESPUIClass::addGraphPoint(uint16_t id, int nValue, int clientId)
// function like this and it's clients array is private // function like this and it's clients array is private
int tryId = 0; int tryId = 0;
for (size_t count = 0; count < this->ws->count();) for (size_t count = 0; tryId < (int)this->ws->count() && count < this->ws->count();)
{ {
if (this->ws->hasClient(tryId)) if (this->ws->hasClient(tryId))
{ {
@ -1108,9 +1108,9 @@ void ESPUIClass::prepareJSONChunk(AsyncWebSocketClient* client, uint16_t startin
item["value"] = String(control->value); item["value"] = String(control->value);
item["color"] = (int)control->color; item["color"] = (int)control->color;
item["visible"] = (int)control->visible; item["visible"] = (int)control->visible;
if (control->panelStyle != 0) if (control->panelStyle.length())
item["panelStyle"] = String(control->panelStyle); item["panelStyle"] = String(control->panelStyle);
if (control->elementStyle != 0) if (control->elementStyle.length())
item["elementStyle"] = String(control->elementStyle); item["elementStyle"] = String(control->elementStyle);
if (control->wide == true) if (control->wide == true)
item["wide"] = true; item["wide"] = true;