Python SDK Wifi Fixes and Hero 13 Testing (#591)

demos/python/sdk_wireless_camera_control/open_gopro/demos/gui/__init__.py

@@ -6,8 +6,6 @@
 import sys
 
 try:
-    import tkinter
-
     import cv2
     import PIL
 

demos/python/sdk_wireless_camera_control/open_gopro/demos/gui/preview_stream.py

@@ -9,7 +9,7 @@
 from rich.console import Console
 
 from open_gopro import Params, WirelessGoPro
-from open_gopro.demos.gui.components.util import display_video_blocking
+from open_gopro.demos.gui.util import display_video_blocking
 from open_gopro.logger import setup_logging
 from open_gopro.util import add_cli_args_and_parse
 

demos/python/sdk_wireless_camera_control/open_gopro/demos/gui/webcam.py

@@ -12,7 +12,7 @@
 
 from open_gopro import Params, WiredGoPro, WirelessGoPro
 from open_gopro.constants import WebcamError, WebcamStatus
-from open_gopro.demos.gui.components.util import display_video_blocking
+from open_gopro.demos.gui.util import display_video_blocking
 from open_gopro.gopro_base import GoProBase
 from open_gopro.logger import setup_logging
 from open_gopro.util import add_cli_args_and_parse

demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py

@@ -712,23 +712,11 @@ def connect(self, ssid: str, password: str, timeout: float = 15) -> bool:
         discovered = False
         while not discovered and (time.time() - start) <= timeout:
             # Scan for network
-            # Surprisingly, yes this is the industry standard location for this and no, there's no shortcut for it
-            response = cmd(
-                r"/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport --scan"
-            )
-            # TODO Sometimes the response is blank?
-            if not response:
-                logger.warning("MacOS did not return a response to SSID scanning.")
-                continue
-            lines = response.splitlines()
-            ssid_end_index = lines[0].index("SSID") + 4  # Find where the SSID column ends
-
-            for result in lines[1:]:  # Skip title row
-                current_ssid = result[:ssid_end_index].strip()
-                if current_ssid == ssid.strip():
-                    discovered = True
-                    break
-            if discovered:
+            response = cmd(r"/usr/sbin/system_profiler SPAirPortDataType")
+            regex = re.compile(
+                r"\n\s+([\x20-\x7E]{1,32}):\n\s+PHY Mode:"
+            )  # 0x20...0x7E --> ASCII for printable characters
+            if ssid in sorted(regex.findall(response)):
                 break
             time.sleep(1)
         else: