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

Fix jsonl NoMemory error

Browse Source
This commit is contained in:
fvanroie 2023-01-17 19:55:19 +01:00
parent ec4b54f05f
commit f542195dd6
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/hasp/hasp_dispatch.cpp
View File

@ -441,8 +441,8 @@ void dispatch_topic_payload(const char* topic, const char* payload, bool update,
// Get or Set a part of the config.json file // Get or Set a part of the config.json file
void dispatch_config(const char* topic, const char* payload, uint8_t source) void dispatch_config(const char* topic, const char* payload, uint8_t source)
{ {
StaticJsonDocument<384> doc; DynamicJsonDocument doc(512);
char buffer[384]; char buffer[512];
JsonObject settings; JsonObject settings;
bool update; bool update;
@ -678,21 +678,30 @@ void dispatch_parse_jsonl(Stream& stream, uint8_t& saved_page_id)
void dispatch_parse_jsonl(std::istream& stream, uint8_t& saved_page_id) void dispatch_parse_jsonl(std::istream& stream, uint8_t& saved_page_id)
#endif #endif
{ {
// StaticJsonDocument<1024> jsonl;
DynamicJsonDocument jsonl(MQTT_MAX_PACKET_SIZE / 2 + 128);
DeserializationError jsonError = deserializeJson(jsonl, stream);
jsonl.shrinkToFit();
#ifdef ARDUINO #ifdef ARDUINO
stream.setTimeout(25); stream.setTimeout(25);
#endif #endif
// StaticJsonDocument<1024> jsonl;
DynamicJsonDocument jsonl(MQTT_MAX_PACKET_SIZE / 2 + 128);
DeserializationError jsonError; // = deserializeJson(jsonl, stream);
uint16_t line = 1; uint16_t line = 1;
while(jsonError == DeserializationError::Ok) {
hasp_new_object(jsonl.as<JsonObject>(), saved_page_id); // while(jsonError == DeserializationError::Ok) {
// hasp_new_object(jsonl.as<JsonObject>(), saved_page_id);
// jsonError = deserializeJson(jsonl, stream);
// line++;
// }
while(1) {
jsonError = deserializeJson(jsonl, stream); jsonError = deserializeJson(jsonl, stream);
line++; if(jsonError == DeserializationError::Ok) {
} hasp_new_object(jsonl.as<JsonObject>(), saved_page_id);
line++;
} else {
break;
}
};
/* For debugging purposes */ /* For debugging purposes */
if(jsonError == DeserializationError::EmptyInput) { if(jsonError == DeserializationError::EmptyInput) {