diff --git a/tm/OBSW_PusPacket.py b/tm/OBSW_PusPacket.py index d664adc5894f9678a3def40221bbc053d61c993b..55d2fe3e6e667ea742b31e9b4c602b277148d67e 100644 --- a/tm/OBSW_PusPacket.py +++ b/tm/OBSW_PusPacket.py @@ -134,6 +134,14 @@ class OBSWPusPacket: def getSSC(self): return self.PUSHeader.sourceSequenceCount + def printData(self): + strToPrint = "[" + for byte in self.data: + strToPrint += str(hex(byte)) + " , " + strToPrint = strToPrint.rstrip(' , ') + strToPrint += ']' + return strToPrint + # Structure of a PUS Packet : # A PUS packet consists of consecutive bits, the allocation and structure is standardised. # Extended information can be found in ECSS-E-70-41A on p.42 diff --git a/tm/OBSW_TmPacket.py b/tm/OBSW_TmPacket.py index 2e86c0740eff0bf458da5a900f37b9e093a516af..b7dbb395fb3fc7dba075b75e0f9b04b0bc96de94 100644 --- a/tm/OBSW_TmPacket.py +++ b/tm/OBSW_TmPacket.py @@ -133,13 +133,22 @@ class Service2TM(PUSTelemetry): class Service3TM(PUSTelemetry): def __init__(self, byteArray): super().__init__(byteArray) + self.sid = struct.unpack('>I', self.byteArrayData[0:4])[0] + if self.getSubservice() == 25: + self.paramLength = len(self.byteArrayData) - 4 + if self.sid == 0x1f00: + pass def printTelemetryHeader(self, array): super().printTelemetryHeader(array) + array.append(hex(self.sid)) + array.append(int(self.paramLength)) return def printTelemetryColumnHeaders(self, array): super().printTelemetryColumnHeaders(array) + array.append("SID") + array.append("Number of Parameters") return diff --git a/utility/OBSW_TmTcPrinter.py b/utility/OBSW_TmTcPrinter.py index 919ff6fac994ad5bfa2d12226a82e0b836264a11..0b97240aba0994943a5a71ab36e00e2c15f811cf 100644 --- a/utility/OBSW_TmTcPrinter.py +++ b/utility/OBSW_TmTcPrinter.py @@ -13,7 +13,7 @@ import OBSW_Config as g # TODO: Print everything in a file class TmtcPrinter: - def __init__(self, displayMode, doPrintToFile, printTc): + def __init__(self, displayMode="long", doPrintToFile=False, printTc=True): self.printBuffer = "" # global print buffer which will be useful to print something to file self.fileBuffer = ""