diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index cdb7931..074c8fa 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -11,12 +11,12 @@ #include "TaskDisplay.h" #include "TaskEth.h" #include "TaskFTP.h" +#include "TaskMQTT.h" #include "TaskModem.h" #include "TaskNTP.h" #include "TaskOTA.h" #include "TaskRouter.h" #include "TaskWifi.h" -#include "TaskMQTT.h" #include "project_configuration.h" #define VERSION "22.7.0_zj" diff --git a/src/project_configuration.cpp b/src/project_configuration.cpp index 78a2510..061c531 100644 --- a/src/project_configuration.cpp +++ b/src/project_configuration.cpp @@ -78,12 +78,12 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen conf.ftp.users.push_back(us); } if (data.containsKey("mqtt")) { - conf.mqtt.active = data["mqtt"]["active"] | false; - conf.mqtt.server = data["mqtt"]["server"].as(); - conf.mqtt.port = data["mqtt"]["port"].as(); - conf.mqtt.name = data["mqtt"]["name"].as(); + conf.mqtt.active = data["mqtt"]["active"] | false; + conf.mqtt.server = data["mqtt"]["server"].as(); + conf.mqtt.port = data["mqtt"]["port"].as(); + conf.mqtt.name = data["mqtt"]["name"].as(); conf.mqtt.password = data["mqtt"]["password"].as(); - conf.mqtt.topic = data["mqtt"]["topic"].as(); + conf.mqtt.topic = data["mqtt"]["topic"].as(); } if (data.containsKey("ntp_server")) conf.ntpServer = data["ntp_server"].as(); @@ -141,13 +141,13 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co v["name"] = u.name; v["password"] = u.password; } - data["mqtt"]["active"] = conf.mqtt.active; - data["mqtt"]["server"] = conf.mqtt.server; - data["mqtt"]["port"] = conf.mqtt.port; - data["mqtt"]["name"] = conf.mqtt.name; - data["mqtt"]["password"] = conf.mqtt.password; - data["mqtt"]["topic"] = conf.mqtt.topic; - data["ntp_server"] = conf.ntpServer; + data["mqtt"]["active"] = conf.mqtt.active; + data["mqtt"]["server"] = conf.mqtt.server; + data["mqtt"]["port"] = conf.mqtt.port; + data["mqtt"]["name"] = conf.mqtt.name; + data["mqtt"]["password"] = conf.mqtt.password; + data["mqtt"]["topic"] = conf.mqtt.topic; + data["ntp_server"] = conf.ntpServer; data["board"] = conf.board; } diff --git a/src/project_configuration.h b/src/project_configuration.h index 12e94a7..5fe2fb3 100644 --- a/src/project_configuration.h +++ b/src/project_configuration.h @@ -119,12 +119,12 @@ public: class MQTT { public: - bool active; - String server; + bool active; + String server; uint16_t port; - String name; - String password; - String topic; + String name; + String password; + String topic; }; Configuration() : callsign("NOCALL-10"), board(""), ntpServer("pool.ntp.org"){};