Merge pull request #165 from lora-aprs/tx_enable_changes

Tx enable changes

data/is-cfg.json

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

src/LoRa_APRS_iGate.cpp

@@ -19,7 +19,7 @@
 #include "TaskWifi.h"
 #include "project_configuration.h"
 
-#define VERSION "22.11.0"
+#define VERSION "22.11.1"
 
 String create_lat_aprs(double lat);
 String create_long_aprs(double lng);

src/TaskModem.cpp

@@ -55,15 +55,16 @@ bool ModemTask::loop(System &system) {
   if (!_toModem.empty()) {
     std::shared_ptr<APRSMessage> msg = _toModem.getElement();
     logPrintD("[" + timeString() + "] ");
-    if (system.getUserConfig()->lora.txok) {
+    if (system.getUserConfig()->lora.tx_enable) {
       logPrintD("Transmitting packet '");
       logPrintD(msg->toString());
+      logPrintlnD("'");
       _lora_aprs.sendMessage(msg);
-      logPrintlnD(String(" TXDone"));
+      logPrintlnD("TX done");
     } else {
-      logPrintD("NOT Transmitting packet '");
+      logPrintD("NOT transmitting packet as TX is not enabled '");
       logPrintD(msg->toString());
-      logPrintlnD(String(" TXNG"));
+      logPrintlnD("'");
     }
   }
 

src/project_configuration.cpp

@@ -58,7 +58,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
   conf.lora.spreadingFactor = data["lora"]["spreading_factor"] | 12;
   conf.lora.signalBandwidth = data["lora"]["signal_bandwidth"] | 125000;
   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.timeout      = data["display"]["timeout"] | 10;
   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"]["signal_bandwidth"]        = conf.lora.signalBandwidth;
   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"]["timeout"]              = conf.display.timeout;
   data["display"]["overwrite_pin"]        = conf.display.overwritePin;

src/project_configuration.h

@@ -79,7 +79,7 @@ public:
 
   class LoRa {
   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;
@@ -89,7 +89,7 @@ public:
     int     spreadingFactor;
     long    signalBandwidth;
     int     codingRate4;
-    bool    txok;
+    bool    tx_enable;
   };
 
   class Display {