lora-aprs/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/lora-aprs/LoRa_APRS_iGate.git synced 2025-12-06 07:42:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #371 from pe-jot/bugfix/DynamicJsonDocument_deprecated_in_ArduinoJSON_#356

Browse source 
Bugfix/dynamic json document deprecated in arduino json #356
This commit is contained in:
Peter Buchegger 2024-09-13 09:34:45 +00:00 committed by GitHub
parent 56fbc22878 7eeb99f02c
commit 6e070e8f5f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ConfigurationManagement/configuration.cpp
View file

@ -23,7 +23,7 @@ void ConfigurationManagement::readConfiguration(logging::Logger &logger, Configu
logger.log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, MODULE_NAME, "Failed to open file for reading, using default configuration."); logger.log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, MODULE_NAME, "Failed to open file for reading, using default configuration.");
return; return;
} }
DynamicJsonDocument data(2048); JsonDocument data;
DeserializationError error = deserializeJson(data, file); DeserializationError error = deserializeJson(data, file);
if (error) { if (error) {
logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, MODULE_NAME, "Failed to read file, using default configuration."); logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, MODULE_NAME, "Failed to read file, using default configuration.");
@ -44,7 +44,7 @@ void ConfigurationManagement::writeConfiguration(logging::Logger &logger, Config
logger.log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, MODULE_NAME, "Failed to open file for writing..."); logger.log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, MODULE_NAME, "Failed to open file for writing...");
return; return;
} }
DynamicJsonDocument data(2048); JsonDocument data;
writeProjectConfiguration(conf, data); writeProjectConfiguration(conf, data);

4
src/ConfigurationManagement/configuration.h
View file

@ -22,8 +22,8 @@ public:
void writeConfiguration(logging::Logger &logger, Configuration &conf); void writeConfiguration(logging::Logger &logger, Configuration &conf);
private: private:
virtual void readProjectConfiguration(DynamicJsonDocument &data, Configuration &conf) = 0; virtual void readProjectConfiguration(JsonDocument &data, Configuration &conf) = 0;
virtual void writeProjectConfiguration(Configuration &conf, DynamicJsonDocument &data) = 0; virtual void writeProjectConfiguration(Configuration &conf, JsonDocument &data) = 0;
const String mFilePath; const String mFilePath;
}; };

2
src/TaskMQTT.cpp
View file

@ -29,7 +29,7 @@ bool MQTTTask::loop(System &system) {
if (!_toMQTT.empty()) { if (!_toMQTT.empty()) {
std::shared_ptr<APRSMessage> msg = _toMQTT.getElement(); std::shared_ptr<APRSMessage> msg = _toMQTT.getElement();
DynamicJsonDocument data(1024); JsonDocument data;
data["source"] = msg->getSource(); data["source"] = msg->getSource();
data["destination"] = msg->getDestination(); data["destination"] = msg->getDestination();
data["path"] = msg->getPath(); data["path"] = msg->getPath();

12
src/project_configuration.cpp
View file

@ -4,7 +4,7 @@
#include "project_configuration.h" #include "project_configuration.h"
void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocument &data, Configuration &conf) { void ProjectConfigurationManagement::readProjectConfiguration(JsonDocument &data, Configuration &conf) {
if (data.containsKey("callsign")) if (data.containsKey("callsign"))
conf.callsign = data["callsign"].as<String>(); conf.callsign = data["callsign"].as<String>();
@ -119,7 +119,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
conf.board = data["board"].as<String>(); conf.board = data["board"].as<String>();
} }
void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &conf, DynamicJsonDocument &data) { void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &conf, JsonDocument &data) {
data["callsign"] = conf.callsign; data["callsign"] = conf.callsign;
if (!conf.network.DHCP) { if (!conf.network.DHCP) {
@ -134,9 +134,9 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co
} }
data["wifi"]["active"] = conf.wifi.active; data["wifi"]["active"] = conf.wifi.active;
JsonArray aps = data["wifi"].createNestedArray("AP"); JsonArray aps = data["wifi"]["AP"].to<JsonArray>();
for (Configuration::Wifi::AP ap : conf.wifi.APs) { for (Configuration::Wifi::AP ap : conf.wifi.APs) {
JsonObject v = aps.createNestedObject(); JsonObject v = aps.add<JsonObject>();
v["SSID"] = ap.SSID; v["SSID"] = ap.SSID;
v["password"] = ap.password; v["password"] = ap.password;
} }
@ -165,9 +165,9 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co
data["display"]["overwrite_pin"] = conf.display.overwritePin; data["display"]["overwrite_pin"] = conf.display.overwritePin;
data["display"]["turn180"] = conf.display.turn180; data["display"]["turn180"] = conf.display.turn180;
data["ftp"]["active"] = conf.ftp.active; data["ftp"]["active"] = conf.ftp.active;
JsonArray users = data["ftp"].createNestedArray("user"); JsonArray users = data["ftp"]["user"].to<JsonArray>();
for (Configuration::Ftp::User u : conf.ftp.users) { for (Configuration::Ftp::User u : conf.ftp.users) {
JsonObject v = users.createNestedObject(); JsonObject v = users.add<JsonObject>();
v["name"] = u.name; v["name"] = u.name;
v["password"] = u.password; v["password"] = u.password;
} }

4
src/project_configuration.h
View file

@ -176,8 +176,8 @@ public:
} }
private: private:
virtual void readProjectConfiguration(DynamicJsonDocument &data, Configuration &conf) override; virtual void readProjectConfiguration(JsonDocument &data, Configuration &conf) override;
virtual void writeProjectConfiguration(Configuration &conf, DynamicJsonDocument &data) override; virtual void writeProjectConfiguration(Configuration &conf, JsonDocument &data) override;
}; };
#endif #endif