Change model code for T3S3 SX1280 w/ PA

diff --git a/Boards.h b/Boards.h
index 898aa48b0047d6920496868c4ba98284255d9f1c..9d913fd15405378b769cef98c45ebf4734e85a2e 100644 (file)
--- a/Boards.h
+++ b/Boards.h
@@ -81,7 +81,8 @@
   #define BOARD_T3S3          0x42 // T3S3 - sold by LilyGO
   #define MODEL_A1 0xA1            // T3S3 SX1262 868/915 MHz
   #define MODEL_AB 0xAB            // T3S3 SX1276 868/915 MHz
-  #define MODEL_A5 0xA5            // T3S3 SX1280 PA (2.4GHz)
+  #define MODEL_A5 0xA5            // T3S3 SX1278 433 MHz
+  #define MODEL_AB 0xAB            // T3S3 SX1280 2.4 GHz w/ PA
 
   #define PRODUCT_TECHO 0x15       // LilyGO T-Echo devices
   #define BOARD_TECHO         0x43

diff --git a/Makefile b/Makefile
index e463d3f7f45f95f168c1da069a28d0de5be90ec1..2fa721bdb8b99ffddc36fd5a8d5eba798542aa79 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=0xA5\""
+       arduino-cli compile --fqbn "esp32:esp32:esp32s3:CDCOnBoot=cdc" $(COMMON_BUILD_FLAGS) --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x42\" \"-DBOARD_VARIANT=0xAB\""
 
 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 05b485bdebb0cf13091495517891a8b3e884d3d4..0f34c5ced2f982aa07f881b7066f002c818646ad 100644 (file)
--- a/Radio.cpp
+++ b/Radio.cpp
@@ -2346,7 +2346,7 @@ void sx128x::setTxPower(int level, int outputPin) {
 
     executeOpcode(OP_TX_PARAMS_8X, tx_buf, 2);
 
-    #elif BOARD_VARIANT == MODEL_A5
+    #elif BOARD_VARIANT == MODEL_AB
     // T3S3 SX1280 PA
         if (level > 20) {
             level = 20;