souko/Kettenoeler
1
0
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Fixed crash bc Stackoverflow from within Webserver

Browse Source
This commit is contained in:
Marcel Peterkau
2022-08-19 11:25:26 +02:00
parent 01ba4b7333
commit 7c38d02bf8
6 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Software/src/webui.cpp
View File

@@ -20,6 +20,8 @@ void initWebUI()
return;
}
globals.FlashVersion = GetFlashVersion();
MDNS.begin(globals.DeviceName);
MDNS.addService("telnet", "tcp", 23);
MDNS.addService("http", "tcp", 80);
@@ -85,7 +87,7 @@ String processor(const String &var)
if (var == "WRITE_CYCLE_COUNT")
return String(PersistenceData.writeCycleCounter);
if (var == "PERSISTENCE_MARKER")
return String(getPersistanceAddress());
return String(globals.eePersistanceAdress);
if (var == "TANK_REMAIN_UL")
return String(PersistenceData.tankRemain_µl);
if (var == "TRAVEL_DISTANCE_HIGHRES")
@@ -194,7 +196,7 @@ String processor(const String &var)
return String(buffer);
}
if (var == "FS_VERSION")
return String(GetFlashVersion());
return String(globals.FlashVersion);
if (var == "PLACEHOLDER")
return "placeholder";
@@ -298,18 +300,17 @@ void WebserverNotFound_Callback(AsyncWebServerRequest *request)
uint32_t GetFlashVersion()
{
char buffer[20];
File this_file = LittleFS.open("version", "r");
if (!this_file)
{ // failed to open the file, retrn empty result
return 0;
}
while (this_file.available())
{
this_file.readBytesUntil('\r', buffer, sizeof(buffer));
}
this_file.close();
char buffer[20];
File this_file = LittleFS.open("version", "r");
if (!this_file)
{ // failed to open the file, retrn empty result
return 0;
}
if (this_file.available())
{
this_file.readBytesUntil('\r', buffer, sizeof(buffer));
}
this_file.close();
return atoi(buffer);
}