Update T3S3 SX1280 PA model code, again

diff --git a/Boards.h b/Boards.h
index f5937c7a95430174e27026e7510d2b5596bdadd9..2f62a4c3bcacb847aabb30b450fb9fbae768409e 100644 (file)
--- a/Boards.h
+++ b/Boards.h
@@ -82,7 +82,7 @@
   #define MODEL_A1 0xA1            // T3S3 SX1262 868/915 MHz
   #define MODEL_AB 0xAB            // T3S3 SX1276 868/915 MHz
   #define MODEL_A5 0xA5            // T3S3 SX1278 433 MHz
-  #define MODEL_AB 0xAB            // T3S3 SX1280 2.4 GHz w/ PA
+  #define MODEL_AC 0xAC            // T3S3 SX1280 2.4 GHz w/ PA
 
   #define PRODUCT_TECHO 0x15       // LilyGO T-Echo devices
   #define BOARD_TECHO         0x43
@@ -727,7 +727,7 @@
               -1  // pin_tcxo_enable
           }
       };
-      #elif BOARD_VARIANT == MODEL_AB // SX1280 with PA 
+      #elif BOARD_VARIANT == MODEL_AC // SX1280 with PA 
       const uint8_t interfaces[INTERFACE_COUNT] = {SX1280};
       const bool interface_cfg[INTERFACE_COUNT][3] = { 
                     // SX1280

diff --git a/Makefile b/Makefile
index ba954fd6912b14061491dbd9bdeb5ec77164406e..e36222248b52717d4eec2e459f2eef65caba13cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ firmware-t3s3_sx126x:
        arduino-cli compile --fqbn "esp32:esp32:esp32s3:CDCOnBoot=cdc" $(COMMON_BUILD_FLAGS) --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x42\" \"-DBOARD_VARIANT=0xA1\""
 
 firmware-t3s3_sx1280_pa:
-       arduino-cli compile --fqbn "esp32:esp32:esp32s3:CDCOnBoot=cdc" $(COMMON_BUILD_FLAGS) --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x42\" \"-DBOARD_VARIANT=0xAB\""
+       arduino-cli compile --fqbn "esp32:esp32:esp32s3:CDCOnBoot=cdc" $(COMMON_BUILD_FLAGS) --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x42\" \"-DBOARD_VARIANT=0xAC\""
 
 firmware-e22_esp32:
        arduino-cli compile --fqbn esp32:esp32:esp32 $(COMMON_BUILD_FLAGS) --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x44\" \"-DEXTERNAL_LEDS=true\""

diff --git a/Radio.cpp b/Radio.cpp
index 03b8e7019ce8aee3e0d527e293ca5e2fe91dca23..852263c9f2407cfe43256edce8943931fcb68f45 100644 (file)
--- a/Radio.cpp
+++ b/Radio.cpp
@@ -2347,7 +2347,7 @@ void sx128x::setTxPower(int level, int outputPin) {
 
     executeOpcode(OP_TX_PARAMS_8X, tx_buf, 2);
 
-    #elif BOARD_VARIANT == MODEL_AB
+    #elif BOARD_VARIANT == MODEL_AC
     // T3S3 SX1280 PA
         if (level > 20) {
             level = 20;

diff --git a/Utilities.h b/Utilities.h
index bcde9b3321dc1a980809b0164028a8b8d26b7fa4..d9a34be6f62a7834eb3dcfbb6f77ec57167d4cd2 100644 (file)
--- a/Utilities.h
+++ b/Utilities.h
@@ -1048,7 +1048,7 @@ void setTXPower(RadioInterface* radio, int txp) {
     if (model == MODEL_A8) radio->setTxPower(txp, PA_OUTPUT_PA_BOOST_PIN);
     if (model == MODEL_A9) radio->setTxPower(txp, PA_OUTPUT_PA_BOOST_PIN);
     if (model == MODEL_AA) radio->setTxPower(txp, PA_OUTPUT_PA_BOOST_PIN);
-    if (model == MODEL_AB) radio->setTxPower(txp, PA_OUTPUT_PA_BOOST_PIN);
+    if (model == MODEL_AC) radio->setTxPower(txp, PA_OUTPUT_PA_BOOST_PIN);
 
     if (model == MODEL_B3) radio->setTxPower(txp, PA_OUTPUT_PA_BOOST_PIN);
     if (model == MODEL_B4) radio->setTxPower(txp, PA_OUTPUT_PA_BOOST_PIN);