From 593a71ec7334f903d1668de4f1d0d689ab6e1b75 Mon Sep 17 00:00:00 2001 From: hornet Date: Sun, 9 Oct 2022 20:54:48 -0400 Subject: [PATCH] Droid discovery extracted to function. --- droid.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/droid.py b/droid.py index 57b8c6a..7e47f79 100644 --- a/droid.py +++ b/droid.py @@ -102,21 +102,34 @@ def findDroid(candidate, data): else: return False -async def main(): +async def discoverDroid(retry=False): myDroid = None - while myDroid is None or myDroid == "None": + while retry and myDroid is None: try: myDroid = await BleakScanner.find_device_by_filter(findDroid) if myDroid is None: - print("Droid discovery timed out. Retrying...") + if not retry: + print("Droid discovery timed out.") + return + else: + print("Droid discovery timed out. Retrying...") + continue except BleakError as err: print("Droid discovery failed. Retrying...") continue - print (f"Astromech successfully discovered: [ {myDroid} ]") + print (f"Astromech successfully discovered: [ {myDroid} ]") + d = Droid(myDroid) + return d + + + +async def main(): + + d = await discoverDroid() try: await d.connect()