Add is-cfg.json to lora.txok for SWL station.

This commit is contained in:
FUJIURA Toyonori 2022-03-18 22:33:36 +09:00
parent 2db09d01be
commit 9d1465e3de
4 changed files with 12 additions and 2 deletions

View file

@ -48,7 +48,8 @@
"power": 20, "power": 20,
"spreading_factor": 12, "spreading_factor": 12,
"signal_bandwidth": 125000, "signal_bandwidth": 125000,
"coding_rate4": 5 "coding_rate4": 5,
"txok": true
}, },
"display": { "display": {
"always_on": true, "always_on": true,

View file

@ -54,7 +54,14 @@ bool ModemTask::loop(System &system) {
if (!_toModem.empty()) { if (!_toModem.empty()) {
std::shared_ptr<APRSMessage> msg = _toModem.getElement(); std::shared_ptr<APRSMessage> msg = _toModem.getElement();
logPrintlnD(msg->toString());
if (system.getUserConfig()->lora.txok) {
logPrintD(String("-- TXOK"));
_lora_aprs.sendMessage(msg); _lora_aprs.sendMessage(msg);
logPrintlnD(String(" -- TXDone"));
} else {
logPrintlnD(String("-- TXNG"));
}
} }
return true; return true;

View file

@ -58,6 +58,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
conf.lora.spreadingFactor = data["lora"]["spreading_factor"] | 12; conf.lora.spreadingFactor = data["lora"]["spreading_factor"] | 12;
conf.lora.signalBandwidth = data["lora"]["signal_bandwidth"] | 125000; conf.lora.signalBandwidth = data["lora"]["signal_bandwidth"] | 125000;
conf.lora.codingRate4 = data["lora"]["coding_rate4"] | 5; conf.lora.codingRate4 = data["lora"]["coding_rate4"] | 5;
conf.lora.txok = data["lora"]["txok"] | false;
conf.display.alwaysOn = data["display"]["always_on"] | true; conf.display.alwaysOn = data["display"]["always_on"] | true;
conf.display.timeout = data["display"]["timeout"] | 10; conf.display.timeout = data["display"]["timeout"] | 10;
conf.display.overwritePin = data["display"]["overwrite_pin"] | 0; conf.display.overwritePin = data["display"]["overwrite_pin"] | 0;

View file

@ -89,6 +89,7 @@ public:
int spreadingFactor; int spreadingFactor;
long signalBandwidth; long signalBandwidth;
int codingRate4; int codingRate4;
bool txok;
}; };
class Display { class Display {