William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-22 21:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge de6c6bffd7 into a762af035a

Browse Source
This commit is contained in:
faragher 2024-11-21 17:17:20 +00:00 committed by GitHub
commit fd3893749b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
RNS/Utilities/rnodeconf.py
View File

@ -168,9 +168,11 @@ class ROM():
PRODUCT_TBEAM = 0xE0 PRODUCT_TBEAM = 0xE0
MODEL_E4 = 0xE4 MODEL_E4 = 0xE4
MODEL_E9 = 0xE9 MODEL_E9 = 0xE9
MODEL_E9_GPS = 0xE7
MODEL_E3 = 0xE3 MODEL_E3 = 0xE3
MODEL_E8 = 0xE8 MODEL_E8 = 0xE8
PRODUCT_TBEAM_S_V1= 0xEA PRODUCT_TBEAM_S_V1= 0xEA
MODEL_DB = 0xDB MODEL_DB = 0xDB
MODEL_DC = 0xDC MODEL_DC = 0xDC
@ -281,6 +283,7 @@ models = {
0xC5: [420000000, 520000000, 21, "420 - 520 MHz", "rnode_firmware_heltec32v3.zip", "SX1262"], 0xC5: [420000000, 520000000, 21, "420 - 520 MHz", "rnode_firmware_heltec32v3.zip", "SX1262"],
0xCA: [850000000, 950000000, 21, "850 - 950 MHz", "rnode_firmware_heltec32v3.zip", "SX1262"], 0xCA: [850000000, 950000000, 21, "850 - 950 MHz", "rnode_firmware_heltec32v3.zip", "SX1262"],
0xE4: [420000000, 520000000, 17, "420 - 520 MHz", "rnode_firmware_tbeam.zip", "SX1278"], 0xE4: [420000000, 520000000, 17, "420 - 520 MHz", "rnode_firmware_tbeam.zip", "SX1278"],
0xE7: [850000000, 950000000, 17, "850 - 950 MHz", "rnode_firmware_tbeam_GPS.zip", "SX1276 w/ GPS"],
0xE9: [850000000, 950000000, 17, "850 - 950 MHz", "rnode_firmware_tbeam.zip", "SX1276"], 0xE9: [850000000, 950000000, 17, "850 - 950 MHz", "rnode_firmware_tbeam.zip", "SX1276"],
0xD4: [420000000, 520000000, 22, "420 - 520 MHz", "rnode_firmware_tdeck.zip", "SX1268"], 0xD4: [420000000, 520000000, 22, "420 - 520 MHz", "rnode_firmware_tdeck.zip", "SX1268"],
0xD9: [850000000, 950000000, 22, "850 - 950 MHz", "rnode_firmware_tdeck.zip", "SX1262"], 0xD9: [850000000, 950000000, 22, "850 - 950 MHz", "rnode_firmware_tdeck.zip", "SX1262"],
@ -1994,9 +1997,10 @@ def main():
print("\nWhat band is this T-Beam for?\n") print("\nWhat band is this T-Beam for?\n")
print("[1] 433 MHz (with SX1278 chip)") print("[1] 433 MHz (with SX1278 chip)")
print("[2] 868/915/923 MHz (with SX1276 chip)") print("[2] 868/915/923 MHz (with SX1276 chip)")
print("[3] 868/915/923 MHz (with SX1276 chip) GPS Enabled")
print(""); print("");
print("[3] 433 MHz (with SX1268 chip)") print("[4] 433 MHz (with SX1268 chip)")
print("[4] 868/915/923 MHz (with SX1262 chip)") print("[5] 868/915/923 MHz (with SX1262 chip)")
print("\n? ", end="") print("\n? ", end="")
try: try:
c_model = int(input()) c_model = int(input())
@ -2009,9 +2013,12 @@ def main():
selected_model = ROM.MODEL_E9 selected_model = ROM.MODEL_E9
selected_platform = ROM.PLATFORM_ESP32 selected_platform = ROM.PLATFORM_ESP32
elif c_model == 3: elif c_model == 3:
selected_model = ROM.MODEL_E3 selected_model = ROM.MODEL_E9_GPS
selected_platform = ROM.PLATFORM_ESP32 selected_platform = ROM.PLATFORM_ESP32
elif c_model == 4: elif c_model == 4:
selected_model = ROM.MODEL_E3
selected_platform = ROM.PLATFORM_ESP32
elif c_model == 5:
selected_model = ROM.MODEL_E8 selected_model = ROM.MODEL_E8
selected_platform = ROM.PLATFORM_ESP32 selected_platform = ROM.PLATFORM_ESP32
except Exception as e: except Exception as e:
@ -2513,6 +2520,42 @@ def main():
"0x10000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam.bin", "0x10000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam.bin",
"0x8000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam.partitions", "0x8000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam.partitions",
] ]
elif fw_filename == "rnode_firmware_tbeam_GPS.zip":
if numeric_version >= 1.55:
return [
sys.executable, flasher,
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
"--before", "default_reset",
"--after", "hard_reset",
"write_flash", "-z",
"--flash_mode", "dio",
"--flash_freq", "80m",
"--flash_size", "4MB",
"0xe000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam_GPS.boot_app0",
"0x1000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam_GPS.bootloader",
"0x10000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam_GPS.bin",
"0x210000",UPD_DIR+"/"+selected_version+"/console_image.bin",
"0x8000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam_GPS.partitions",
]
else:
return [
sys.executable, flasher,
"--chip", "esp32",
"--port", args.port,
"--baud", args.baud_flash,
"--before", "default_reset",
"--after", "hard_reset",
"write_flash", "-z",
"--flash_mode", "dio",
"--flash_freq", "80m",
"--flash_size", "4MB",
"0xe000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam_GPS.boot_app0",
"0x1000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam_GPS.bootloader",
"0x10000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam_GPS.bin",
"0x8000", UPD_DIR+"/"+selected_version+"/rnode_firmware_tbeam_GPS.partitions",
]
elif fw_filename == "rnode_firmware_tbeam_sx1262.zip": elif fw_filename == "rnode_firmware_tbeam_sx1262.zip":
if numeric_version >= 1.55: if numeric_version >= 1.55:
return [ return [
@ -3532,6 +3575,8 @@ def main():
model = ROM.MODEL_B4 model = ROM.MODEL_B4
elif mapped_model == ROM.MODEL_B9_TCXO: elif mapped_model == ROM.MODEL_B9_TCXO:
model = ROM.MODEL_B9 model = ROM.MODEL_B9
elif mapped_model == ROM.MODEL_E9_GPS:
model = ROM.MODEL_E9
else: else:
model = mapped_model model = mapped_model
else: else: