From eee7baaece704a260d6f81c91ff9072e1b15512a Mon Sep 17 00:00:00 2001 From: Marcel Peterkau Date: Thu, 11 Jan 2024 10:41:20 +0100 Subject: [PATCH] Updated some Libraries (Json and Webserver) --- Software/platformio.ini | 4 +-- Software/src/webui.cpp | 68 ++++++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Software/platformio.ini b/Software/platformio.ini index dbd7110..9304e9b 100644 --- a/Software/platformio.ini +++ b/Software/platformio.ini @@ -50,8 +50,8 @@ lib_deps = adafruit/Adafruit NeoPixel @ ^1.11.0 sstaub/Ticker @ ^4.2.0 robtillaart/I2C_EEPROM @ ^1.5.2 - me-no-dev/ESP Async WebServer @ ^1.2.3 - bblanchon/ArduinoJson @ ^6.19.4 + esphome/ESPAsyncWebServer-esphome @ 3.1.0 + bblanchon/ArduinoJson @ ^7.0.1 [env:pcb_rev_1-3] ;build_type = debug diff --git a/Software/src/webui.cpp b/Software/src/webui.cpp index cff7943..5122fd6 100644 --- a/Software/src/webui.cpp +++ b/Software/src/webui.cpp @@ -386,8 +386,8 @@ void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &f if (buffer != NULL) { Serial.print(buffer); - StaticJsonDocument<1536> doc; - error = deserializeJson(doc, buffer); + JsonDocument json; + error = deserializeJson(json, buffer); if (error) { Debug_pushMessage("deserializeJson() failed: %s\n", error.f_str()); @@ -395,30 +395,30 @@ void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &f else { - LubeConfig.DistancePerLube_Default = doc["config"]["DistancePerLube_Default"].as(); - LubeConfig.DistancePerLube_Rain = doc["config"]["DistancePerLube_Rain"].as(); - LubeConfig.tankCapacity_ml = doc["config"]["tankCapacity_ml"].as(); - LubeConfig.amountPerDose_microL = doc["config"]["amountPerDose_microL"].as(); - LubeConfig.TankRemindAtPercentage = doc["config"]["TankRemindAtPercentage"].as(); - LubeConfig.PulsePerRevolution = doc["config"]["PulsePerRevolution"].as(); - LubeConfig.TireWidth_mm = doc["config"]["TireWidth_mm"].as(); - LubeConfig.TireWidthHeight_Ratio = doc["config"]["TireWidthHeight_Ratio"].as(); - LubeConfig.RimDiameter_Inch = doc["config"]["RimDiameter_Inch"].as(); - LubeConfig.DistancePerRevolution_mm = doc["config"]["DistancePerRevolution_mm"].as(); - LubeConfig.BleedingPulses = doc["config"]["BleedingPulses"].as(); - LubeConfig.SpeedSource = (SpeedSource_t)doc["config"]["SpeedSource"].as(); - LubeConfig.GPSBaudRate = (GPSBaudRate_t)doc["config"]["GPSBaudRate"].as(); - LubeConfig.CANSource = (CANSource_t)doc["config"]["CANSource"].as(); - LubeConfig.LED_Mode_Flash = doc["config"]["LED_Mode_Flash"].as(); - LubeConfig.LED_Max_Brightness = doc["config"]["LED_Max_Brightness"].as(); - LubeConfig.LED_Min_Brightness = doc["config"]["LED_Min_Brightness"].as(); + LubeConfig.DistancePerLube_Default = json["config"]["DistancePerLube_Default"].as(); + LubeConfig.DistancePerLube_Rain = json["config"]["DistancePerLube_Rain"].as(); + LubeConfig.tankCapacity_ml = json["config"]["tankCapacity_ml"].as(); + LubeConfig.amountPerDose_microL = json["config"]["amountPerDose_microL"].as(); + LubeConfig.TankRemindAtPercentage = json["config"]["TankRemindAtPercentage"].as(); + LubeConfig.PulsePerRevolution = json["config"]["PulsePerRevolution"].as(); + LubeConfig.TireWidth_mm = json["config"]["TireWidth_mm"].as(); + LubeConfig.TireWidthHeight_Ratio = json["config"]["TireWidthHeight_Ratio"].as(); + LubeConfig.RimDiameter_Inch = json["config"]["RimDiameter_Inch"].as(); + LubeConfig.DistancePerRevolution_mm = json["config"]["DistancePerRevolution_mm"].as(); + LubeConfig.BleedingPulses = json["config"]["BleedingPulses"].as(); + LubeConfig.SpeedSource = (SpeedSource_t)json["config"]["SpeedSource"].as(); + LubeConfig.GPSBaudRate = (GPSBaudRate_t)json["config"]["GPSBaudRate"].as(); + LubeConfig.CANSource = (CANSource_t)json["config"]["CANSource"].as(); + LubeConfig.LED_Mode_Flash = json["config"]["LED_Mode_Flash"].as(); + LubeConfig.LED_Max_Brightness = json["config"]["LED_Max_Brightness"].as(); + LubeConfig.LED_Min_Brightness = json["config"]["LED_Min_Brightness"].as(); - PersistenceData.writeCycleCounter = doc["persis"]["writeCycleCounter"].as(); - PersistenceData.tankRemain_microL = doc["persis"]["tankRemain_microL"].as(); - PersistenceData.TravelDistance_highRes_mm = doc["persis"]["TravelDistance_highRes_mm"].as(); - PersistenceData.odometer_mm = doc["persis"]["odometer_mm"].as(); - PersistenceData.odometer = doc["persis"]["odometer"].as(); - PersistenceData.checksum = doc["persis"]["checksum"].as(); + PersistenceData.writeCycleCounter = json["persis"]["writeCycleCounter"].as(); + PersistenceData.tankRemain_microL = json["persis"]["tankRemain_microL"].as(); + PersistenceData.TravelDistance_highRes_mm = json["persis"]["TravelDistance_highRes_mm"].as(); + PersistenceData.odometer_mm = json["persis"]["odometer_mm"].as(); + PersistenceData.odometer = json["persis"]["odometer"].as(); + PersistenceData.checksum = json["persis"]["checksum"].as(); ee_done = true; } @@ -450,24 +450,24 @@ void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &f void WebServerEEJSON_Callback(AsyncWebServerRequest *request) { AsyncResponseStream *response = request->beginResponseStream("application/json"); - DynamicJsonDocument json(1024); - JsonObject fwinfo = json.createNestedObject("info"); + JsonDocument json; + JsonObject info = json.to(); char buffer[16]; - fwinfo["DeviceName"] = globals.DeviceName; + info["DeviceName"] = globals.DeviceName; sprintf(buffer, "%d.%02d", constants.Required_Flash_Version_major, constants.Required_Flash_Version_minor); - fwinfo["FW-Version"] = buffer; - fwinfo["FS-Version"] = globals.FlashVersion; + info["FW-Version"] = buffer; + info["FS-Version"] = globals.FlashVersion; snprintf_P(buffer, sizeof(buffer), "%s", constants.GitHash); - fwinfo["Git-Hash"] = buffer; + info["Git-Hash"] = buffer; - JsonObject config = json.createNestedObject("config"); + JsonObject config = json.to(); generateJsonObject_LubeConfig(config); - JsonObject persis = json.createNestedObject("persis"); + JsonObject persis = json.to(); generateJsonObject_PersistenceData(persis); - JsonObject eepart = json.createNestedObject("eepart"); + JsonObject eepart = json.to(); sprintf(buffer, "0x%04X", globals.eePersistanceAdress); eepart["PersistanceAddress"] = buffer;