Merge branch 'ble-logging' into pr-powermon

# Conflicts:
#	poetry.lock
#	pyproject.toml

Author: geeksville

.vscode/launch.json

@@ -10,7 +10,15 @@
       "request": "launch",
       "module": "meshtastic",
       "justMyCode": false,
-      "args": ["--debug", "--ble", "24:62:AB:DD:DF:3A"]
+      "args": ["--ble", "--ble-dest", "Meshtastic_9f6e"]
+    },
+     {
+      "name": "meshtastic BLE scan",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": false,
+      "args": ["--debug", "--ble-scan"]
     },
     {
       "name": "meshtastic admin",
@@ -76,6 +84,14 @@
       "justMyCode": true,
       "args": ["--debug", "--info"]
     },
+    {
+      "name": "meshtastic debug BLE",
+      "type": "python",
+      "request": "launch",
+      "module": "meshtastic",
+      "justMyCode": true,
+      "args": ["--debug", "--ble", "--info"]
+    },
     {
       "name": "meshtastic debug set region",
       "type": "debugpy",

meshtastic/__main__.py

@@ -1085,16 +1085,11 @@ def common():
             subscribe()
             if args.ble_scan:
                 logging.debug("BLE scan starting")
-                client = BLEInterface(None, debugOut=logfile, noProto=args.noproto)
-                try:
-                    for x in client.scan():
-                        print(f"Found: name='{x[1].local_name}' address='{x[0].address}'")
-                finally:
-                    client.close()
+                for x in BLEInterface.scan():
+                    print(f"Found: name='{x.name}' address='{x.address}'")
                 meshtastic.util.our_exit("BLE scan finished", 0)
-                return
             elif args.ble:
-                client = BLEInterface(args.ble, debugOut=logfile, noProto=args.noproto, noNodes=args.no_nodes)
+                client = BLEInterface(args.ble_dest, debugOut=logfile, noProto=args.noproto, noNodes=args.no_nodes)
             elif args.host:
                 try:
                     client = meshtastic.tcp_interface.TCPInterface(
@@ -1165,6 +1160,12 @@ def addConnectionArgs(parser: argparse.ArgumentParser) -> argparse.ArgumentParse
     group.add_argument(
         "--ble",
         help="The BLE device address or name to connect to",
+        action="store_true",
+    )
+
+    outer.add_argument(
+        "--ble-dest",
+        help="The BLE device address or name to connect to",
         default=None,
     )