Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions dronecan_gui_tool/panels/serial_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,6 @@ def __init__(self, parent, node):
self.num_tx_bytes = 0
self.node = node
self.tunnel = None
self.target_dev = -1
self.ublox_msg_in = None
self.ublox_msg_out = None

Expand All @@ -348,6 +347,12 @@ def __init__(self, parent, node):
self.baud_select.addItem(str(b))
self.baud_select.currentIndexChanged.connect(self.change_baud)

self.serial_device_select = QComboBox()
self.serial_device_select.addItem("Default", -1)
for index in range(0, 6):
self.serial_device_select.addItem(f"Serial {index}", index)
self.serial_device_select.currentIndexChanged.connect(self.update_target_serial_device)

self.lock_select = QComboBox()
self.lock_select.addItem("UnLocked")
self.lock_select.addItem("Locked")
Expand All @@ -373,6 +378,7 @@ def __init__(self, parent, node):
self.ublox_handling = QCheckBox(self)

layout.addLayout(self.labelWidget('Node', self.node_select))
layout.addLayout(self.labelWidget('Target Serial', self.serial_device_select))
layout.addLayout(self.labelWidget('UART Locking', self.lock_select))
layout.addLayout(self.labelWidget('Baudrate', self.baud_select))
layout.addLayout(self.labelWidget('Listen Port', self.port_select))
Expand Down Expand Up @@ -454,6 +460,12 @@ def change_baud(self):
print("change baudrate to %u" % baud)
self.tunnel.baudrate = baud

def update_target_serial_device(self):
'''callback when uart target serial device changes'''
if self.tunnel:
target_serial_dev = int(self.serial_device_select.currentData())
self.tunnel.target_serial_dev = target_serial_dev

def update_locked(self):
'''callback when locked state changes'''
if self.tunnel:
Expand Down Expand Up @@ -627,7 +639,8 @@ def check_connection(self):
target_node = int(self.node_select.currentText().split(':')[0])

locked = self.lock_select.currentText() == "Locked"
self.tunnel = dronecan.DroneCANSerial(None, target_node, self.target_dev,
target_serial_dev = int(self.serial_device_select.currentData())
self.tunnel = dronecan.DroneCANSerial(None, target_node, target_serial_dev,
node=self.node,
lock_port=locked, baudrate=self.get_baudrate())
print("ucenter connection from %s" % str(self.addr))
Expand Down
Loading