From 08847e708abaa73a9d87555d1c22110c8f558d43 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 18 May 2021 16:49:24 +0200 Subject: [PATCH] some objects missing --- fsfw | 2 +- generators/bsp_q7s_objects.csv | 32 ++++++ generators/objects/objects.py | 7 +- generators/objects/translateObjects.cpp | 100 +++++++++++++++++- linux/fsfwconfig/objects/translateObjects.cpp | 100 +++++++++++++++++- 5 files changed, 233 insertions(+), 8 deletions(-) diff --git a/fsfw b/fsfw index fc4e65b2..e9adaf67 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit fc4e65b2fcb552425e94e91b59b6983721917e05 +Subproject commit e9adaf672f7bfac9aaa03c284410b318142431ff diff --git a/generators/bsp_q7s_objects.csv b/generators/bsp_q7s_objects.csv index 88701ee5..8df83d6a 100644 --- a/generators/bsp_q7s_objects.csv +++ b/generators/bsp_q7s_objects.csv @@ -1,4 +1,32 @@ 0x00005060;P60DOCK_TEST_TASK +0x44000001;P60DOCK_HANDLER +0x44000002;PDU1_HANDLER +0x44000003;PDU2_HANDLER +0x44000004;ACU_HANDLER +0x44000005;TMP1075_HANDLER_1 +0x44000006;TMP1075_HANDLER_2 +0x44000007;MGM_0_LIS3_HANDLER +0x44000008;MGM_1_RM3100_HANDLER +0x44000009;MGM_2_LIS3_HANDLER +0x44000010;MGM_3_RM3100_HANDLER +0x44000011;GYRO_0_ADIS_HANDLER +0x44000012;GYRO_1_L3G_HANDLER +0x44000013;GYRO_2_L3G_HANDLER +0x44000014;IMTQ_HANDLER +0x44000015;PLOC_HANDLER +0x44000016;SUS_1 +0x44000017;SUS_2 +0x44000018;SUS_3 +0x44000019;SUS_4 +0x4400001A;SUS_5 +0x4400001B;SUS_6 +0x4400001C;SUS_7 +0x4400001D;SUS_8 +0x4400001E;SUS_9 +0x4400001F;SUS_10 +0x44000021;SUS_11 +0x44000022;SUS_12 +0x44000023;SUS_13 0x44001000;PCDU_HANDLER 0x44001001;SOLAR_ARRAY_DEPL_HANDLER 0x44001002;SYRLINKS_HK_HANDLER @@ -8,6 +36,10 @@ 0x49000003;I2C_COM_IF 0x49000004;UART_COM_IF 0x49000005;SPI_COM_IF +0x50000100;CCSDS_PACKET_DISTRIBUTOR +0x50000200;PUS_PACKET_DISTRIBUTOR +0x50000300;UDP_BRIDGE +0x50000400;UDP_POLLING_TASK 0x51000300;PUS_SERVICE_3 0x51000400;PUS_SERVICE_5 0x51000500;PUS_SERVICE_6 diff --git a/generators/objects/objects.py b/generators/objects/objects.py index 0e7c5509..c7df218e 100644 --- a/generators/objects/objects.py +++ b/generators/objects/objects.py @@ -45,9 +45,10 @@ CSV_OBJECT_FILENAME = f"{BSP_SELECT.value}_objects.csv" FILE_SEPARATOR = ";" -SUBSYSTEM_DEFINITION_DESTINATION = f"{FSFW_CONFIG_ROOT}/objects/systemObjectList.h" -FRAMEWORK_SUBSYSTEM_DEFINITION_DESTINATION = "../../fsfw/objectmanager/frameworkObjects.h" -OBJECTS_DEFINITIONS = [SUBSYSTEM_DEFINITION_DESTINATION, FRAMEWORK_SUBSYSTEM_DEFINITION_DESTINATION] +OBJECTS_PATH = f"{FSFW_CONFIG_ROOT}/objects/systemObjectList.h" +FRAMEWORK_OBJECT_PATH = "../../fsfw/objectmanager/frameworkObjects.h" +COMMON_OBJECTS_PATH = "../../common/config/commonObjects.h" +OBJECTS_DEFINITIONS = [OBJECTS_PATH, FRAMEWORK_OBJECT_PATH, COMMON_OBJECTS_PATH] SQL_DELETE_OBJECTS_CMD = """ DROP TABLE IF EXISTS Objects diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index a3347a99..47b55435 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -1,12 +1,40 @@ /** * @brief Auto-generated object translation file. * @details - * Contains 61 translations. - * Generated on: 2021-05-18 16:15:47 + * Contains 93 translations. + * Generated on: 2021-05-18 16:48:46 */ #include "translateObjects.h" const char *P60DOCK_TEST_TASK_STRING = "P60DOCK_TEST_TASK"; +const char *P60DOCK_HANDLER_STRING = "P60DOCK_HANDLER"; +const char *PDU1_HANDLER_STRING = "PDU1_HANDLER"; +const char *PDU2_HANDLER_STRING = "PDU2_HANDLER"; +const char *ACU_HANDLER_STRING = "ACU_HANDLER"; +const char *TMP1075_HANDLER_1_STRING = "TMP1075_HANDLER_1"; +const char *TMP1075_HANDLER_2_STRING = "TMP1075_HANDLER_2"; +const char *MGM_0_LIS3_HANDLER_STRING = "MGM_0_LIS3_HANDLER"; +const char *MGM_1_RM3100_HANDLER_STRING = "MGM_1_RM3100_HANDLER"; +const char *MGM_2_LIS3_HANDLER_STRING = "MGM_2_LIS3_HANDLER"; +const char *MGM_3_RM3100_HANDLER_STRING = "MGM_3_RM3100_HANDLER"; +const char *GYRO_0_ADIS_HANDLER_STRING = "GYRO_0_ADIS_HANDLER"; +const char *GYRO_1_L3G_HANDLER_STRING = "GYRO_1_L3G_HANDLER"; +const char *GYRO_2_L3G_HANDLER_STRING = "GYRO_2_L3G_HANDLER"; +const char *IMTQ_HANDLER_STRING = "IMTQ_HANDLER"; +const char *PLOC_HANDLER_STRING = "PLOC_HANDLER"; +const char *SUS_1_STRING = "SUS_1"; +const char *SUS_2_STRING = "SUS_2"; +const char *SUS_3_STRING = "SUS_3"; +const char *SUS_4_STRING = "SUS_4"; +const char *SUS_5_STRING = "SUS_5"; +const char *SUS_6_STRING = "SUS_6"; +const char *SUS_7_STRING = "SUS_7"; +const char *SUS_8_STRING = "SUS_8"; +const char *SUS_9_STRING = "SUS_9"; +const char *SUS_10_STRING = "SUS_10"; +const char *SUS_11_STRING = "SUS_11"; +const char *SUS_12_STRING = "SUS_12"; +const char *SUS_13_STRING = "SUS_13"; const char *PCDU_HANDLER_STRING = "PCDU_HANDLER"; const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER"; const char *SYRLINKS_HK_HANDLER_STRING = "SYRLINKS_HK_HANDLER"; @@ -16,6 +44,10 @@ const char *CSP_COM_IF_STRING = "CSP_COM_IF"; const char *I2C_COM_IF_STRING = "I2C_COM_IF"; const char *UART_COM_IF_STRING = "UART_COM_IF"; const char *SPI_COM_IF_STRING = "SPI_COM_IF"; +const char *CCSDS_PACKET_DISTRIBUTOR_STRING = "CCSDS_PACKET_DISTRIBUTOR"; +const char *PUS_PACKET_DISTRIBUTOR_STRING = "PUS_PACKET_DISTRIBUTOR"; +const char *UDP_BRIDGE_STRING = "UDP_BRIDGE"; +const char *UDP_POLLING_TASK_STRING = "UDP_POLLING_TASK"; const char *PUS_SERVICE_3_STRING = "PUS_SERVICE_3"; const char *PUS_SERVICE_5_STRING = "PUS_SERVICE_5"; const char *PUS_SERVICE_6_STRING = "PUS_SERVICE_6"; @@ -72,6 +104,62 @@ const char* translateObject(object_id_t object) { switch( (object & 0xFFFFFFFF) ) { case 0x00005060: return P60DOCK_TEST_TASK_STRING; + case 0x44000001: + return P60DOCK_HANDLER_STRING; + case 0x44000002: + return PDU1_HANDLER_STRING; + case 0x44000003: + return PDU2_HANDLER_STRING; + case 0x44000004: + return ACU_HANDLER_STRING; + case 0x44000005: + return TMP1075_HANDLER_1_STRING; + case 0x44000006: + return TMP1075_HANDLER_2_STRING; + case 0x44000007: + return MGM_0_LIS3_HANDLER_STRING; + case 0x44000008: + return MGM_1_RM3100_HANDLER_STRING; + case 0x44000009: + return MGM_2_LIS3_HANDLER_STRING; + case 0x44000010: + return MGM_3_RM3100_HANDLER_STRING; + case 0x44000011: + return GYRO_0_ADIS_HANDLER_STRING; + case 0x44000012: + return GYRO_1_L3G_HANDLER_STRING; + case 0x44000013: + return GYRO_2_L3G_HANDLER_STRING; + case 0x44000014: + return IMTQ_HANDLER_STRING; + case 0x44000015: + return PLOC_HANDLER_STRING; + case 0x44000016: + return SUS_1_STRING; + case 0x44000017: + return SUS_2_STRING; + case 0x44000018: + return SUS_3_STRING; + case 0x44000019: + return SUS_4_STRING; + case 0x4400001A: + return SUS_5_STRING; + case 0x4400001B: + return SUS_6_STRING; + case 0x4400001C: + return SUS_7_STRING; + case 0x4400001D: + return SUS_8_STRING; + case 0x4400001E: + return SUS_9_STRING; + case 0x4400001F: + return SUS_10_STRING; + case 0x44000021: + return SUS_11_STRING; + case 0x44000022: + return SUS_12_STRING; + case 0x44000023: + return SUS_13_STRING; case 0x44001000: return PCDU_HANDLER_STRING; case 0x44001001: @@ -90,6 +178,14 @@ const char* translateObject(object_id_t object) { return UART_COM_IF_STRING; case 0x49000005: return SPI_COM_IF_STRING; + case 0x50000100: + return CCSDS_PACKET_DISTRIBUTOR_STRING; + case 0x50000200: + return PUS_PACKET_DISTRIBUTOR_STRING; + case 0x50000300: + return UDP_BRIDGE_STRING; + case 0x50000400: + return UDP_POLLING_TASK_STRING; case 0x51000300: return PUS_SERVICE_3_STRING; case 0x51000400: diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index a3347a99..47b55435 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -1,12 +1,40 @@ /** * @brief Auto-generated object translation file. * @details - * Contains 61 translations. - * Generated on: 2021-05-18 16:15:47 + * Contains 93 translations. + * Generated on: 2021-05-18 16:48:46 */ #include "translateObjects.h" const char *P60DOCK_TEST_TASK_STRING = "P60DOCK_TEST_TASK"; +const char *P60DOCK_HANDLER_STRING = "P60DOCK_HANDLER"; +const char *PDU1_HANDLER_STRING = "PDU1_HANDLER"; +const char *PDU2_HANDLER_STRING = "PDU2_HANDLER"; +const char *ACU_HANDLER_STRING = "ACU_HANDLER"; +const char *TMP1075_HANDLER_1_STRING = "TMP1075_HANDLER_1"; +const char *TMP1075_HANDLER_2_STRING = "TMP1075_HANDLER_2"; +const char *MGM_0_LIS3_HANDLER_STRING = "MGM_0_LIS3_HANDLER"; +const char *MGM_1_RM3100_HANDLER_STRING = "MGM_1_RM3100_HANDLER"; +const char *MGM_2_LIS3_HANDLER_STRING = "MGM_2_LIS3_HANDLER"; +const char *MGM_3_RM3100_HANDLER_STRING = "MGM_3_RM3100_HANDLER"; +const char *GYRO_0_ADIS_HANDLER_STRING = "GYRO_0_ADIS_HANDLER"; +const char *GYRO_1_L3G_HANDLER_STRING = "GYRO_1_L3G_HANDLER"; +const char *GYRO_2_L3G_HANDLER_STRING = "GYRO_2_L3G_HANDLER"; +const char *IMTQ_HANDLER_STRING = "IMTQ_HANDLER"; +const char *PLOC_HANDLER_STRING = "PLOC_HANDLER"; +const char *SUS_1_STRING = "SUS_1"; +const char *SUS_2_STRING = "SUS_2"; +const char *SUS_3_STRING = "SUS_3"; +const char *SUS_4_STRING = "SUS_4"; +const char *SUS_5_STRING = "SUS_5"; +const char *SUS_6_STRING = "SUS_6"; +const char *SUS_7_STRING = "SUS_7"; +const char *SUS_8_STRING = "SUS_8"; +const char *SUS_9_STRING = "SUS_9"; +const char *SUS_10_STRING = "SUS_10"; +const char *SUS_11_STRING = "SUS_11"; +const char *SUS_12_STRING = "SUS_12"; +const char *SUS_13_STRING = "SUS_13"; const char *PCDU_HANDLER_STRING = "PCDU_HANDLER"; const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER"; const char *SYRLINKS_HK_HANDLER_STRING = "SYRLINKS_HK_HANDLER"; @@ -16,6 +44,10 @@ const char *CSP_COM_IF_STRING = "CSP_COM_IF"; const char *I2C_COM_IF_STRING = "I2C_COM_IF"; const char *UART_COM_IF_STRING = "UART_COM_IF"; const char *SPI_COM_IF_STRING = "SPI_COM_IF"; +const char *CCSDS_PACKET_DISTRIBUTOR_STRING = "CCSDS_PACKET_DISTRIBUTOR"; +const char *PUS_PACKET_DISTRIBUTOR_STRING = "PUS_PACKET_DISTRIBUTOR"; +const char *UDP_BRIDGE_STRING = "UDP_BRIDGE"; +const char *UDP_POLLING_TASK_STRING = "UDP_POLLING_TASK"; const char *PUS_SERVICE_3_STRING = "PUS_SERVICE_3"; const char *PUS_SERVICE_5_STRING = "PUS_SERVICE_5"; const char *PUS_SERVICE_6_STRING = "PUS_SERVICE_6"; @@ -72,6 +104,62 @@ const char* translateObject(object_id_t object) { switch( (object & 0xFFFFFFFF) ) { case 0x00005060: return P60DOCK_TEST_TASK_STRING; + case 0x44000001: + return P60DOCK_HANDLER_STRING; + case 0x44000002: + return PDU1_HANDLER_STRING; + case 0x44000003: + return PDU2_HANDLER_STRING; + case 0x44000004: + return ACU_HANDLER_STRING; + case 0x44000005: + return TMP1075_HANDLER_1_STRING; + case 0x44000006: + return TMP1075_HANDLER_2_STRING; + case 0x44000007: + return MGM_0_LIS3_HANDLER_STRING; + case 0x44000008: + return MGM_1_RM3100_HANDLER_STRING; + case 0x44000009: + return MGM_2_LIS3_HANDLER_STRING; + case 0x44000010: + return MGM_3_RM3100_HANDLER_STRING; + case 0x44000011: + return GYRO_0_ADIS_HANDLER_STRING; + case 0x44000012: + return GYRO_1_L3G_HANDLER_STRING; + case 0x44000013: + return GYRO_2_L3G_HANDLER_STRING; + case 0x44000014: + return IMTQ_HANDLER_STRING; + case 0x44000015: + return PLOC_HANDLER_STRING; + case 0x44000016: + return SUS_1_STRING; + case 0x44000017: + return SUS_2_STRING; + case 0x44000018: + return SUS_3_STRING; + case 0x44000019: + return SUS_4_STRING; + case 0x4400001A: + return SUS_5_STRING; + case 0x4400001B: + return SUS_6_STRING; + case 0x4400001C: + return SUS_7_STRING; + case 0x4400001D: + return SUS_8_STRING; + case 0x4400001E: + return SUS_9_STRING; + case 0x4400001F: + return SUS_10_STRING; + case 0x44000021: + return SUS_11_STRING; + case 0x44000022: + return SUS_12_STRING; + case 0x44000023: + return SUS_13_STRING; case 0x44001000: return PCDU_HANDLER_STRING; case 0x44001001: @@ -90,6 +178,14 @@ const char* translateObject(object_id_t object) { return UART_COM_IF_STRING; case 0x49000005: return SPI_COM_IF_STRING; + case 0x50000100: + return CCSDS_PACKET_DISTRIBUTOR_STRING; + case 0x50000200: + return PUS_PACKET_DISTRIBUTOR_STRING; + case 0x50000300: + return UDP_BRIDGE_STRING; + case 0x50000400: + return UDP_POLLING_TASK_STRING; case 0x51000300: return PUS_SERVICE_3_STRING; case 0x51000400: