fsfw
/
fsfw-example-tmtc-common
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

smaller fixes

This commit is contained in:
Robin Müller 2022-07-28 15:44:57 +02:00
parent 2593105d65
commit 57aeba3de0
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pus_tc/cmd_definitions.py
View File

@ -1,4 +1,5 @@
from common_tmtc.pus_tc.service_20_parameters import add_param_cmds from common_tmtc.pus_tc.service_20_parameters import add_param_cmds
from common_tmtc.pus_tc.service_3_housekeeping import add_hk_cmds
from tmtccmd.config import ( from tmtccmd.config import (
TmTcDefWrapper, TmTcDefWrapper,
) )
@ -20,5 +21,6 @@ def common_fsfw_service_op_code_dict() -> TmTcDefWrapper:
add_tc_sched_cmds(def_wrapper) add_tc_sched_cmds(def_wrapper)
add_param_cmds(def_wrapper) add_param_cmds(def_wrapper)
add_hk_cmds(def_wrapper)
return def_wrapper return def_wrapper

2
pus_tc/service_20_parameters.py
View File

@ -19,7 +19,7 @@ def add_param_cmds(defs: TmTcDefWrapper):
op_code_entry.add(keys=["0", "test"], info="Generic Test") op_code_entry.add(keys=["0", "test"], info="Generic Test")
defs.add_service( defs.add_service(
name=str(PusServices.S20_PARAMETER.value), name=str(PusServices.S20_PARAMETER.value),
info="Service 20 Parameters", info="PUS Service 20 Parameters",
op_code_entry=op_code_entry op_code_entry=op_code_entry
) )

16
pus_tc/service_3_housekeeping.py
View File

@ -2,6 +2,8 @@ from datetime import timedelta
from spacepackets.ecss.tc import PusTelecommand from spacepackets.ecss.tc import PusTelecommand
from deps.spacepackets.spacepackets.ecss import PusServices
from tmtccmd.config import TmTcDefWrapper, OpCodeEntry
from tmtccmd.tc import QueueHelper from tmtccmd.tc import QueueHelper
from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
from tmtccmd.tc.pus_20_params import ( from tmtccmd.tc.pus_20_params import (
@ -25,6 +27,16 @@ TEST_NOTIFICATION_ACTION_ID = 3
PARAM_ACTIVATE_CHANGING_DATASETS = 4 PARAM_ACTIVATE_CHANGING_DATASETS = 4
def add_hk_cmds(defs: TmTcDefWrapper):
op_code_entry = OpCodeEntry()
op_code_entry.add(keys=["0", "test"], info="Generic Test")
defs.add_service(
name=str(PusServices.S3_HOUSEKEEPING.value),
info="PUS Service 3 Housekeeping",
op_code_entry=op_code_entry
)
def pack_service_3_commands_into(q: QueueHelper, op_code: str): def pack_service_3_commands_into(q: QueueHelper, op_code: str):
current_ssc = 3000 current_ssc = 3000
device_idx = 0 device_idx = 0
@ -100,7 +112,7 @@ def pack_housekeeping_basic_test(
unique_id=PARAM_ACTIVATE_CHANGING_DATASETS, unique_id=PARAM_ACTIVATE_CHANGING_DATASETS,
parameter=True, parameter=True,
) )
q.add_pus_tc(pack_fsfw_load_param_cmd(app_data=app_data, ssc=0)) q.add_pus_tc(pack_fsfw_load_param_cmd(app_data=app_data))
# Enable periodic reporting # Enable periodic reporting
q.add_log_cmd("Enabling periodic thermal sensor packet generation: ") q.add_log_cmd("Enabling periodic thermal sensor packet generation: ")
@ -131,7 +143,7 @@ def pack_housekeeping_basic_test(
unique_id=PARAM_ACTIVATE_CHANGING_DATASETS, unique_id=PARAM_ACTIVATE_CHANGING_DATASETS,
parameter=False, parameter=False,
) )
q.add_pus_tc(pack_fsfw_load_param_cmd(app_data=app_data, ssc=0)) q.add_pus_tc(pack_fsfw_load_param_cmd(app_data=app_data))
def pack_notification_basic_test( def pack_notification_basic_test(