Refactor BT startup methods

Author: Jakeler

ble_serial/bluetooth/ble_interface.py

@@ -6,9 +6,10 @@
 from typing import Optional
 
 class BLE_interface():
-    async def start(self, addr_str, addr_type, adapter, timeout, write_uuid, read_uuid, mode):
+    def __init__(self):
         self._send_queue = asyncio.Queue()
 
+    async def connect(self, addr_str: str, addr_type: str, adapter: str, timeout: float):
         # address_type used only in Windows .NET currently
         self.dev = BleakClient(addr_str, adapter=adapter, address_type=addr_type, timeout=timeout)
         self.dev.set_disconnected_callback(self.handle_disconnect)
@@ -17,6 +18,7 @@ async def start(self, addr_str, addr_type, adapter, timeout, write_uuid, read_uu
         await self.dev.connect()
         logging.info(f'Device {self.dev.address} connected')
 
+    async def setup_chars(self, write_uuid: str, read_uuid: str, mode: str):
         self.read_enabled = 'r' in mode
         self.write_enabled = 'w' in mode
 

ble_serial/main.py

@@ -65,8 +65,8 @@ async def _run(self):
                 self.uart.set_receiver(self.bt.queue_send)
 
             self.uart.start()
-            await self.bt.start(args.device, args.addr_type, args.adapter, args.timeout,
-                args.write_uuid, args.read_uuid, args.mode)
+            await self.bt.connect(args.device, args.addr_type, args.adapter, args.timeout)
+            await self.bt.setup_chars(args.write_uuid, args.read_uuid, args.mode)
             logging.info('Running main loop!')
             self.main_loop = asyncio.gather(self.bt.send_loop(), self.uart.run_loop())
             await self.main_loop