SX1262 T-Beam configs

diff --git a/Config.h b/Config.h
index e58094f3d1bc10bb59896f21b2f960bb4af01e99..49c49afbdca3957f223157ecf4507de630d7d7a9 100644 (file)
--- a/Config.h
+++ b/Config.h
@@ -158,6 +158,13 @@
             #define HAS_CONSOLE true
             #define HAS_SD false
             #define HAS_EEPROM true
+            #if MODEM == SX1262
+               // TODO: Figure out how on earth the SX1262 T-Beams are actually connected
+               // #define HAS_RF_SWITCH_RX_TX true
+                   // const int pin_rxen = 32;
+               #define HAS_BUSY true
+                               const int pin_busy = 32;
+            #endif
                #elif BOARD_MODEL == BOARD_HUZZAH32
                        const int pin_cs = 4;
                        const int pin_reset = 36;
@@ -278,7 +285,9 @@
                                #endif
                        #endif
         #elif BOARD_MODEL == BOARD_RNODE_NG_22
+                       #define IS_ESP32S3 true
             #define HAS_DISPLAY true
+                       #define HAS_BLE true
             #define HAS_BLUETOOTH false // TODO: Implement
                        #define HAS_CONSOLE false   // TODO: Implement
             #define HAS_PMU true

diff --git a/Makefile b/Makefile
index 0b38bea2e3102f6cde2b09f18dd7c3e44e0eecf2..3ad2fbee0437e562f764a27d9fbe231c874c3f89 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,7 @@ upload-rnode_ng_22:
        @sleep 1
        rnodeconf /dev/ttyACM0 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.esp32s3/RNode_Firmware.ino.bin)
        @sleep 3
-       python ./Release/esptool/esptool.py --chip esp32s3 --port /dev/ttyACM0 --baud 921600 --before hard_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin
+       python ./Release/esptool/esptool.py --chip esp32s3 --port /dev/ttyACM0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin
 
 upload-featheresp32:
        arduino-cli upload -p /dev/ttyUSB0 --fqbn esp32:esp32:featheresp32

diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino
index bb18d3966527fb1f0415ca2e1efad995bd389789..2590fd3483085201f6ab2d014ba77f18299b08dc 100644 (file)
--- a/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@ -154,6 +154,9 @@ void setup() {
     #if HAS_BLUETOOTH
       bt_init();
       bt_init_ran = true;
+    #elif HAS_BLE
+      // TODO: Implement BLE on ESP32S3 instead of this hack
+      bt_ready = true;
     #endif
 
     if (console_active) {