From 3dd2efeae9ec3997c8d10f8af4f7b29e60bf2a8d Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Fri, 9 Oct 2020 18:26:27 +0200
Subject: [PATCH] srv17 fixes
---
.../tmtcclient_Disable_Periodic_Print_.xml | 2 +-
.../tmtcclient_Enable_Periodic_Print.xml | 2 +-
tc/obsw_tc_service5_17.py | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.idea/runConfigurations/tmtcclient_Disable_Periodic_Print_.xml b/.idea/runConfigurations/tmtcclient_Disable_Periodic_Print_.xml
index be75fe2..b664592 100644
--- a/.idea/runConfigurations/tmtcclient_Disable_Periodic_Print_.xml
+++ b/.idea/runConfigurations/tmtcclient_Disable_Periodic_Print_.xml
@@ -13,7 +13,7 @@
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/obsw_tmtc_client.py" />
- <option name="PARAMETERS" value="-m 3 -s 17 -o 129 -c 1 -t 2.2" />
+ <option name="PARAMETERS" value="-m 3 -s 17 -o 130 -c 1 -t 2.2" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="true" />
<option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcclient_Enable_Periodic_Print.xml b/.idea/runConfigurations/tmtcclient_Enable_Periodic_Print.xml
index 62d7645..b7394cb 100644
--- a/.idea/runConfigurations/tmtcclient_Enable_Periodic_Print.xml
+++ b/.idea/runConfigurations/tmtcclient_Enable_Periodic_Print.xml
@@ -13,7 +13,7 @@
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/obsw_tmtc_client.py" />
- <option name="PARAMETERS" value="-m 3 -s 17 -o 128 -c 1 -t 2.2" />
+ <option name="PARAMETERS" value="-m 3 -s 17 -o 129 -c 1 -t 2.2" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="true" />
<option name="MODULE_MODE" value="false" />
diff --git a/tc/obsw_tc_service5_17.py b/tc/obsw_tc_service5_17.py
index 4b4a94a..170c16b 100644
--- a/tc/obsw_tc_service5_17.py
+++ b/tc/obsw_tc_service5_17.py
@@ -56,9 +56,9 @@ def pack_service17_test_into(tc_queue: TcQueueT, op_code: int) -> TcQueueT:
command = PusTelecommand(service=17, subservice=243, ssc=1702)
tc_queue.appendleft(command.pack_command_tuple())
tc_queue.appendleft(("export", "log/tmtc_log_service17.txt"))
- elif op_code == 128:
- pack_enable_periodic_print_packet(tc_queue, True, 0)
elif op_code == 129:
+ pack_enable_periodic_print_packet(tc_queue, True, 0)
+ elif op_code == 130:
pack_enable_periodic_print_packet(tc_queue, False, 0)
elif op_code == 150:
pack_trigger_exception_packet(tc_queue, 0)
@@ -68,9 +68,9 @@ def pack_service17_test_into(tc_queue: TcQueueT, op_code: int) -> TcQueueT:
def pack_enable_periodic_print_packet(tc_queue: TcQueueT, enable: bool, ssc: int):
tc_queue.appendleft(("print", "Enabling periodic printout"))
if enable:
- command = PusTelecommand(service=17, subservice=128, ssc=ssc)
- else:
command = PusTelecommand(service=17, subservice=129, ssc=ssc)
+ else:
+ command = PusTelecommand(service=17, subservice=130, ssc=ssc)
tc_queue.appendleft(command.pack_command_tuple())
--
GitLab