Skip to content

Commit 85aee10

Browse files
authored
Merge pull request #50 from ke5gdb/pyqt6
Fix PSTRotator command and Horus V1 packet handling
2 parents e576f83 + 1df7e2d commit 85aee10

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

horusgui/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.4.0"
1+
__version__ = "0.4.1"

horusgui/gui.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,8 @@ def handle_new_packet(self, frame):
12391239
else:
12401240
self.widgets["latestTelemTemperatureValue"].setText("---")
12411241

1242-
if len(_decoded['custom_field_names']) > 0:
1242+
# Handle custom data from Horus V2 packets
1243+
if 'custom_field_names' in _decoded and len(_decoded['custom_field_names']) > 0:
12431244
column = 0
12441245
for field in _decoded['custom_field_names']:
12451246
field_nice = field.replace('_', ' ').title()
@@ -1255,9 +1256,16 @@ def handle_new_packet(self, frame):
12551256
# Hide remaining columns
12561257
if column < 8:
12571258
for i in range(column, 9):
1258-
self.widgets[f"latestTelem{column}Label"].hide()
1259-
self.widgets[f"latestTelem{column}Value"].hide()
1259+
self.widgets[f"latestTelem{i}Label"].hide()
1260+
self.widgets[f"latestTelem{i}Value"].hide()
12601261
self.w5_telemetry.setColumnStretch((i + 3), 1)
1262+
1263+
# Else hide unused (Horus V1) columns
1264+
else:
1265+
for i in range(0, 9):
1266+
self.widgets[f"latestTelem{i}Label"].hide()
1267+
self.widgets[f"latestTelem{i}Value"].hide()
1268+
self.w5_telemetry.setColumnStretch((i + 3), 1)
12611269

12621270
# Attempt to update the range/elevation/bearing fields.
12631271
try:
@@ -1561,12 +1569,12 @@ def startstop_rotator(self):
15611569

15621570
# Create worker thread for commanding rotator
15631571
worker = Worker(self.rotator.azel_rx_loop)
1564-
worker.signals.info.connect(self.info_callback)
1572+
#worker.signals.info.connect(self.info_callback)
15651573
self.threadpool.start(worker)
15661574

15671575
# Create worker thread for receiving info from rotator
15681576
worker = Worker(self.rotator.azel_poll_loop)
1569-
worker.signals.info.connect(self.info_callback)
1577+
#worker.signals.info.connect(self.info_callback)
15701578
self.threadpool.start(worker)
15711579
else:
15721580
return

0 commit comments

Comments
 (0)