Changelog.md

@@ -1,39 +1,3 @@
-### 2023-02-17: RNS β 0.4.9
-
-This maintenance release contains a number of bugfixes and minor improvements, along with a few additions to the API.
-
-**Changes**
-- Added JSON output mode to rnstatus
-- Added Link ID to response_generator callback
-- Added Link establishment rate calculation
-- Added get_establishment_rate call to Link API
-- Fixed a number of typos in programs and documentation
-- Fixed some broken links in documentation
-
-**Release Hashes**
-```
-b44eaed796dcd194bec7a541aaeeb1685b07b2ffce068ca268841e6a8661717f rns-0.4.9-py3-none-any.whl
-a15f965a27d208493485724486eb6bc6268d699f2a22ae4fb816bb9b979330fc rnspure-0.4.9-py3-none-any.whl
-```
-
-### 2023-02-04: RNS β 0.4.8
-
-This release introduces the useful `rnid` utility, which makes it possible to use Reticulum Identities for offline file encryption, decryption, signing and validation. The IFAC system has also been significantly improved, and several outdated parts of the documentation was updated and fixed. Thanks to @Erethon and @jooray who contributed to this release!
-
-**Changes**
-- Added header and payload masking to the IFAC system
-- Added `rnid` utility for encrypting, decrypting, signing and validating with Reticulum Identities
-- Added Bluetooth pairing PIN output to `rnodeconf` utility
-- Fixed a bug in announce callback handling
-- Fixed a inconsistency in header flag handling since IFACs were introduced
-- Updated documentation and manual
-
-**Release Hashes**
-```
-fbbd55ee43a68c18491f5deabed51085c46fadca7e1bda823ad455c2f7c95a51 rns-0.4.8-py3-none-any.whl
-335b0d5dd1d2aacd0d8810191aa09567ecf5d3aa990c446f3e3b1bbf7fce1387 rnspure-0.4.8-py3-none-any.whl
-```
-
 ### 2023-01-14: RNS β 0.4.7
 
 This maintenance release adds support for using the `rnodeconf` utility to replicate RNode devices, and bootstrap device creation using only tools and software packages obtained from an RNode Bootstrap Console.

RNS/Interfaces/RNodeInterface.py

@@ -125,8 +125,6 @@ class RNodeInterface(Interface):
         self.stopbits    = 1
         self.timeout     = 100
         self.online      = False
-        self.detached    = False
-        self.reconnecting= False
 
         self.frequency   = frequency
         self.bandwidth   = bandwidth
@@ -212,10 +210,9 @@ class RNodeInterface(Interface):
             RNS.log("Could not open serial port for interface "+str(self), RNS.LOG_ERROR)
             RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
             RNS.log("Reticulum will attempt to bring up this interface periodically", RNS.LOG_ERROR)
-            if not self.detached and not self.reconnecting:
-                thread = threading.Thread(target=self.reconnect_port)
-                thread.daemon = True
-                thread.start()
+            thread = threading.Thread(target=self.reconnect_port)
+            thread.daemon = True
+            thread.start()
 
 
     def open_port(self):
@@ -236,15 +233,7 @@ class RNodeInterface(Interface):
 
 
     def configure_device(self):
-        self.r_frequency = None
-        self.r_bandwidth = None
-        self.r_txpower   = None
-        self.r_sf        = None
-        self.r_cr        = None
-        self.r_state     = None
-        self.r_lock      = None
         sleep(2.0)
-
         thread = threading.Thread(target=self.readLoop)
         thread.daemon = True
         thread.start()
@@ -253,8 +242,7 @@ class RNodeInterface(Interface):
         sleep(0.2)
         
         if not self.detected:
-            RNS.log("Could not detect device for "+str(self), RNS.LOG_ERROR)
-            self.serial.close()
+            raise IOError("Could not detect device")
         else:
             if self.platform == KISS.PLATFORM_ESP32:
                 self.display = True
@@ -272,6 +260,7 @@ class RNodeInterface(Interface):
             RNS.log("Make sure that your hardware actually supports the parameters specified in the configuration", RNS.LOG_ERROR)
             RNS.log("Aborting RNode startup", RNS.LOG_ERROR)
             self.serial.close()
+            raise IOError("RNode interface did not pass configuration validation")
             
 
     def initRadio(self):
@@ -406,7 +395,7 @@ class RNodeInterface(Interface):
 
 
     def validateRadioState(self):
-        RNS.log("Waiting for radio configuration validation for "+str(self)+"...", RNS.LOG_VERBOSE)
+        RNS.log("Wating for radio configuration validation for "+str(self)+"...", RNS.LOG_VERBOSE)
         sleep(0.25);
 
         self.validcfg = True
@@ -679,17 +668,11 @@ class RNodeInterface(Interface):
             RNS.log("Reticulum will attempt to reconnect the interface periodically.", RNS.LOG_ERROR)
 
         self.online = False
-        try:
-            self.serial.close()
-        except Exception as e:
-            pass
-
-        if not self.detached and not self.reconnecting:
-            self.reconnect_port()
+        self.serial.close()
+        self.reconnect_port()
 
     def reconnect_port(self):
-        self.reconnecting = True
-        while not self.online and not self.detached:
+        while not self.online:
             try:
                 time.sleep(5)
                 RNS.log("Attempting to reconnect serial port "+str(self.port)+" for "+str(self)+"...", RNS.LOG_VERBOSE)
@@ -699,12 +682,10 @@ class RNodeInterface(Interface):
             except Exception as e:
                 RNS.log("Error while reconnecting port, the contained exception was: "+str(e), RNS.LOG_ERROR)
 
-        self.reconnecting = False
         if self.online:
             RNS.log("Reconnected serial port for "+str(self))
 
     def detach(self):
-        self.detached = True
         self.disable_external_framebuffer()
         self.setRadioState(KISS.RADIO_STATE_OFF)
         self.leave()