Upgrade to ArduinoJSON v6

platformio.ini

@@ -4,7 +4,7 @@ default_envs = generic
 [common]
 platform = espressif8266@2.3.2
 lib_deps =
-  ArduinoJson@5.13.4
+  ArduinoJson@6.19.1
   ESPAsyncTCP
   ESPAsyncUDP
   ESP Async WebServer

src/config.esp

@@ -11,9 +11,9 @@ bool ICACHE_FLASH_ATTR loadConfiguration()
 	size_t size = configFile.size();
 	std::unique_ptr<char[]> buf(new char[size]);
 	configFile.readBytes(buf.get(), size);
-	DynamicJsonBuffer jsonBuffer;
-	JsonObject &json = jsonBuffer.parseObject(buf.get());
-	if (!json.success())
+	DynamicJsonDocument json(4096);
+	auto error = deserializeJson(json, buf.get());
+	if (error)
 	{
 #ifdef DEBUG
 		Serial.println(F("[ WARN ] Failed to parse config file"));
@@ -22,14 +22,14 @@ bool ICACHE_FLASH_ATTR loadConfiguration()
 	}
 #ifdef DEBUG
 	Serial.println(F("[ INFO ] Config file found"));
-	json.prettyPrintTo(Serial);
+	serializeJsonPretty(json, Serial);
 	Serial.println();
 #endif
-	JsonObject &network = json["network"];
-	JsonObject &hardware = json["hardware"];
-	JsonObject &general = json["general"];
-	JsonObject &mqtt = json["mqtt"];
-	JsonObject &ntp = json["ntp"];
+	JsonObject network = json["network"];
+	JsonObject hardware = json["hardware"];
+	JsonObject general = json["general"];
+	JsonObject mqtt = json["mqtt"];
+	JsonObject ntp = json["ntp"];
 #ifdef DEBUG
 	Serial.println(F("[ INFO ] Trying to setup RFID Hardware"));
 #endif
@@ -162,7 +162,7 @@ bool ICACHE_FLASH_ATTR loadConfiguration()
 
 	for (int i = 1; i < numRelays; i++)
 	{
-		JsonObject &relay = hardware["relay" + String((i + 1))];
+		JsonObject relay = hardware["relay" + String((i + 1))];
 		activateTime[i] = relay["rtime"];
 		lockType[i] = relay["ltype"];
 		relayType[i] = relay["rtype"];

src/log.esp

@@ -1,9 +1,8 @@
-void extern mqtt_publish_event(JsonObject *root);
+void extern mqtt_publish_event(JsonDocument *root);
 
 void ICACHE_FLASH_ATTR writeEvent(String type, String src, String desc, String data)
 {
-	DynamicJsonBuffer jsonBuffer;
-	JsonObject &root = jsonBuffer.createObject();
+	DynamicJsonDocument root(512);
 	root["type"] = type;
 	root["src"] = src;
 	root["desc"] = desc;
@@ -18,7 +17,7 @@ void ICACHE_FLASH_ATTR writeEvent(String type, String src, String desc, String d
 	else // log to file
 	{
 		File eventlog = SPIFFS.open("/eventlog.json", "a");
-		root.printTo(eventlog);
+		serializeJson(root, eventlog);
 		eventlog.print("\n");
 		eventlog.close();
 	}
@@ -29,8 +28,7 @@ void ICACHE_FLASH_ATTR writeEvent(String type, String src, String desc, String d
 
 void ICACHE_FLASH_ATTR writeLatest(String uid, String username, int acctype)
 {
-	DynamicJsonBuffer jsonBuffer;
-	JsonObject &root = jsonBuffer.createObject();
+	DynamicJsonDocument root(512);
 	root["uid"] = uid;
 	root["username"] = username;
 	root["acctype"] = acctype;
@@ -43,7 +41,7 @@ void ICACHE_FLASH_ATTR writeLatest(String uid, String username, int acctype)
 	else // log to file
 	{
 		File latestlog = SPIFFS.open("/latestlog.json", "a");
-		root.printTo(latestlog);
+		serializeJson(root, latestlog);
 		latestlog.print("\n");
 		latestlog.close();
 	}
@@ -65,14 +63,15 @@ void ICACHE_FLASH_ATTR sendLogFile(int page, String fileName, int logFileType)
 	if (page == 1)
 		lastPos = 0;
 	float pages;
-	DynamicJsonBuffer jsonBuffer;
-	JsonObject &root = jsonBuffer.createObject();
+	Serial.println("sendLogFile");
+	Serial.println(ESP.getFreeHeap());
+	DynamicJsonDocument root(2048);
 	if (logFileType == LOGTYPE_EVENTLOG)
 		root["command"] = "eventlist";
 	if (logFileType == LOGTYPE_LATESTLOG)
 		root["command"] = "latestlist";
 	root["page"] = page;
-	JsonArray &items = root.createNestedArray("list");
+	JsonArray items = root.createNestedArray("list");
 
 	File logFile;
 
@@ -116,11 +115,11 @@ void ICACHE_FLASH_ATTR sendLogFile(int page, String fileName, int logFileType)
 
 	logFile.close();
 	root["haspages"] = ceil(pages);
-	size_t len = root.measureLength();
+	size_t len = measureJson(root);
 	AsyncWebSocketMessageBuffer *buffer = ws.makeBuffer(len);
 	if (buffer)
 	{
-		root.printTo((char *)buffer->get(), len + 1);
+		serializeJson(root, (char *)buffer->get(), len + 1);
 		ws.textAll(buffer);
 		if (logFileType == LOGTYPE_EVENTLOG)
 			ws.textAll("{\"command\":\"result\",\"resultof\":\"eventlist\",\"result\": true}");
@@ -224,11 +223,10 @@ void ICACHE_FLASH_ATTR logMaintenance(String action, String filename)
 void ICACHE_FLASH_ATTR sendFileList(int page)
 {
 
-	DynamicJsonBuffer jsonBuffer;
-	JsonObject &root = jsonBuffer.createObject();
+	DynamicJsonDocument root(512);
 	root["command"] = "listfiles";
 	root["page"] = page;
-	JsonArray &items = root.createNestedArray("list");
+	JsonArray items = root.createNestedArray("list");
 
 	size_t first = (page - 1) * FILES_PER_PAGE;
 	size_t last = page * FILES_PER_PAGE;
@@ -245,7 +243,7 @@ void ICACHE_FLASH_ATTR sendFileList(int page)
 		{
 			if (numFiles >= first && numFiles < last)
 			{
-				JsonObject &item = items.createNestedObject();
+				JsonObject item = items.createNestedObject();
 				item["filename"] = dir.fileName();
 				item["filesize"] = dir.fileSize();
 			} // first, last
@@ -256,11 +254,11 @@ void ICACHE_FLASH_ATTR sendFileList(int page)
 	float pages = numFiles / FILES_PER_PAGE;
 	root["haspages"] = ceil(pages);
 
-	size_t len = root.measureLength();
+	size_t len = measureJson(root);
 	AsyncWebSocketMessageBuffer *buffer = ws.makeBuffer(len);
 	if (buffer)
 	{
-		root.printTo((char *)buffer->get(), len + 1);
+		serializeJson(root, (char *)buffer->get(), len + 1);
 		ws.textAll(buffer);
 		ws.textAll("{\"command\":\"result\",\"resultof\":\"listfiles\",\"result\": true}");
 	}