From f583fc1d99b767fc39beaca7e9120427b7a616c8 Mon Sep 17 00:00:00 2001 From: "Jakob.Meier" Date: Tue, 29 Jun 2021 17:27:39 +0200 Subject: [PATCH] generator runs and rw transition delay --- generators/bsp_q7s_events.csv | 9 + generators/bsp_q7s_objects.csv | 129 ++++---- generators/events/translateEvents.cpp | 31 +- generators/objects/translateObjects.cpp | 313 ++++++++++-------- linux/fsfwconfig/events/translateEvents.cpp | 31 +- linux/fsfwconfig/objects/translateObjects.cpp | 313 ++++++++++-------- mission/devices/RwHandler.cpp | 4 +- 7 files changed, 471 insertions(+), 359 deletions(-) diff --git a/generators/bsp_q7s_events.csv b/generators/bsp_q7s_events.csv index 81459869..c895aebb 100644 --- a/generators/bsp_q7s_events.csv +++ b/generators/bsp_q7s_events.csv @@ -81,3 +81,12 @@ 11102;ACK_FAILURE;LOW; ;../../mission/devices/PlocHandler.h 11103;EXE_FAILURE;LOW; ;../../mission/devices/PlocHandler.h 11104;CRC_FAILURE_EVENT;LOW; ;../../mission/devices/PlocHandler.h +11201;SELF_TEST_I2C_FAILURE;LOW; ;../../mission/devices/IMTQHandler.h +11202;SELF_TEST_SPI_FAILURE;LOW; ;../../mission/devices/IMTQHandler.h +11203;SELF_TEST_ADC_FAILURE;LOW; ;../../mission/devices/IMTQHandler.h +11204;SELF_TEST_PWM_FAILURE;LOW; ;../../mission/devices/IMTQHandler.h +11205;SELF_TEST_TC_FAILURE;LOW; ;../../mission/devices/IMTQHandler.h +11206;SELF_TEST_MTM_RANGE_FAILURE;LOW; ;../../mission/devices/IMTQHandler.h +11207;SELF_TEST_COIL_CURRENT_FAILURE;LOW; ;../../mission/devices/IMTQHandler.h +11208;INVALID_ERROR_BYTE;LOW; ;../../mission/devices/IMTQHandler.h +11301;ERROR_STATE;HIGH; ;../../mission/devices/RwHandler.h diff --git a/generators/bsp_q7s_objects.csv b/generators/bsp_q7s_objects.csv index 8df83d6a..e0180089 100644 --- a/generators/bsp_q7s_objects.csv +++ b/generators/bsp_q7s_objects.csv @@ -1,52 +1,74 @@ 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 -0x47000001;GPIO_IF -0x49000001;ARDUINO_COM_IF -0x49000002;CSP_COM_IF -0x49000003;I2C_COM_IF -0x49000004;UART_COM_IF -0x49000005;SPI_COM_IF +0x43000003;CORE_CONTROLLER +0x43100002;ACS_CONTROLLER +0x43400001;THERMAL_CONTROLLER +0x44120006;MGM_0_LIS3_HANDLER +0x44120010;GYRO_0_ADIS_HANDLER +0x44120032;SUS_1 +0x44120033;SUS_2 +0x44120034;SUS_3 +0x44120035;SUS_4 +0x44120036;SUS_5 +0x44120037;SUS_6 +0x44120038;SUS_7 +0x44120039;SUS_8 +0x44120040;SUS_9 +0x44120041;SUS_10 +0x44120042;SUS_11 +0x44120043;SUS_12 +0x44120044;SUS_13 +0x44120107;MGM_1_RM3100_HANDLER +0x44120111;GYRO_1_L3G_HANDLER +0x44120208;MGM_2_LIS3_HANDLER +0x44120212;GYRO_2_ADIS_HANDLER +0x44120309;MGM_3_RM3100_HANDLER +0x44120313;GYRO_3_L3G_HANDLER +0x44130045;GPS0_HANDLER +0x44130146;GPS1_HANDLER +0x44140014;IMTQ_HANDLER +0x442000A1;PCDU_HANDLER +0x44210001;RW1 +0x44210002;RW2 +0x44210003;RW3 +0x44210004;RW4 +0x44250000;P60DOCK_HANDLER +0x44250001;PDU1_HANDLER +0x44250002;PDU2_HANDLER +0x44250003;ACU_HANDLER +0x443200A5;RAD_SENSOR +0x44330015;PLOC_HANDLER +0x444100A2;SOLAR_ARRAY_DEPL_HANDLER +0x444100A4;HEATER_HANDLER +0x44420004;TMP1075_HANDLER_1 +0x44420005;TMP1075_HANDLER_2 +0x44420016;RTD_IC3 +0x44420017;RTD_IC4 +0x44420018;RTD_IC5 +0x44420019;RTD_IC6 +0x44420020;RTD_IC7 +0x44420021;RTD_IC8 +0x44420022;RTD_IC9 +0x44420023;RTD_IC10 +0x44420024;RTD_IC11 +0x44420025;RTD_IC12 +0x44420026;RTD_IC13 +0x44420027;RTD_IC14 +0x44420028;RTD_IC15 +0x44420029;RTD_IC16 +0x44420030;RTD_IC17 +0x44420031;RTD_IC18 +0x445300A3;SYRLINKS_HK_HANDLER +0x49000000;ARDUINO_COM_IF +0x49010005;GPIO_IF +0x49020004;SPI_COM_IF +0x49030003;UART_COM_IF +0x49040002;I2C_COM_IF +0x49050001;CSP_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 -0x51000800;PUS_SERVICE_8 -0x51002300;PUS_SERVICE_23 -0x51020100;PUS_SERVICE_201 -0x52000002;TM_FUNNEL 0x53000000;FSFW_OBJECTS_START 0x53000001;PUS_SERVICE_1_VERIFICATION 0x53000002;PUS_SERVICE_2_DEVICE_ACCESS @@ -67,27 +89,12 @@ 0x534f0300;IPC_STORE 0x53500010;TIME_STAMPER 0x53ffffff;FSFW_OBJECTS_END -0x54000003;HEATER_HANDLER -0x54000004;RTD_IC3 -0x54000005;RTD_IC4 -0x54000006;RTD_IC5 -0x54000007;RTD_IC6 -0x54000008;RTD_IC7 -0x54000009;RTD_IC8 -0x5400000A;RTD_IC9 -0x5400000B;RTD_IC10 -0x5400000C;RTD_IC11 -0x5400000D;RTD_IC12 -0x5400000E;RTD_IC13 -0x5400000F;RTD_IC14 0x54000010;SPI_TEST -0x5400001F;RTD_IC15 -0x5400002F;RTD_IC16 -0x5400003F;RTD_IC17 -0x5400004F;RTD_IC18 -0x54000050;RAD_SENSOR +0x54000020;UART_TEST 0x5400AFFE;DUMMY_HANDLER 0x5400CAFE;DUMMY_INTERFACE 0x54123456;LIBGPIOD_TEST 0x54694269;TEST_TASK +0x73000100;TM_FUNNEL +0x73500000;CCSDS_IP_CORE_BRIDGE 0xFFFFFFFF;NO_OBJECT diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index c3af08e1..9ae81646 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 83 translations. + * @brief Auto-generated event translation file. Contains 92 translations. * @details - * Generated on: 2021-06-08 17:09:32 + * Generated on: 2021-06-29 16:20:09 */ #include "translateEvents.h" @@ -88,6 +88,15 @@ const char *MEMORY_READ_RPT_CRC_FAILURE_STRING = "MEMORY_READ_RPT_CRC_FAILURE"; const char *ACK_FAILURE_STRING = "ACK_FAILURE"; const char *EXE_FAILURE_STRING = "EXE_FAILURE"; const char *CRC_FAILURE_EVENT_STRING = "CRC_FAILURE_EVENT"; +const char *SELF_TEST_I2C_FAILURE_STRING = "SELF_TEST_I2C_FAILURE"; +const char *SELF_TEST_SPI_FAILURE_STRING = "SELF_TEST_SPI_FAILURE"; +const char *SELF_TEST_ADC_FAILURE_STRING = "SELF_TEST_ADC_FAILURE"; +const char *SELF_TEST_PWM_FAILURE_STRING = "SELF_TEST_PWM_FAILURE"; +const char *SELF_TEST_TC_FAILURE_STRING = "SELF_TEST_TC_FAILURE"; +const char *SELF_TEST_MTM_RANGE_FAILURE_STRING = "SELF_TEST_MTM_RANGE_FAILURE"; +const char *SELF_TEST_COIL_CURRENT_FAILURE_STRING = "SELF_TEST_COIL_CURRENT_FAILURE"; +const char *INVALID_ERROR_BYTE_STRING = "INVALID_ERROR_BYTE"; +const char *ERROR_STATE_STRING = "ERROR_STATE"; const char * translateEvents(Event event) { switch( (event & 0xffff) ) { @@ -257,6 +266,24 @@ const char * translateEvents(Event event) { return EXE_FAILURE_STRING; case(11104): return CRC_FAILURE_EVENT_STRING; + case(11201): + return SELF_TEST_I2C_FAILURE_STRING; + case(11202): + return SELF_TEST_SPI_FAILURE_STRING; + case(11203): + return SELF_TEST_ADC_FAILURE_STRING; + case(11204): + return SELF_TEST_PWM_FAILURE_STRING; + case(11205): + return SELF_TEST_TC_FAILURE_STRING; + case(11206): + return SELF_TEST_MTM_RANGE_FAILURE_STRING; + case(11207): + return SELF_TEST_COIL_CURRENT_FAILURE_STRING; + case(11208): + return INVALID_ERROR_BYTE_STRING; + case(11301): + return ERROR_STATE_STRING; default: return "UNKNOWN_EVENT"; } diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 47b55435..2068158b 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -1,27 +1,17 @@ -/** +/** * @brief Auto-generated object translation file. * @details - * Contains 93 translations. - * Generated on: 2021-05-18 16:48:46 + * Contains 100 translations. + * Generated on: 2021-06-29 16:19:57 */ #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 *CORE_CONTROLLER_STRING = "CORE_CONTROLLER"; +const char *ACS_CONTROLLER_STRING = "ACS_CONTROLLER"; +const char *THERMAL_CONTROLLER_STRING = "THERMAL_CONTROLLER"; 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"; @@ -35,26 +25,58 @@ 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 *MGM_1_RM3100_HANDLER_STRING = "MGM_1_RM3100_HANDLER"; +const char *GYRO_1_L3G_HANDLER_STRING = "GYRO_1_L3G_HANDLER"; +const char *MGM_2_LIS3_HANDLER_STRING = "MGM_2_LIS3_HANDLER"; +const char *GYRO_2_ADIS_HANDLER_STRING = "GYRO_2_ADIS_HANDLER"; +const char *MGM_3_RM3100_HANDLER_STRING = "MGM_3_RM3100_HANDLER"; +const char *GYRO_3_L3G_HANDLER_STRING = "GYRO_3_L3G_HANDLER"; +const char *GPS0_HANDLER_STRING = "GPS0_HANDLER"; +const char *GPS1_HANDLER_STRING = "GPS1_HANDLER"; +const char *IMTQ_HANDLER_STRING = "IMTQ_HANDLER"; const char *PCDU_HANDLER_STRING = "PCDU_HANDLER"; +const char *RW1_STRING = "RW1"; +const char *RW2_STRING = "RW2"; +const char *RW3_STRING = "RW3"; +const char *RW4_STRING = "RW4"; +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 *RAD_SENSOR_STRING = "RAD_SENSOR"; +const char *PLOC_HANDLER_STRING = "PLOC_HANDLER"; const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER"; +const char *HEATER_HANDLER_STRING = "HEATER_HANDLER"; +const char *TMP1075_HANDLER_1_STRING = "TMP1075_HANDLER_1"; +const char *TMP1075_HANDLER_2_STRING = "TMP1075_HANDLER_2"; +const char *RTD_IC3_STRING = "RTD_IC3"; +const char *RTD_IC4_STRING = "RTD_IC4"; +const char *RTD_IC5_STRING = "RTD_IC5"; +const char *RTD_IC6_STRING = "RTD_IC6"; +const char *RTD_IC7_STRING = "RTD_IC7"; +const char *RTD_IC8_STRING = "RTD_IC8"; +const char *RTD_IC9_STRING = "RTD_IC9"; +const char *RTD_IC10_STRING = "RTD_IC10"; +const char *RTD_IC11_STRING = "RTD_IC11"; +const char *RTD_IC12_STRING = "RTD_IC12"; +const char *RTD_IC13_STRING = "RTD_IC13"; +const char *RTD_IC14_STRING = "RTD_IC14"; +const char *RTD_IC15_STRING = "RTD_IC15"; +const char *RTD_IC16_STRING = "RTD_IC16"; +const char *RTD_IC17_STRING = "RTD_IC17"; +const char *RTD_IC18_STRING = "RTD_IC18"; const char *SYRLINKS_HK_HANDLER_STRING = "SYRLINKS_HK_HANDLER"; -const char *GPIO_IF_STRING = "GPIO_IF"; const char *ARDUINO_COM_IF_STRING = "ARDUINO_COM_IF"; -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 *GPIO_IF_STRING = "GPIO_IF"; const char *SPI_COM_IF_STRING = "SPI_COM_IF"; +const char *UART_COM_IF_STRING = "UART_COM_IF"; +const char *I2C_COM_IF_STRING = "I2C_COM_IF"; +const char *CSP_COM_IF_STRING = "CSP_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"; -const char *PUS_SERVICE_8_STRING = "PUS_SERVICE_8"; -const char *PUS_SERVICE_23_STRING = "PUS_SERVICE_23"; -const char *PUS_SERVICE_201_STRING = "PUS_SERVICE_201"; -const char *TM_FUNNEL_STRING = "TM_FUNNEL"; const char *FSFW_OBJECTS_START_STRING = "FSFW_OBJECTS_START"; const char *PUS_SERVICE_1_VERIFICATION_STRING = "PUS_SERVICE_1_VERIFICATION"; const char *PUS_SERVICE_2_DEVICE_ACCESS_STRING = "PUS_SERVICE_2_DEVICE_ACCESS"; @@ -75,109 +97,150 @@ const char *TM_STORE_STRING = "TM_STORE"; const char *IPC_STORE_STRING = "IPC_STORE"; const char *TIME_STAMPER_STRING = "TIME_STAMPER"; const char *FSFW_OBJECTS_END_STRING = "FSFW_OBJECTS_END"; -const char *HEATER_HANDLER_STRING = "HEATER_HANDLER"; -const char *RTD_IC3_STRING = "RTD_IC3"; -const char *RTD_IC4_STRING = "RTD_IC4"; -const char *RTD_IC5_STRING = "RTD_IC5"; -const char *RTD_IC6_STRING = "RTD_IC6"; -const char *RTD_IC7_STRING = "RTD_IC7"; -const char *RTD_IC8_STRING = "RTD_IC8"; -const char *RTD_IC9_STRING = "RTD_IC9"; -const char *RTD_IC10_STRING = "RTD_IC10"; -const char *RTD_IC11_STRING = "RTD_IC11"; -const char *RTD_IC12_STRING = "RTD_IC12"; -const char *RTD_IC13_STRING = "RTD_IC13"; -const char *RTD_IC14_STRING = "RTD_IC14"; const char *SPI_TEST_STRING = "SPI_TEST"; -const char *RTD_IC15_STRING = "RTD_IC15"; -const char *RTD_IC16_STRING = "RTD_IC16"; -const char *RTD_IC17_STRING = "RTD_IC17"; -const char *RTD_IC18_STRING = "RTD_IC18"; -const char *RAD_SENSOR_STRING = "RAD_SENSOR"; +const char *UART_TEST_STRING = "UART_TEST"; const char *DUMMY_HANDLER_STRING = "DUMMY_HANDLER"; const char *DUMMY_INTERFACE_STRING = "DUMMY_INTERFACE"; const char *LIBGPIOD_TEST_STRING = "LIBGPIOD_TEST"; const char *TEST_TASK_STRING = "TEST_TASK"; +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"; 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: + case 0x43000003: + return CORE_CONTROLLER_STRING; + case 0x43100002: + return ACS_CONTROLLER_STRING; + case 0x43400001: + return THERMAL_CONTROLLER_STRING; + case 0x44120006: 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: + case 0x44120010: 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: + case 0x44120032: return SUS_1_STRING; - case 0x44000017: + case 0x44120033: return SUS_2_STRING; - case 0x44000018: + case 0x44120034: return SUS_3_STRING; - case 0x44000019: + case 0x44120035: return SUS_4_STRING; - case 0x4400001A: + case 0x44120036: return SUS_5_STRING; - case 0x4400001B: + case 0x44120037: return SUS_6_STRING; - case 0x4400001C: + case 0x44120038: return SUS_7_STRING; - case 0x4400001D: + case 0x44120039: return SUS_8_STRING; - case 0x4400001E: + case 0x44120040: return SUS_9_STRING; - case 0x4400001F: + case 0x44120041: return SUS_10_STRING; - case 0x44000021: + case 0x44120042: return SUS_11_STRING; - case 0x44000022: + case 0x44120043: return SUS_12_STRING; - case 0x44000023: + case 0x44120044: return SUS_13_STRING; - case 0x44001000: + case 0x44120107: + return MGM_1_RM3100_HANDLER_STRING; + case 0x44120111: + return GYRO_1_L3G_HANDLER_STRING; + case 0x44120208: + return MGM_2_LIS3_HANDLER_STRING; + case 0x44120212: + return GYRO_2_ADIS_HANDLER_STRING; + case 0x44120309: + return MGM_3_RM3100_HANDLER_STRING; + case 0x44120313: + return GYRO_3_L3G_HANDLER_STRING; + case 0x44130045: + return GPS0_HANDLER_STRING; + case 0x44130146: + return GPS1_HANDLER_STRING; + case 0x44140014: + return IMTQ_HANDLER_STRING; + case 0x442000A1: return PCDU_HANDLER_STRING; - case 0x44001001: + case 0x44210001: + return RW1_STRING; + case 0x44210002: + return RW2_STRING; + case 0x44210003: + return RW3_STRING; + case 0x44210004: + return RW4_STRING; + case 0x44250000: + return P60DOCK_HANDLER_STRING; + case 0x44250001: + return PDU1_HANDLER_STRING; + case 0x44250002: + return PDU2_HANDLER_STRING; + case 0x44250003: + return ACU_HANDLER_STRING; + case 0x443200A5: + return RAD_SENSOR_STRING; + case 0x44330015: + return PLOC_HANDLER_STRING; + case 0x444100A2: return SOLAR_ARRAY_DEPL_HANDLER_STRING; - case 0x44001002: + case 0x444100A4: + return HEATER_HANDLER_STRING; + case 0x44420004: + return TMP1075_HANDLER_1_STRING; + case 0x44420005: + return TMP1075_HANDLER_2_STRING; + case 0x44420016: + return RTD_IC3_STRING; + case 0x44420017: + return RTD_IC4_STRING; + case 0x44420018: + return RTD_IC5_STRING; + case 0x44420019: + return RTD_IC6_STRING; + case 0x44420020: + return RTD_IC7_STRING; + case 0x44420021: + return RTD_IC8_STRING; + case 0x44420022: + return RTD_IC9_STRING; + case 0x44420023: + return RTD_IC10_STRING; + case 0x44420024: + return RTD_IC11_STRING; + case 0x44420025: + return RTD_IC12_STRING; + case 0x44420026: + return RTD_IC13_STRING; + case 0x44420027: + return RTD_IC14_STRING; + case 0x44420028: + return RTD_IC15_STRING; + case 0x44420029: + return RTD_IC16_STRING; + case 0x44420030: + return RTD_IC17_STRING; + case 0x44420031: + return RTD_IC18_STRING; + case 0x445300A3: return SYRLINKS_HK_HANDLER_STRING; - case 0x47000001: - return GPIO_IF_STRING; - case 0x49000001: + case 0x49000000: return ARDUINO_COM_IF_STRING; - case 0x49000002: - return CSP_COM_IF_STRING; - case 0x49000003: - return I2C_COM_IF_STRING; - case 0x49000004: - return UART_COM_IF_STRING; - case 0x49000005: + case 0x49010005: + return GPIO_IF_STRING; + case 0x49020004: return SPI_COM_IF_STRING; + case 0x49030003: + return UART_COM_IF_STRING; + case 0x49040002: + return I2C_COM_IF_STRING; + case 0x49050001: + return CSP_COM_IF_STRING; case 0x50000100: return CCSDS_PACKET_DISTRIBUTOR_STRING; case 0x50000200: @@ -186,20 +249,8 @@ const char* translateObject(object_id_t object) { return UDP_BRIDGE_STRING; case 0x50000400: return UDP_POLLING_TASK_STRING; - case 0x51000300: - return PUS_SERVICE_3_STRING; - case 0x51000400: - return PUS_SERVICE_5_STRING; case 0x51000500: return PUS_SERVICE_6_STRING; - case 0x51000800: - return PUS_SERVICE_8_STRING; - case 0x51002300: - return PUS_SERVICE_23_STRING; - case 0x51020100: - return PUS_SERVICE_201_STRING; - case 0x52000002: - return TM_FUNNEL_STRING; case 0x53000000: return FSFW_OBJECTS_START_STRING; case 0x53000001: @@ -240,44 +291,10 @@ const char* translateObject(object_id_t object) { return TIME_STAMPER_STRING; case 0x53ffffff: return FSFW_OBJECTS_END_STRING; - case 0x54000003: - return HEATER_HANDLER_STRING; - case 0x54000004: - return RTD_IC3_STRING; - case 0x54000005: - return RTD_IC4_STRING; - case 0x54000006: - return RTD_IC5_STRING; - case 0x54000007: - return RTD_IC6_STRING; - case 0x54000008: - return RTD_IC7_STRING; - case 0x54000009: - return RTD_IC8_STRING; - case 0x5400000A: - return RTD_IC9_STRING; - case 0x5400000B: - return RTD_IC10_STRING; - case 0x5400000C: - return RTD_IC11_STRING; - case 0x5400000D: - return RTD_IC12_STRING; - case 0x5400000E: - return RTD_IC13_STRING; - case 0x5400000F: - return RTD_IC14_STRING; case 0x54000010: return SPI_TEST_STRING; - case 0x5400001F: - return RTD_IC15_STRING; - case 0x5400002F: - return RTD_IC16_STRING; - case 0x5400003F: - return RTD_IC17_STRING; - case 0x5400004F: - return RTD_IC18_STRING; - case 0x54000050: - return RAD_SENSOR_STRING; + case 0x54000020: + return UART_TEST_STRING; case 0x5400AFFE: return DUMMY_HANDLER_STRING; case 0x5400CAFE: @@ -286,6 +303,10 @@ const char* translateObject(object_id_t object) { return LIBGPIOD_TEST_STRING; case 0x54694269: return TEST_TASK_STRING; + case 0x73000100: + return TM_FUNNEL_STRING; + case 0x73500000: + return CCSDS_IP_CORE_BRIDGE_STRING; case 0xFFFFFFFF: return NO_OBJECT_STRING; default: diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index c3af08e1..9ae81646 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 83 translations. + * @brief Auto-generated event translation file. Contains 92 translations. * @details - * Generated on: 2021-06-08 17:09:32 + * Generated on: 2021-06-29 16:20:09 */ #include "translateEvents.h" @@ -88,6 +88,15 @@ const char *MEMORY_READ_RPT_CRC_FAILURE_STRING = "MEMORY_READ_RPT_CRC_FAILURE"; const char *ACK_FAILURE_STRING = "ACK_FAILURE"; const char *EXE_FAILURE_STRING = "EXE_FAILURE"; const char *CRC_FAILURE_EVENT_STRING = "CRC_FAILURE_EVENT"; +const char *SELF_TEST_I2C_FAILURE_STRING = "SELF_TEST_I2C_FAILURE"; +const char *SELF_TEST_SPI_FAILURE_STRING = "SELF_TEST_SPI_FAILURE"; +const char *SELF_TEST_ADC_FAILURE_STRING = "SELF_TEST_ADC_FAILURE"; +const char *SELF_TEST_PWM_FAILURE_STRING = "SELF_TEST_PWM_FAILURE"; +const char *SELF_TEST_TC_FAILURE_STRING = "SELF_TEST_TC_FAILURE"; +const char *SELF_TEST_MTM_RANGE_FAILURE_STRING = "SELF_TEST_MTM_RANGE_FAILURE"; +const char *SELF_TEST_COIL_CURRENT_FAILURE_STRING = "SELF_TEST_COIL_CURRENT_FAILURE"; +const char *INVALID_ERROR_BYTE_STRING = "INVALID_ERROR_BYTE"; +const char *ERROR_STATE_STRING = "ERROR_STATE"; const char * translateEvents(Event event) { switch( (event & 0xffff) ) { @@ -257,6 +266,24 @@ const char * translateEvents(Event event) { return EXE_FAILURE_STRING; case(11104): return CRC_FAILURE_EVENT_STRING; + case(11201): + return SELF_TEST_I2C_FAILURE_STRING; + case(11202): + return SELF_TEST_SPI_FAILURE_STRING; + case(11203): + return SELF_TEST_ADC_FAILURE_STRING; + case(11204): + return SELF_TEST_PWM_FAILURE_STRING; + case(11205): + return SELF_TEST_TC_FAILURE_STRING; + case(11206): + return SELF_TEST_MTM_RANGE_FAILURE_STRING; + case(11207): + return SELF_TEST_COIL_CURRENT_FAILURE_STRING; + case(11208): + return INVALID_ERROR_BYTE_STRING; + case(11301): + return ERROR_STATE_STRING; default: return "UNKNOWN_EVENT"; } diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 47b55435..2068158b 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -1,27 +1,17 @@ -/** +/** * @brief Auto-generated object translation file. * @details - * Contains 93 translations. - * Generated on: 2021-05-18 16:48:46 + * Contains 100 translations. + * Generated on: 2021-06-29 16:19:57 */ #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 *CORE_CONTROLLER_STRING = "CORE_CONTROLLER"; +const char *ACS_CONTROLLER_STRING = "ACS_CONTROLLER"; +const char *THERMAL_CONTROLLER_STRING = "THERMAL_CONTROLLER"; 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"; @@ -35,26 +25,58 @@ 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 *MGM_1_RM3100_HANDLER_STRING = "MGM_1_RM3100_HANDLER"; +const char *GYRO_1_L3G_HANDLER_STRING = "GYRO_1_L3G_HANDLER"; +const char *MGM_2_LIS3_HANDLER_STRING = "MGM_2_LIS3_HANDLER"; +const char *GYRO_2_ADIS_HANDLER_STRING = "GYRO_2_ADIS_HANDLER"; +const char *MGM_3_RM3100_HANDLER_STRING = "MGM_3_RM3100_HANDLER"; +const char *GYRO_3_L3G_HANDLER_STRING = "GYRO_3_L3G_HANDLER"; +const char *GPS0_HANDLER_STRING = "GPS0_HANDLER"; +const char *GPS1_HANDLER_STRING = "GPS1_HANDLER"; +const char *IMTQ_HANDLER_STRING = "IMTQ_HANDLER"; const char *PCDU_HANDLER_STRING = "PCDU_HANDLER"; +const char *RW1_STRING = "RW1"; +const char *RW2_STRING = "RW2"; +const char *RW3_STRING = "RW3"; +const char *RW4_STRING = "RW4"; +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 *RAD_SENSOR_STRING = "RAD_SENSOR"; +const char *PLOC_HANDLER_STRING = "PLOC_HANDLER"; const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER"; +const char *HEATER_HANDLER_STRING = "HEATER_HANDLER"; +const char *TMP1075_HANDLER_1_STRING = "TMP1075_HANDLER_1"; +const char *TMP1075_HANDLER_2_STRING = "TMP1075_HANDLER_2"; +const char *RTD_IC3_STRING = "RTD_IC3"; +const char *RTD_IC4_STRING = "RTD_IC4"; +const char *RTD_IC5_STRING = "RTD_IC5"; +const char *RTD_IC6_STRING = "RTD_IC6"; +const char *RTD_IC7_STRING = "RTD_IC7"; +const char *RTD_IC8_STRING = "RTD_IC8"; +const char *RTD_IC9_STRING = "RTD_IC9"; +const char *RTD_IC10_STRING = "RTD_IC10"; +const char *RTD_IC11_STRING = "RTD_IC11"; +const char *RTD_IC12_STRING = "RTD_IC12"; +const char *RTD_IC13_STRING = "RTD_IC13"; +const char *RTD_IC14_STRING = "RTD_IC14"; +const char *RTD_IC15_STRING = "RTD_IC15"; +const char *RTD_IC16_STRING = "RTD_IC16"; +const char *RTD_IC17_STRING = "RTD_IC17"; +const char *RTD_IC18_STRING = "RTD_IC18"; const char *SYRLINKS_HK_HANDLER_STRING = "SYRLINKS_HK_HANDLER"; -const char *GPIO_IF_STRING = "GPIO_IF"; const char *ARDUINO_COM_IF_STRING = "ARDUINO_COM_IF"; -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 *GPIO_IF_STRING = "GPIO_IF"; const char *SPI_COM_IF_STRING = "SPI_COM_IF"; +const char *UART_COM_IF_STRING = "UART_COM_IF"; +const char *I2C_COM_IF_STRING = "I2C_COM_IF"; +const char *CSP_COM_IF_STRING = "CSP_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"; -const char *PUS_SERVICE_8_STRING = "PUS_SERVICE_8"; -const char *PUS_SERVICE_23_STRING = "PUS_SERVICE_23"; -const char *PUS_SERVICE_201_STRING = "PUS_SERVICE_201"; -const char *TM_FUNNEL_STRING = "TM_FUNNEL"; const char *FSFW_OBJECTS_START_STRING = "FSFW_OBJECTS_START"; const char *PUS_SERVICE_1_VERIFICATION_STRING = "PUS_SERVICE_1_VERIFICATION"; const char *PUS_SERVICE_2_DEVICE_ACCESS_STRING = "PUS_SERVICE_2_DEVICE_ACCESS"; @@ -75,109 +97,150 @@ const char *TM_STORE_STRING = "TM_STORE"; const char *IPC_STORE_STRING = "IPC_STORE"; const char *TIME_STAMPER_STRING = "TIME_STAMPER"; const char *FSFW_OBJECTS_END_STRING = "FSFW_OBJECTS_END"; -const char *HEATER_HANDLER_STRING = "HEATER_HANDLER"; -const char *RTD_IC3_STRING = "RTD_IC3"; -const char *RTD_IC4_STRING = "RTD_IC4"; -const char *RTD_IC5_STRING = "RTD_IC5"; -const char *RTD_IC6_STRING = "RTD_IC6"; -const char *RTD_IC7_STRING = "RTD_IC7"; -const char *RTD_IC8_STRING = "RTD_IC8"; -const char *RTD_IC9_STRING = "RTD_IC9"; -const char *RTD_IC10_STRING = "RTD_IC10"; -const char *RTD_IC11_STRING = "RTD_IC11"; -const char *RTD_IC12_STRING = "RTD_IC12"; -const char *RTD_IC13_STRING = "RTD_IC13"; -const char *RTD_IC14_STRING = "RTD_IC14"; const char *SPI_TEST_STRING = "SPI_TEST"; -const char *RTD_IC15_STRING = "RTD_IC15"; -const char *RTD_IC16_STRING = "RTD_IC16"; -const char *RTD_IC17_STRING = "RTD_IC17"; -const char *RTD_IC18_STRING = "RTD_IC18"; -const char *RAD_SENSOR_STRING = "RAD_SENSOR"; +const char *UART_TEST_STRING = "UART_TEST"; const char *DUMMY_HANDLER_STRING = "DUMMY_HANDLER"; const char *DUMMY_INTERFACE_STRING = "DUMMY_INTERFACE"; const char *LIBGPIOD_TEST_STRING = "LIBGPIOD_TEST"; const char *TEST_TASK_STRING = "TEST_TASK"; +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"; 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: + case 0x43000003: + return CORE_CONTROLLER_STRING; + case 0x43100002: + return ACS_CONTROLLER_STRING; + case 0x43400001: + return THERMAL_CONTROLLER_STRING; + case 0x44120006: 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: + case 0x44120010: 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: + case 0x44120032: return SUS_1_STRING; - case 0x44000017: + case 0x44120033: return SUS_2_STRING; - case 0x44000018: + case 0x44120034: return SUS_3_STRING; - case 0x44000019: + case 0x44120035: return SUS_4_STRING; - case 0x4400001A: + case 0x44120036: return SUS_5_STRING; - case 0x4400001B: + case 0x44120037: return SUS_6_STRING; - case 0x4400001C: + case 0x44120038: return SUS_7_STRING; - case 0x4400001D: + case 0x44120039: return SUS_8_STRING; - case 0x4400001E: + case 0x44120040: return SUS_9_STRING; - case 0x4400001F: + case 0x44120041: return SUS_10_STRING; - case 0x44000021: + case 0x44120042: return SUS_11_STRING; - case 0x44000022: + case 0x44120043: return SUS_12_STRING; - case 0x44000023: + case 0x44120044: return SUS_13_STRING; - case 0x44001000: + case 0x44120107: + return MGM_1_RM3100_HANDLER_STRING; + case 0x44120111: + return GYRO_1_L3G_HANDLER_STRING; + case 0x44120208: + return MGM_2_LIS3_HANDLER_STRING; + case 0x44120212: + return GYRO_2_ADIS_HANDLER_STRING; + case 0x44120309: + return MGM_3_RM3100_HANDLER_STRING; + case 0x44120313: + return GYRO_3_L3G_HANDLER_STRING; + case 0x44130045: + return GPS0_HANDLER_STRING; + case 0x44130146: + return GPS1_HANDLER_STRING; + case 0x44140014: + return IMTQ_HANDLER_STRING; + case 0x442000A1: return PCDU_HANDLER_STRING; - case 0x44001001: + case 0x44210001: + return RW1_STRING; + case 0x44210002: + return RW2_STRING; + case 0x44210003: + return RW3_STRING; + case 0x44210004: + return RW4_STRING; + case 0x44250000: + return P60DOCK_HANDLER_STRING; + case 0x44250001: + return PDU1_HANDLER_STRING; + case 0x44250002: + return PDU2_HANDLER_STRING; + case 0x44250003: + return ACU_HANDLER_STRING; + case 0x443200A5: + return RAD_SENSOR_STRING; + case 0x44330015: + return PLOC_HANDLER_STRING; + case 0x444100A2: return SOLAR_ARRAY_DEPL_HANDLER_STRING; - case 0x44001002: + case 0x444100A4: + return HEATER_HANDLER_STRING; + case 0x44420004: + return TMP1075_HANDLER_1_STRING; + case 0x44420005: + return TMP1075_HANDLER_2_STRING; + case 0x44420016: + return RTD_IC3_STRING; + case 0x44420017: + return RTD_IC4_STRING; + case 0x44420018: + return RTD_IC5_STRING; + case 0x44420019: + return RTD_IC6_STRING; + case 0x44420020: + return RTD_IC7_STRING; + case 0x44420021: + return RTD_IC8_STRING; + case 0x44420022: + return RTD_IC9_STRING; + case 0x44420023: + return RTD_IC10_STRING; + case 0x44420024: + return RTD_IC11_STRING; + case 0x44420025: + return RTD_IC12_STRING; + case 0x44420026: + return RTD_IC13_STRING; + case 0x44420027: + return RTD_IC14_STRING; + case 0x44420028: + return RTD_IC15_STRING; + case 0x44420029: + return RTD_IC16_STRING; + case 0x44420030: + return RTD_IC17_STRING; + case 0x44420031: + return RTD_IC18_STRING; + case 0x445300A3: return SYRLINKS_HK_HANDLER_STRING; - case 0x47000001: - return GPIO_IF_STRING; - case 0x49000001: + case 0x49000000: return ARDUINO_COM_IF_STRING; - case 0x49000002: - return CSP_COM_IF_STRING; - case 0x49000003: - return I2C_COM_IF_STRING; - case 0x49000004: - return UART_COM_IF_STRING; - case 0x49000005: + case 0x49010005: + return GPIO_IF_STRING; + case 0x49020004: return SPI_COM_IF_STRING; + case 0x49030003: + return UART_COM_IF_STRING; + case 0x49040002: + return I2C_COM_IF_STRING; + case 0x49050001: + return CSP_COM_IF_STRING; case 0x50000100: return CCSDS_PACKET_DISTRIBUTOR_STRING; case 0x50000200: @@ -186,20 +249,8 @@ const char* translateObject(object_id_t object) { return UDP_BRIDGE_STRING; case 0x50000400: return UDP_POLLING_TASK_STRING; - case 0x51000300: - return PUS_SERVICE_3_STRING; - case 0x51000400: - return PUS_SERVICE_5_STRING; case 0x51000500: return PUS_SERVICE_6_STRING; - case 0x51000800: - return PUS_SERVICE_8_STRING; - case 0x51002300: - return PUS_SERVICE_23_STRING; - case 0x51020100: - return PUS_SERVICE_201_STRING; - case 0x52000002: - return TM_FUNNEL_STRING; case 0x53000000: return FSFW_OBJECTS_START_STRING; case 0x53000001: @@ -240,44 +291,10 @@ const char* translateObject(object_id_t object) { return TIME_STAMPER_STRING; case 0x53ffffff: return FSFW_OBJECTS_END_STRING; - case 0x54000003: - return HEATER_HANDLER_STRING; - case 0x54000004: - return RTD_IC3_STRING; - case 0x54000005: - return RTD_IC4_STRING; - case 0x54000006: - return RTD_IC5_STRING; - case 0x54000007: - return RTD_IC6_STRING; - case 0x54000008: - return RTD_IC7_STRING; - case 0x54000009: - return RTD_IC8_STRING; - case 0x5400000A: - return RTD_IC9_STRING; - case 0x5400000B: - return RTD_IC10_STRING; - case 0x5400000C: - return RTD_IC11_STRING; - case 0x5400000D: - return RTD_IC12_STRING; - case 0x5400000E: - return RTD_IC13_STRING; - case 0x5400000F: - return RTD_IC14_STRING; case 0x54000010: return SPI_TEST_STRING; - case 0x5400001F: - return RTD_IC15_STRING; - case 0x5400002F: - return RTD_IC16_STRING; - case 0x5400003F: - return RTD_IC17_STRING; - case 0x5400004F: - return RTD_IC18_STRING; - case 0x54000050: - return RAD_SENSOR_STRING; + case 0x54000020: + return UART_TEST_STRING; case 0x5400AFFE: return DUMMY_HANDLER_STRING; case 0x5400CAFE: @@ -286,6 +303,10 @@ const char* translateObject(object_id_t object) { return LIBGPIOD_TEST_STRING; case 0x54694269: return TEST_TASK_STRING; + case 0x73000100: + return TM_FUNNEL_STRING; + case 0x73500000: + return CCSDS_IP_CORE_BRIDGE_STRING; case 0xFFFFFFFF: return NO_OBJECT_STRING; default: diff --git a/mission/devices/RwHandler.cpp b/mission/devices/RwHandler.cpp index 45c721a8..a5f6dbef 100644 --- a/mission/devices/RwHandler.cpp +++ b/mission/devices/RwHandler.cpp @@ -68,7 +68,7 @@ ReturnValue_t RwHandler::buildNormalDeviceCommand(DeviceCommandId_t * id) { } ReturnValue_t RwHandler::buildTransitionDeviceCommand(DeviceCommandId_t * id) { - return RETURN_OK; + return NOTHING_TO_SEND; } ReturnValue_t RwHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand, @@ -230,7 +230,7 @@ void RwHandler::setNormalDatapoolEntriesInvalid() { } uint32_t RwHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { - return 500; + return 5000; } ReturnValue_t RwHandler::initializeLocalDataPool(localpool::DataPool& localDataPoolMap,