From 9076cf3d76fea69710d3e1843e2f5bdc8ad426af Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Fri, 8 Jan 2021 18:54:41 -0500 Subject: [PATCH] Fix #147, Pad GUI headers to 64 bit boundary --- GroundSystem.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/GroundSystem.py b/GroundSystem.py index f72a52a..257a01e 100644 --- a/GroundSystem.py +++ b/GroundSystem.py @@ -44,8 +44,12 @@ # CFS Ground System: Setup and manage the main window # class GroundSystem(QMainWindow, Ui_MainWindow): - HDR_VER_1_OFFSET = 0 - HDR_VER_2_OFFSET = 4 + TLM_HDR_V1_OFFSET = 4 + TLM_HDR_V2_OFFSET = 4 + CMD_HDR_PRI_V1_OFFSET = 0 + CMD_HDR_SEC_V1_OFFSET = 0 + CMD_HDR_PRI_V2_OFFSET = 4 + CMD_HDR_SEC_V2_OFFSET = 4 # # Init the class @@ -57,10 +61,16 @@ def __init__(self): self.RoutingService = None self.alert = QMessageBox() + # set initial defaults + self.sbTlmOffset.setValue(self.TLM_HDR_V1_OFFSET) + self.sbCmdOffsetPri.setValue(self.CMD_HDR_PRI_V1_OFFSET) + self.sbCmdOffsetSec.setValue(self.CMD_HDR_SEC_V1_OFFSET) + self.pushButtonStartTlm.clicked.connect(self.startTlmSystem) self.pushButtonStartCmd.clicked.connect(self.startCmdSystem) self.cbTlmHeaderVer.currentIndexChanged.connect(self.setTlmOffset) self.cbCmdHeaderVer.currentIndexChanged.connect(self.setCmdOffsets) + for sb in (self.sbTlmOffset, self.sbCmdOffsetPri, self.sbCmdOffsetSec): sb.valueChanged.connect(self.saveOffsets) # Init lists @@ -132,9 +142,9 @@ def setTlmOffset(self): else: self.sbTlmOffset.setEnabled(False) if selectedVer == "1": - self.sbTlmOffset.setValue(self.HDR_VER_1_OFFSET) + self.sbTlmOffset.setValue(self.TLM_HDR_V1_OFFSET) elif selectedVer == "2": - self.sbTlmOffset.setValue(self.HDR_VER_2_OFFSET) + self.sbTlmOffset.setValue(self.TLM_HDR_V2_OFFSET) def setCmdOffsets(self): selectedVer = self.cbCmdHeaderVer.currentText().strip() @@ -145,10 +155,11 @@ def setCmdOffsets(self): self.sbCmdOffsetPri.setEnabled(False) self.sbCmdOffsetSec.setEnabled(False) if selectedVer == "1": - self.sbCmdOffsetPri.setValue(self.HDR_VER_1_OFFSET) + self.sbCmdOffsetPri.setValue(self.CMD_HDR_PRI_V1_OFFSET) + self.sbCmdOffsetSec.setValue(self.CMD_HDR_SEC_V1_OFFSET) elif selectedVer == "2": - self.sbCmdOffsetPri.setValue(self.HDR_VER_2_OFFSET) - self.sbCmdOffsetSec.setValue(self.HDR_VER_1_OFFSET) + self.sbCmdOffsetPri.setValue(self.CMD_HDR_PRI_V2_OFFSET) + self.sbCmdOffsetSec.setValue(self.CMD_HDR_SEC_V2_OFFSET) def saveOffsets(self): offsets = bytes((self.sbTlmOffset.value(), self.sbCmdOffsetPri.value(),