From 3cb5f66dd3221f6da493142b18b7d22a293ffae9 Mon Sep 17 00:00:00 2001
From: "Jan.Gerhards" <jan@gerhards.net>
Date: Sun, 5 Jul 2020 12:35:50 +0200
Subject: [PATCH] continue implementing test for pus service 20

---
 tc/obsw_pus_tc_packer.py |  3 +++
 tc/obsw_tc_service20.py  | 24 +++++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/tc/obsw_pus_tc_packer.py b/tc/obsw_pus_tc_packer.py
index af18555..4e73036 100644
--- a/tc/obsw_pus_tc_packer.py
+++ b/tc/obsw_pus_tc_packer.py
@@ -14,6 +14,7 @@ from tc.obsw_tc_service2 import pack_service2_test_into
 from tc.obsw_tc_service3 import pack_service3_test_into
 from tc.obsw_tc_service8 import pack_service8_test_into
 from tc.obsw_tc_service9 import pack_service9_test_into
+from tc.obsw_tc_service20 import pack_service20_test_into
 from tc.obsw_tc_service200 import pack_mode_data, pack_service200_test_into
 from tc.obsw_tc_service5_17 import pack_service5_test_into, pack_service17_test_into
 from tc.obsw_tc_gps import pack_gps_test_into
@@ -38,6 +39,8 @@ def pack_service_queue(service: Union[int, str], service_queue: TcQueueT):
         return pack_service9_test_into(service_queue)
     if service == 17:
         return pack_service17_test_into(service_queue)
+    if service == 20:
+        return pack_service20_test_into(service_queue)
     if service == 200:
         return pack_service200_test_into(service_queue)
     if service == "Dummy":
diff --git a/tc/obsw_tc_service20.py b/tc/obsw_tc_service20.py
index 924acd7..2d87569 100644
--- a/tc/obsw_tc_service20.py
+++ b/tc/obsw_tc_service20.py
@@ -5,6 +5,7 @@
 @author J. Gerhards
 @date   30.06.2020
 """
+import struct
 from typing import Deque
 
 import config.obsw_config as g
@@ -56,18 +57,25 @@ def pack_service20_test_into(tc_queue: Deque, called_externally: bool = False) -
 
     #test checking Load for uint32_t
     tc_queue.appendleft(("print", "Testing Service 20: Load uint32_t"))
-    parameter = struct.pack(">I", parameterID0)
+    parameter_id = struct.pack(">I", parameterID0)
     parameter_data = struct.pack(">I", 42)
-    payload = parameter+parameter_data
+    payload = object_id + parameter_id + parameter_data
     command = PusTelecommand(service=20, subservice=128, ssc=2001, app_data=payload)
     tc_queue.appendleft(command.pack_command_tuple())
 
     #test checking Dump for uint32_t
     tc_queue.appendleft(("print", "Testing Service 20: Dump uint32_t"))
-    parameter = struct.pack(">I", parameterID0)
-    command = PusTelecommand(service=20, subservice=129, ssc=2001, app_data=parameter)
+    parameter_id = struct.pack(">I", parameterID0)
+    payload = object_id + parameter_id
+    command = PusTelecommand(service=20, subservice=129, ssc=2001, app_data=payload)
     tc_queue.appendleft(command.pack_command_tuple())
 
+    if called_externally is False:
+        tc_queue.appendleft(("export", "log/tmtc_log_service20.txt"))
+    return tc_queue
+
+
+"""
     #test checking Load for int32_t
     tc_queue.appendleft(("print", "Testing Service 20: Load int32_t"))
     mode_data = pack_mode_data(object_id, 2, 0)
@@ -91,14 +99,12 @@ def pack_service20_test_into(tc_queue: Deque, called_externally: bool = False) -
     mode_data = pack_mode_data(object_id, 2, 0)
     command = PusTelecommand(service=20, subservice=129, ssc=2006, app_data=mode_data)
     tc_queue.appendleft(command.pack_command_tuple())
-
-    if called_externally is False:
-        tc_queue.appendleft(("export", "log/tmtc_log_service8.txt"))
-    return tc_queue
+"""
 
 
 
 
+"""
     # set mode on
     tc_queue.appendleft(("print", "Testing Service 8: Set On Mode"))
     mode_data = pack_mode_data(object_id, 1, 0)
@@ -140,4 +146,4 @@ def pack_service20_test_into(tc_queue: Deque, called_externally: bool = False) -
     command = PusTelecommand(service=200, subservice=1, ssc=800, app_data=mode_data)
     tc_queue.appendleft(command.pack_command_tuple())
     tc_queue.appendleft(("wait", 2))
-
+"""
-- 
GitLab