Remove boot-mode/reset requirements for T3S3 flashing

diff --git a/Boards.h b/Boards.h
index e4606ec106d8717e907471508671defbe0b9d164..05d2d5daee5845b55a2c18349fae7f48e9e1a309 100644 (file)
--- a/Boards.h
+++ b/Boards.h
@@ -42,8 +42,10 @@
   #define MODEL_A7            0xA7 // RNode v2.1, 868 MHz
 
   #define BOARD_RNODE_NG_22   0x42 // RNode hardware revision v2.2
-  #define MODEL_A1            0xA1 // RNode v2.2, 433 MHz
-  #define MODEL_A6            0xA6 // RNode v2.2, 868 MHz
+  #define MODEL_A1            0xA1 // RNode v2.2, 433 MHz with SX1268
+  #define MODEL_A5            0xA1 // RNode v2.2, 433 MHz with SX1278
+  #define MODEL_A6            0xA6 // RNode v2.2, 868 MHz with SX1262
+  #define MODEL_AA            0xA6 // RNode v2.2, 868 MHz with SX1276
 
   #define PRODUCT_TBEAM       0xE0 // T-Beam devices
   #define BOARD_TBEAM         0x33

diff --git a/Makefile b/Makefile
index 9bf7a8969dd631ede70ce9507093342001713b51..04e212562ea25d2ae888923eabf61e33ab0fc78c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -203,17 +203,11 @@ upload-rnode_ng_21:
        python ./Release/esptool/esptool.py --chip esp32 --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-t3s3:
-       @echo
-       @echo Put board into flashing mode by holding BOOT button while momentarily pressing the RESET button. Hit enter when done.
-       @read
        arduino-cli upload -p /dev/ttyACM0 --fqbn esp32:esp32:esp32s3
-       @sleep 2
-       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
-       @echo
-       @echo Press the RESET button on the board now, and hit enter
-       @read
        @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 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