lbsadmin
/
ESPUI
mirror of https://github.com/s00500/ESPUI.git
1
0
Fork 0
Code Issues Releases Activity

Merge pull request #235 from MartinMueller2003/master 

Exposed  WebServer, Added password support.
This commit is contained in:
Lukas Bachschwell 2023-05-13 15:55:39 +02:00 committed by GitHub
parent 270f0dd16b be8cf73d55
commit 678a2ccf53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ESPUI.h
View File

@ -206,6 +206,7 @@ public:
void jsonDom(uint16_t startidx, AsyncWebSocketClient* client = nullptr, bool Updating = false);
Verbosity verbosity;
AsyncWebServer* server;
protected:
friend class ESPUIclient;
@ -217,7 +218,6 @@ protected:
void RemoveToBeDeletedControls();
AsyncWebServer* server;
AsyncWebSocket* ws;
const char* basicAuthUsername = nullptr;

7
src/ESPUIcontrol.cpp
View File

@ -59,16 +59,17 @@ void Control::DeleteControl()
void Control::MarshalControl(JsonObject & item, bool refresh)
{
item[F("id")] = id;
ControlType TempType = (ControlType::Password == type) ? ControlType::Text : type;
if(refresh)
{
item[F("type")] = uint32_t(type) + uint32_t(ControlType::UpdateOffset);
item[F("type")] = uint32_t(TempType) + uint32_t(ControlType::UpdateOffset);
}
else
{
item[F("type")] = uint32_t(type);
item[F("type")] = uint32_t(TempType);
}
item[F("label")] = label;
item[F("value")] = value;
item[F ("value")] = (ControlType::Password == type) ? F ("--------") : value;
item[F("visible")] = visible;
item[F("color")] = (int)color;
item[F("enabled")] = enabled;

1
src/ESPUIcontrol.h
View File

@ -30,6 +30,7 @@ enum ControlType : uint8_t
Separator,
Time,
Password = 99,
UpdateOffset = 100,
};