From 51b8f018b9f7b3be267fe05cdaebd4c8aacc6e1b Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Wed, 8 Jul 2020 03:23:45 +0200
Subject: [PATCH] some tweaks for udp cfg
---
.idea/runConfigurations/tmtcclient_Service_17_UDP.xml | 2 +-
obsw_user_code.py | 9 +--------
utility/obsw_args_parser.py | 2 +-
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/.idea/runConfigurations/tmtcclient_Service_17_UDP.xml b/.idea/runConfigurations/tmtcclient_Service_17_UDP.xml
index 4d49dab..9962a4d 100644
--- a/.idea/runConfigurations/tmtcclient_Service_17_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_Service_17_UDP.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 -p -t 5" />
+ <option name="PARAMETERS" value="-m 2 -c 3 -s 17 -t 3" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="true" />
<option name="MODULE_MODE" value="false" />
diff --git a/obsw_user_code.py b/obsw_user_code.py
index 1b204fa..a74a537 100644
--- a/obsw_user_code.py
+++ b/obsw_user_code.py
@@ -2,8 +2,7 @@
User defined code can be added here.
"""
from typing import Tuple, Union
-from tc.obsw_pus_tc_base import PusTcInfo, PusTelecommand
-from tc.obsw_pus_tc_frame_packer import pack_tc_frame
+from tc.obsw_pus_tc_base import PusTcInfo, PusTelecommand
def command_preparation_hook() -> Tuple[bytearray, Union[None, PusTcInfo]]:
@@ -11,12 +10,6 @@ def command_preparation_hook() -> Tuple[bytearray, Union[None, PusTcInfo]]:
Can be used to pack user-defined commands.
"""
command = PusTelecommand(service=17, subservice=1, ssc=20)
- # command2 = PusTelecommand(service=17, subservice=1, ssc=21)
- # tc_list = list()
- # tc_list.append(command)
- # tc_list.append(command2)
- # frame, frame_size, num_packets = pack_tc_frame(tc_list, 256)
-
return command.pack_command_tuple()
diff --git a/utility/obsw_args_parser.py b/utility/obsw_args_parser.py
index f269f4a..e2cce09 100644
--- a/utility/obsw_args_parser.py
+++ b/utility/obsw_args_parser.py
@@ -26,7 +26,7 @@ def parse_input_arguments():
'2: QEMU, 3: UDP', default=2)
arg_parser.add_argument('--clientIP', help='Client(Computer) IP. Default:\'\'', default='')
arg_parser.add_argument(
- '--boardIP', help='Board IP. Default: Localhost 127.0.0.1', default='127.0.0.1')
+ '--boardIP', help='Board IP. Default: Localhost 127.0.0.1', default="127.0.0.1")
arg_parser.add_argument('-s', '--service', help='Service to test. Default: 17', default=17)
arg_parser.add_argument(
'-t', '--tm_timeout', type=float, help='TM Timeout when listening to verification sequence.'
--
GitLab