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

convert txok to tx_enable

Browse source
This commit is contained in:
Peter Buchegger 2022-03-19 20:53:38 +01:00
parent e0ddf9685d
commit 692a2a6f35
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/is-cfg.json
View file

@ -49,7 +49,7 @@
"spreading_factor": 12, "spreading_factor": 12,
"signal_bandwidth": 125000, "signal_bandwidth": 125000,
"coding_rate4": 5, "coding_rate4": 5,
"txok": true "tx_enable": true
}, },
"display": { "display": {
"always_on": true, "always_on": true,

9
src/TaskModem.cpp
View file

@ -55,15 +55,16 @@ 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();
logPrintD("[" + timeString() + "] "); logPrintD("[" + timeString() + "] ");
if (system.getUserConfig()->lora.txok) { if (system.getUserConfig()->lora.tx_enable) {
logPrintD("Transmitting packet '"); logPrintD("Transmitting packet '");
logPrintD(msg->toString()); logPrintD(msg->toString());
logPrintlnD("'");
_lora_aprs.sendMessage(msg); _lora_aprs.sendMessage(msg);
logPrintlnD(String(" TXDone")); logPrintlnD("TX done");
} else { } else {
logPrintD("NOT Transmitting packet '"); logPrintD("NOT transmitting packet as TX is not enabled '");
logPrintD(msg->toString()); logPrintD(msg->toString());
logPrintlnD(String(" TXNG")); logPrintlnD("'");
} }
} }

4
src/project_configuration.cpp
View file

@ -58,7 +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.lora.tx_enable = data["lora"]["tx_enable"] | true;
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;
@ -131,7 +131,7 @@ void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &co
data["lora"]["spreading_factor"] = conf.lora.spreadingFactor; data["lora"]["spreading_factor"] = conf.lora.spreadingFactor;
data["lora"]["signal_bandwidth"] = conf.lora.signalBandwidth; data["lora"]["signal_bandwidth"] = conf.lora.signalBandwidth;
data["lora"]["coding_rate4"] = conf.lora.codingRate4; data["lora"]["coding_rate4"] = conf.lora.codingRate4;
data["lora"]["txok"] = conf.lora.txok; data["lora"]["tx_enable"] = conf.lora.tx_enable;
data["display"]["always_on"] = conf.display.alwaysOn; data["display"]["always_on"] = conf.display.alwaysOn;
data["display"]["timeout"] = conf.display.timeout; data["display"]["timeout"] = conf.display.timeout;
data["display"]["overwrite_pin"] = conf.display.overwritePin; data["display"]["overwrite_pin"] = conf.display.overwritePin;

4
src/project_configuration.h
View file

@ -79,7 +79,7 @@ public:
class LoRa { class LoRa {
public: public:
LoRa() : frequencyRx(433775000), frequencyTx(433775000), power(20), spreadingFactor(12), signalBandwidth(125000), codingRate4(5), txok(false) { LoRa() : frequencyRx(433775000), frequencyTx(433775000), power(20), spreadingFactor(12), signalBandwidth(125000), codingRate4(5), tx_enable(true) {
} }
long frequencyRx; long frequencyRx;
@ -89,7 +89,7 @@ public:
int spreadingFactor; int spreadingFactor;
long signalBandwidth; long signalBandwidth;
int codingRate4; int codingRate4;
bool txok; bool tx_enable;
}; };
class Display { class Display {