diff --git a/.idea/runConfigurations/OBSW_TmTcClient_GPS1_Serial.xml b/.idea/runConfigurations/tmtcclient_GPS1_Serial.xml similarity index 81% rename from .idea/runConfigurations/OBSW_TmTcClient_GPS1_Serial.xml rename to .idea/runConfigurations/tmtcclient_GPS1_Serial.xml index 122ed72c3db2f685eaa65d8fd213146b4c6f1d90..1f8098a72d1b52a387c0256e35fa3cebdb4ccfae 100644 --- a/.idea/runConfigurations/OBSW_TmTcClient_GPS1_Serial.xml +++ b/.idea/runConfigurations/tmtcclient_GPS1_Serial.xml @@ -1,5 +1,5 @@ <component name="ProjectRunConfigurationManager"> - <configuration default="false" name="OBSW_TmTcClient GPS1 Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial Communication"> + <configuration default="false" name="tmtcclient GPS1 Serial" type="PythonConfigurationType" factoryName="Python" folderName="Serial Communication"> <module name="tmtc" /> <option name="INTERPRETER_OPTIONS" value="" /> <option name="PARENT_ENVS" value="true" /> @@ -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 GPS1 -c 1" /> + <option name="PARAMETERS" value="-m 3 -s GPS1 -c 1 -t 3" /> <option name="SHOW_COMMAND_LINE" value="false" /> <option name="EMULATE_TERMINAL" value="true" /> <option name="MODULE_MODE" value="false" /> diff --git a/.idea/runConfigurations/OBSW_TmTcClient_Service_3_Serial_.xml b/.idea/runConfigurations/tmtcclient_Service_3_Serial_.xml similarity index 86% rename from .idea/runConfigurations/OBSW_TmTcClient_Service_3_Serial_.xml rename to .idea/runConfigurations/tmtcclient_Service_3_Serial_.xml index 642285d0ab0ca68199dd8aa65332bf4d97bf8746..7b0db83d4daea21024c7ef99394582f529ca1486 100644 --- a/.idea/runConfigurations/OBSW_TmTcClient_Service_3_Serial_.xml +++ b/.idea/runConfigurations/tmtcclient_Service_3_Serial_.xml @@ -1,5 +1,5 @@ <component name="ProjectRunConfigurationManager"> - <configuration default="false" name="OBSW_TmTcClient Service 3 Serial " type="PythonConfigurationType" factoryName="Python" folderName="Serial Communication"> + <configuration default="false" name="tmtcclient Service 3 Serial " type="PythonConfigurationType" factoryName="Python" folderName="Serial Communication"> <module name="tmtc" /> <option name="INTERPRETER_OPTIONS" value="" /> <option name="PARENT_ENVS" value="true" /> diff --git a/tc/obsw_tc_service3.py b/tc/obsw_tc_service3.py index 89d90612a2badc148f0e99e44bf1477d7585fe17..f488cada97fcae1e400e5e1675563e75d8069b5c 100644 --- a/tc/obsw_tc_service3.py +++ b/tc/obsw_tc_service3.py @@ -26,16 +26,18 @@ hk_definition = sid_test + collection_interval_hk + number_of_parameters + p1 + diag_definition = (sid_custom + collection_interval_diag + number_of_parameters + p1 + p2 + p3 + p4 + p5) + def pack_service3_test_into(tc_queue: Deque) -> Deque: tc_queue.appendleft(("print", "Testing Service 3")) # Predefined packet testing - # pack_predefined_tests(tc_queue) + pack_predefined_tests(tc_queue) pack_custom_tests(tc_queue) tc_queue.appendleft(("export", "log/tmtc_log_service3.txt")) return tc_queue + def pack_predefined_tests(tc_queue: Deque): # enable gps0 tc_queue.appendleft(("print", "Testing Service 3: Enable GPS definition")) @@ -80,6 +82,7 @@ def pack_predefined_tests(tc_queue: Deque): command = PusTelecommand(service=3, subservice=27, ssc=3070, app_data=sid_test) tc_queue.appendleft(command.pack_command_tuple()) + def pack_custom_tests(tc_queue: Deque): # deleting pre-defined test entry tc_queue.appendleft(("print", "Testing Service 3: Deleting pre-defined HK definition"))