From a668e06c3eea721ee7e32f586f9beb506c51e514 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Sat, 4 Jan 2020 16:39:16 +0100
Subject: [PATCH] Service 1 Error Param handling

---
 tm/OBSW_TmPacket.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tm/OBSW_TmPacket.py b/tm/OBSW_TmPacket.py
index e4f02de..eb4bb1d 100644
--- a/tm/OBSW_TmPacket.py
+++ b/tm/OBSW_TmPacket.py
@@ -53,8 +53,13 @@ class Service1TM(PUSTelemetry):
                 self.appendPacketInfo(" : Step Failure")
                 self.stepNumber = struct.unpack('>B', self.byteArrayData[4:5])[0]
                 self.ErrCode = struct.unpack('>H', self.byteArrayData[5:7])[0]
+                self.errorParam1 = struct.unpack('>I', self.byteArrayData[7:11])[0]
+                self.errorParam2 = struct.unpack('>I', self.byteArrayData[11:15])[0]
             else:
                 self.ErrCode = struct.unpack('>H', self.byteArrayData[4:6])[0]
+                self.errorParam1 = struct.unpack('>I', self.byteArrayData[6:10])[0]
+                self.errorParam2 = struct.unpack('>I', self.byteArrayData[10:14])[0]
+
         elif self.dataFieldHeader.subtype == 5:
             self.isStep = True
             self.appendPacketInfo(" : Step Success")
@@ -68,6 +73,8 @@ class Service1TM(PUSTelemetry):
             if self.isStep:
                 array.append(str(self.stepNumber))
             array.append(str(hex(self.ErrCode)))
+            array.append(str(hex(self.errorParam1)))
+            array.append(str(hex(self.errorParam2)))
         elif self.isStep:
             array.append(str(self.stepNumber))
             
@@ -78,7 +85,9 @@ class Service1TM(PUSTelemetry):
         if self.tcErrorCode:
             if self.isStep:
                 array.append("Step Number")
-            array.append("Err. Code")
+            array.append("Return Value")
+            array.append("Error Param 1")
+            array.append("Error Param 2")
         elif self.isStep:
             array.append("Step Number")
 
-- 
GitLab