allow adapter selection

python-test/flow.py

@@ -78,8 +78,8 @@ def flow(client):
     set_state(client, (False, False)) # turn off heater and pump
 
 if __name__ == "__main__":
-    def main(address):
-        client = ble_conn(address)
+    def main(address, adapter):
+        client = ble_conn(address, adapter)
 
         try:
             if get_unit_is_fahrenheit(client):
@@ -99,7 +99,11 @@ if __name__ == "__main__":
         print("Disconnecting")
         client.disconnect()
 
-    arg = None
+    adapter = None
+    mac = None
     if len(sys.argv) > 1:
-        arg = sys.argv[1]
-    main(arg)
+        adapter = int(sys.argv[1])
+    if len(sys.argv) > 2:
+        mac = sys.argv[2]
+
+    main(mac, adapter)

python-test/poll.py

@@ -7,11 +7,12 @@ import time
 serviceUuidVolcano3 = "10100000-5354-4f52-5a26-4249434b454c"
 serviceUuidVolcano4 = "10110000-5354-4f52-5a26-4249434b454c"
 
-def ble_conn(address):
-    dev = ble_scan(address)
+def ble_conn(address, adapter):
+    dev = ble_scan(address, adapter)
 
     if dev != None:
-        print("Connecting to {}...".format(address))
+        address = dev.address()
+        print("Connecting to '{}'...".format(address))
         dev.connect()
 
     return dev
@@ -78,8 +79,8 @@ if __name__ == "__main__":
         else:
             print("Pump is Off")
 
-    def test(address):
-        device = ble_conn(address)
+    def test(address, adapter):
+        device = ble_conn(address, adapter)
         if device == None:
             return
 
@@ -103,8 +104,11 @@ if __name__ == "__main__":
 
     import sys
 
-    arg = None
+    adapter = None
+    mac = None
     if len(sys.argv) > 1:
-        arg = sys.argv[1]
+        adapter = int(sys.argv[1])
+    if len(sys.argv) > 2:
+        mac = sys.argv[2]
 
-    test(arg)
+    test(mac, adapter)

python-test/scan.py

@@ -1,19 +1,18 @@
 import simplepyble
 
-def ble_scan(addr):
+def ble_scan(addr = None, adapterIndex = 0, timeout = 1):
     adapters = simplepyble.Adapter.get_adapters()
 
     if len(adapters) == 0:
         print("No adapters found")
         return None
 
-    # TODO allow selection of bluetooth adapter
-    adapter = adapters[0]
+    adapter = adapters[adapterIndex]
     print("Selected adapter: {} [{}]".format(adapter.identifier(), adapter.address()))
 
-    # TODO support longer scans?
-    print("Scanning for '{}' for 1s...".format(addr))
-    adapter.scan_for(1000)
+    # TODO abort scan when found?
+    print("Scanning for '{}' for {}s...".format(addr, timeout))
+    adapter.scan_for(timeout * 1000)
 
     peripherals = adapter.scan_get_results()
     for peripheral in peripherals:
@@ -30,10 +29,13 @@ def ble_scan(addr):
 if __name__ == "__main__":
     import sys
 
-    arg = None
+    adapter = None
+    mac = None
     if len(sys.argv) > 1:
-        arg = sys.argv[1]
+        adapter = int(sys.argv[1])
+    if len(sys.argv) > 2:
+        mac = sys.argv[2]
 
-    dev = ble_scan(arg)
+    dev = ble_scan(mac, adapter)
     if dev != None:
         print("{} {}".format(dev.identifier(), dev.address()))