Merge 2f0199a739 into 878e67f69d

Add NRF52 support

Changelog.md

@@ -1,3 +1,20 @@
+### 2024-01-17: RNS β 0.7.0
+
+This maintenance release fixes a number of bugs. Thanks to @jooray and @jacobeva, who contributed to this release!
+
+**Changes**
+- Fixed large resource transfers failing under some conditions
+- Fixed a potential division by zero
+- Fixed a missing check on malformed advertisement packets
+- Fixed a formatting issue in `rnprobe`
+- Improved resource timeout calculations
+
+**Release Hashes**
+```
+0dc2abe5373b9afadfba7ec05bf7ddeff659c004aa339a94001ebed5b46f5b47 rns-0.7.0-py3-none-any.whl
+97f6e65a20b53bbdccd54b4d2bdaa36dc1712e144a55f40800c63fe7113819a5 rnspure-0.7.0-py3-none-any.whl
+```
+
 ### 2023-12-07: RNS β 0.6.9
 
 This release adds a few convenience functions to the `rnid` utility, and improves roaming support on Android.

RNS/Utilities/rnodeconf.py

@@ -120,10 +120,12 @@ class KISS():
 class ROM():
     PLATFORM_AVR   = 0x90
     PLATFORM_ESP32 = 0x80
+    PLATFORM_NRF52 = 0x70
 
     MCU_1284P      = 0x91
     MCU_2560       = 0x92
     MCU_ESP32      = 0x81
+    MCU_NRF52      = 0x71
 
     PRODUCT_RNODE  = 0x03
     MODEL_A4       = 0xA4
@@ -182,6 +184,7 @@ class ROM():
     BOARD_GENERIC_ESP32 = 0x35
     BOARD_LORA32_V2_0   = 0x36
     BOARD_LORA32_V2_1   = 0x37
+    BOARD_RAK4630       = 0x51
 
 mapped_product = ROM.PRODUCT_RNODE
 products = {
@@ -197,12 +200,14 @@ products = {
 platforms = {
     ROM.PLATFORM_AVR: "AVR",
     ROM.PLATFORM_ESP32:"ESP32",
+    ROM.PLATFORM_NRF52:"NRF52",
 }
 
 mcus = {
     ROM.MCU_1284P: "ATmega1284P",
     ROM.MCU_2560:"ATmega2560",
     ROM.MCU_ESP32:"Espressif Systems ESP32",
+    ROM.MCU_NRF52:"Nordic nRF52840",
 }
 
 models = {
@@ -516,7 +521,7 @@ class RNode():
                                 if (len(command_buffer) == 4):
                                     self.r_stat_tx = ord(command_buffer[0]) << 24 | ord(command_buffer[1]) << 16 | ord(command_buffer[2]) << 8 | ord(command_buffer[3])
                         elif (command == KISS.CMD_STAT_RSSI):
-                            self.r_stat_rssi = byte-RNodeInterface.RSSI_OFFSET
+                            self.r_stat_rssi = byte-157 # RSSI Offset
                         elif (command == KISS.CMD_STAT_SNR):
                             self.r_stat_snr = int.from_bytes(bytes([byte]), byteorder="big", signed=True) * 0.25
                         elif (command == KISS.CMD_RANDOM):
@@ -1045,6 +1050,35 @@ def ensure_firmware_file(fw_filename):
 
                 try:
                     if selected_hash == None:
+                        if not os.path.isfile(UPD_DIR+"/"+selected_version+"/"+fw_filename+".version"):
+                            RNS.log("No hash file found for "+fw_filename+" version "+selected_version)
+                            if not upd_nocheck:
+                                try:
+                                    RNS.log("Retrieving hash...")
+                                    selected_firmware_version_url = "broken" #"https://unsigned.io/firmware/latest/?v="+selected_version+"&variant="+fw_filename
+                                    fallback_selected_version_url = "https://github.com/markqvist/rnode_firmware/releases/download/"+selected_version+"/release.json"
+                                    urlretrieve(selected_firmware_version_url, UPD_DIR+"/"+selected_version+"/"+fw_filename+".version")
+                                except Exception as e:
+                                    RNS.log("")
+                                    RNS.log("WARNING!")
+                                    RNS.log("Failed to retrieve latest version hash for your board from the default server")
+                                    RNS.log("Will retry using the following fallback URL: "+fallback_selected_version_url)
+                                    RNS.log("This is currently expected.")
+                                    RNS.log("")
+                                    RNS.log("Hit enter if you want to proceed")
+                                    input()
+                                    try:
+                                        urlretrieve(fallback_selected_version_url, UPD_DIR+"/fallback_release_info.json")
+                                        import json
+                                        with open(UPD_DIR+"/fallback_release_info.json", "rb") as rif:
+                                            rdat = json.loads(rif.read())
+                                            variant = rdat[fw_filename]
+                                            with open(UPD_DIR+"/"+selected_version+"/"+fw_filename+".version", "wb") as verf:
+                                                inf_str = str(variant["version"])+" "+str(variant["hash"])
+                                                verf.write(inf_str.encode("utf-8"))
+                                    except Exception as e:
+                                        RNS.log("Error while trying fallback URL: "+str(e))
+                                        raise e
                         try:
                             file = open(UPD_DIR+"/"+selected_version+"/"+fw_filename+".version", "rb")
                             release_info = file.read().decode("utf-8").strip()