Update release builds to include T3S3 SX1280 PA

diff --git a/Boards.h b/Boards.h
index c5548b96694f58f2645f027d01a2d36e32fbc712..c292a21f6c462f6420ac3ac6ca7eee7f77c3c20b 100644 (file)
--- a/Boards.h
+++ b/Boards.h
@@ -445,13 +445,14 @@
         const int pin_dio = 33;
         const int pin_tcxo_enable = -1;
       #elif MODEM == SX1280
+        #define CONFIG_QUEUE_SIZE 40960
         #define DIO2_AS_RF_SWITCH false
         #define HAS_BUSY true
         #define HAS_TCXO true
         #define HAS_PA true
         const int pa_max_input = 3;
 
-        #define HAS_RF_SWITCH_RX_TX false
+        #define HAS_RF_SWITCH_RX_TX true
         const int pin_rxen = 21;
         const int pin_txen = 10;
         
@@ -619,6 +620,7 @@
 
       // Following pins are for the sx1262
       const int pin_rxen = 37;
+      const int pin_txen = -1;
       const int pin_reset = 38;
       const int pin_cs = 42;
       const int pin_sclk = 43;

diff --git a/Console/build.py b/Console/build.py
index 0ff883d253f834e027755ff37cd75527bc7a2cf3..88592031079d6604e584470c2d13166f6661df71 100644 (file)
--- a/Console/build.py
+++ b/Console/build.py
@@ -174,7 +174,7 @@ mf.write(help_redirect)
 mf.close()
 
 def optimise_manual(path):
-    pm = 56
+    pm = 45
     scale_imgs = [
         ("_images/board_rnodev2.png", pm),
         ("_images/board_rnode.png", pm),

diff --git a/Makefile b/Makefile
index 2bba6e462d365bd3dbdce3cfc82bdef9c0f654c3..ace14afba0b46450103bb2fdce56234d3935ed95 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -244,7 +244,7 @@ upload-heltec-t114:
 
 release: release-all
 
-release-all: console-site spiffs-image release-rnode release-tbeam release-tbeam_sx1262 release-lora32_v10 release-lora32_v20 release-lora32_v21 release-lora32_v10_extled release-lora32_v20_extled release-lora32_v21_extled release-lora32_v21_tcxo release-featheresp32 release-genericesp32 release-heltec32_v2 release-heltec32_v3 release-heltec32_v2_extled release-rnode_ng_20 release-rnode_ng_21 release-t3s3 release-t3s3_sx127x release-t3s3_sx1280_pa release-tdeck release-tbeam_supreme release-rak4631 release-hashes
+release-all: console-site spiffs-image release-tbeam release-tbeam_sx1262 release-lora32_v10 release-lora32_v20 release-lora32_v21 release-lora32_v10_extled release-lora32_v20_extled release-lora32_v21_extled release-lora32_v21_tcxo release-featheresp32 release-genericesp32 release-heltec32_v2 release-heltec32_v3 release-heltec32_v2_extled release-rnode_ng_20 release-rnode_ng_21 release-t3s3 release-t3s3_sx127x release-t3s3_sx1280_pa release-tdeck release-tbeam_supreme release-rak4631 release-hashes
 
 release-hashes:
        python ./release_hashes.py > ./Release/release.json

diff --git a/Release/console_image.bin b/Release/console_image.bin
index dc5df16e428354ce5c1eba35d31e7e8356c055f2..85cd7cc16f68fd4722210930e5421808754d240e 100644 (file)
Binary files a/Release/console_image.bin and b/Release/console_image.bin differ

diff --git a/sx128x.cpp b/sx128x.cpp
index 8e70d2460e5868b590aaa43443ba1edbac0888bf..5b8c81ef5d53be5b5278280f7a4449766ab9be29 100644 (file)
--- a/sx128x.cpp
+++ b/sx128x.cpp
@@ -160,11 +160,11 @@ bool sx128x::preInit() {
   
   // todo: check if this change causes issues on any platforms
   #if MCU_VARIANT == MCU_ESP32
-    if (pin_sclk != -1 && pin_miso != -1 && pin_mosi != -1 && pin_cs != -1) {
+    #if BOARD_MODEL == BOARD_RNODE_NG_22 || BOARD_MODEL == BOARD_HELTEC32_V3 || BOARD_MODEL == BOARD_TDECK
       SPI.begin(pin_sclk, pin_miso, pin_mosi, pin_cs);
-    } else {
+    #else
       SPI.begin();
-    }
+    #endif
   #else
     SPI.begin();
   #endif