Merge 9d744e2317 into 1c56385473

Changelog.md

@@ -1,19 +1,3 @@
-### 2024-10-02: RNS β 0.8.1
-
-This release add BLE support to RNodeInterface, and support for configuring additional options to `rnodeconf`.
-
-**Changes**
-- Added Bluetooth Low Energy support to RNodeInterface
-- Added RNode battery information to `rnstatus` output
-- Added display blanking configuration to `rnodeconf`
-- Added NeoPixel intensity configuration to `rnodeconf`
-
-**Release Hashes**
-```
-f4b6b99b67d6b33b8a4562e5d5d5ac54c76814fff26e6c7a79950b82bd80123f rns-0.8.1-py3-none-any.whl
-c2e540b4bf0f272bb51ae3e33a02f9c07f2619746d069d7ed83d88017bf7ea30 rnspure-0.8.1-py3-none-any.whl
-```
-
 ### 2024-09-25: RNS β 0.8.0
 
 This maintenance release improves the interface statistics API, and updates documentation.

RNS/Interfaces/Android/RNodeInterface.py

@@ -28,9 +28,6 @@ import time
 import math
 import RNS
 
-from able import BluetoothDispatcher, GATT_SUCCESS
-from able.adapter import require_bluetooth_enabled
-
 class KISS():
     FEND            = 0xC0
     FESC            = 0xDB
@@ -57,7 +54,6 @@ class KISS():
     CMD_STAT_SNR    = 0x24
     CMD_STAT_CHTM   = 0x25
     CMD_STAT_PHYPRM = 0x26
-    CMD_STAT_BAT    = 0x27
     CMD_BLINK       = 0x30
     CMD_RANDOM      = 0x40
     CMD_FB_EXT      = 0x41
@@ -82,7 +78,6 @@ class KISS():
     ERROR_TXFAILED      = 0x02
     ERROR_EEPROM_LOCKED = 0x03
     ERROR_INVALID_FIRMWARE = 0x10
-    ERROR_INVALID_BLE_MTU  = 0x20
 
     PLATFORM_AVR   = 0x90
     PLATFORM_ESP32 = 0x80
@@ -95,10 +90,6 @@ class KISS():
         return data
 
 class AndroidBluetoothManager():
-    DEVICE_TYPE_CLASSIC = 1
-    DEVICE_TYPE_LE = 2
-    DEVICE_TYPE_DUAL = 3
-
     def __init__(self, owner, target_device_name = None, target_device_address = None):
         from jnius import autoclass
         self.owner = owner
@@ -247,11 +238,6 @@ class RNodeInterface(Interface):
     Q_SNR_MAX      = 6
     Q_SNR_STEP     = 2
 
-    BATTERY_STATE_UNKNOWN     = 0x00
-    BATTERY_STATE_DISCHARGING = 0x01
-    BATTERY_STATE_CHARGING    = 0x02
-    BATTERY_STATE_CHARGED     = 0x03
-
     @classmethod
     def bluetooth_control(device_serial = None, port = None, enable_bluetooth = False, disable_bluetooth = False, pairing_mode = False):
         if (port != None or device_serial != None) and (enable_bluetooth or disable_bluetooth or pairing_mode):
@@ -336,8 +322,7 @@ class RNodeInterface(Interface):
         self, owner, name, port, frequency = None, bandwidth = None, txpower = None,
         sf = None, cr = None, flow_control = False, id_interval = None,
         allow_bluetooth = False, target_device_name = None,
-        target_device_address = None, id_callsign = None, st_alock = None, lt_alock = None,
+        target_device_address = None, id_callsign = None, st_alock = None, lt_alock = None):
-        ble_addr = None, ble_name = None, force_ble=False):
         import importlib
         if RNS.vendor.platformutils.is_android():
             self.on_android  = True
@@ -384,19 +369,9 @@ class RNodeInterface(Interface):
         self.stopbits    = 1
         self.timeout     = 150
         self.online      = False
-        self.detached    = False
         self.hw_errors   = []
         self.allow_bluetooth = allow_bluetooth
 
-        self.use_ble     = False
-        self.ble_name    = ble_name
-        self.ble_addr    = ble_addr
-        self.ble         = None
-        self.ble_rx_lock = threading.Lock()
-        self.ble_tx_lock = threading.Lock()
-        self.ble_rx_queue= b""
-        self.ble_tx_queue= b""
-
         self.frequency   = frequency
         self.bandwidth   = bandwidth
         self.txpower     = txpower
@@ -417,7 +392,6 @@ class RNodeInterface(Interface):
         self.last_id     = 0
         self.first_tx    = None
         self.reconnect_w = RNodeInterface.RECONNECT_WAIT
-        self.reconnect_lock = threading.Lock()
 
         self.r_frequency = None
         self.r_bandwidth = None
@@ -441,8 +415,6 @@ class RNodeInterface(Interface):
         self.r_symbol_rate = None
         self.r_preamble_symbols = None
         self.r_premable_time_ms = None
-        self.r_battery_state = RNodeInterface.BATTERY_STATE_UNKNOWN
-        self.r_battery_percent = 0
 
         self.packet_queue    = []
         self.flow_control    = flow_control
@@ -452,9 +424,6 @@ class RNodeInterface(Interface):
         self.port_io_timeout = RNodeInterface.PORT_IO_TIMEOUT
         self.last_imagedata = None
 
-        if force_ble or self.ble_addr != None or self.ble_name != None:
-            self.use_ble = True
-
         self.validcfg  = True
         if (self.frequency < RNodeInterface.FREQ_MIN or self.frequency > RNodeInterface.FREQ_MAX):
             RNS.log("Invalid frequency configured for "+str(self), RNS.LOG_ERROR)
@@ -520,7 +489,9 @@ class RNodeInterface(Interface):
             RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
             if len(self.hw_errors) == 0:
                 RNS.log("Reticulum will attempt to bring up this interface periodically", RNS.LOG_ERROR)
-                thread = threading.Thread(target=self.reconnect_port, daemon=True).start()
+                thread = threading.Thread(target=self.reconnect_port)
+                thread.daemon = True
+                thread.start()
 
 
     def read_mux(self, len=None):
@@ -544,17 +515,7 @@ class RNodeInterface(Interface):
         else:
             raise IOError("No ports available for writing")
 
-    # def reset_ble(self):
-    #     RNS.log(f"Clearing previous connection instance: "+str(self.ble))
-    #     del self.ble
-    #     self.ble = None
-    #     self.serial = None
-    #     self.ble = BLEConnection(owner=self, target_name=self.ble_name, target_bt_addr=self.ble_addr)
-    #     self.serial = self.ble
-    #     RNS.log(f"New connection instance: "+str(self.ble))
-        
     def open_port(self):
-        if not self.use_ble:
         if self.port != None:
             RNS.log("Opening serial port "+self.port+"...")
             # Get device parameters
@@ -622,33 +583,15 @@ class RNodeInterface(Interface):
             if self.bt_manager != None:
                 self.bt_manager.connect_any_device()
 
-        else:
-            if self.ble == None:
-                self.ble = BLEConnection(owner=self, target_name=self.ble_name, target_bt_addr=self.ble_addr)
-                self.serial = self.ble
-
-            open_time = time.time()
-            while not self.ble.connected and time.time() < open_time + self.ble.CONNECT_TIMEOUT:
-                time.sleep(1)
-
 
     def configure_device(self):
-        self.resetRadioState()
         sleep(2.0)
-        thread = threading.Thread(target=self.readLoop, daemon=True).start()
+        thread = threading.Thread(target=self.readLoop)
+        thread.daemon = True
+        thread.start()
 
         self.detect()
-        if not self.use_ble:
         sleep(0.5)
-        else:
-            ble_detect_timeout = 5
-            detect_time = time.time()
-            while not self.detected and time.time() < detect_time + ble_detect_timeout:
-                time.sleep(0.1)
-            if self.detected:
-                detect_time = RNS.prettytime(time.time()-detect_time)
-            else:
-                RNS.log(f"RNode detect timed out over {self.port}", RNS.LOG_ERROR)
 
         if not self.detected:
             raise IOError("Could not detect device")
@@ -712,9 +655,6 @@ class RNodeInterface(Interface):
         self.setRadioState(KISS.RADIO_STATE_ON)
         time.sleep(0.15)
 
-        if self.use_ble:
-            time.sleep(1)
-
     def detect(self):
         kiss_command = bytes([KISS.FEND, KISS.CMD_DETECT, KISS.DETECT_REQ, KISS.FEND, KISS.CMD_FW_VERSION, 0x00, KISS.FEND, KISS.CMD_PLATFORM, 0x00, KISS.FEND, KISS.CMD_MCU, 0x00, KISS.FEND])
         written = self.write_mux(kiss_command)
@@ -868,9 +808,6 @@ class RNodeInterface(Interface):
             raise IOError("An IO error occurred while configuring radio state for "+str(self))
 
     def validate_firmware(self):
-        if (self.maj_version > RNodeInterface.REQUIRED_FW_VER_MAJ):
-            self.firmware_ok = True
-        else:
         if (self.maj_version >= RNodeInterface.REQUIRED_FW_VER_MAJ):
             if (self.min_version >= RNodeInterface.REQUIRED_FW_VER_MIN):
                 self.firmware_ok = True
@@ -880,7 +817,7 @@ class RNodeInterface(Interface):
 
         RNS.log("The firmware version of the connected RNode is "+str(self.maj_version)+"."+str(self.min_version), RNS.LOG_ERROR)
         RNS.log("This version of Reticulum requires at least version "+str(RNodeInterface.REQUIRED_FW_VER_MAJ)+"."+str(RNodeInterface.REQUIRED_FW_VER_MIN), RNS.LOG_ERROR)
-        RNS.log("Please update your RNode firmware with rnodeconf from https://github.com/markqvist/reticulum/")
+        RNS.log("Please update your RNode firmware with rnodeconf from https://github.com/markqvist/rnodeconfigutil/")
         error_description  = "The firmware version of the connected RNode is "+str(self.maj_version)+"."+str(self.min_version)+". "
         error_description += "This version of Reticulum requires at least version "+str(RNodeInterface.REQUIRED_FW_VER_MAJ)+"."+str(RNodeInterface.REQUIRED_FW_VER_MIN)+". "
         error_description += "Please update your RNode firmware with rnodeconf from: https://github.com/markqvist/rnodeconfigutil/"
@@ -888,7 +825,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)
         if not self.platform == KISS.PLATFORM_ESP32:
             sleep(1.00);
         else:
@@ -916,13 +853,6 @@ class RNodeInterface(Interface):
         else:
             return False
 
-    def resetRadioState(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
 
     def updateBitrate(self):
         try:
@@ -1211,25 +1141,6 @@ class RNodeInterface(Interface):
                                         RNS.log(str(self)+" Radio reporting symbol time is "+str(round(self.r_symbol_time_ms,2))+"ms (at "+str(self.r_symbol_rate)+" baud)", RNS.LOG_DEBUG)
                                         RNS.log(str(self)+" Radio reporting preamble is "+str(self.r_preamble_symbols)+" symbols ("+str(self.r_premable_time_ms)+"ms)", RNS.LOG_DEBUG)
                                         RNS.log(str(self)+" Radio reporting CSMA slot time is "+str(self.r_csma_slot_time_ms)+"ms", RNS.LOG_DEBUG)
-                        elif (command == KISS.CMD_STAT_BAT):
-                            if (byte == KISS.FESC):
-                                escape = True
-                            else:
-                                if (escape):
-                                    if (byte == KISS.TFEND):
-                                        byte = KISS.FEND
-                                    if (byte == KISS.TFESC):
-                                        byte = KISS.FESC
-                                    escape = False
-                                command_buffer = command_buffer+bytes([byte])
-                                if (len(command_buffer) == 2):
-                                    bat_percent = command_buffer[1]
-                                    if bat_percent > 100:
-                                        bat_percent = 100
-                                    if bat_percent < 0:
-                                        bat_percent = 0
-                                    self.r_battery_state   = command_buffer[0]
-                                    self.r_battery_percent = bat_percent
                         elif (command == KISS.CMD_RANDOM):
                             self.r_random = byte
                         elif (command == KISS.CMD_PLATFORM):
@@ -1302,15 +1213,9 @@ class RNodeInterface(Interface):
         if self.bt_manager != None:
             self.bt_manager.close()
 
-        if not self.detached:
         self.reconnect_port()
 
     def reconnect_port(self):
-        if self.reconnect_lock.locked():
-            RNS.log("Dropping superflous reconnect port job")
-            return
-
-        with self.reconnect_lock:
         while not self.online and len(self.hw_errors) == 0:
             try:
                 time.sleep(self.reconnect_w)
@@ -1343,278 +1248,13 @@ class RNodeInterface(Interface):
             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()
 
-        if self.use_ble:
-            self.ble.close()
-
     def should_ingress_limit(self):
         return False
 
-    def get_battery_state(self):
-        return self.r_battery_state
-
-    def get_battery_state_string(self):
-        if self.r_battery_state == RNodeInterface.BATTERY_STATE_CHARGED:
-            return "charged"
-        elif  self.r_battery_state == RNodeInterface.BATTERY_STATE_CHARGING:
-            return "charging"
-        elif self.r_battery_state == RNodeInterface.BATTERY_STATE_DISCHARGING:
-            return "discharging"
-        else:
-            return "unknown"
-
-    def get_battery_percent(self):
-        return self.r_battery_percent
-
-    def ble_receive(self, data):
-        with self.ble_rx_lock:
-            self.ble_rx_queue += data
-
-    def ble_waiting(self):
-        return len(self.ble_tx_queue) > 0
-
-    def get_ble_waiting(self, n):
-        with self.ble_tx_lock:
-            data = self.ble_tx_queue[:n]
-            self.ble_tx_queue = self.ble_tx_queue[n:]
-            return data
-
     def __str__(self):
         return "RNodeInterface["+str(self.name)+"]"
 
-class BLEConnection(BluetoothDispatcher):
-    UART_SERVICE_UUID = "6e400001-b5a3-f393-e0a9-e50e24dcca9e"
-    UART_RX_CHAR_UUID = "6e400002-b5a3-f393-e0a9-e50e24dcca9e"
-    UART_TX_CHAR_UUID = "6e400003-b5a3-f393-e0a9-e50e24dcca9e"
-    MAX_GATT_ATTR_LEN = 512
-    BASE_MTU          = 20
-    TARGET_MTU        = 512
-
-    MTU_TIMEOUT = 4.0
-    CONNECT_TIMEOUT = 7.0
-    RECONNECT_WAIT = 1.0
-
-    @property
-    def is_open(self):
-        return self.connected
-
-    @property
-    def in_waiting(self):
-        return len(self.owner.ble_rx_queue) > 0
-
-    def write(self, data_bytes):
-        with self.owner.ble_tx_lock:
-            self.owner.ble_tx_queue += data_bytes
-            return len(data_bytes)
-
-    def read(self):
-        with self.owner.ble_rx_lock:
-            data = self.owner.ble_rx_queue
-            self.owner.ble_rx_queue = b""
-            return data
-
-    def close(self):
-        try:
-            if self.connected:
-                RNS.log(f"Disconnecting BLE device from {self.owner}", RNS.LOG_DEBUG)
-                # RNS.log("Waiting for BLE write buffer to empty...")
-                timeout = time.time() + 10
-                while self.owner.ble_waiting() and self.write_thread != None and time.time() < timeout:
-                    time.sleep(0.1)
-                # if time.time() > timeout:
-                #     RNS.log("Writing timed out")
-                # else:
-                #     RNS.log("Writing concluded")
-
-                self.rx_char = None
-                self.tx_char = None
-                self.mtu = BLEConnection.BASE_MTU
-                self.mtu_requested_time = None
-
-                if self.write_thread != None:
-                    # RNS.log("Waiting for write thread to finish...")
-                    while self.write_thread != None:
-                        time.sleep(0.1)
-
-                # RNS.log("Writing finished, closing GATT connection")
-                self.close_gatt()
-
-                with self.owner.ble_rx_lock:
-                    self.owner.ble_rx_queue = b""
-
-                with self.owner.ble_tx_lock:
-                    self.owner.ble_tx_queue = b""
-
-                self.connected = False
-                self.ble_device = None
-
-        except Exception as e:
-            RNS.log("An error occurred while closing BLE connection for {self.owner}: {e}", RNS.LOG_ERROR)
-            RNS.trace_exception(e)
-
-    def __init__(self, owner=None, target_name=None, target_bt_addr=None):
-        super(BLEConnection, self).__init__()
-        self.owner = owner
-        self.target_name = target_name
-        self.target_bt_addr = target_bt_addr
-        self.connect_timeout = BLEConnection.CONNECT_TIMEOUT
-        self.ble_device = None
-        self.rx_char = None
-        self.tx_char = None
-        self.connected = False
-        self.was_connected = False
-        self.connected_time = None
-        self.mtu_requested_time = None
-        self.running = False
-        self.should_run = False
-        self.connect_job_running = False
-        self.write_thread = None
-        self.mtu = BLEConnection.BASE_MTU
-        self.target_mtu = BLEConnection.TARGET_MTU
-
-        self.bt_manager = AndroidBluetoothManager(owner=self)
-
-        self.should_run = True
-        self.connection_thread = threading.Thread(target=self.connection_job, daemon=True).start()
-
-    def write_loop(self):
-        try:
-            while self.connected and self.rx_char != None:
-                if self.owner.ble_waiting():
-                    data = self.owner.get_ble_waiting(self.mtu)
-                    self.write_characteristic(self.rx_char, data)
-                else:
-                    time.sleep(0.1)
-        
-        except Exception as e:
-            RNS.log("An error occurred in {self} write loop: {e}", RNS.LOG_ERROR)
-            RNS.trace_exception(e)
-
-        self.write_thread = None
-
-    def connection_job(self):
-        while self.should_run:
-            if self.bt_manager.bt_enabled():
-                if self.ble_device == None:
-                    self.ble_device = self.find_target_device()
-
-                if self.ble_device != None:
-                    if not self.connected:
-                        if self.was_connected:
-                            RNS.log(f"Throttling BLE reconnect for {BLEConnection.RECONNECT_WAIT} seconds", RNS.LOG_DEBUG)
-                            time.sleep(BLEConnection.RECONNECT_WAIT)
-
-                        self.connect_device()
-
-            else:
-                if self.connected:
-                    RNS.log("Bluetooth was disabled, closing active BLE device connection", RNS.LOG_ERROR)
-                    self.close()
-
-            time.sleep(2)
-
-    def connect_device(self):
-        if self.ble_device != None and self.bt_manager.bt_enabled():
-            RNS.log(f"Trying to connect BLE device {self.ble_device.getName()} / {self.ble_device.getAddress()} for {self.owner}...", RNS.LOG_DEBUG)
-            self.mtu = BLEConnection.BASE_MTU
-            self.connect_by_device_address(self.ble_device.getAddress())
-            end = time.time() + BLEConnection.CONNECT_TIMEOUT
-            while time.time() < end and not self.connected:
-                time.sleep(0.25)
-
-            if self.connected:
-                self.owner.port = f"ble://{self.ble_device.getAddress()}"
-                self.write_thread = threading.Thread(target=self.write_loop, daemon=True)
-                self.write_thread.start()
-            else:
-                RNS.log(f"BLE device connection timed out for {self.owner}", RNS.LOG_DEBUG)
-                if self.mtu_requested_time:
-                    RNS.log("MTU update timeout, tearing down connection")
-                    self.owner.hw_errors.append({"error": KISS.ERROR_INVALID_BLE_MTU, "description": "The Bluetooth Low Energy transfer MTU could not be configured for the connected device, and communication has failed. Restart Reticulum and any connected applications to retry connecting."})
-                    self.close()
-                    self.should_run = False
-                
-                self.close_gatt()
-
-            self.connect_job_running = False
-
-    def device_disconnected(self):
-        RNS.log(f"BLE device for {self.owner} disconnected", RNS.LOG_NOTICE)
-        self.connected = False
-        self.ble_device = None
-        self.close_gatt()
-
-    def find_target_device(self):
-        found_device = None
-        potential_devices = self.bt_manager.get_paired_devices()
-
-        if self.target_bt_addr != None:
-            for device in potential_devices:
-                if (device.getType() == AndroidBluetoothManager.DEVICE_TYPE_LE) or (device.getType() == AndroidBluetoothManager.DEVICE_TYPE_DUAL):
-                    if str(device.getAddress()).replace(":", "").lower() == str(self.target_bt_addr).replace(":", "").lower():
-                        found_device = device
-                        break
-
-        if not found_device and self.target_name != None:
-            for device in potential_devices:
-                if (device.getType() == AndroidBluetoothManager.DEVICE_TYPE_LE) or (device.getType() == AndroidBluetoothManager.DEVICE_TYPE_DUAL):
-                    if device.getName().lower() == self.target_name.lower():
-                        found_device = device
-                        break
-
-        if not found_device:
-            for device in potential_devices:
-                if (device.getType() == AndroidBluetoothManager.DEVICE_TYPE_LE) or (device.getType() == AndroidBluetoothManager.DEVICE_TYPE_DUAL):
-                    if device.getName().startswith("RNode "):
-                        found_device = device
-                        break
-
-        return found_device
-
-    def on_connection_state_change(self, status, state):
-        if status == GATT_SUCCESS and state:
-            self.discover_services()
-        else:
-            self.device_disconnected()
-
-    def on_services(self, status, services):
-        if status == GATT_SUCCESS:
-            self.rx_char = services.search(BLEConnection.UART_RX_CHAR_UUID)
-            
-            if self.rx_char is not None:
-                self.tx_char = services.search(BLEConnection.UART_TX_CHAR_UUID)
-
-                if self.tx_char is not None:                
-                    if self.enable_notifications(self.tx_char):
-                        RNS.log("Enabled notifications for BLE TX characteristic", RNS.LOG_DEBUG)
-                        
-                        RNS.log(f"Requesting BLE connection MTU update to {self.target_mtu}", RNS.LOG_DEBUG)
-                        self.mtu_requested_time = time.time()
-                        self.request_mtu(self.target_mtu)
-
-                    else:
-                        RNS.log("Could not enable notifications for BLE TX characteristic", RNS.LOG_ERROR)
-
-        else:
-            RNS.log("BLE device service discovery failure", RNS.LOG_ERROR)
-
-    def on_mtu_changed(self, mtu, status):
-        if status == GATT_SUCCESS:
-            self.mtu = min(mtu-5, BLEConnection.MAX_GATT_ATTR_LEN)
-            RNS.log(f"BLE MTU updated to {self.mtu} for {self.owner}", RNS.LOG_DEBUG)
-            self.connected = True
-            self.was_connected = True
-            self.connected_time = time.time()
-            self.mtu_requested_time = None
-
-        else:
-            RNS.log(f"MTU update request did not succeed, mtu={mtu}, status={status}", RNS.LOG_ERROR)
-
-    def on_characteristic_changed(self, characteristic):
-        if characteristic.getUuid().toString() == BLEConnection.UART_TX_CHAR_UUID:
-            recvd = bytes(characteristic.getValue())
-            self.owner.ble_receive(recvd)

RNS/Interfaces/RNodeInterface.py

@@ -54,7 +54,6 @@ class KISS():
     CMD_STAT_SNR    = 0x24
     CMD_STAT_CHTM   = 0x25
     CMD_STAT_PHYPRM = 0x26
-    CMD_STAT_BAT    = 0x27
     CMD_BLINK       = 0x30
     CMD_RANDOM      = 0x40
     CMD_FB_EXT      = 0x41
@@ -109,12 +108,7 @@ class RNodeInterface(Interface):
     Q_SNR_MAX      = 6
     Q_SNR_STEP     = 2
 
-    BATTERY_STATE_UNKNOWN     = 0x00
+    def __init__(self, owner, name, port, frequency = None, bandwidth = None, txpower = None, sf = None, cr = None, flow_control = False, id_interval = None, id_callsign = None, st_alock = None, lt_alock = None):
-    BATTERY_STATE_DISCHARGING = 0x01
-    BATTERY_STATE_CHARGING    = 0x02
-    BATTERY_STATE_CHARGED     = 0x03
-
-    def __init__(self, owner, name, port, frequency = None, bandwidth = None, txpower = None, sf = None, cr = None, flow_control = False, id_interval = None, id_callsign = None, st_alock = None, lt_alock = None, ble_addr = None, ble_name = None, force_ble=False):
         if RNS.vendor.platformutils.is_android():
             raise SystemError("Invalid interface type. The Android-specific RNode interface must be used on Android")
 
@@ -143,15 +137,6 @@ class RNodeInterface(Interface):
         self.detached    = False
         self.reconnecting= False
 
-        self.use_ble     = False
-        self.ble_name    = ble_name
-        self.ble_addr    = ble_addr
-        self.ble         = None
-        self.ble_rx_lock = threading.Lock()
-        self.ble_tx_lock = threading.Lock()
-        self.ble_rx_queue= b""
-        self.ble_tx_queue= b""
-
         self.frequency   = frequency
         self.bandwidth   = bandwidth
         self.txpower     = txpower
@@ -195,17 +180,12 @@ class RNodeInterface(Interface):
         self.r_symbol_rate = None
         self.r_preamble_symbols = None
         self.r_premable_time_ms = None
-        self.r_battery_state = RNodeInterface.BATTERY_STATE_UNKNOWN
-        self.r_battery_percent = 0
 
         self.packet_queue    = []
         self.flow_control    = flow_control
         self.interface_ready = False
         self.announce_rate_target = None
 
-        if force_ble or self.ble_addr != None or self.ble_name != None:
-            self.use_ble = True
-
         self.validcfg  = True
         if (self.frequency < RNodeInterface.FREQ_MIN or self.frequency > RNodeInterface.FREQ_MAX):
             RNS.log("Invalid frequency configured for "+str(self), RNS.LOG_ERROR)
@@ -269,7 +249,6 @@ class RNodeInterface(Interface):
 
 
     def open_port(self):
-        if not self.use_ble:
         RNS.log("Opening serial port "+self.port+"...")
         self.serial = self.pyserial.Serial(
             port = self.port,
@@ -285,16 +264,6 @@ class RNodeInterface(Interface):
             dsrdtr = False,
         )
 
-        else:
-            RNS.log(f"Opening BLE connection for {self}...")
-            if self.ble == None:
-                self.ble = BLEConnection(owner=self, target_name=self.ble_name, target_bt_addr=self.ble_addr)
-                self.serial = self.ble
-
-            open_time = time.time()
-            while not self.ble.connected and time.time() < open_time + self.ble.CONNECT_TIMEOUT:
-                time.sleep(1)
-
 
     def configure_device(self):
         self.r_frequency = None
@@ -311,17 +280,7 @@ class RNodeInterface(Interface):
         thread.start()
 
         self.detect()
-        if not self.use_ble:
         sleep(0.2)
-        else:
-            ble_detect_timeout = 5
-            detect_time = time.time()
-            while not self.detected and time.time() < detect_time + ble_detect_timeout:
-                time.sleep(0.1)
-            if self.detected:
-                detect_time = RNS.prettytime(time.time()-detect_time)
-            else:
-                RNS.log(f"RNode detect timed out over {self.port}", RNS.LOG_ERROR)
         
         if not self.detected:
             RNS.log("Could not detect device for "+str(self), RNS.LOG_ERROR)
@@ -355,9 +314,6 @@ class RNodeInterface(Interface):
         self.setLTALock()
         self.setRadioState(KISS.RADIO_STATE_ON)
 
-        if self.use_ble:
-            time.sleep(2)
-
     def detect(self):
         kiss_command = bytes([KISS.FEND, KISS.CMD_DETECT, KISS.DETECT_REQ, KISS.FEND, KISS.CMD_FW_VERSION, 0x00, KISS.FEND, KISS.CMD_PLATFORM, 0x00, KISS.FEND, KISS.CMD_MCU, 0x00, KISS.FEND])
         written = self.serial.write(kiss_command)
@@ -492,9 +448,6 @@ class RNodeInterface(Interface):
             raise IOError("An IO error occurred while configuring radio state for "+str(self))
 
     def validate_firmware(self):
-        if (self.maj_version > RNodeInterface.REQUIRED_FW_VER_MAJ):
-            self.firmware_ok = True
-        else:
         if (self.maj_version >= RNodeInterface.REQUIRED_FW_VER_MAJ):
             if (self.min_version >= RNodeInterface.REQUIRED_FW_VER_MIN):
                 self.firmware_ok = True
@@ -813,25 +766,6 @@ class RNodeInterface(Interface):
                                         RNS.log(str(self)+" Radio reporting symbol time is "+str(round(self.r_symbol_time_ms,2))+"ms (at "+str(self.r_symbol_rate)+" baud)", RNS.LOG_DEBUG)
                                         RNS.log(str(self)+" Radio reporting preamble is "+str(self.r_preamble_symbols)+" symbols ("+str(self.r_premable_time_ms)+"ms)", RNS.LOG_DEBUG)
                                         RNS.log(str(self)+" Radio reporting CSMA slot time is "+str(self.r_csma_slot_time_ms)+"ms", RNS.LOG_DEBUG)
-                        elif (command == KISS.CMD_STAT_BAT):
-                            if (byte == KISS.FESC):
-                                escape = True
-                            else:
-                                if (escape):
-                                    if (byte == KISS.TFEND):
-                                        byte = KISS.FEND
-                                    if (byte == KISS.TFESC):
-                                        byte = KISS.FESC
-                                    escape = False
-                                command_buffer = command_buffer+bytes([byte])
-                                if (len(command_buffer) == 2):
-                                    bat_percent = command_buffer[1]
-                                    if bat_percent > 100:
-                                        bat_percent = 100
-                                    if bat_percent < 0:
-                                        bat_percent = 0
-                                    self.r_battery_state   = command_buffer[0]
-                                    self.r_battery_percent = bat_percent
                         elif (command == KISS.CMD_RANDOM):
                             self.r_random = byte
                         elif (command == KISS.CMD_PLATFORM):
@@ -920,194 +854,8 @@ class RNodeInterface(Interface):
         self.setRadioState(KISS.RADIO_STATE_OFF)
         self.leave()
 
-        if self.use_ble:
-            self.ble.close()
-
     def should_ingress_limit(self):
         return False
 
-    def get_battery_state(self):
-        return self.r_battery_state
-
-    def get_battery_state_string(self):
-        if self.r_battery_state == RNodeInterface.BATTERY_STATE_CHARGED:
-            return "charged"
-        elif  self.r_battery_state == RNodeInterface.BATTERY_STATE_CHARGING:
-            return "charging"
-        elif self.r_battery_state == RNodeInterface.BATTERY_STATE_DISCHARGING:
-            return "discharging"
-        else:
-            return "unknown"
-
-    def get_battery_percent(self):
-        return self.r_battery_percent
-
-    def ble_receive(self, data):
-        with self.ble_rx_lock:
-            self.ble_rx_queue += data
-
-    def ble_waiting(self):
-        return len(self.ble_tx_queue) > 0
-
-    def get_ble_waiting(self, n):
-        with self.ble_tx_lock:
-            data = self.ble_tx_queue[:n]
-            self.ble_tx_queue = self.ble_tx_queue[n:]
-            return data
-
     def __str__(self):
         return "RNodeInterface["+str(self.name)+"]"
-
-class BLEConnection():
-    UART_SERVICE_UUID = "6E400001-B5A3-F393-E0A9-E50E24DCCA9E"
-    UART_RX_CHAR_UUID = "6E400002-B5A3-F393-E0A9-E50E24DCCA9E"
-    UART_TX_CHAR_UUID = "6E400003-B5A3-F393-E0A9-E50E24DCCA9E"
-    bleak = None
-
-    SCAN_TIMEOUT = 2.0
-    CONNECT_TIMEOUT = 5.0
-
-    @property
-    def is_open(self):
-        return self.connected
-
-    @property
-    def in_waiting(self):
-        buflen = len(self.owner.ble_rx_queue)
-        return buflen > 0
-
-    def write(self, data_bytes):
-        with self.owner.ble_tx_lock:
-            self.owner.ble_tx_queue += data_bytes
-            return len(data_bytes)
-
-    def read(self, n):
-        with self.owner.ble_rx_lock:
-            data = self.owner.ble_rx_queue[:n]
-            self.owner.ble_rx_queue = self.owner.ble_rx_queue[n:]
-            return data
-
-    def close(self):
-        if self.connected and self.ble_device:
-            RNS.log(f"Disconnecting BLE device from {self.owner}", RNS.LOG_DEBUG)
-            self.must_disconnect = True
-
-            while self.connect_job_running:
-                time.sleep(0.1)
-
-    def __init__(self, owner=None, target_name=None, target_bt_addr=None):
-        self.owner = owner
-        self.target_name = target_name
-        self.target_bt_addr = target_bt_addr
-        self.scan_timeout = BLEConnection.SCAN_TIMEOUT
-        self.ble_device = None
-        self.connected = False
-        self.running = False
-        self.should_run = False
-        self.must_disconnect = False
-        self.connect_job_running = False
-
-        import importlib
-        if BLEConnection.bleak == None:
-            if importlib.util.find_spec("bleak") != None:
-                import bleak
-                BLEConnection.bleak = bleak
-                
-                import asyncio
-                BLEConnection.asyncio = asyncio
-            else:
-                RNS.log("Using the RNode interface over BLE requires a the \"bleak\" module to be installed.", RNS.LOG_CRITICAL)
-                RNS.log("You can install one with the command: python3 -m pip install bleak", RNS.LOG_CRITICAL)
-                RNS.panic()
-
-        self.should_run = True
-        self.connection_thread = threading.Thread(target=self.connection_job, daemon=True).start()
-
-    def connection_job(self):
-        while (self.should_run):
-            if self.ble_device == None:
-                self.ble_device = self.find_target_device()
-
-            if type(self.ble_device) == self.bleak.backends.device.BLEDevice:
-                if not self.connected:
-                    self.connect_device()
-
-            time.sleep(1)
-
-    def connect_device(self):
-        if self.ble_device != None and type(self.ble_device) == self.bleak.backends.device.BLEDevice:
-            RNS.log(f"Connecting BLE device {self.ble_device} for {self.owner}...", RNS.LOG_DEBUG)
-
-            async def connect_job():
-                self.connect_job_running = True
-                async with self.bleak.BleakClient(self.ble_device, disconnected_callback=self.device_disconnected) as ble_client:
-                    def handle_rx(device, data):
-                        if self.owner != None:
-                            self.owner.ble_receive(data)
-
-                    self.connected = True
-                    self.ble_device = ble_client
-                    self.owner.port = str(f"ble://{ble_client.address}")
-
-                    loop = self.asyncio.get_running_loop()
-                    uart_service = ble_client.services.get_service(BLEConnection.UART_SERVICE_UUID)
-                    rx_characteristic = uart_service.get_characteristic(BLEConnection.UART_RX_CHAR_UUID)
-                    await ble_client.start_notify(BLEConnection.UART_TX_CHAR_UUID, handle_rx)
-
-                    while self.connected:
-                        if self.owner != None and self.owner.ble_waiting():
-                            outbound_data = self.owner.get_ble_waiting(rx_characteristic.max_write_without_response_size)
-                            await ble_client.write_gatt_char(rx_characteristic, outbound_data, response=False)
-                        elif self.must_disconnect:
-                            await ble_client.disconnect()
-                        else:
-                            await self.asyncio.sleep(0.1)
-
-
-            try:
-                self.asyncio.run(connect_job())
-            except Exception as e:
-                RNS.log(f"Could not connect BLE device {self.ble_device} for {self.owner}. Possibly missing authentication.", RNS.LOG_ERROR)
-            self.connect_job_running = False
-
-    def device_disconnected(self, device):
-        RNS.log(f"BLE device for {self.owner} disconnected", RNS.LOG_NOTICE)
-        self.connected = False
-        self.ble_device = None
-
-    def find_target_device(self):
-        RNS.log(f"Searching for attachable BLE device for {self.owner}...", RNS.LOG_EXTREME)
-        def device_filter(device: self.bleak.backends.device.BLEDevice, adv: self.bleak.backends.scanner.AdvertisementData):
-            if BLEConnection.UART_SERVICE_UUID.lower() in adv.service_uuids:
-                if self.device_bonded(device):
-                    if self.target_bt_addr == None and self.target_name == None:
-                        if device.name.startswith("RNode "):
-                            return True
-
-                    if self.target_bt_addr == None or (device.address != None and device.address == self.target_bt_addr):
-                        if self.target_name == None or (device.name != None and device.name == self.target_name):
-                            return True
-
-                else:
-                    if self.target_bt_addr != None and device.address == self.target_bt_addr:
-                        RNS.log(f"Can't connect to target device {self.target_bt_addr} over BLE, device is not bonded", RNS.LOG_ERROR)
-                    
-                    elif self.target_name != None and device.name == self.target_name:
-                        RNS.log(f"Can't connect to target device {self.target_name} over BLE, device is not bonded", RNS.LOG_ERROR)
-
-            return False
-
-        device = self.asyncio.run(self.bleak.BleakScanner.find_device_by_filter(device_filter, timeout=self.scan_timeout))
-        return device
-
-    def device_bonded(self, device):
-        try:
-            if hasattr(device, "details"):
-                if "props" in device.details and "Bonded" in device.details["props"]:
-                    if device.details["props"]["Bonded"] == True:
-                        return True
-        
-        except Exception as e:
-            RNS.log(f"Error while determining device bond status for {device}, the contained exception was: {e}", RNS.LOG_ERROR)
-
-        return False

RNS/Reticulum.py

@@ -916,28 +916,11 @@ class Reticulum:
                                     st_alock = float(c["airtime_limit_short"]) if "airtime_limit_short" in c else None
                                     lt_alock = float(c["airtime_limit_long"]) if "airtime_limit_long" in c else None
 
-                                    force_ble = False
-                                    ble_name = None
-                                    ble_addr = None
-
                                     port = c["port"] if "port" in c else None
                                     
                                     if port == None:
                                         raise ValueError("No port specified for RNode interface")
 
-                                    if port != None:
-                                        ble_uri_scheme = "ble://"
-                                        if port.lower().startswith(ble_uri_scheme):
-                                            force_ble = True
-                                            ble_string = port[len(ble_uri_scheme):]
-                                            port = None
-                                            if len(ble_string) == 0:
-                                                pass
-                                            elif len(ble_string.split(":")) == 6 and len(ble_string) == 17:
-                                                ble_addr = ble_string
-                                            else:
-                                                ble_name = ble_string
-                                    
                                     interface = RNodeInterface.RNodeInterface(
                                         RNS.Transport,
                                         name,
@@ -951,10 +934,7 @@ class Reticulum:
                                         id_interval = id_interval,
                                         id_callsign = id_callsign,
                                         st_alock = st_alock,
-                                        lt_alock = lt_alock,
+                                        lt_alock = lt_alock
-                                        ble_addr = ble_addr,
-                                        ble_name = ble_name,
-                                        force_ble = force_ble,
                                     )
 
                                     if "outgoing" in c and c.as_bool("outgoing") == False:
@@ -1319,13 +1299,6 @@ class Reticulum:
                 if hasattr(interface, "r_channel_load_long"):
                     ifstats["channel_load_long"] = interface.r_channel_load_long
 
-                if hasattr(interface, "r_battery_state"):
-                    if interface.r_battery_state != 0x00:
-                        ifstats["battery_state"] = interface.r_battery_state
-
-                    if hasattr(interface, "r_battery_percent"):
-                        ifstats["battery_percent"] = interface.r_battery_percent
-
                 if hasattr(interface, "bitrate"):
                     if interface.bitrate != None:
                         ifstats["bitrate"] = interface.bitrate

RNS/Utilities/rnodeconf.py

@@ -169,10 +169,6 @@ class ROM():
     MODEL_E3       = 0xE3
     MODEL_E8       = 0xE8
 
-    PRODUCT_TDECK  = 0xD0
-    MODEL_D4       = 0xD4
-    MODEL_D9       = 0xD9
-
     PRODUCT_RAK4631 = 0x10
     MODEL_11       = 0x11
     MODEL_12       = 0x12
@@ -211,7 +207,6 @@ class ROM():
     BOARD_RNODE         = 0x31
     BOARD_HMBRW         = 0x32
     BOARD_TBEAM         = 0x33
-    BOARD_TDECK         = 0x3B
     BOARD_HUZZAH32      = 0x34
     BOARD_GENERIC_ESP32 = 0x35
     BOARD_LORA32_V2_0   = 0x36
@@ -226,7 +221,6 @@ products = {
     ROM.PRODUCT_RNODE:  "RNode",
     ROM.PRODUCT_HMBRW:  "Hombrew RNode",
     ROM.PRODUCT_TBEAM:  "LilyGO T-Beam",
-    ROM.PRODUCT_TDECK:  "LilyGO T-Deck",
     ROM.PRODUCT_T32_10: "LilyGO LoRa32 v1.0",
     ROM.PRODUCT_T32_20: "LilyGO LoRa32 v2.0",
     ROM.PRODUCT_T32_21: "LilyGO LoRa32 v2.1",
@@ -273,14 +267,12 @@ models = {
     0xCA: [863000000, 928000000, 21, "863 - 928 MHz", "rnode_firmware_heltec32v3.zip", "SX1262"],
     0xE4: [420000000, 520000000, 17, "420 - 520 MHz", "rnode_firmware_tbeam.zip", "SX1278"],
     0xE9: [850000000, 950000000, 17, "850 - 950 MHz", "rnode_firmware_tbeam.zip", "SX1276"],
-    0xD4: [420000000, 520000000, 22, "420 - 520 MHz", "rnode_firmware_tdeck.zip", "SX1268"],
-    0xD9: [850000000, 950000000, 22, "850 - 950 MHz", "rnode_firmware_tdeck.zip", "SX1262"],
     0xE3: [420000000, 520000000, 22, "420 - 520 MHz", "rnode_firmware_tbeam_sx1262.zip", "SX1268"],
     0xE8: [850000000, 950000000, 22, "850 - 950 MHz", "rnode_firmware_tbeam_sx1262.zip", "SX1262"],
     0x11: [430000000, 510000000, 22, "430 - 510 MHz", "rnode_firmware_rak4631.zip", "SX1262"],
     0x12: [779000000, 928000000, 22, "779 - 928 MHz", "rnode_firmware_rak4631.zip", "SX1262"],
-    0x13: [430000000, 510000000, 22, "430 - 510 MHz", "rnode_firmware_rak4631_sx1280.zip", "SX1262 + SX1280"],
+    0x11: [430000000, 510000000, 22, "430 - 510 MHz", "rnode_firmware_rak4631_sx1280.zip", "SX1262 + SX1280"],
-    0x14: [779000000, 928000000, 22, "779 - 928 MHz", "rnode_firmware_rak4631_sx1280.zip", "SX1262 + SX1280"],
+    0x12: [779000000, 928000000, 22, "779 - 928 MHz", "rnode_firmware_rak4631_sx1280.zip", "SX1262 + SX1280"],
     0x16: [779000000, 928000000, 22, "430 - 510 Mhz", "rnode_firmware_techo.zip", "SX1262"],
     0x17: [779000000, 928000000, 22, "779 - 928 Mhz", "rnode_firmware_techo.zip", "SX1262"],
     0x21: [820000000, 960000000, 22, "820 - 960 MHz", "rnode_firmware_opencom_xl.zip", "SX1262 + SX1280"],

RNS/Utilities/rnsd.py

@@ -294,23 +294,6 @@ loglevel = 4
     # Serial port for the device
     port = /dev/ttyUSB0
 
-    # It is also possible to use BLE devices
-    # instead of wired serial ports. The
-    # target RNode must be paired with the
-    # host device before connecting. BLE
-    # devices can be connected by name,
-    # BLE MAC address or by any available.
-    
-    # Connect to specific device by name
-    # port = ble://RNode 3B87
-
-    # Or by BLE MAC address
-    # port = ble://F4:12:73:29:4E:89
-
-    # Or connect to the first available,
-    # paired device
-    # port = ble://
-
     # Set frequency to 867.2 MHz
     frequency = 867200000
 

RNS/Utilities/rnstatus.py

@@ -292,13 +292,6 @@ def program_setup(configdir, dispall=False, verbosity=0, name_filter=None, json=
                         if "bitrate" in ifstat and ifstat["bitrate"] != None:
                             print("    Rate      : {ss}".format(ss=speed_str(ifstat["bitrate"])))
 
-                        if "battery_percent" in ifstat and ifstat["battery_percent"] != None:
-                            try:
-                                bpi = int(ifstat["battery_percent"])
-                                print("    Battery   : {bp}%".format(bp=bpi))
-                            except:
-                                pass
-
                         if "airtime_short" in ifstat and "airtime_long" in ifstat:
                             print("    Airtime   : {ats}% (15s), {atl}% (1h)".format(ats=str(ifstat["airtime_short"]),atl=str(ifstat["airtime_long"])))
                         

RNS/_version.py

@@ -1 +1 @@
-__version__ = "0.8.1"
+__version__ = "0.8.0"

docs/manual/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 1447e58e81cf4037238271210a352494
+config: 94939fd3ce633867445ef29897b42133
 tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/manual/_sources/interfaces.rst.txt

@@ -358,23 +358,6 @@ can be used, and offers full control over LoRa parameters.
     # Serial port for the device
     port = /dev/ttyUSB0
 
-    # It is also possible to use BLE devices
-    # instead of wired serial ports. The
-    # target RNode must be paired with the
-    # host device before connecting. BLE
-    # devices can be connected by name,
-    # BLE MAC address or by any available.
-    
-    # Connect to specific device by name
-    # port = ble://RNode 3B87
-
-    # Or by BLE MAC address
-    # port = ble://F4:12:73:29:4E:89
-
-    # Or connect to the first available,
-    # paired device
-    # port = ble://
-
     # Set frequency to 867.2 MHz
     frequency = 867200000
 

docs/manual/_static/documentation_options.js

@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.8.1 beta',
+    VERSION: '0.8.0 beta',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

docs/manual/examples.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="Support Reticulum" href="support.html" /><link rel="prev" title="Building Networks" href="networks.html" />
 
     <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/>
-        <title>Code Examples - Reticulum Network Stack 0.8.1 beta documentation</title>
+        <title>Code Examples - Reticulum Network Stack 0.8.0 beta documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -141,7 +141,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -167,7 +167,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/manual/forhumans.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" />
 
     <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/>
-        <title>An Explanation of Reticulum for Human Beings - Reticulum Network Stack 0.8.1 beta documentation</title>
+        <title>An Explanation of Reticulum for Human Beings - Reticulum Network Stack 0.8.0 beta documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -141,7 +141,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -167,7 +167,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/manual/genindex.html

@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1"/>
     <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="#" /><link rel="search" title="Search" href="search.html" />
 
-    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/><title>Index - Reticulum Network Stack 0.8.1 beta documentation</title>
+    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/><title>Index - Reticulum Network Stack 0.8.0 beta documentation</title>
 <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -139,7 +139,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -165,7 +165,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/manual/gettingstartedfast.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="Using Reticulum on Your System" href="using.html" /><link rel="prev" title="What is Reticulum?" href="whatis.html" />
 
     <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/>
-        <title>Getting Started Fast - Reticulum Network Stack 0.8.1 beta documentation</title>
+        <title>Getting Started Fast - Reticulum Network Stack 0.8.0 beta documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -141,7 +141,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -167,7 +167,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/manual/hardware.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="Configuring Interfaces" href="interfaces.html" /><link rel="prev" title="Understanding Reticulum" href="understanding.html" />
 
     <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/>
-        <title>Communications Hardware - Reticulum Network Stack 0.8.1 beta documentation</title>
+        <title>Communications Hardware - Reticulum Network Stack 0.8.0 beta documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -141,7 +141,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -167,7 +167,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/manual/index.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="What is Reticulum?" href="whatis.html" />
 
     <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/>
-        <title>Reticulum Network Stack 0.8.1 beta documentation</title>
+        <title>Reticulum Network Stack 0.8.0 beta documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -141,7 +141,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="#"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="#"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -167,7 +167,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/manual/interfaces.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="Building Networks" href="networks.html" /><link rel="prev" title="Communications Hardware" href="hardware.html" />
 
     <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/>
-        <title>Configuring Interfaces - Reticulum Network Stack 0.8.1 beta documentation</title>
+        <title>Configuring Interfaces - Reticulum Network Stack 0.8.0 beta documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -141,7 +141,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -167,7 +167,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">
@@ -520,23 +520,6 @@ can be used, and offers full control over LoRa parameters.</p>
   <span class="c1"># Serial port for the device</span>
   <span class="n">port</span> <span class="o">=</span> <span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">ttyUSB0</span>
 
-  <span class="c1"># It is also possible to use BLE devices</span>
-  <span class="c1"># instead of wired serial ports. The</span>
-  <span class="c1"># target RNode must be paired with the</span>
-  <span class="c1"># host device before connecting. BLE</span>
-  <span class="c1"># devices can be connected by name,</span>
-  <span class="c1"># BLE MAC address or by any available.</span>
-
-  <span class="c1"># Connect to specific device by name</span>
-  <span class="c1"># port = ble://RNode 3B87</span>
-
-  <span class="c1"># Or by BLE MAC address</span>
-  <span class="c1"># port = ble://F4:12:73:29:4E:89</span>
-
-  <span class="c1"># Or connect to the first available,</span>
-  <span class="c1"># paired device</span>
-  <span class="c1"># port = ble://</span>
-
   <span class="c1"># Set frequency to 867.2 MHz</span>
   <span class="n">frequency</span> <span class="o">=</span> <span class="mi">867200000</span>
 

docs/manual/networks.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="Code Examples" href="examples.html" /><link rel="prev" title="Configuring Interfaces" href="interfaces.html" />
 
     <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/>
-        <title>Building Networks - Reticulum Network Stack 0.8.1 beta documentation</title>
+        <title>Building Networks - Reticulum Network Stack 0.8.0 beta documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -141,7 +141,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -167,7 +167,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/manual/reference.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="prev" title="Support Reticulum" href="support.html" />
 
     <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/>
-        <title>API Reference - Reticulum Network Stack 0.8.1 beta documentation</title>
+        <title>API Reference - Reticulum Network Stack 0.8.0 beta documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -141,7 +141,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -167,7 +167,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/manual/search.html

@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1"/>
     <meta name="color-scheme" content="light dark"><link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="#" />
 
-    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/><title>Search - Reticulum Network Stack 0.8.1 beta documentation</title><link rel="stylesheet" type="text/css" href="_static/pygments.css" />
+    <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/><title>Search - Reticulum Network Stack 0.8.0 beta documentation</title><link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo-extensions.css?digest=30d1aed668e5c3a91c3e3bf6a60b675221979f0e" />
@@ -138,7 +138,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -164,7 +164,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="#" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/manual/support.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="API Reference" href="reference.html" /><link rel="prev" title="Code Examples" href="examples.html" />
 
     <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/>
-        <title>Support Reticulum - Reticulum Network Stack 0.8.1 beta documentation</title>
+        <title>Support Reticulum - Reticulum Network Stack 0.8.0 beta documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -141,7 +141,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -167,7 +167,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/manual/understanding.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="Communications Hardware" href="hardware.html" /><link rel="prev" title="Using Reticulum on Your System" href="using.html" />
 
     <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/>
-        <title>Understanding Reticulum - Reticulum Network Stack 0.8.1 beta documentation</title>
+        <title>Understanding Reticulum - Reticulum Network Stack 0.8.0 beta documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -141,7 +141,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -167,7 +167,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/manual/using.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="Understanding Reticulum" href="understanding.html" /><link rel="prev" title="Getting Started Fast" href="gettingstartedfast.html" />
 
     <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/>
-        <title>Using Reticulum on Your System - Reticulum Network Stack 0.8.1 beta documentation</title>
+        <title>Using Reticulum on Your System - Reticulum Network Stack 0.8.0 beta documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -141,7 +141,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -167,7 +167,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/manual/whatis.html

@@ -6,7 +6,7 @@
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="next" title="Getting Started Fast" href="gettingstartedfast.html" /><link rel="prev" title="Reticulum Network Stack Manual" href="index.html" />
 
     <meta name="generator" content="sphinx-5.3.0, furo 2022.09.29.dev1"/>
-        <title>What is Reticulum? - Reticulum Network Stack 0.8.1 beta documentation</title>
+        <title>What is Reticulum? - Reticulum Network Stack 0.8.0 beta documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?digest=189ec851f9bb375a2509b67be1f64f0cf212b702" />
     <link rel="stylesheet" type="text/css" href="_static/copybutton.css" />
@@ -141,7 +141,7 @@
       </label>
     </div>
     <div class="header-center">
-      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.1 beta documentation</div></a>
+      <a href="index.html"><div class="brand">Reticulum Network Stack 0.8.0 beta documentation</div></a>
     </div>
     <div class="header-right">
       <div class="theme-toggle-container theme-toggle-header">
@@ -167,7 +167,7 @@
     <img class="sidebar-logo" src="_static/rns_logo_512.png" alt="Logo"/>
   </div>
   
-  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.1 beta documentation</span>
+  <span class="sidebar-brand-text">Reticulum Network Stack 0.8.0 beta documentation</span>
   
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
   <input class="sidebar-search" placeholder="Search" name="q" aria-label="Search">

docs/source/interfaces.rst

@@ -358,23 +358,6 @@ can be used, and offers full control over LoRa parameters.
     # Serial port for the device
     port = /dev/ttyUSB0
 
-    # It is also possible to use BLE devices
-    # instead of wired serial ports. The
-    # target RNode must be paired with the
-    # host device before connecting. BLE
-    # devices can be connected by name,
-    # BLE MAC address or by any available.
-    
-    # Connect to specific device by name
-    # port = ble://RNode 3B87
-
-    # Or by BLE MAC address
-    # port = ble://F4:12:73:29:4E:89
-
-    # Or connect to the first available,
-    # paired device
-    # port = ble://
-
     # Set frequency to 867.2 MHz
     frequency = 867200000