From cac58b318a16a72fc1ced42bfc065fff9d10d727 Mon Sep 17 00:00:00 2001
From: Mark Qvist <mark@unsigned.io>
Date: Sat, 10 Feb 2024 19:19:22 +0100
Subject: [PATCH] SX1262 T-Beam configs

---
 Config.h           | 9 +++++++++
 Makefile           | 2 +-
 RNode_Firmware.ino | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Config.h b/Config.h
index e58094f..49c49af 100644
--- 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 0b38bea..3ad2fbe 100644
--- 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 bb18d39..2590fd3 100644
--- 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) {