Git-Mirrors/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-10-01 03:15:44 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #502 from jacobeva/master

Browse Source 
Extend RAK4631 support
This commit is contained in:
markqvist 2024-05-18 00:15:48 +02:00 committed by GitHub
commit e28dd6e14a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 222 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
RNS/Utilities/rnodeconf.py
View File

@ -128,6 +128,10 @@ class ROM():
MCU_ESP32 = 0x81 MCU_ESP32 = 0x81
MCU_NRF52 = 0x71 MCU_NRF52 = 0x71
PRODUCT_RAK4631 = 0x10
MODEL_11 = 0x11
MODEL_12 = 0x12
PRODUCT_RNODE = 0x03 PRODUCT_RNODE = 0x03
MODEL_A1 = 0xA1 MODEL_A1 = 0xA1
MODEL_A6 = 0xA6 MODEL_A6 = 0xA6
@ -196,7 +200,7 @@ class ROM():
BOARD_GENERIC_ESP32 = 0x35 BOARD_GENERIC_ESP32 = 0x35
BOARD_LORA32_V2_0 = 0x36 BOARD_LORA32_V2_0 = 0x36
BOARD_LORA32_V2_1 = 0x37 BOARD_LORA32_V2_1 = 0x37
BOARD_RAK4630 = 0x51 BOARD_RAK4631 = 0x51
mapped_product = ROM.PRODUCT_RNODE mapped_product = ROM.PRODUCT_RNODE
products = { products = {
@ -208,22 +212,25 @@ products = {
ROM.PRODUCT_T32_21: "LilyGO LoRa32 v2.1", ROM.PRODUCT_T32_21: "LilyGO LoRa32 v2.1",
ROM.PRODUCT_H32_V2: "Heltec LoRa32 v2", ROM.PRODUCT_H32_V2: "Heltec LoRa32 v2",
ROM.PRODUCT_H32_V3: "Heltec LoRa32 v3", ROM.PRODUCT_H32_V3: "Heltec LoRa32 v3",
ROM.PRODUCT_RAK4631: "RAK4631",
} }
platforms = { platforms = {
ROM.PLATFORM_AVR: "AVR", ROM.PLATFORM_AVR: "AVR",
ROM.PLATFORM_ESP32:"ESP32", ROM.PLATFORM_ESP32:"ESP32",
ROM.PLATFORM_NRF52:"NRF52", ROM.PLATFORM_NRF52: "NRF52",
} }
mcus = { mcus = {
ROM.MCU_1284P: "ATmega1284P", ROM.MCU_1284P: "ATmega1284P",
ROM.MCU_2560:"ATmega2560", ROM.MCU_2560:"ATmega2560",
ROM.MCU_ESP32:"Espressif Systems ESP32", ROM.MCU_ESP32:"Espressif Systems ESP32",
ROM.MCU_NRF52:"Nordic nRF52840", ROM.MCU_NRF52: "Nordic Semiconductor nRF52840",
} }
models = { models = {
0x11: [430000000, 510000000, 22, "430 - 510 MHz", "rnode_firmware_rak4631.zip", "SX1262"],
0x12: [779000000, 928000000, 22, "779 - 928 MHz", "rnode_firmware_rak4631.zip", "SX1262"],
0xA4: [410000000, 525000000, 14, "410 - 525 MHz", "rnode_firmware.hex", "SX1278"], 0xA4: [410000000, 525000000, 14, "410 - 525 MHz", "rnode_firmware.hex", "SX1278"],
0xA9: [820000000, 1020000000, 17, "820 - 1020 MHz", "rnode_firmware.hex", "SX1276"], 0xA9: [820000000, 1020000000, 17, "820 - 1020 MHz", "rnode_firmware.hex", "SX1276"],
0xA1: [410000000, 525000000, 22, "410 - 525 MHz", "rnode_firmware_t3s3.zip", "SX1268"], 0xA1: [410000000, 525000000, 22, "410 - 525 MHz", "rnode_firmware_t3s3.zip", "SX1268"],
@ -306,6 +313,7 @@ class RNode():
self.bandwidth = None self.bandwidth = None
self.detected = None self.detected = None
self.usb_serial_id = None
self.platform = None self.platform = None
self.mcu = None self.mcu = None
@ -738,6 +746,10 @@ class RNode():
if written != len(kiss_command): if written != len(kiss_command):
raise IOError("An IO error occurred while wiping EEPROM") raise IOError("An IO error occurred while wiping EEPROM")
sleep(13); sleep(13);
# Due to the current janky emulated EEPROM implementation for the
# RAK4631, extra time must be given to allow for writing.
if self.board == ROM.BOARD_RAK4631:
sleep(10)
def hard_reset(self): def hard_reset(self):
kiss_command = bytes([KISS.FEND, KISS.CMD_RESET, 0xf8, KISS.FEND]) kiss_command = bytes([KISS.FEND, KISS.CMD_RESET, 0xf8, KISS.FEND])
@ -1405,6 +1417,7 @@ def main():
graceful_exit() graceful_exit()
rnode = RNode(rnode_serial) rnode = RNode(rnode_serial)
rnode.usb_serial_id = port_serialno
thread = threading.Thread(target=rnode.readLoop, daemon=True).start() thread = threading.Thread(target=rnode.readLoop, daemon=True).start()
try: try:
rnode.device_probe() rnode.device_probe()
@ -1417,6 +1430,7 @@ def main():
else: else:
RNS.log("Could not detect a connected RNode") RNS.log("Could not detect a connected RNode")
if rnode.platform == ROM.PLATFORM_ESP32:
if rnode.provisioned: if rnode.provisioned:
if not rnode.signature_valid: if not rnode.signature_valid:
print("\nThe device signature in this RNode is unknown and cannot be verified. It is still") print("\nThe device signature in this RNode is unknown and cannot be verified. It is still")
@ -1455,16 +1469,19 @@ def main():
print("Extracting "+part+"...") print("Extracting "+part+"...")
if subprocess.call(shlex.split(command), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) != 0: if subprocess.call(shlex.split(command), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) != 0:
print("The extraction failed, the following command did not complete successfully:\n"+command) print("The extraction failed, the following command did not complete successfully:\n"+command)
graceful_exit(182) exit(182)
print("\nFirmware successfully extracted!") print("\nFirmware successfully extracted!")
print("\nYou can now use this firmware to update or autoinstall other RNodes") print("\nYou can now use this firmware to update or autoinstall other RNodes")
graceful_exit() exit()
else: else:
print("Could not read firmware information from device") print("Could not read firmware information from device")
print("\nRNode firmware extraction failed") print("\nRNode firmware extraction failed")
graceful_exit(180) graceful_exit(180)
else:
print("\nFirmware extraction is currently only supported on ESP32-based RNodes.")
graceful_exit(170)
if args.autoinstall: if args.autoinstall:
clear() clear()
@ -1538,6 +1555,7 @@ def main():
graceful_exit() graceful_exit()
rnode = RNode(rnode_serial) rnode = RNode(rnode_serial)
rnode.usb_serial_id = port_serialno
thread = threading.Thread(target=rnode.readLoop, daemon=True).start() thread = threading.Thread(target=rnode.readLoop, daemon=True).start()
try: try:
rnode.device_probe() rnode.device_probe()
@ -1582,6 +1600,7 @@ def main():
print("[7] Heltec LoRa32 v2") print("[7] Heltec LoRa32 v2")
print("[8] Heltec LoRa32 v3") print("[8] Heltec LoRa32 v3")
#print("[9] LilyGO LoRa T3S3") #print("[9] LilyGO LoRa T3S3")
print("[10] RAK4631")
print(" .") print(" .")
print(" / \\ Select one of these options if you want to easily turn") print(" / \\ Select one of these options if you want to easily turn")
print(" | a supported development board into an RNode.") print(" | a supported development board into an RNode.")
@ -1593,7 +1612,7 @@ def main():
try: try:
c_dev = int(input()) c_dev = int(input())
c_mod = False c_mod = False
if c_dev < 1 or c_dev > 9: if c_dev < 1 or c_dev > 10:
raise ValueError() raise ValueError()
elif c_dev == 1: elif c_dev == 1:
selected_product = ROM.PRODUCT_RNODE selected_product = ROM.PRODUCT_RNODE
@ -1722,6 +1741,15 @@ def main():
print("") print("")
print("Please note that Bluetooth is currently not implemented on this board.") print("Please note that Bluetooth is currently not implemented on this board.")
print("") print("")
elif c_dev == 10:
selected_product = ROM.PRODUCT_RAK4631
clear()
print("")
print("---------------------------------------------------------------------------")
print(" RAK4631 RNode Installer")
print("")
print("Important! Using RNode firmware on RAKwireless devices should currently be")
print("considered experimental. It is not intended for production or critical use.")
print("The currently supplied firmware is provided AS-IS as a courtesey to those") print("The currently supplied firmware is provided AS-IS as a courtesey to those")
print("who would like to experiment with it. Hit enter to continue.") print("who would like to experiment with it. Hit enter to continue.")
print("---------------------------------------------------------------------------") print("---------------------------------------------------------------------------")
@ -1974,11 +2002,6 @@ def main():
elif selected_product == ROM.PRODUCT_H32_V3: elif selected_product == ROM.PRODUCT_H32_V3:
selected_mcu = ROM.MCU_ESP32 selected_mcu = ROM.MCU_ESP32
print("\nWhat band is this Heltec LoRa32 V3 for?\n") print("\nWhat band is this Heltec LoRa32 V3 for?\n")
print("[1] 433 MHz")
print("[2] 868 MHz")
print("[3] 915 MHz")
print("[4] 923 MHz")
print("\n? ", end="")
try: try:
c_model = int(input()) c_model = int(input())
if c_model < 1 or c_model > 4: if c_model < 1 or c_model > 4:
@ -1989,6 +2012,27 @@ def main():
elif c_model > 1: elif c_model > 1:
selected_model = ROM.MODEL_CA selected_model = ROM.MODEL_CA
selected_platform = ROM.PLATFORM_ESP32 selected_platform = ROM.PLATFORM_ESP32
except Exception as e:
print("That band does not exist, exiting now.")
exit()
elif selected_product == ROM.PRODUCT_RAK4631:
selected_mcu = ROM.MCU_NRF52
print("\nWhat band is this RAK4631 for?\n")
print("[1] 433 MHz")
print("[2] 868 MHz")
print("[3] 915 MHz")
print("[4] 923 MHz")
print("\n? ", end="")
try:
c_model = int(input())
if c_model < 1 or c_model > 4:
raise ValueError()
elif c_model == 1:
selected_model = ROM.MODEL_11
selected_platform = ROM.PLATFORM_NRF52
elif c_model > 1:
selected_model = ROM.MODEL_12
selected_platform = ROM.PLATFORM_NRF52
except Exception as e: except Exception as e:
print("That band does not exist, exiting now.") print("That band does not exist, exiting now.")
graceful_exit() graceful_exit()
@ -2178,9 +2222,12 @@ def main():
if not args.autoinstall: if not args.autoinstall:
graceful_exit() graceful_exit()
def get_partition_hash(partition_file): def get_partition_hash(platform, partition_file):
try: try:
if platform == ROM.PLATFORM_ESP32 or platform == ROM.PLATFORM_AVR:
firmware_data = open(partition_file, "rb").read() firmware_data = open(partition_file, "rb").read()
# Calculate the digest manually and see if it matches the
# SHA256 digest included in the ESP32 image.
calc_hash = hashlib.sha256(firmware_data[0:-32]).digest() calc_hash = hashlib.sha256(firmware_data[0:-32]).digest()
part_hash = firmware_data[-32:] part_hash = firmware_data[-32:]
@ -2188,6 +2235,13 @@ def main():
return part_hash return part_hash
else: else:
return None return None
elif platform == ROM.PLATFORM_NRF52:
# Calculate digest manually, as it is not included in the image.
firmware_data = open(partition_file, "rb")
hash = hashlib.file_digest(firmware_data, 'sha256').digest()
firmware_data.close()
return hash
except Exception as e: except Exception as e:
RNS.log("Could not calculate firmware partition hash. The contained exception was:") RNS.log("Could not calculate firmware partition hash. The contained exception was:")
RNS.log(str(e)) RNS.log(str(e))
@ -2689,6 +2743,21 @@ def main():
RNS.log("Please install \""+flasher+"\" and try again.") RNS.log("Please install \""+flasher+"\" and try again.")
graceful_exit() graceful_exit()
elif platform == ROM.PLATFORM_NRF52:
flasher = "adafruit-nrfutil"
if which(flasher) is not None:
return [flasher, "dfu", "serial", "--package", UPD_DIR+"/"+selected_version+"/"+fw_filename, "-p", args.port, "-b", "115200", "-t", "1200"]
else:
RNS.log("")
RNS.log("You do not currently have the \""+flasher+"\" program installed on your system.")
RNS.log("Unfortunately, that means we can't proceed, since it is needed to flash your")
RNS.log("board. You can install it via your package manager, for example:")
RNS.log("")
RNS.log(" pip3 install --user adafruit-nrfutil")
RNS.log("")
RNS.log("Please install \""+flasher+"\" and try again.")
graceful_exit()
if args.port: if args.port:
wants_fw_provision = False wants_fw_provision = False
if args.flash: if args.flash:
@ -2750,6 +2819,11 @@ def main():
wants_fw_provision = True wants_fw_provision = True
RNS.log("Waiting for ESP32 reset...") RNS.log("Waiting for ESP32 reset...")
time.sleep(7) time.sleep(7)
if args.platform == ROM.PLATFORM_NRF52:
wants_fw_provision = True
RNS.log("Waiting for NRF52 reset...")
# Don't need to wait as long this time.
time.sleep(5)
else: else:
RNS.log("Error from flasher ("+str(flash_status)+") while writing.") RNS.log("Error from flasher ("+str(flash_status)+") while writing.")
RNS.log("Some boards have trouble flashing at high speeds, and you can") RNS.log("Some boards have trouble flashing at high speeds, and you can")
@ -2775,6 +2849,11 @@ def main():
graceful_exit() graceful_exit()
rnode = RNode(rnode_serial) rnode = RNode(rnode_serial)
ports = list_ports.comports()
for port in ports:
if port.device == args.port:
rnode.usb_serial_id = port.serial_number
break
thread = threading.Thread(target=rnode.readLoop, daemon=True).start() thread = threading.Thread(target=rnode.readLoop, daemon=True).start()
try: try:
@ -2793,6 +2872,8 @@ def main():
if args.eeprom_wipe: if args.eeprom_wipe:
RNS.log("WARNING: EEPROM is being wiped! Power down device NOW if you do not want this!") RNS.log("WARNING: EEPROM is being wiped! Power down device NOW if you do not want this!")
rnode.wipe_eeprom() rnode.wipe_eeprom()
# TODO: Add conditional for avoiding this reset on nRF
rnode.hard_reset() rnode.hard_reset()
graceful_exit() graceful_exit()
@ -2816,8 +2897,12 @@ def main():
fw_filename = "rnode_firmware_featheresp32.zip" fw_filename = "rnode_firmware_featheresp32.zip"
elif rnode.board == ROM.BOARD_GENERIC_ESP32: elif rnode.board == ROM.BOARD_GENERIC_ESP32:
fw_filename = "rnode_firmware_esp32_generic.zip" fw_filename = "rnode_firmware_esp32_generic.zip"
elif rnode.platform == ROM.PLATFORM_NRF52:
if rnode.board == ROM.BOARD_RAK4631:
fw_filename = "rnode_firmware_rak4631.zip"
else: else:
fw_filename = None fw_filename = None
if args.update: if args.update:
RNS.log("ERROR: No firmware found for this board. Cannot update.") RNS.log("ERROR: No firmware found for this board. Cannot update.")
graceful_exit() graceful_exit()
@ -2898,12 +2983,16 @@ def main():
partition_full_path = EXT_DIR+"/extracted_rnode_firmware.bin" partition_full_path = EXT_DIR+"/extracted_rnode_firmware.bin"
else: else:
partition_full_path = UPD_DIR+"/"+selected_version+"/"+partition_filename partition_full_path = UPD_DIR+"/"+selected_version+"/"+partition_filename
partition_hash = get_partition_hash(partition_full_path) partition_hash = get_partition_hash(rnode.platform, partition_full_path)
if partition_hash != None: if partition_hash != None:
rnode.set_firmware_hash(partition_hash) rnode.set_firmware_hash(partition_hash)
rnode.indicate_firmware_update() rnode.indicate_firmware_update()
sleep(1) sleep(1)
if rnode.platform == ROM.PLATFORM_NRF52:
# Allow extra time for writing to EEPROM on NRF52. Current implementation is slow.
sleep(14)
rnode.disconnect() rnode.disconnect()
flash_status = call(get_flasher_call(rnode.platform, fw_filename)) flash_status = call(get_flasher_call(rnode.platform, fw_filename))
if flash_status == 0: if flash_status == 0:
@ -3095,6 +3184,27 @@ def main():
if rnode.platform == ROM.PLATFORM_ESP32: if rnode.platform == ROM.PLATFORM_ESP32:
RNS.log("Waiting for ESP32 reset...") RNS.log("Waiting for ESP32 reset...")
time.sleep(6) time.sleep(6)
elif rnode.platform == ROM.PLATFORM_NRF52:
rnode_serial.close()
RNS.log("Waiting for NRF52 reset...")
time.sleep(14)
selected_port = None
ports = list_ports.comports()
for port in ports:
if port.serial_number == rnode.usb_serial_id:
selected_port = port
break
if selected_port is None:
RNS.log("Could not detect new port for NRF52...")
else:
try:
rnode_serial = rnode_open_serial(selected_port.device)
rnode.serial = rnode_serial
thread = threading.Thread(target=rnode.readLoop, daemon=True).start()
except Exception as e:
RNS.log("Could not open the specified serial port. The contained exception was:")
RNS.log(str(e))
exit()
else: else:
time.sleep(3) time.sleep(3)
@ -3119,6 +3229,8 @@ def main():
if args.product != None: if args.product != None:
if args.product == "03": if args.product == "03":
mapped_product = ROM.PRODUCT_RNODE mapped_product = ROM.PRODUCT_RNODE
elif args.product == "10":
mapped_product = ROM.PRODUCT_RAK4631
elif args.product == "f0": elif args.product == "f0":
mapped_product = ROM.PRODUCT_HMBRW mapped_product = ROM.PRODUCT_HMBRW
elif args.product == "e0": elif args.product == "e0":
@ -3135,7 +3247,11 @@ def main():
else: else:
model = mapped_model model = mapped_model
else: else:
if args.model == "a4": if args.model == "11":
model = ROM.MODEL_11
elif args.model == "12":
model = ROM.MODEL_12
elif args.model == "a4":
model = ROM.MODEL_A4 model = ROM.MODEL_A4
elif args.model == "a9": elif args.model == "a9":
model = ROM.MODEL_A9 model = ROM.MODEL_A9
@ -3248,7 +3364,9 @@ def main():
time.sleep(0.006) time.sleep(0.006)
rnode.write_eeprom(ROM.ADDR_INFO_LOCK, ROM.INFO_LOCK_BYTE) rnode.write_eeprom(ROM.ADDR_INFO_LOCK, ROM.INFO_LOCK_BYTE)
if rnode.platform == ROM.PLATFORM_NRF52:
# Allow extra time for writing to EEPROM on NRF52. Current implementation is slow.
sleep(3)
RNS.log("EEPROM written! Validating...") RNS.log("EEPROM written! Validating...")
if wants_fw_provision: if wants_fw_provision:
@ -3262,18 +3380,58 @@ def main():
vf.close() vf.close()
else: else:
partition_filename = fw_filename.replace(".zip", ".bin") partition_filename = fw_filename.replace(".zip", ".bin")
partition_hash = get_partition_hash(UPD_DIR+"/"+selected_version+"/"+partition_filename) partition_hash = get_partition_hash(rnode.platform, UPD_DIR+"/"+selected_version+"/"+partition_filename)
if partition_hash != None: if partition_hash != None:
time.sleep(0.75) time.sleep(0.75)
RNS.log("Setting firmware checksum...") RNS.log("Setting firmware checksum...")
rnode.set_firmware_hash(partition_hash) rnode.set_firmware_hash(partition_hash)
rnode.hard_reset()
if rnode.platform == ROM.PLATFORM_ESP32: if rnode.platform == ROM.PLATFORM_ESP32:
rnode.hard_reset()
RNS.log("Waiting for ESP32 reset...") RNS.log("Waiting for ESP32 reset...")
time.sleep(6.5) time.sleep(6.5)
elif rnode.platform == ROM.PLATFORM_NRF52:
rnode.hard_reset()
# The hard reset on this platform is different
# to that of the ESP32 platform, it causes
# disruption to the serial connection.
# Therefore, we have to reestablish the serial
# connection after the reset.
rnode_serial.close()
RNS.log("Waiting for NRF52 reset...")
# Give plenty of time for to allow for
# potential e-ink display refresh too.
time.sleep(14)
# After the hard reset, the port number will
# change. We need to find the new port number,
# which can be done non-interactively by
# comparing the USB serial numbers of the
# original port and the one we are currently
# iterating.
selected_port = None
ports = list_ports.comports()
for port in ports:
if port.serial_number == rnode.usb_serial_id:
selected_port = port
break
if selected_port is None:
RNS.log("Could not detect new port for NRF52...")
else:
try:
rnode_serial = rnode_open_serial(selected_port.device)
rnode.serial = rnode_serial
thread = threading.Thread(target=rnode.readLoop, daemon=True).start()
except Exception as e:
RNS.log("Could not open the specified serial port. The contained exception was:")
RNS.log(str(e))
exit()
else:
rnode.hard_reset()
rnode.download_eeprom() rnode.download_eeprom()
if rnode.provisioned: if rnode.provisioned:
RNS.log("EEPROM Bootstrapping successful!") RNS.log("EEPROM Bootstrapping successful!")