From a07dbada5aa1e1edf282c1f7ee79753da24cfeff Mon Sep 17 00:00:00 2001
From: sh123 <sh123@users.noreply.github.com>
Date: Sat, 13 Nov 2021 11:07:49 +0200
Subject: [PATCH] Improve module selection

---
 loraprs_service.cpp | 12 ++++++------
 module_name.h       | 12 ++++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/loraprs_service.cpp b/loraprs_service.cpp
index 7779c0f..563585a 100644
--- a/loraprs_service.cpp
+++ b/loraprs_service.cpp
@@ -214,7 +214,7 @@ void Service::setupLora(long loraFreq, long bw, int sf, int cr, int pwr, int syn
   }
   radio_->setCRC(enableCrc);
   //radio_->forceLDRO(false);
-  #ifdef USE_SX1268
+  #ifdef USE_SX126X
     #pragma message("Using SX1268")
     radio_->setRfSwitchPins(4, 5);
     radio_->clearDio1Action();
@@ -346,7 +346,7 @@ void Service::loop()
 }
 
 bool Service::isLoraRxBusy() {
-#if defined(USE_RADIOLIB) && !defined(USE_SX1268)
+#if defined(USE_RADIOLIB) && !defined(USE_SX126X)
   return config_.LoraUseCad && (radio_->getModemStatus() & 0x01); // SX1278_STATUS_SIG_DETECT
 #else
   return false;
@@ -539,7 +539,7 @@ void Service::onRigPacket(void *packet, int packetLength)
 
 void Service::performFrequencyCorrection() {
 #ifdef USE_RADIOLIB
-  #ifdef USE_SX1268
+  #ifdef USE_SX126X
   long frequencyErrorHz = 0;
   #else
   long frequencyErrorHz = radio_->getFrequencyError();
@@ -653,7 +653,7 @@ bool Service::onRigTxBegin()
 
 void Service::onRigTx(byte b)
 {
-  LOG_TRACE((char)b);
+  LOG_TRACE((char)b, b);
 #ifdef USE_RADIOLIB
   txQueue_.push(b);
 #else
@@ -717,7 +717,7 @@ void Service::attachKissNetworkClient()
 
 void Service::onSerialTx(byte b)
 {
-  LOG_TRACE((char)b);
+  LOG_TRACE((char)b, b);
   if (config_.UsbSerialEnable) {
     Serial.write(b);
   } 
@@ -772,7 +772,7 @@ bool Service::onSerialRx(byte *b)
     return false;
   }
   *b = (byte)rxResult;
-  LOG_TRACE((char)rxResult);
+  LOG_TRACE((char)rxResult, rxResult);
   return true;
 }
 
diff --git a/module_name.h b/module_name.h
index 1973bf4..3aaac19 100644
--- a/module_name.h
+++ b/module_name.h
@@ -1,5 +1,9 @@
-// Check your module name at https://github.com/jgromes/RadioLib/wiki/Modules
-//#define USE_SX1268
-//#define MODULE_NAME   SX1268
+// Uncomment for SX126X module usage
+//#define USE_SX126X
 
-#define MODULE_NAME  SX1278
+// Check your module name at https://github.com/jgromes/RadioLib/wiki/Modules
+#ifdef USE_SX126X
+#define MODULE_NAME   SX1268
+#else
+#define MODULE_NAME   SX1278
+#endif