jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 13:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

use one allocation size for DynamicJsonDocument settings

Browse Source 
The problem was detected in configSetup() - the configuration was read
only from EEPROM but not from SPI flash FS.

Cleanup things and use only one allocation size for both write and read
configuration operations.
This commit is contained in:
Jaroslav Kysela 2023-12-01 19:51:58 +01:00
parent 894370b4cc
commit 58970f485e
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hasp_config.cpp
View File

@ -354,7 +354,7 @@ void configWrite()
settingsChanged = F(D_CONFIG_CHANGED);
/* Read Config File */
DynamicJsonDocument doc(8 * 256);
DynamicJsonDocument doc(MAX_CONFIG_JSON_ALLOC_SIZE);
LOG_TRACE(TAG_CONF, F(D_FILE_LOADING), configFile.c_str());
configRead(doc, false);
LOG_INFO(TAG_CONF, F(D_FILE_LOADED), configFile.c_str());
@ -515,7 +515,7 @@ void configWrite()
void configSetup()
{
DynamicJsonDocument settings(1024 + 512);
DynamicJsonDocument settings(MAX_CONFIG_JSON_ALLOC_SIZE);
for(uint32_t i = 0; i < 2; i++) {
if(i == 0) {

2
src/hasp_config.h
View File

@ -8,6 +8,8 @@
#include "hasplib.h"
#define MAX_CONFIG_JSON_ALLOC_SIZE (2048)
/* ===== Default Event Processors ===== */
void configSetup(void);
void configLoop(void);

4
src/sys/svc/hasp_http.cpp
View File

@ -561,7 +561,7 @@ static void webHandleApi()
{ // http://plate01/api
if(!http_is_authenticated("api")) return;
DynamicJsonDocument doc(2048);
DynamicJsonDocument doc(max(MAX_CONFIG_JSON_ALLOC_SIZE, 2048));
String contentType = http_get_content_type(F(".json"));
String endpoint((char*)0);
endpoint = webServer.pathArg(0);
@ -1109,7 +1109,7 @@ static inline int handleFilesystemFile(String path)
configFile = FPSTR(FP_HASP_CONFIG_FILE);
if(path.endsWith(configFile.c_str())) { // "//config.json" is also a valid path!
DynamicJsonDocument settings(2048);
DynamicJsonDocument settings(MAX_CONFIG_JSON_ALLOC_SIZE);
DeserializationError error = configParseFile(configFile, settings);
if(error) return 500; // Internal Server Error

2
src/sys/svc/hasp_http_async.cpp
View File

@ -934,7 +934,7 @@ int handleFileRead(AsyncWebServerRequest* request, String path)
if(!strncasecmp(file.name(), configFile.c_str(), configFile.length())) {
file.close();
DynamicJsonDocument settings(8 * 256);
DynamicJsonDocument settings(MAX_CONFIG_JSON_ALLOC_SIZE);
DeserializationError error = configParseFile(configFile, settings);
if(error) return 500; // Internal Server Error