diff --git a/.idea/runConfigurations/OBSW_UdpClient_Service_3.xml b/.idea/runConfigurations/OBSW_UdpClient_Service_3.xml index 882fdef586dadd82ecdb46637455a4ec16036bca..22cb0b2ae3740b2a98ba12ecee6738a0646c765f 100644 --- a/.idea/runConfigurations/OBSW_UdpClient_Service_3.xml +++ b/.idea/runConfigurations/OBSW_UdpClient_Service_3.xml @@ -12,8 +12,8 @@ <option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" /> - <option name="SCRIPT_NAME" value="C:\Users\Robin\NoSyncDokumente\sourceobsw\tmtc\OBSW_TmTcClient.py" /> - <option name="PARAMETERS" value="-m 3 -s 3 -p" /> + <option name="SCRIPT_NAME" value="$PROJECT_DIR$/OBSW_TmTcClient.py" /> + <option name="PARAMETERS" value="-m 3 -s 3 -p --hk" /> <option name="SHOW_COMMAND_LINE" value="false" /> <option name="EMULATE_TERMINAL" value="true" /> <option name="MODULE_MODE" value="false" /> diff --git a/OBSW_TmTcClient.py b/OBSW_TmTcClient.py index 0cbaa95e51976d5bfb748edb7257610655610789..ed17d8d3925a11dc1fced865d386c0f1a028c1ba 100644 --- a/OBSW_TmTcClient.py +++ b/OBSW_TmTcClient.py @@ -62,7 +62,7 @@ from test import OBSW_UnitTest from config import OBSW_Config as g from config.OBSW_Config import setGlobals from tc.OBSW_TcPacker import PUSTelecommand, createTotalTcQueue, serviceTestSelect -from sendreceive.OBSW_CommandSenderReceiver import CommandSenderReceiver +from sendreceive.OBSW_CommandSenderReceiver import CommandSenderReceiver, connectToBoard from sendreceive.OBSW_SingleCommandSenderReceiver import SingleCommandSenderReceiver from sendreceive.OBSW_SequentialSenderReceiver import SequentialCommandSenderReceiver from utility.OBSW_ArgParser import parseInputArguments @@ -143,6 +143,7 @@ def setUpSocket(): def setCommunicationInterface(tmtcPrinter): if g.comIF == 0: setUpSocket() + connectToBoard() communicationInterface = EthernetComIF(tmtcPrinter, g.tmTimeout, g.tcSendTimeoutFactor, g.sockSend, g.sockReceive, g.sendAddress) else: diff --git a/tm/OBSW_TmService3.py b/tm/OBSW_TmService3.py index a3c9073ffb312ef0637bbd9de39cc3e848a27eb9..4a693cdb99ffe2eae1a23f824854f1cec1d7f7ab 100644 --- a/tm/OBSW_TmService3.py +++ b/tm/OBSW_TmService3.py @@ -58,11 +58,11 @@ class Service3TM(PUSTelemetry): self.hkContent.append(self.testUint8) self.testUint16 = (self.byteArrayData[6] << 8) | self.byteArrayData[7] self.hkContent.append(self.testUint16) - self.testUint32 = struct.unpack('>I', self.byteArrayData[7:11])[0] + self.testUint32 = struct.unpack('>I', self.byteArrayData[8:12])[0] self.hkContent.append(self.testUint32) - self.floatVector1 = struct.unpack('>f', self.byteArrayData[11:15])[0] + self.floatVector1 = struct.unpack('>f', self.byteArrayData[12:16])[0] self.hkContent.append(self.floatVector1) - self.floatVector2 = struct.unpack('>f', self.byteArrayData[15:19])[0] + self.floatVector2 = struct.unpack('>f', self.byteArrayData[16:20])[0] self.hkContent.append(self.floatVector2) def printTelemetryHeader(self, array): diff --git a/utility/OBSW_ArgParser.py b/utility/OBSW_ArgParser.py index 5cbf976746c4e06c187b88e7e4c154ce5b072dd6..60ce182dacb43ff88b95d35832b20a72c23a6aa8 100644 --- a/utility/OBSW_ArgParser.py +++ b/utility/OBSW_ArgParser.py @@ -44,7 +44,7 @@ def parseInputArguments(): def assignEmptyArgs(args): - if len(sys.argv) > 1 : + if len(sys.argv) > 1: handleUnspecifiedArgs(args) if len(sys.argv) == 1: handleEmptyArgs(args) diff --git a/utility/OBSW_TmTcPrinter.py b/utility/OBSW_TmTcPrinter.py index 297c6c97d04a41fc8e0d1d1860c4c884c3dcd581..90132b8048bacf0e4c1ca615dca4f43ace2abec3 100644 --- a/utility/OBSW_TmTcPrinter.py +++ b/utility/OBSW_TmTcPrinter.py @@ -28,7 +28,7 @@ class TmtcPrinter: self.handleLongPrint(packet) self.handleWiretappingPacket(packet) self.handleDataReplyPacket(packet) - if packet.getService == 3 and (packet.getSubservice == 25 or packet.getSubservice == 26): + if packet.getService() == 3 and (packet.getSubservice() == 25 or packet.getSubservice() == 26): self.handleHkPrint(packet) if g.printRawTmData: self.printBuffer = "TM Data:" + "\n" + self.returnDataString(packet.data)