Service 3 rcv bugfixes

.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" />

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:

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):

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)

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)