jeans/HASPone
jeans/HASPone
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/HASPone.git synced 2025-07-25 20:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MQTT broker save, bounds check on nextionMaxPages

Browse Source
This commit is contained in:
aderusha 2021-12-07 07:00:14 -05:00
parent 570eefcb90
commit 5f3adc06aa
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Arduino_Sketch/HASwitchPlate/HASwitchPlate.ino
View File

@ -2246,7 +2246,7 @@ void configRead()
{ // Cover off any edge case where this value winds up being zero or negative { // Cover off any edge case where this value winds up being zero or negative
debugPrintln(F("SPIFFS: [WARNING] /config.json has nextionMaxPages value of zero or negative, setting to '11'")); debugPrintln(F("SPIFFS: [WARNING] /config.json has nextionMaxPages value of zero or negative, setting to '11'"));
nextionMaxPages = 11; nextionMaxPages = 11;
} }
if (!jsonConfigValues["motionPinConfig"].isNull()) if (!jsonConfigValues["motionPinConfig"].isNull())
{ {
strcpy(motionPinConfig, jsonConfigValues["motionPinConfig"]); strcpy(motionPinConfig, jsonConfigValues["motionPinConfig"]);
@ -2348,7 +2348,6 @@ void configSaveCallback()
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
void configSave() void configSave()
{ // Save the custom parameters to config.json { // Save the custom parameters to config.json
nextionSetAttr("p[0].b[1].txt", "\"Saving\\rconfig\"");
debugPrintln(F("SPIFFS: Saving config")); debugPrintln(F("SPIFFS: Saving config"));
DynamicJsonDocument jsonConfigValues(2048); DynamicJsonDocument jsonConfigValues(2048);
@ -2764,7 +2763,7 @@ void webHandleSaveConfig()
if (webServer.arg("mqttServer") != "" && webServer.arg("mqttServer") != String(mqttServer)) if (webServer.arg("mqttServer") != "" && webServer.arg("mqttServer") != String(mqttServer))
{ // Handle mqttServer { // Handle mqttServer
shouldSaveConfig = true; shouldSaveConfig = true;
webServer.arg("mqttServer").toCharArray(mqttServer, 64); webServer.arg("mqttServer").toCharArray(mqttServer, 128);
} }
if (webServer.arg("mqttPort") != "" && webServer.arg("mqttPort") != String(mqttPort)) if (webServer.arg("mqttPort") != "" && webServer.arg("mqttPort") != String(mqttPort))
{ // Handle mqttPort { // Handle mqttPort
@ -2811,8 +2810,8 @@ void webHandleSaveConfig()
shouldSaveConfig = true; shouldSaveConfig = true;
webServer.arg("hassDiscovery").toCharArray(hassDiscovery, 128); webServer.arg("hassDiscovery").toCharArray(hassDiscovery, 128);
} }
if (webServer.arg("nextionMaxPages") != String(nextionMaxPages)) if ((webServer.arg("nextionMaxPages") != String(nextionMaxPages)) && (webServer.arg("nextionMaxPages").toInt() < 256) && (webServer.arg("nextionMaxPages").toInt() > 0))
{ // Handle nextionMaxPages {
shouldSaveConfig = true; shouldSaveConfig = true;
nextionMaxPages = webServer.arg("nextionMaxPages").toInt(); nextionMaxPages = webServer.arg("nextionMaxPages").toInt();
} }