kopia lustrzana https://github.com/lora-aprs/LoRa_APRS_iGate
Use JsonDocument instead of DynamicJsonDocument
rodzic
56fbc22878
commit
d074febe13
|
@ -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.");
|
||||
return;
|
||||
}
|
||||
DynamicJsonDocument data(2048);
|
||||
JsonDocument data;
|
||||
DeserializationError error = deserializeJson(data, file);
|
||||
if (error) {
|
||||
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...");
|
||||
return;
|
||||
}
|
||||
DynamicJsonDocument data(2048);
|
||||
JsonDocument data;
|
||||
|
||||
writeProjectConfiguration(conf, data);
|
||||
|
||||
|
|
|
@ -22,8 +22,8 @@ public:
|
|||
void writeConfiguration(logging::Logger &logger, Configuration &conf);
|
||||
|
||||
private:
|
||||
virtual void readProjectConfiguration(DynamicJsonDocument &data, Configuration &conf) = 0;
|
||||
virtual void writeProjectConfiguration(Configuration &conf, DynamicJsonDocument &data) = 0;
|
||||
virtual void readProjectConfiguration(JsonDocument &data, Configuration &conf) = 0;
|
||||
virtual void writeProjectConfiguration(Configuration &conf, JsonDocument &data) = 0;
|
||||
|
||||
const String mFilePath;
|
||||
};
|
||||
|
|
|
@ -29,7 +29,7 @@ bool MQTTTask::loop(System &system) {
|
|||
if (!_toMQTT.empty()) {
|
||||
std::shared_ptr<APRSMessage> msg = _toMQTT.getElement();
|
||||
|
||||
DynamicJsonDocument data(1024);
|
||||
JsonDocument data;
|
||||
data["source"] = msg->getSource();
|
||||
data["destination"] = msg->getDestination();
|
||||
data["path"] = msg->getPath();
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include "project_configuration.h"
|
||||
|
||||
void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocument &data, Configuration &conf) {
|
||||
void ProjectConfigurationManagement::readProjectConfiguration(JsonDocument &data, Configuration &conf) {
|
||||
if (data.containsKey("callsign"))
|
||||
conf.callsign = data["callsign"].as<String>();
|
||||
|
||||
|
@ -119,7 +119,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
|
|||
conf.board = data["board"].as<String>();
|
||||
}
|
||||
|
||||
void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &conf, DynamicJsonDocument &data) {
|
||||
void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &conf, JsonDocument &data) {
|
||||
data["callsign"] = conf.callsign;
|
||||
|
||||
if (!conf.network.DHCP) {
|
||||
|
|
|
@ -176,8 +176,8 @@ public:
|
|||
}
|
||||
|
||||
private:
|
||||
virtual void readProjectConfiguration(DynamicJsonDocument &data, Configuration &conf) override;
|
||||
virtual void writeProjectConfiguration(Configuration &conf, DynamicJsonDocument &data) override;
|
||||
virtual void readProjectConfiguration(JsonDocument &data, Configuration &conf) override;
|
||||
virtual void writeProjectConfiguration(Configuration &conf, JsonDocument &data) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
Ładowanie…
Reference in New Issue