Skip to content

Pr improve macos setup window #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Huibean merged 2 commits into from
Jun 13, 2025
Merged

Pr improve macos setup window #89

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb4c3cf
add serial port filter to avoid display system tty port
Huibean May 4, 2025
d0c64a4
fix macos try to run linux ifconfig api causing looping error
Huibean May 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions dronecan_gui_tool/setup_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

RUNNING_ON_LINUX = 'linux' in sys.platform.lower()


MACOS_SERIAL_PORTS_FILTER = ['/dev/tty.debug-console', '/dev/tty.wlan-debug', '/dev/tty.Bluetooth-Incoming-Port']
logger = getLogger(__name__)


Expand Down Expand Up @@ -100,7 +100,8 @@ def list_ifaces():
for port in QtSerialPort.QSerialPortInfo.availablePorts():
if sys.platform == 'darwin':
if 'tty' in port.systemLocation():
out[port.systemLocation()] = port.systemLocation()
if port.systemLocation() not in MACOS_SERIAL_PORTS_FILTER:
out[port.systemLocation()] = port.systemLocation()
else:
sys_name = port.systemLocation()
sys_alpha = re.sub(r'[^a-zA-Z0-9]', '', sys_name)
Expand All @@ -114,10 +115,11 @@ def list_ifaces():
out[x] = x

try:
from can import detect_available_configs
for interface in detect_available_configs():
if interface['interface'] == "pcan":
out[interface['channel']] = interface['channel']
if sys.platform != 'darwin':
from can import detect_available_configs
for interface in detect_available_configs():
if interface['interface'] == "pcan":
out[interface['channel']] = interface['channel']
except Exception as ex:
logger.warning('Could not load can interfaces: %s', ex, exc_info=True)

Expand Down