lora-aprs/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/lora-aprs/LoRa_APRS_iGate.git synced 2026-01-02 22:59:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing format check

Browse source
This commit is contained in:
Peter Buchegger 2022-02-24 16:02:28 +01:00
parent c66d7d7d8f
commit af6fd114bc
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/LoRa_APRS_iGate.cpp
View file

@ -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"

24
src/project_configuration.cpp
View file

@ -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<String>();
conf.mqtt.port = data["mqtt"]["port"].as<uint16_t>();
conf.mqtt.name = data["mqtt"]["name"].as<String>();
conf.mqtt.active = data["mqtt"]["active"] | false;
conf.mqtt.server = data["mqtt"]["server"].as<String>();
conf.mqtt.port = data["mqtt"]["port"].as<uint16_t>();
conf.mqtt.name = data["mqtt"]["name"].as<String>();
conf.mqtt.password = data["mqtt"]["password"].as<String>();
conf.mqtt.topic = data["mqtt"]["topic"].as<String>();
conf.mqtt.topic = data["mqtt"]["topic"].as<String>();
}
if (data.containsKey("ntp_server"))
conf.ntpServer = data["ntp_server"].as<String>();
@ -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;
}

10
src/project_configuration.h
View file

@ -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"){};