Merge branch 'master' of github.com:markqvist/Reticulum

Fix for broken `--rom` manual device provisioning

Examples/Link.py

@@ -70,7 +70,7 @@ def server_loop(destination):
         " running, waiting for a connection."
     )
 
-    RNS.log("Hit enter to manually send an announce (Ctrl-C to quit)")
+    RNS.log("Hit enter to manually send an announce (Ctrl-C or \"quit\" to quit)")
 
     # We enter a loop that runs until the users exits.
     # If the user hits enter, we will announce our server
@@ -80,6 +80,12 @@ def server_loop(destination):
         entered = input()
         destination.announce()
         RNS.log("Sent announce from "+RNS.prettyhexrep(destination.hash))
+        if entered == "quit":
+            if latest_client_link:
+                latest_client_link.teardown()
+            break
+    print("")
+    exit()
 
 # When a client establishes a link to our server
 # destination, this function will be called with

README.md

@@ -37,7 +37,7 @@ The full documentation for Reticulum is available at [markqvist.github.io/Reticu
 
 You can also download the [Reticulum manual as a PDF](https://github.com/markqvist/Reticulum/raw/master/docs/Reticulum%20Manual.pdf) or [as an e-book in EPUB format](https://github.com/markqvist/Reticulum/raw/master/docs/Reticulum%20Manual.epub).
 
-For more info, see [reticulum.network](https://reticulum.network/)
+For more info, see [reticulum.network](https://reticulum.network/) and [the FAQ section of the wiki](https://github.com/markqvist/Reticulum/wiki/Frequently-Asked-Questions).
 
 ## Notable Features
 - Coordination-less globally unique addressing and identification

RNS/Utilities/rnodeconf.py

@@ -3204,7 +3204,7 @@ def main():
 
                 else:
                     RNS.log("EEPROM is invalid, no further information available")
-                    egraceful_xit()
+                    graceful_exit()
 
             if args.rom:
                 if rnode.provisioned and not args.autoinstall:
@@ -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)