Squashed commit of the following:
commit79060acfb6Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Sun Jun 18 16:19:00 2023 +0200 add enable HK set cmd commitb9038f1c86Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Sun Jun 18 13:37:21 2023 +0200 add back PL PCDU 1 commitfd20a9fe3cAuthor: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Sun Jun 18 13:30:45 2023 +0200 add TMP1075 HK handling commit936dcdf334Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Thu Jun 15 05:15:05 2023 +0200 remove sw update, add fake test files commit29fc7a5fcaMerge:e106e0b2202c95Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 14 07:46:34 2023 +0200 Merge pull request 'Some minor tweaks for BPX commands' (#202) from add-bpx-man-heater-cmds into main Reviewed-on: #202 commit2202c95c4cMerge:b38da20e106e0bAuthor: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 14 07:46:23 2023 +0200 Merge branch 'main' into add-bpx-man-heater-cmds commitb38da20953Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 14 07:46:00 2023 +0200 some better doc commitf9a61fa485Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 14 07:45:03 2023 +0200 clean up batt cmds a bit commite106e0bc63Merge:970c899d1bd8f1Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 14 07:43:19 2023 +0200 Merge pull request 'added BPX manual heater commands' (#201) from add-bpx-man-heater-cmds into main Reviewed-on: #201 commitd1bd8f15d9Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 14 07:42:12 2023 +0200 added BPX manual heater commands commit970c8998f0Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 14 06:16:17 2023 +0200 prep v4.1.0 commit8a87d83653Merge:eae0120cf55b36Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 14 06:06:58 2023 +0200 Merge pull request 'Add more heater commands' (#200) from add-heater-cmd-ids into main Reviewed-on: #200 commitcf55b3630cAuthor: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 14 05:16:21 2023 +0200 add set cfg and rst cfg commit656e75052bAuthor: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 14 02:59:20 2023 +0200 fix broken IDs commite91bf01dafAuthor: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 14 02:03:20 2023 +0200 add heater cmd IDs commiteae0120643Merge:4a990e7fc3cf48Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Sun Jun 11 13:36:27 2023 +0200 Merge pull request 'switched to prebuilt docker image' (#198) from mohr/docker into main Reviewed-on: #198 commitfc3cf480dcAuthor: Ulrich Mohr <mohr@irs.uni-stuttgart.de> Date: Sun Jun 11 12:14:52 2023 +0200 bump docker version commitacca981260Author: Ulrich Mohr <mohr@irs.uni-stuttgart.de> Date: Sun Jun 11 12:12:47 2023 +0200 jenkins user in docker commit822eaa4c89Author: Ulrich Mohr <mohr@irs.uni-stuttgart.de> Date: Sun Jun 11 12:01:26 2023 +0200 removed empty `environment` block in Jenkinsfile which Jenkins does not like diva.... commit252d140b8eAuthor: Ulrich Mohr <mohr@irs.uni-stuttgart.de> Date: Sun Jun 11 11:56:39 2023 +0200 switched to prebuilt docker image commit4a990e704bAuthor: Robin Mueller <robin.mueller.m@gmail.com> Date: Sat Jun 10 14:58:15 2023 +0200 added basic automation file commit522f273c99Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Sat Jun 10 14:48:02 2023 +0200 add date in changelog commit1724a90a26Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Sat Jun 10 14:46:00 2023 +0200 add release checklist commit7b21070363Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Sat Jun 10 14:42:28 2023 +0200 linter fixes, version bump commitd390168829Merge:238bbd5a969481Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Sat Jun 10 14:10:42 2023 +0200 Merge pull request 'v4.0.0-dev' (#197) from v4.0.0-dev into main Reviewed-on: #197 commita969481698Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Fri Jun 9 18:53:11 2023 +0200 imtq parsing fixes commit8bdba71dc3Merge:8804a4ee3800acAuthor: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Jun 9 12:44:00 2023 +0200 Merge pull request 'Rework logging handling' (#194) from rework_logging_handling into v4.0.0-dev Reviewed-on: #194 commite3800ac0c9Merge:15482788804a4eAuthor: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Jun 9 12:43:21 2023 +0200 Merge branch 'v4.0.0-dev' into rework_logging_handling commit8804a4e8e9Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Fri Jun 9 12:43:08 2023 +0200 bump tmtccmd to v5.0.0rc0 commit1548278ad6Merge:148a52aac140aeAuthor: Robin Mueller <robin.mueller.m@gmail.com> Date: Fri Jun 9 12:42:26 2023 +0200 Merge remote-tracking branch 'origin/v4.0.0-dev' into rework_logging_handling commit148a52a69aMerge:e45072c238bbd5Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Fri Jun 9 12:42:16 2023 +0200 Merge remote-tracking branch 'origin/main' into rework_logging_handling commitac140aeb2cMerge:c6c4b9aa5a30d3Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Jun 9 12:41:55 2023 +0200 Merge pull request 'moved 2 parameters' (#196) from move-pdu-datavar into v4.0.0-dev Reviewed-on: #196 commita5a30d37ebAuthor: Robin Mueller <robin.mueller.m@gmail.com> Date: Fri Jun 9 12:41:49 2023 +0200 tweak changelog commitd9194207a4Merge:14d14f1c6c4b9aAuthor: Robin Mueller <robin.mueller.m@gmail.com> Date: Fri Jun 9 12:39:38 2023 +0200 Merge remote-tracking branch 'origin/v4.0.0-dev' into move-pdu-datavar commit14d14f12c0Merge:17dd9de238bbd5Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 7 17:27:52 2023 +0200 Merge branch 'v3.2.0-dev' into move-pdu-datavar commit17dd9de51eAuthor: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 7 17:25:51 2023 +0200 moved 2 parameters commit238bbd5843Merge:6182369de02d81Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 7 17:16:37 2023 +0200 Merge pull request 'better exception handling' (#195) from better-exception-handling into v3.2.0-dev Reviewed-on: #195 commitde02d81e1dAuthor: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Jun 7 16:56:43 2023 +0200 better exception handling commite45072c38dAuthor: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Thu May 25 11:31:06 2023 +0200 import replacement commitfe96f115d5Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed May 24 13:50:37 2023 +0200 that should be all commite9e43f03d2Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed May 24 13:44:45 2023 +0200 more stuff commitaab093cc0aAuthor: Robin Mueller <robin.mueller.m@gmail.com> Date: Tue May 23 09:54:51 2023 +0200 rework it commitc6c4b9a995Merge:280c7245f379bfAuthor: Marius Eggert <eggertm@irs.uni-stuttgart.de> Date: Mon May 22 10:42:49 2023 +0200 Merge pull request 'Bugfix CFDP' (#191) from bugfix-cfdp into v4.0.0-dev Reviewed-on: #191 commit6182369e4fMerge:d23c0c2620360cAuthor: Marius Eggert <eggertm@irs.uni-stuttgart.de> Date: Mon May 22 10:41:54 2023 +0200 Merge pull request 'generic systemctl' (#193) from generic_systemctl into main Reviewed-on: #193 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commit620360c8e8Merge:49dde29d23c0c2Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri May 19 11:02:35 2023 +0200 Merge branch 'main' into generic_systemctl commit49dde29847Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri May 19 11:01:06 2023 +0200 generic systemctl commitd23c0c20fcMerge:280c724ef1da1eAuthor: Marius Eggert <eggertm@irs.uni-stuttgart.de> Date: Fri May 19 10:44:01 2023 +0200 Merge pull request 'new MPSoC events and retvals' (#192) from mpsoc_new_events_retvals into main Reviewed-on: #192 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commitef1da1e882Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Wed May 17 19:00:17 2023 +0200 changelog commit6ec0ce20faAuthor: Robin Mueller <robin.mueller.m@gmail.com> Date: Wed May 17 17:15:43 2023 +0200 new event commit5f379bf2bbAuthor: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Mon May 15 16:43:40 2023 +0200 changelog commit7c1e7226e0Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Mon May 15 16:42:56 2023 +0200 bugfix CFDP: bump tmtccmd commitb8e1c7afe9Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Mon May 15 15:20:56 2023 +0200 new MPSoC events and retvals commit280c72439eAuthor: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Mon May 15 14:18:18 2023 +0200 bugfix MPSoC command commit14c42a91ffAuthor: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Mon May 15 13:43:26 2023 +0200 rework read and write prompts for MPSoC commitdd3e4c649bMerge:3b167170c1bfc6Author: Marius Eggert <eggertm@irs.uni-stuttgart.de> Date: Mon May 15 09:10:41 2023 +0200 Merge pull request 'MPSoC flash content reporter' (#190) from mpsoc_action_reply_handler into main Reviewed-on: #190 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commit3b16717ce2Merge:377e98bf1a0334Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri May 12 16:27:39 2023 +0200 Merge pull request 'fixfixfix' (#189) from ploc_pwr_switching_fix into main Reviewed-on: #189 commitf1a0334d3dMerge:f090c3a377e98bAuthor: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri May 12 16:27:33 2023 +0200 Merge branch 'main' into ploc_pwr_switching_fix commit0c1bfc6fd3Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Fri May 12 16:27:16 2023 +0200 bump changelog commit04bbe057e7Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Fri May 12 16:24:45 2023 +0200 flash c ontent report works now commite05a54b076Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Fri May 12 16:08:57 2023 +0200 somethings wrong with the format commitef0adef04aAuthor: Robin Mueller <robin.mueller.m@gmail.com> Date: Fri May 12 15:51:17 2023 +0200 start adding action reply handler for MPSoC commit377e98b5c2Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Fri May 12 13:22:58 2023 +0200 bugfix MPSoC HK parsing commit87e5abe8ebAuthor: Robin Mueller <robin.mueller.m@gmail.com> Date: Fri May 12 11:51:47 2023 +0200 add missing command list of PLOC MPSoC commands commitf090c3af66Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Thu May 11 17:55:15 2023 +0200 fixfixfix commit13fd9a7d84Merge:4d921e0bbcc0f9Author: Marius Eggert <eggertm@irs.uni-stuttgart.de> Date: Thu May 4 15:30:49 2023 +0200 Merge pull request 'impl MPSoC HK parsing' (#188) from mpsoc_commands into main Reviewed-on: #188 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commitbbcc0f9de7Merge:a0aa6521ab8710Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Thu May 4 15:17:12 2023 +0200 Merge branch 'mpsoc_commands' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mpsoc_commands commita0aa6525e4Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Thu May 4 15:17:00 2023 +0200 fix commit1ab8710040Merge:f480d864d921e0Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Thu May 4 14:51:13 2023 +0200 Merge branch 'main' into mpsoc_commands commitf480d86fbdAuthor: Robin Mueller <robin.mueller.m@gmail.com> Date: Thu May 4 14:50:38 2023 +0200 impl MPSoC HK parsing commit4d921e01afMerge:e85d1a1b505524Author: Marius Eggert <eggertm@irs.uni-stuttgart.de> Date: Thu May 4 12:01:43 2023 +0200 Merge pull request 'MPSoC module update' (#187) from mpsoc_commands into main Reviewed-on: #187 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commitb505524e0bMerge:e0e9a31e85d1a1Author: Marius Eggert <eggertm@irs.uni-stuttgart.de> Date: Thu May 4 12:01:33 2023 +0200 Merge branch 'main' into mpsoc_commands commite0e9a310b9Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Thu May 4 11:51:50 2023 +0200 add command to get flash dir content commit0e9ebefc87Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Thu May 4 11:27:12 2023 +0200 new mpsoc commands commite85d1a1966Merge:60fba8b4ff50b6Author: Marius Eggert <eggertm@irs.uni-stuttgart.de> Date: Wed May 3 13:36:31 2023 +0200 Merge pull request 'most important bugfix' (#186) from most-important-bugfix into main Reviewed-on: #186 commit4ff50b6559Author: meggert <eggertm@irs.uni-stuttgart.de> Date: Wed May 3 13:34:14 2023 +0200 bub commit60fba8b6d9Merge:5fbd19b1707f24Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:25:35 2023 +0200 Merge pull request 'more system modes' (#185) from more-system-modes into main Reviewed-on: #185 commit1707f24612Author: meggert <eggertm@irs.uni-stuttgart.de> Date: Wed Apr 19 15:10:44 2023 +0200 more system modes commit5fbd19bb6cMerge:4083a300c6a967Author: Robin Mueller <robin.mueller.m@gmail.com> Date: Mon Apr 17 18:41:08 2023 +0200 Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc
This commit is contained in:
@@ -177,6 +177,7 @@ def handle_regular_hk_print( # noqa C901: Complexity okay here
|
||||
obj_ids.TMP1075_HANDLER_TCS_BRD_1_ID,
|
||||
obj_ids.TMP1075_HANDLER_IF_BRD_ID,
|
||||
obj_ids.TMP1075_HANDLER_PLPCDU_0_ID,
|
||||
obj_ids.TMP1075_HANDLER_PLPCDU_1_ID,
|
||||
]:
|
||||
return handle_tmp_1075_hk_data(set_id=set_id, hk_data=hk_data, pw=pw)
|
||||
elif objb == obj_ids.ACS_CONTROLLER:
|
||||
|
||||
@@ -13,6 +13,7 @@ from tmtccmd.tc.pus_200_fsfw_mode import Mode, create_announce_mode_recursive_co
|
||||
from tmtccmd.tc.pus_3_fsfw_hk import (
|
||||
make_sid,
|
||||
generate_one_hk_command,
|
||||
create_enable_periodic_hk_command_with_interval,
|
||||
create_request_one_diag_command,
|
||||
)
|
||||
|
||||
@@ -21,6 +22,7 @@ class OpCodeSys:
|
||||
OFF = ["off"]
|
||||
NML = ["nml"]
|
||||
REQUEST_PRIMARY_TEMP_SET = ["temp"]
|
||||
ENABLE_TEMP_SET = "enable_temp_set"
|
||||
REQUEST_DEVICE_TEMP_SET = ["temp_devs"]
|
||||
REQUEST_DEVICE_SUS_SET = ["temp_sus"]
|
||||
REQUEST_HEATER_INFO = "heater_info"
|
||||
@@ -30,6 +32,7 @@ class OpCodeSys:
|
||||
class InfoSys:
|
||||
OFF = "Switch TCS subsystem OFF"
|
||||
NML = "Switch TCS subsystem NORMAL (nominal)"
|
||||
ENABLE_TEMP_SET = "Enable Primary Temperature Set"
|
||||
REQUEST_PRIMARY_TEMP_SET = "Request HK set of primary sensor temperatures"
|
||||
REQUEST_DEVICE_TEMP_SET = "Request HK set of device sensor temperatures"
|
||||
REQUEST_DEVICE_SUS_SET = "Request HK set of the SUS temperatures"
|
||||
@@ -67,6 +70,13 @@ def pack_tcs_sys_commands(q: DefaultPusQueueHelper, op_code: str):
|
||||
if op_code in OpCodeSys.NML:
|
||||
q.add_log_cmd(InfoSys.NML)
|
||||
pack_mode_cmd_with_info(TCS_SUBSYSTEM_ID, Mode.NORMAL, 0, q, InfoSys.OFF)
|
||||
if op_code == OpCodeSys.ENABLE_TEMP_SET:
|
||||
interval_seconds = float(input("Please specify interval in seconds: "))
|
||||
cmds = create_enable_periodic_hk_command_with_interval(
|
||||
False, make_sid(TCS_CONTROLLER, CtrlSetId.PRIMARY_SENSORS), interval_seconds
|
||||
)
|
||||
for cmd in cmds:
|
||||
q.add_pus_tc(cmd)
|
||||
if op_code == OpCodeSys.ANNOUNCE_MODES:
|
||||
q.add_log_cmd(InfoSys.ANNOUNCE_MODES)
|
||||
q.add_pus_tc(create_announce_mode_recursive_command(TCS_SUBSYSTEM_ID))
|
||||
@@ -87,8 +97,9 @@ def add_tcs_subsystem_cmds(defs: TmtcDefinitionWrapper):
|
||||
oce.add(keys=OpCodeSys.REQUEST_DEVICE_SUS_SET, info=InfoSys.REQUEST_DEVICE_SUS_SET)
|
||||
oce.add(keys=OpCodeSys.REQUEST_HEATER_INFO, info=InfoSys.REQUEST_HEATER_INFO)
|
||||
oce.add(keys=OpCodeSys.ANNOUNCE_MODES, info=InfoSys.ANNOUNCE_MODES)
|
||||
oce.add(keys=OpCodeSys.ENABLE_TEMP_SET, info=InfoSys.ENABLE_TEMP_SET)
|
||||
defs.add_service(
|
||||
name=CustomServiceList.TCS,
|
||||
info="TCS Board",
|
||||
info="TCS",
|
||||
op_code_entry=oce,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user