From 5fb4e468ba79ea78a4fb376b071fc04114d363eb Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 22 Mar 2022 19:33:49 +0100 Subject: [PATCH] update object list, bugfix --- generators/bsp_q7s_objects.csv | 1 + generators/events/translateEvents.cpp | 2 +- generators/objects/translateObjects.cpp | 7 +++++-- linux/fsfwconfig/events/translateEvents.cpp | 2 +- linux/fsfwconfig/objects/translateObjects.cpp | 7 +++++-- mission/system/TcsBoardAssembly.cpp | 1 + tmtc | 2 +- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/generators/bsp_q7s_objects.csv b/generators/bsp_q7s_objects.csv index 63116d0f..9f8ce56a 100644 --- a/generators/bsp_q7s_objects.csv +++ b/generators/bsp_q7s_objects.csv @@ -109,6 +109,7 @@ 0x54694269;TEST_TASK 0x73000001;ACS_BOARD_ASS 0x73000002;SUS_BOARD_ASS +0x73000003;TCS_BOARD_ASS 0x73000100;TM_FUNNEL 0x73500000;CCSDS_IP_CORE_BRIDGE 0xFFFFFFFF;NO_OBJECT diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index f04a44e0..00139cc5 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 167 translations. * @details - * Generated on: 2022-03-22 11:15:56 + * Generated on: 2022-03-22 19:33:14 */ #include "translateEvents.h" diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 96167528..9ae9afda 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -1,8 +1,8 @@ /** * @brief Auto-generated object translation file. * @details - * Contains 114 translations. - * Generated on: 2022-03-22 11:16:03 + * Contains 115 translations. + * Generated on: 2022-03-22 19:33:19 */ #include "translateObjects.h" @@ -117,6 +117,7 @@ const char *LIBGPIOD_TEST_STRING = "LIBGPIOD_TEST"; const char *TEST_TASK_STRING = "TEST_TASK"; const char *ACS_BOARD_ASS_STRING = "ACS_BOARD_ASS"; const char *SUS_BOARD_ASS_STRING = "SUS_BOARD_ASS"; +const char *TCS_BOARD_ASS_STRING = "TCS_BOARD_ASS"; const char *TM_FUNNEL_STRING = "TM_FUNNEL"; const char *CCSDS_IP_CORE_BRIDGE_STRING = "CCSDS_IP_CORE_BRIDGE"; const char *NO_OBJECT_STRING = "NO_OBJECT"; @@ -345,6 +346,8 @@ const char *translateObject(object_id_t object) { return ACS_BOARD_ASS_STRING; case 0x73000002: return SUS_BOARD_ASS_STRING; + case 0x73000003: + return TCS_BOARD_ASS_STRING; case 0x73000100: return TM_FUNNEL_STRING; case 0x73500000: diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index f04a44e0..00139cc5 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 167 translations. * @details - * Generated on: 2022-03-22 11:15:56 + * Generated on: 2022-03-22 19:33:14 */ #include "translateEvents.h" diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 96167528..9ae9afda 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -1,8 +1,8 @@ /** * @brief Auto-generated object translation file. * @details - * Contains 114 translations. - * Generated on: 2022-03-22 11:16:03 + * Contains 115 translations. + * Generated on: 2022-03-22 19:33:19 */ #include "translateObjects.h" @@ -117,6 +117,7 @@ const char *LIBGPIOD_TEST_STRING = "LIBGPIOD_TEST"; const char *TEST_TASK_STRING = "TEST_TASK"; const char *ACS_BOARD_ASS_STRING = "ACS_BOARD_ASS"; const char *SUS_BOARD_ASS_STRING = "SUS_BOARD_ASS"; +const char *TCS_BOARD_ASS_STRING = "TCS_BOARD_ASS"; const char *TM_FUNNEL_STRING = "TM_FUNNEL"; const char *CCSDS_IP_CORE_BRIDGE_STRING = "CCSDS_IP_CORE_BRIDGE"; const char *NO_OBJECT_STRING = "NO_OBJECT"; @@ -345,6 +346,8 @@ const char *translateObject(object_id_t object) { return ACS_BOARD_ASS_STRING; case 0x73000002: return SUS_BOARD_ASS_STRING; + case 0x73000003: + return TCS_BOARD_ASS_STRING; case 0x73000100: return TM_FUNNEL_STRING; case 0x73500000: diff --git a/mission/system/TcsBoardAssembly.cpp b/mission/system/TcsBoardAssembly.cpp index 71964a3c..241c157a 100644 --- a/mission/system/TcsBoardAssembly.cpp +++ b/mission/system/TcsBoardAssembly.cpp @@ -23,6 +23,7 @@ void TcsBoardAssembly::performChildOperation() { } else if (state == PowerSwitcher::WAIT_ON and switcher.getState() == PowerSwitcher::SWITCH_IS_ON) { // Indicator that mode commanding can be performed now + AssemblyBase::startTransition(targetMode, targetSubmode); AssemblyBase::performChildOperation(); } } diff --git a/tmtc b/tmtc index cb479cc2..a5594033 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit cb479cc2f48ed15668a5b223529dc1cf1ee5b6ad +Subproject commit a55940339850e862b05a06a94fa8381bf7da0743