From 1ac3a6c2c8c30e874d80e0702f76f003d39afb72 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sat, 5 Oct 2024 01:07:44 +0200 Subject: [PATCH] Remove boot-mode/reset requirements for T3S3 flashing --- Boards.h | 6 ++++-- Makefile | 10 ++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Boards.h b/Boards.h index e4606ec..05d2d5d 100644 --- 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 9bf7a89..04e2125 100644 --- 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