diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 3c13888..22b05c3 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -12,8 +12,9 @@ # name: run PlatformIO Dependabot # steps: # - name: Checkout -# uses: actions/checkout@v3 +# uses: actions/checkout@v4 # - name: run PlatformIO Dependabot # uses: peterus/platformio_dependabot@v1 # with: -# github_token: ${{ secrets.DEPENDABOT_PAT }} +# github_token: ${{ secrets.GITHUB_TOKEN }} +# assignee: peterus diff --git a/platformio.ini b/platformio.ini index aa93901..4dd6e60 100644 --- a/platformio.ini +++ b/platformio.ini @@ -51,7 +51,7 @@ build_flags = monitor_speed = 115200 lib_deps = - bblanchon/ArduinoJson @ 7.0.4 + bblanchon/ArduinoJson @ 7.1.0 lewisxhe/XPowersLib @ 0.1.8 peterus/APRS-Decoder-Lib @ 0.0.6 peterus/esp-logger @ 1.0.0 @@ -59,8 +59,7 @@ lib_deps = knolleary/PubSubClient@^2.8 mikalhart/TinyGPSPlus @ 1.1.0 shaggydog/OneButton @ 1.5.0 - jgromes/RadioLib @ 6.5.0 - + jgromes/RadioLib @ 6.6.0 check_tool = cppcheck check_skip_packages = yes check_flags = diff --git a/src/ConfigurationManagement/configuration.cpp b/src/ConfigurationManagement/configuration.cpp index 6eff722..53ad575 100644 --- a/src/ConfigurationManagement/configuration.cpp +++ b/src/ConfigurationManagement/configuration.cpp @@ -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); diff --git a/src/ConfigurationManagement/configuration.h b/src/ConfigurationManagement/configuration.h index 4d988cb..d2b6608 100644 --- a/src/ConfigurationManagement/configuration.h +++ b/src/ConfigurationManagement/configuration.h @@ -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; }; diff --git a/src/TaskMQTT.cpp b/src/TaskMQTT.cpp index 1509aca..b6393ba 100644 --- a/src/TaskMQTT.cpp +++ b/src/TaskMQTT.cpp @@ -29,7 +29,7 @@ bool MQTTTask::loop(System &system) { if (!_toMQTT.empty()) { std::shared_ptr msg = _toMQTT.getElement(); - DynamicJsonDocument data(1024); + JsonDocument data; data["source"] = msg->getSource(); data["destination"] = msg->getDestination(); data["path"] = msg->getPath(); diff --git a/src/project_configuration.cpp b/src/project_configuration.cpp index 592b482..fdee843 100644 --- a/src/project_configuration.cpp +++ b/src/project_configuration.cpp @@ -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(); @@ -119,7 +119,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen conf.board = data["board"].as(); } -void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &conf, DynamicJsonDocument &data) { +void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &conf, JsonDocument &data) { data["callsign"] = conf.callsign; if (!conf.network.DHCP) { @@ -134,9 +134,9 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co } data["wifi"]["active"] = conf.wifi.active; - JsonArray aps = data["wifi"].createNestedArray("AP"); + JsonArray aps = data["wifi"]["AP"].to(); for (Configuration::Wifi::AP ap : conf.wifi.APs) { - JsonObject v = aps.createNestedObject(); + JsonObject v = aps.add(); v["SSID"] = ap.SSID; v["password"] = ap.password; } @@ -165,9 +165,9 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co data["display"]["overwrite_pin"] = conf.display.overwritePin; data["display"]["turn180"] = conf.display.turn180; data["ftp"]["active"] = conf.ftp.active; - JsonArray users = data["ftp"].createNestedArray("user"); + JsonArray users = data["ftp"]["user"].to(); for (Configuration::Ftp::User u : conf.ftp.users) { - JsonObject v = users.createNestedObject(); + JsonObject v = users.add(); v["name"] = u.name; v["password"] = u.password; } diff --git a/src/project_configuration.h b/src/project_configuration.h index dd30523..6fecc06 100644 --- a/src/project_configuration.h +++ b/src/project_configuration.h @@ -175,8 +175,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