From 80d231586e1171f0e7f3d2f021c4fc96755eb4e0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 19 Jun 2023 17:59:14 +0200 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 79060acfb688a8896cf56c27d83da14e5630f091 Author: Robin Mueller Date: Sun Jun 18 16:19:00 2023 +0200 add enable HK set cmd commit b9038f1c86fb2b3cb9cae5be42fafd678e12de52 Author: Robin Mueller Date: Sun Jun 18 13:37:21 2023 +0200 add back PL PCDU 1 commit fd20a9fe3c73e5a8dd41c1217ab997abba2621f2 Author: Robin Mueller Date: Sun Jun 18 13:30:45 2023 +0200 add TMP1075 HK handling commit 936dcdf334c2258d2256373cd4995b2574202a59 Author: Robin Mueller Date: Thu Jun 15 05:15:05 2023 +0200 remove sw update, add fake test files commit 29fc7a5fca197abe44d8bbba6b0db3af2744f01c Merge: e106e0b 2202c95 Author: Robin Müller 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: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/202 commit 2202c95c4c8d96c2b1fbd01375d3aedea0067909 Merge: b38da20 e106e0b Author: Robin Müller Date: Wed Jun 14 07:46:23 2023 +0200 Merge branch 'main' into add-bpx-man-heater-cmds commit b38da20953b4d9b1550e31be4274e9c0df2943f3 Author: Robin Mueller Date: Wed Jun 14 07:46:00 2023 +0200 some better doc commit f9a61fa485ac3ed56a68b54eaaf76a995f2d097c Author: Robin Mueller Date: Wed Jun 14 07:45:03 2023 +0200 clean up batt cmds a bit commit e106e0bc639350131a48c373db8cb937145f76da Merge: 970c899 d1bd8f1 Author: Robin Müller 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: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/201 commit d1bd8f15d928624f17a5346bd3e9b2790851adcf Author: Robin Mueller Date: Wed Jun 14 07:42:12 2023 +0200 added BPX manual heater commands commit 970c8998f0bb719ab4b289fa95406d7037b2bb35 Author: Robin Mueller Date: Wed Jun 14 06:16:17 2023 +0200 prep v4.1.0 commit 8a87d836534d92d47debd42595cd66ef657c2f20 Merge: eae0120 cf55b36 Author: Robin Müller 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: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/200 commit cf55b3630c82c35639c39c6c0e28506ef55049e4 Author: Robin Mueller Date: Wed Jun 14 05:16:21 2023 +0200 add set cfg and rst cfg commit 656e75052be3e9fe8e3c6846725bd71a1bfdd28b Author: Robin Mueller Date: Wed Jun 14 02:59:20 2023 +0200 fix broken IDs commit e91bf01daf1202beeb67c572b9468fde035b0c48 Author: Robin Mueller Date: Wed Jun 14 02:03:20 2023 +0200 add heater cmd IDs commit eae0120643aead96a07cee0d7ada9c9c6af34b85 Merge: 4a990e7 fc3cf48 Author: Robin Müller 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: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/198 commit fc3cf480dcb487f0d1ee5f4e68ed39a8b50c1834 Author: Ulrich Mohr Date: Sun Jun 11 12:14:52 2023 +0200 bump docker version commit acca98126099f21b2cb90fdfa70dd60a1f60a3e7 Author: Ulrich Mohr Date: Sun Jun 11 12:12:47 2023 +0200 jenkins user in docker commit 822eaa4c89b6aadf0bafff94d8867595cd340c2d Author: Ulrich Mohr Date: Sun Jun 11 12:01:26 2023 +0200 removed empty `environment` block in Jenkinsfile which Jenkins does not like diva.... commit 252d140b8ef0f485ea7ad467770c1d8904abc663 Author: Ulrich Mohr Date: Sun Jun 11 11:56:39 2023 +0200 switched to prebuilt docker image commit 4a990e704bb4ece6b5464bb1b76046191a52f423 Author: Robin Mueller Date: Sat Jun 10 14:58:15 2023 +0200 added basic automation file commit 522f273c99845f9c50aaf135b1c6f52676b975dd Author: Robin Mueller Date: Sat Jun 10 14:48:02 2023 +0200 add date in changelog commit 1724a90a2656c583581b9ee1bc669c61464b8cbd Author: Robin Mueller Date: Sat Jun 10 14:46:00 2023 +0200 add release checklist commit 7b210703635de48b80b00a8fc3cce4412f350d78 Author: Robin Mueller Date: Sat Jun 10 14:42:28 2023 +0200 linter fixes, version bump commit d390168829165d02d11ede0786b5727ea31f0533 Merge: 238bbd5 a969481 Author: Robin Müller 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: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/197 commit a969481698a205b8ae1d303cbee5bf88eb3defdc Author: Robin Mueller Date: Fri Jun 9 18:53:11 2023 +0200 imtq parsing fixes commit 8bdba71dc3c2cab9ae863deca71b1682933dd630 Merge: 8804a4e e3800ac Author: Robin Müller 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: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/194 commit e3800ac0c9c56c70d7c2c30d72e570bc9021292e Merge: 1548278 8804a4e Author: Robin Müller Date: Fri Jun 9 12:43:21 2023 +0200 Merge branch 'v4.0.0-dev' into rework_logging_handling commit 8804a4e8e9fce1d45fcf62314affb791114d1517 Author: Robin Mueller Date: Fri Jun 9 12:43:08 2023 +0200 bump tmtccmd to v5.0.0rc0 commit 1548278ad6b1d0c9a969f9d3fc204f8455ea2881 Merge: 148a52a ac140ae Author: Robin Mueller Date: Fri Jun 9 12:42:26 2023 +0200 Merge remote-tracking branch 'origin/v4.0.0-dev' into rework_logging_handling commit 148a52a69a576a952a33629dc8b3c49664a05180 Merge: e45072c 238bbd5 Author: Robin Mueller Date: Fri Jun 9 12:42:16 2023 +0200 Merge remote-tracking branch 'origin/main' into rework_logging_handling commit ac140aeb2c9c88e0c4d913953e370f167d204119 Merge: c6c4b9a a5a30d3 Author: Robin Müller 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: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/196 commit a5a30d37ebefb897d9b60de11a14903cccd84f93 Author: Robin Mueller Date: Fri Jun 9 12:41:49 2023 +0200 tweak changelog commit d9194207a4506fa4e126517092e28d31b27beff1 Merge: 14d14f1 c6c4b9a Author: Robin Mueller Date: Fri Jun 9 12:39:38 2023 +0200 Merge remote-tracking branch 'origin/v4.0.0-dev' into move-pdu-datavar commit 14d14f12c05d73eb3fa71bf20cefe727f845ca13 Merge: 17dd9de 238bbd5 Author: Robin Müller Date: Wed Jun 7 17:27:52 2023 +0200 Merge branch 'v3.2.0-dev' into move-pdu-datavar commit 17dd9de51e174828ecb244fc5508de3d5f867ac2 Author: Robin Mueller Date: Wed Jun 7 17:25:51 2023 +0200 moved 2 parameters commit 238bbd584371dacb3eef0f217535e08cc33af7ad Merge: 6182369 de02d81 Author: Robin Müller 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: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/195 commit de02d81e1dc6897002c276277f07e6d181ac7719 Author: Robin Mueller Date: Wed Jun 7 16:56:43 2023 +0200 better exception handling commit e45072c38d521795e7319a50c1daf859398f5bb7 Author: Robin Mueller Date: Thu May 25 11:31:06 2023 +0200 import replacement commit fe96f115d5400b9b943ea53ebb9ce23f22a709bd Author: Robin Mueller Date: Wed May 24 13:50:37 2023 +0200 that should be all commit e9e43f03d20b0fa722410b7f69b79bc7e08e5dbb Author: Robin Mueller Date: Wed May 24 13:44:45 2023 +0200 more stuff commit aab093cc0a4540cfada992fc3fc46225a5f744dc Author: Robin Mueller Date: Tue May 23 09:54:51 2023 +0200 rework it commit c6c4b9a995b549c0875fc930f63ab73120ac7d5c Merge: 280c724 5f379bf Author: Marius Eggert 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: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/191 commit 6182369e4f40872c5c26e59be25d5fa79339176a Merge: d23c0c2 620360c Author: Marius Eggert Date: Mon May 22 10:41:54 2023 +0200 Merge pull request 'generic systemctl' (#193) from generic_systemctl into main Reviewed-on: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/193 Reviewed-by: Marius Eggert commit 620360c8e83f4ece2f153fe7d00827fe3b5bcb96 Merge: 49dde29 d23c0c2 Author: Robin Müller Date: Fri May 19 11:02:35 2023 +0200 Merge branch 'main' into generic_systemctl commit 49dde29847b0cde4b51fe4af6425c5cc0f6fcc27 Author: Robin Mueller Date: Fri May 19 11:01:06 2023 +0200 generic systemctl commit d23c0c20fc178ec6c1e26e9d1586dad686ccf990 Merge: 280c724 ef1da1e Author: Marius Eggert 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: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/192 Reviewed-by: Marius Eggert commit ef1da1e882c7ce5debdb929e1653c50cf96b8c64 Author: Robin Mueller Date: Wed May 17 19:00:17 2023 +0200 changelog commit 6ec0ce20fa98877c9f88acb5fe9129254291344b Author: Robin Mueller Date: Wed May 17 17:15:43 2023 +0200 new event commit 5f379bf2bb76f5cc65e9ca58036a4b239d8638b8 Author: Robin Mueller Date: Mon May 15 16:43:40 2023 +0200 changelog commit 7c1e7226e08b7ae5f1eda9259201a5140626ed24 Author: Robin Mueller Date: Mon May 15 16:42:56 2023 +0200 bugfix CFDP: bump tmtccmd commit b8e1c7afe91bddfea2b139217320033f3a3b0efb Author: Robin Mueller Date: Mon May 15 15:20:56 2023 +0200 new MPSoC events and retvals commit 280c72439effa1b4290dc500dade2c62a9d6e3f7 Author: Robin Mueller Date: Mon May 15 14:18:18 2023 +0200 bugfix MPSoC command commit 14c42a91ff3063835069374be5b720f10556f058 Author: Robin Mueller Date: Mon May 15 13:43:26 2023 +0200 rework read and write prompts for MPSoC commit dd3e4c649b687ea6b9444389439f3f2d5a558ad2 Merge: 3b16717 0c1bfc6 Author: Marius Eggert 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: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/190 Reviewed-by: Marius Eggert commit 3b16717ce23d747150ea8d0f6e91b75e280836cc Merge: 377e98b f1a0334 Author: Robin Müller Date: Fri May 12 16:27:39 2023 +0200 Merge pull request 'fixfixfix' (#189) from ploc_pwr_switching_fix into main Reviewed-on: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/189 commit f1a0334d3d2a70876b625aae765c9e778fbdc5de Merge: f090c3a 377e98b Author: Robin Müller Date: Fri May 12 16:27:33 2023 +0200 Merge branch 'main' into ploc_pwr_switching_fix commit 0c1bfc6fd32e66fe0da13bebc4eeb3030ead13a9 Author: Robin Mueller Date: Fri May 12 16:27:16 2023 +0200 bump changelog commit 04bbe057e7a0ca24b7d0a2d3c620d422ca15f59a Author: Robin Mueller Date: Fri May 12 16:24:45 2023 +0200 flash c ontent report works now commit e05a54b076a9b34059bfa5baf783a7f134a91f09 Author: Robin Mueller Date: Fri May 12 16:08:57 2023 +0200 somethings wrong with the format commit ef0adef04aebf8aa0d673e14403b484bd1200d9c Author: Robin Mueller Date: Fri May 12 15:51:17 2023 +0200 start adding action reply handler for MPSoC commit 377e98b5c2da12f10cdd12b027548a8075fdcb58 Author: Robin Mueller Date: Fri May 12 13:22:58 2023 +0200 bugfix MPSoC HK parsing commit 87e5abe8ebb6a33d36445d43bcb6674b313626f1 Author: Robin Mueller Date: Fri May 12 11:51:47 2023 +0200 add missing command list of PLOC MPSoC commands commit f090c3af66d1a0b760344e80053d6e83895e661a Author: Robin Mueller Date: Thu May 11 17:55:15 2023 +0200 fixfixfix commit 13fd9a7d84645535496e9ff2855118e5d0b59916 Merge: 4d921e0 bbcc0f9 Author: Marius Eggert Date: Thu May 4 15:30:49 2023 +0200 Merge pull request 'impl MPSoC HK parsing' (#188) from mpsoc_commands into main Reviewed-on: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/188 Reviewed-by: Marius Eggert commit bbcc0f9de711167e26db716cd1a55ac9839e7248 Merge: a0aa652 1ab8710 Author: Robin Mueller 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 commit a0aa6525e40c8247f3147416263e4230d5179dec Author: Robin Mueller Date: Thu May 4 15:17:00 2023 +0200 fix commit 1ab8710040e78afa5649a55fe82afc2a684f3bd8 Merge: f480d86 4d921e0 Author: Robin Müller Date: Thu May 4 14:51:13 2023 +0200 Merge branch 'main' into mpsoc_commands commit f480d86fbd1b7d48e28dace958cdf95ddb973db2 Author: Robin Mueller Date: Thu May 4 14:50:38 2023 +0200 impl MPSoC HK parsing commit 4d921e01af22fb6b0ea2060bcb7b8a11590a4195 Merge: e85d1a1 b505524 Author: Marius Eggert Date: Thu May 4 12:01:43 2023 +0200 Merge pull request 'MPSoC module update' (#187) from mpsoc_commands into main Reviewed-on: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/187 Reviewed-by: Marius Eggert commit b505524e0b3f33db9048236f4a7ac55e222ea8eb Merge: e0e9a31 e85d1a1 Author: Marius Eggert Date: Thu May 4 12:01:33 2023 +0200 Merge branch 'main' into mpsoc_commands commit e0e9a310b9a49bee742b9cf0f98baccfab3b03ee Author: Robin Mueller Date: Thu May 4 11:51:50 2023 +0200 add command to get flash dir content commit 0e9ebefc87785b5b0a379abcdbeb50c075c1b6b9 Author: Robin Mueller Date: Thu May 4 11:27:12 2023 +0200 new mpsoc commands commit e85d1a196628701326582a8f42bf006f29e083c5 Merge: 60fba8b 4ff50b6 Author: Marius Eggert Date: Wed May 3 13:36:31 2023 +0200 Merge pull request 'most important bugfix' (#186) from most-important-bugfix into main Reviewed-on: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/186 commit 4ff50b6559df7995485df0d79ac5a4735a320b52 Author: meggert Date: Wed May 3 13:34:14 2023 +0200 bub commit 60fba8b6d9c977cc3706e9cb5521cbfc3ab105e8 Merge: 5fbd19b 1707f24 Author: Robin Müller Date: Fri Apr 28 10:25:35 2023 +0200 Merge pull request 'more system modes' (#185) from more-system-modes into main Reviewed-on: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/185 commit 1707f24612d0c25f88db4e5089da558d5eead081 Author: meggert Date: Wed Apr 19 15:10:44 2023 +0200 more system modes commit 5fbd19bb6cca0790373a809d78f2307adca9d0c8 Merge: 4083a30 0c6a967 Author: Robin Mueller Date: Mon Apr 17 18:41:08 2023 +0200 Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc --- eive_tmtc/pus_tm/hk_handling.py | 1 + eive_tmtc/tmtc/tcs/subsystem.py | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/eive_tmtc/pus_tm/hk_handling.py b/eive_tmtc/pus_tm/hk_handling.py index 4011705..b9020b0 100644 --- a/eive_tmtc/pus_tm/hk_handling.py +++ b/eive_tmtc/pus_tm/hk_handling.py @@ -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: diff --git a/eive_tmtc/tmtc/tcs/subsystem.py b/eive_tmtc/tmtc/tcs/subsystem.py index 674bfb5..04e87b8 100644 --- a/eive_tmtc/tmtc/tcs/subsystem.py +++ b/eive_tmtc/tmtc/tcs/subsystem.py @@ -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, )