From 1a8e9004fd80c62fefa5f425fa3c037f0cbfabb3 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Thu, 16 May 2024 01:04:38 -0400
Subject: [PATCH] sx126x to 2 and 8

---
 platformio.ini      | 16 ++++++++--------
 src/lora_utils.cpp  | 16 ++++++++--------
 src/power_utils.cpp |  3 ++-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 08306d7..44c954e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -132,7 +132,7 @@ board = esp32dev
 build_flags = 
 	-Werror -Wall 
 	-DESP32_DIY_1W_LoRa_GPS
-	-DHAS_SX126X
+	-DHAS_SX1268
 	-DHAS_BT_CLASSIC
 lib_deps =
 	${common.lib_deps}
@@ -148,7 +148,7 @@ board = ttgo-t-beam
 build_flags = 
 	-Werror -Wall 
 	-DTTGO_T_Beam_V1_0_SX1268
-	-DHAS_SX126X
+	-DHAS_SX1268
 	-DHAS_AXP192
 	-DHAS_BT_CLASSIC
 lib_deps =
@@ -166,7 +166,7 @@ board = ttgo-t-beam
 build_flags = 
 	-Werror -Wall 
 	-DTTGO_T_Beam_V1_2_SX1262
-	-DHAS_SX126X
+	-DHAS_SX1262
 	-DHAS_AXP2101
 	-DHAS_BT_CLASSIC
 lib_deps =
@@ -201,7 +201,7 @@ board_build.mcu = esp32s3
 build_flags = 
     -DTTGO_T_Beam_S3_SUPREME_V3
     -DBOARD_HAS_PSRAM
-	-DHAS_SX126X
+	-DHAS_SX1262
 	-DHAS_AXP2101
 	-DARDUINO_USB_MODE=1
     -DARDUINO_USB_CDC_ON_BOOT=1
@@ -220,7 +220,7 @@ board = heltec_wifi_lora_32_V3
 board_build.mcu = esp32s3
 build_flags = 
 	-DHELTEC_V3_GPS
-	-DHAS_SX126X
+	-DHAS_SX1262
 	-DARDUINO_USB_MODE=1
     -DARDUINO_USB_CDC_ON_BOOT=1
 lib_deps =
@@ -237,7 +237,7 @@ board = esp32dev
 build_flags = 
 	-Werror -Wall 
 	-DOE5HWN_MeshCom
-	-DHAS_SX126X
+	-DHAS_SX1268
 	-DHAS_BT_CLASSIC
 lib_deps =
 	${common.lib_deps}
@@ -271,7 +271,7 @@ board = esp32-s3-devkitc-1
 board_build.mcu = esp32s3
 build_flags = 
 	-DHELTEC_WIRELESS_TRACKER
-	-DHAS_SX126X
+	-DHAS_SX1262
     -DHIGH_GPS_BAUDRATE
 	-DHAS_TFT
     -D USER_SETUP_LOADED
@@ -310,7 +310,7 @@ board = esp32-s3-devkitc-1
 board_build.mcu = esp32s3
 build_flags = 
 	-DTTGO_T_DECK_GPS
-	-DHAS_SX126X
+	-DHAS_SX1262
 	-DHAS_TFT
 	-DBOARD_HAS_PSRAM
     -DUSER_SETUP_LOADED
diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp
index cf47ab4..3b2cca6 100644
--- a/src/lora_utils.cpp
+++ b/src/lora_utils.cpp
@@ -8,7 +8,7 @@
 #ifdef HAS_SX127X
     #include <LoRa.h>
 #endif
-#ifdef HAS_SX126X
+#if defined(HAS_SX1262) || defined(HAS_SX1268)
     #include <RadioLib.h>
 #endif
 
@@ -20,12 +20,12 @@ extern uint8_t          loraIndex;
 extern int              loraIndexSize;
 
 
-#if defined(TTGO_T_Beam_V1_0_SX1268) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(OE5HWN_MeshCom)
+#if defined(HAS_SX1268)
     SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
     bool transmissionFlag = true;
     bool enableInterrupt = true;
 #endif
-#if defined(TTGO_T_Beam_V1_2_SX1262) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS)
+#if defined(HAS_SX1262)
     SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
     bool transmissionFlag = true;
     bool enableInterrupt = true;
@@ -34,7 +34,7 @@ extern int              loraIndexSize;
 namespace LoRa_Utils {
 
     void setFlag(void) {
-        #ifdef HAS_SX126X
+        #if defined(HAS_SX1262) || defined(HAS_SX1268)
             if(!enableInterrupt) {
                 return;
             }
@@ -49,7 +49,7 @@ namespace LoRa_Utils {
             loraIndex++;
         }
         currentLoRaType = &Config.loraTypes[loraIndex];
-        #ifdef HAS_SX126X
+        #if defined(HAS_SX1262) || defined(HAS_SX1268)
             float freq = (float)currentLoRaType->frequency/1000000;
             radio.setFrequency(freq);
             radio.setSpreadingFactor(currentLoRaType->spreadingFactor);
@@ -85,7 +85,7 @@ namespace LoRa_Utils {
     }
 
     void setup() {
-        #ifdef HAS_SX126X
+        #if defined(HAS_SX1262) || defined(HAS_SX1268)
             logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "LoRa", "Set SPI pins!");
             SPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN);
             float freq = (float)currentLoRaType->frequency/1000000;
@@ -155,7 +155,7 @@ namespace LoRa_Utils {
         }
         if (Config.notification.ledTx) digitalWrite(Config.notification.ledTxPin, HIGH);
         if (Config.notification.buzzerActive && Config.notification.txBeep) NOTIFICATION_Utils::beaconTxBeep();
-        #ifdef HAS_SX126X
+        #if defined(HAS_SX1262) || defined(HAS_SX1268)
             enableInterrupt = false;
             int state = radio.transmit("\x3c\xff\x01" + newPacket);
             if (state == RADIOLIB_ERR_NONE) {
@@ -202,7 +202,7 @@ namespace LoRa_Utils {
                 logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "LoRa Rx", "---> %s", packet.substring(3).c_str());
             }
         #endif
-        #ifdef HAS_SX126X
+        #if defined(HAS_SX1262) || defined(HAS_SX1268)
             if (transmissionFlag) {
                 transmissionFlag = false;
                 int state = radio.readData(packet);
diff --git a/src/power_utils.cpp b/src/power_utils.cpp
index 6f733b3..2f143dc 100644
--- a/src/power_utils.cpp
+++ b/src/power_utils.cpp
@@ -444,6 +444,7 @@ namespace POWER_Utils {
     }
 
     void lowerCpuFrequency() {
+        // later for all boards!
         #if defined(HAS_AXP192) || defined(HAS_AXP2101) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(OE5HWN_MeshCom) || defined(ESP32_C3_DIY_LoRa_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS)
             if (setCpuFrequencyMhz(80)) {
                 logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "Main", "CPU frequency set to 80MHz");
@@ -460,7 +461,7 @@ namespace POWER_Utils {
             PMU.shutdown();
         #else
 
-            if (Config.bluetoothType==0) {
+            if (Config.bluetoothType == 0) {
                 BLE_Utils::stop();
             } else {
                 // turn off BT classic ???