Merge 1cee0a2619 into 4fdb9dda40

Fix for macos failing to set firmware hash on NRF52

RNS/Utilities/rnodeconf.py

@@ -3310,6 +3310,8 @@ def main():
                             if len(args.model) == 2:
                                 model = ord(bytes.fromhex(args.model))
 
+                        # Initialize selected_model from specified model
+                        selected_model = model
 
                     if args.hwrev != None and (args.hwrev > 0 and args.hwrev < 256):
                         hwrev = chr(args.hwrev)
@@ -3440,6 +3442,11 @@ def main():
                                 time.sleep(6.5)
 
                             elif rnode.platform == ROM.PLATFORM_NRF52:
+                                # Wait a few seconds before hard resetting.
+                                # Otherwise, macOS fails to set firmware hash on NRF52
+                                if RNS.vendor.platformutils.is_darwin():
+                                    time.sleep(5)
+
                                 rnode.hard_reset()
                                 # The hard reset on this platform is different
                                 # to that of the ESP32 platform, it causes