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 branches 'master' and 'master' of https://github.com/toyo/LoRa_APRS_iGate into master

Browse source
This commit is contained in:
FUJIURA Toyonori 2022-03-31 10:34:45 +09:00
parent e26023302d 7171805d0f
commit 3afa421978
4 changed files with 37 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/release.yml vendored
View file

@ -22,4 +22,5 @@ jobs:
commit: master
generateReleaseNotes: true
artifacts: ".pio/build/lora_board/firmware.bin,data/is-cfg.json"
token: ${{ secrets.GITHUB_TOKEN }}
owner: ${{ secrets.OWNER }}
token: ${{ secrets.PAT }}

2
src/LoRa_APRS_iGate.cpp
View file

@ -20,7 +20,7 @@
#include "TaskWifi.h"
#include "project_configuration.h"
#define VERSION "22.13.0"
#define VERSION "22.13.2"
#define MODULE_NAME "Main"
String create_lat_aprs(double lat);

21
src/project_configuration.cpp
View file

@ -33,7 +33,9 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
JsonArray aps = data["wifi"]["AP"].as<JsonArray>();
for (JsonVariant v : aps) {
Configuration::Wifi::AP ap;
if (v.containsKey("SSID"))
ap.SSID = v["SSID"].as<String>();
if (v.containsKey("password"))
ap.password = v["password"].as<String>();
conf.wifi.APs.push_back(ap);
}
@ -44,6 +46,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
conf.beacon.use_gps = data["beacon"]["use_gps"] | false;
conf.beacon.timeout = data["beacon"]["timeout"] | 15;
conf.aprs_is.active = data["aprs_is"]["active"] | true;
if (data.containsKey("aprs_is") && data["aprs_is"].containsKey("passcode"))
conf.aprs_is.passcode = data["aprs_is"]["passcode"].as<String>();
if (data.containsKey("aprs_is") && data["aprs_is"].containsKey("server"))
@ -52,6 +55,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
conf.digi.active = data["digi"]["active"] | false;
conf.digi.beacon = data["digi"]["beacon"] | false;
conf.lora.frequencyRx = data["lora"]["frequency_rx"] | 433775000;
conf.lora.gainRx = data["lora"]["gain_rx"] | 0;
conf.lora.frequencyTx = data["lora"]["frequency_tx"] | 433775000;
@ -60,6 +64,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
conf.lora.signalBandwidth = data["lora"]["signal_bandwidth"] | 125000;
conf.lora.codingRate4 = data["lora"]["coding_rate4"] | 5;
conf.lora.tx_enable = data["lora"]["tx_enable"] | true;
conf.display.alwaysOn = data["display"]["always_on"] | true;
conf.display.timeout = data["display"]["timeout"] | 10;
conf.display.overwritePin = data["display"]["overwrite_pin"] | 0;
@ -69,7 +74,9 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
JsonArray users = data["ftp"]["user"].as<JsonArray>();
for (JsonVariant u : users) {
Configuration::Ftp::User us;
if (u.containsKey("name"))
us.name = u["name"].as<String>();
if (u.containsKey("password"))
us.password = u["password"].as<String>();
conf.ftp.users.push_back(us);
}
@ -79,19 +86,23 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
us.password = "ftp";
conf.ftp.users.push_back(us);
}
if (data.containsKey("mqtt")) {
conf.mqtt.active = data["mqtt"]["active"] | false;
if (data["mqtt"].containsKey("server"))
conf.mqtt.server = data["mqtt"]["server"].as<String>();
conf.mqtt.port = data["mqtt"]["port"].as<uint16_t>();
conf.mqtt.port = data["mqtt"]["port"] | 1883;
if (data["mqtt"].containsKey("name"))
conf.mqtt.name = data["mqtt"]["name"].as<String>();
if (data["mqtt"].containsKey("password"))
conf.mqtt.password = data["mqtt"]["password"].as<String>();
if (data["mqtt"].containsKey("topic"))
conf.mqtt.topic = data["mqtt"]["topic"].as<String>();
}
if (data.containsKey("syslog")) {
conf.syslog.active = data["syslog"]["active"] | true;
if (data["syslog"].containsKey("server"))
conf.syslog.server = data["syslog"]["server"].as<String>();
conf.syslog.port = data["syslog"]["port"] | 514;
}
if (data.containsKey("ntp_server"))
conf.ntpServer = data["ntp_server"].as<String>();

2
src/project_configuration.h
View file

@ -126,7 +126,7 @@ public:
bool active;
String server;
uint16_t port;
int port;
String name;
String password;
String topic;