From aa6d93562b9e44edabf21e8b57f72ca2769cc333 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Thu, 30 Apr 2020 21:40:39 +0200
Subject: [PATCH] print and rawprint options

---
 sendreceive/obsw_command_sender_receiver.py |  7 ++++---
 tc/obsw_tc_service3.py                      | 22 ++++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/sendreceive/obsw_command_sender_receiver.py b/sendreceive/obsw_command_sender_receiver.py
index 36b96aa..21ad35b 100644
--- a/sendreceive/obsw_command_sender_receiver.py
+++ b/sendreceive/obsw_command_sender_receiver.py
@@ -117,13 +117,14 @@ class CommandSenderReceiver:
             wait_time = queue_entry_second
             self._tm_timeout = self._tm_timeout + wait_time
             time.sleep(wait_time)
+        # printout optimized for logger and debugging
         elif queue_entry_first == "print":
-            print_string = queue_entry_second
-            self._tmtc_printer.print_string(print_string, False)
-        elif queue_entry_first == "lprint":
             print_string = queue_entry_second
             print()
             self._tmtc_printer.print_string(print_string, True)
+        elif queue_entry_first == "rawprint":
+            print_string = queue_entry_second
+            self._tmtc_printer.print_string(print_string, False)
         elif queue_entry_first == "export":
             export_name = queue_entry_second
             self._tmtc_printer.add_print_buffer_to_buffer_list()
diff --git a/tc/obsw_tc_service3.py b/tc/obsw_tc_service3.py
index d5913c8..2dbb3f0 100644
--- a/tc/obsw_tc_service3.py
+++ b/tc/obsw_tc_service3.py
@@ -83,57 +83,57 @@ def pack_predefined_tests(tc_queue: Deque):
 
 def pack_custom_tests(tc_queue: Deque):
     # deleting pre-defined test entry
-    tc_queue.appendleft(("lprint", "Testing Service 3: Deleting pre-defined HK definition"))
+    tc_queue.appendleft(("print", "Testing Service 3: Deleting pre-defined HK definition"))
     command = PusTelecommand(service=3, subservice=3, ssc=3100, app_data=sid_test)
     tc_queue.appendleft(command.pack_command_tuple())
 
     # adding pre-defined definition to hk using test pool variables
-    tc_queue.appendleft(("lprint", "Testing Service 3: Adding pre-defined HK definition"))
+    tc_queue.appendleft(("print", "Testing Service 3: Adding pre-defined HK definition"))
     command = PusTelecommand(service=3, subservice=1, ssc=3110, app_data=hk_definition)
     tc_queue.appendleft(command.pack_command_tuple())
 
     # adding custom definition to diagnostics using test pool variables
-    tc_queue.appendleft(("lprint", "Testing Service 3: Adding custom diganostics definition"))
+    tc_queue.appendleft(("print", "Testing Service 3: Adding custom diganostics definition"))
     command = PusTelecommand(service=3, subservice=2, ssc=3120, app_data=diag_definition)
     tc_queue.appendleft(command.pack_command_tuple())
 
     # enable custom hk definition
-    tc_queue.appendleft(("lprint", "Testing Service 3: Enable custom definition"))
+    tc_queue.appendleft(("print", "Testing Service 3: Enable custom definition"))
     command = PusTelecommand(service=3, subservice=5, ssc=3130, app_data=hk_definition)
     tc_queue.appendleft(command.pack_command_tuple())
 
     # enable custom diag definition
-    tc_queue.appendleft(("lprint", "Testing Service 3: Enable custom diagnostics definition"))
+    tc_queue.appendleft(("print", "Testing Service 3: Enable custom diagnostics definition"))
     command = PusTelecommand(service=3, subservice=7, ssc=3140, app_data=diag_definition)
     tc_queue.appendleft(command.pack_command_tuple())
 
     # Disable custom diag definition
-    tc_queue.appendleft(("lprint", "Testing Service 3: Disable custom diagnostics definition"))
+    tc_queue.appendleft(("print", "Testing Service 3: Disable custom diagnostics definition"))
     command = PusTelecommand(service=3, subservice=8, ssc=3160, app_data=sid_custom)
     tc_queue.appendleft(command.pack_command_tuple())
 
     # Disable custom hk definition
-    tc_queue.appendleft(("lprint", "Testing Service 3: Disable custom definition"))
+    tc_queue.appendleft(("print", "Testing Service 3: Disable custom definition"))
     command = PusTelecommand(service=3, subservice=6, ssc=3150, app_data=sid_test)
     tc_queue.appendleft(command.pack_command_tuple())
 
     # report custom test definition
-    tc_queue.appendleft(("lprint", "Testing Service 3: Reporting hk definition"))
+    tc_queue.appendleft(("print", "Testing Service 3: Reporting hk definition"))
     command = PusTelecommand(service=3, subservice=9, ssc=3170, app_data=sid_test)
     tc_queue.appendleft(command.pack_command_tuple())
 
     # report custom Diag definition
-    tc_queue.appendleft(("lprint", "Testing Service 3: Reporting diag definition"))
+    tc_queue.appendleft(("print", "Testing Service 3: Reporting diag definition"))
     command = PusTelecommand(service=3, subservice=11, ssc=3180, app_data=sid_custom)
     tc_queue.appendleft(command.pack_command_tuple())
 
     # generate one custom hk definition
-    tc_queue.appendleft(("lprint", "Testing Service 3: Generate one custom hk definition"))
+    tc_queue.appendleft(("print", "Testing Service 3: Generate one custom hk definition"))
     command = PusTelecommand(service=3, subservice=27, ssc=3190, app_data=sid_test)
     tc_queue.appendleft(command.pack_command_tuple())
 
     # generate one custom diag definition
-    tc_queue.appendleft(("lprint", "Testing Service 3: Generate one custom diagnostics definition"))
+    tc_queue.appendleft(("print", "Testing Service 3: Generate one custom diagnostics definition"))
     command = PusTelecommand(service=3, subservice=28, ssc=3200, app_data=sid_custom)
     tc_queue.appendleft(command.pack_command_tuple())
 
-- 
GitLab