souko/Kettenoeler
souko/Kettenoeler
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Updated some Libraries (Json and Webserver)

Browse Source
This commit is contained in:
Marcel Peterkau 2024-01-11 10:41:20 +01:00
parent 58c6bc820a
commit eee7baaece
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Software/platformio.ini
View File

@ -50,8 +50,8 @@ lib_deps =
adafruit/Adafruit NeoPixel @ ^1.11.0 adafruit/Adafruit NeoPixel @ ^1.11.0
sstaub/Ticker @ ^4.2.0 sstaub/Ticker @ ^4.2.0
robtillaart/I2C_EEPROM @ ^1.5.2 robtillaart/I2C_EEPROM @ ^1.5.2
me-no-dev/ESP Async WebServer @ ^1.2.3 esphome/ESPAsyncWebServer-esphome @ 3.1.0
bblanchon/ArduinoJson @ ^6.19.4 bblanchon/ArduinoJson @ ^7.0.1
[env:pcb_rev_1-3] [env:pcb_rev_1-3]
;build_type = debug ;build_type = debug

68
Software/src/webui.cpp
View File

@ -386,8 +386,8 @@ void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &f
if (buffer != NULL) if (buffer != NULL)
{ {
Serial.print(buffer); Serial.print(buffer);
StaticJsonDocument<1536> doc; JsonDocument json;
error = deserializeJson(doc, buffer); error = deserializeJson(json, buffer);
if (error) if (error)
{ {
Debug_pushMessage("deserializeJson() failed: %s\n", error.f_str()); Debug_pushMessage("deserializeJson() failed: %s\n", error.f_str());
@ -395,30 +395,30 @@ void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &f
else else
{ {
LubeConfig.DistancePerLube_Default = doc["config"]["DistancePerLube_Default"].as<uint32_t>(); LubeConfig.DistancePerLube_Default = json["config"]["DistancePerLube_Default"].as<uint32_t>();
LubeConfig.DistancePerLube_Rain = doc["config"]["DistancePerLube_Rain"].as<uint32_t>(); LubeConfig.DistancePerLube_Rain = json["config"]["DistancePerLube_Rain"].as<uint32_t>();
LubeConfig.tankCapacity_ml = doc["config"]["tankCapacity_ml"].as<uint32_t>(); LubeConfig.tankCapacity_ml = json["config"]["tankCapacity_ml"].as<uint32_t>();
LubeConfig.amountPerDose_microL = doc["config"]["amountPerDose_microL"].as<uint32_t>(); LubeConfig.amountPerDose_microL = json["config"]["amountPerDose_microL"].as<uint32_t>();
LubeConfig.TankRemindAtPercentage = doc["config"]["TankRemindAtPercentage"].as<uint8_t>(); LubeConfig.TankRemindAtPercentage = json["config"]["TankRemindAtPercentage"].as<uint8_t>();
LubeConfig.PulsePerRevolution = doc["config"]["PulsePerRevolution"].as<uint8_t>(); LubeConfig.PulsePerRevolution = json["config"]["PulsePerRevolution"].as<uint8_t>();
LubeConfig.TireWidth_mm = doc["config"]["TireWidth_mm"].as<uint32_t>(); LubeConfig.TireWidth_mm = json["config"]["TireWidth_mm"].as<uint32_t>();
LubeConfig.TireWidthHeight_Ratio = doc["config"]["TireWidthHeight_Ratio"].as<uint32_t>(); LubeConfig.TireWidthHeight_Ratio = json["config"]["TireWidthHeight_Ratio"].as<uint32_t>();
LubeConfig.RimDiameter_Inch = doc["config"]["RimDiameter_Inch"].as<uint32_t>(); LubeConfig.RimDiameter_Inch = json["config"]["RimDiameter_Inch"].as<uint32_t>();
LubeConfig.DistancePerRevolution_mm = doc["config"]["DistancePerRevolution_mm"].as<uint32_t>(); LubeConfig.DistancePerRevolution_mm = json["config"]["DistancePerRevolution_mm"].as<uint32_t>();
LubeConfig.BleedingPulses = doc["config"]["BleedingPulses"].as<uint16_t>(); LubeConfig.BleedingPulses = json["config"]["BleedingPulses"].as<uint16_t>();
LubeConfig.SpeedSource = (SpeedSource_t)doc["config"]["SpeedSource"].as<int>(); LubeConfig.SpeedSource = (SpeedSource_t)json["config"]["SpeedSource"].as<int>();
LubeConfig.GPSBaudRate = (GPSBaudRate_t)doc["config"]["GPSBaudRate"].as<int>(); LubeConfig.GPSBaudRate = (GPSBaudRate_t)json["config"]["GPSBaudRate"].as<int>();
LubeConfig.CANSource = (CANSource_t)doc["config"]["CANSource"].as<int>(); LubeConfig.CANSource = (CANSource_t)json["config"]["CANSource"].as<int>();
LubeConfig.LED_Mode_Flash = doc["config"]["LED_Mode_Flash"].as<bool>(); LubeConfig.LED_Mode_Flash = json["config"]["LED_Mode_Flash"].as<bool>();
LubeConfig.LED_Max_Brightness = doc["config"]["LED_Max_Brightness"].as<uint8_t>(); LubeConfig.LED_Max_Brightness = json["config"]["LED_Max_Brightness"].as<uint8_t>();
LubeConfig.LED_Min_Brightness = doc["config"]["LED_Min_Brightness"].as<uint8_t>(); LubeConfig.LED_Min_Brightness = json["config"]["LED_Min_Brightness"].as<uint8_t>();
PersistenceData.writeCycleCounter = doc["persis"]["writeCycleCounter"].as<uint16_t>(); PersistenceData.writeCycleCounter = json["persis"]["writeCycleCounter"].as<uint16_t>();
PersistenceData.tankRemain_microL = doc["persis"]["tankRemain_microL"].as<uint32_t>(); PersistenceData.tankRemain_microL = json["persis"]["tankRemain_microL"].as<uint32_t>();
PersistenceData.TravelDistance_highRes_mm = doc["persis"]["TravelDistance_highRes_mm"].as<uint32_t>(); PersistenceData.TravelDistance_highRes_mm = json["persis"]["TravelDistance_highRes_mm"].as<uint32_t>();
PersistenceData.odometer_mm = doc["persis"]["odometer_mm"].as<uint32_t>(); PersistenceData.odometer_mm = json["persis"]["odometer_mm"].as<uint32_t>();
PersistenceData.odometer = doc["persis"]["odometer"].as<uint32_t>(); PersistenceData.odometer = json["persis"]["odometer"].as<uint32_t>();
PersistenceData.checksum = doc["persis"]["checksum"].as<uint32_t>(); PersistenceData.checksum = json["persis"]["checksum"].as<uint32_t>();
ee_done = true; ee_done = true;
} }
@ -450,24 +450,24 @@ void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &f
void WebServerEEJSON_Callback(AsyncWebServerRequest *request) void WebServerEEJSON_Callback(AsyncWebServerRequest *request)
{ {
AsyncResponseStream *response = request->beginResponseStream("application/json"); AsyncResponseStream *response = request->beginResponseStream("application/json");
DynamicJsonDocument json(1024); JsonDocument json;
JsonObject fwinfo = json.createNestedObject("info"); JsonObject info = json.to<JsonObject>();
char buffer[16]; 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); sprintf(buffer, "%d.%02d", constants.Required_Flash_Version_major, constants.Required_Flash_Version_minor);
fwinfo["FW-Version"] = buffer; info["FW-Version"] = buffer;
fwinfo["FS-Version"] = globals.FlashVersion; info["FS-Version"] = globals.FlashVersion;
snprintf_P(buffer, sizeof(buffer), "%s", constants.GitHash); 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<JsonObject>();
generateJsonObject_LubeConfig(config); generateJsonObject_LubeConfig(config);
JsonObject persis = json.createNestedObject("persis"); JsonObject persis = json.to<JsonObject>();
generateJsonObject_PersistenceData(persis); generateJsonObject_PersistenceData(persis);
JsonObject eepart = json.createNestedObject("eepart"); JsonObject eepart = json.to<JsonObject>();
sprintf(buffer, "0x%04X", globals.eePersistanceAdress); sprintf(buffer, "0x%04X", globals.eePersistanceAdress);
eepart["PersistanceAddress"] = buffer; eepart["PersistanceAddress"] = buffer;