From 4000c352993b998f371bf782be9e9464ef7eae6c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 3 Feb 2022 17:10:11 +0100 Subject: [PATCH] added back more events --- fsfw | 2 +- generators/bsp_q7s_events.csv | 5 +++++ generators/events/translateEvents.cpp | 19 ++++++++++++++-- linux/fsfwconfig/events/translateEvents.cpp | 19 ++++++++++++++-- mission/devices/PlocMPSoCHandler.h | 24 +++++++-------------- 5 files changed, 48 insertions(+), 21 deletions(-) diff --git a/fsfw b/fsfw index b3aee76d..a910a055 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit b3aee76d91cdc8da568d844a83fcfde4faadce81 +Subproject commit a910a055416962a97d575bf37c39acd6f8ac59ea diff --git a/generators/bsp_q7s_events.csv b/generators/bsp_q7s_events.csv index 8d2c6285..1896a46b 100644 --- a/generators/bsp_q7s_events.csv +++ b/generators/bsp_q7s_events.csv @@ -46,6 +46,7 @@ 5903;COMPONENT_TEMP_OOL_LOW;LOW;;/home/rmueller/EIVE/eive-obsw/fsfw/src/fsfw/thermal/ThermalComponentIF.h 5904;COMPONENT_TEMP_OOL_HIGH;LOW;;/home/rmueller/EIVE/eive-obsw/fsfw/src/fsfw/thermal/ThermalComponentIF.h 5905;TEMP_NOT_IN_OP_RANGE;LOW;;/home/rmueller/EIVE/eive-obsw/fsfw/src/fsfw/thermal/ThermalComponentIF.h +7101;FDIR_CHANGED_STATE;INFO;;/home/rmueller/EIVE/eive-obsw/fsfw/src/fsfw/fdir/FailureIsolationBase.h 7102;FDIR_STARTS_RECOVERY;MEDIUM;;/home/rmueller/EIVE/eive-obsw/fsfw/src/fsfw/fdir/FailureIsolationBase.h 7103;FDIR_TURNS_OFF_DEVICE;MEDIUM;;/home/rmueller/EIVE/eive-obsw/fsfw/src/fsfw/fdir/FailureIsolationBase.h 7201;MONITOR_CHANGED_STATE;LOW;;/home/rmueller/EIVE/eive-obsw/fsfw/src/fsfw/monitoring/MonitoringIF.h @@ -84,6 +85,10 @@ 11002;DEPLOYMENT_FAILED;HIGH;;/home/rmueller/EIVE/eive-obsw/linux/devices/SolarArrayDeploymentHandler.h 11003;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;;/home/rmueller/EIVE/eive-obsw/linux/devices/SolarArrayDeploymentHandler.h 11004;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;;/home/rmueller/EIVE/eive-obsw/linux/devices/SolarArrayDeploymentHandler.h +11101;MEMORY_READ_RPT_CRC_FAILURE;LOW;;/home/rmueller/EIVE/eive-obsw/mission/devices/PlocMPSoCHandler.h +11102;ACK_FAILURE;LOW;;/home/rmueller/EIVE/eive-obsw/mission/devices/PlocMPSoCHandler.h +11103;EXE_FAILURE;LOW;;/home/rmueller/EIVE/eive-obsw/mission/devices/PlocMPSoCHandler.h +11104;CRC_FAILURE_EVENT;LOW;;/home/rmueller/EIVE/eive-obsw/mission/devices/PlocMPSoCHandler.h 11201;SELF_TEST_I2C_FAILURE;LOW;;/home/rmueller/EIVE/eive-obsw/mission/devices/IMTQHandler.h 11202;SELF_TEST_SPI_FAILURE;LOW;;/home/rmueller/EIVE/eive-obsw/mission/devices/IMTQHandler.h 11203;SELF_TEST_ADC_FAILURE;LOW;;/home/rmueller/EIVE/eive-obsw/mission/devices/IMTQHandler.h diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index 0e2de0ef..3412b482 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 133 translations. + * @brief Auto-generated event translation file. Contains 138 translations. * @details - * Generated on: 2022-02-03 17:06:01 + * Generated on: 2022-02-03 17:09:37 */ #include "translateEvents.h" @@ -53,6 +53,7 @@ const char *COMPONENT_TEMP_HIGH_STRING = "COMPONENT_TEMP_HIGH"; const char *COMPONENT_TEMP_OOL_LOW_STRING = "COMPONENT_TEMP_OOL_LOW"; const char *COMPONENT_TEMP_OOL_HIGH_STRING = "COMPONENT_TEMP_OOL_HIGH"; const char *TEMP_NOT_IN_OP_RANGE_STRING = "TEMP_NOT_IN_OP_RANGE"; +const char *FDIR_CHANGED_STATE_STRING = "FDIR_CHANGED_STATE"; const char *FDIR_STARTS_RECOVERY_STRING = "FDIR_STARTS_RECOVERY"; const char *FDIR_TURNS_OFF_DEVICE_STRING = "FDIR_TURNS_OFF_DEVICE"; const char *MONITOR_CHANGED_STATE_STRING = "MONITOR_CHANGED_STATE"; @@ -91,6 +92,10 @@ const char *MAIN_SWITCH_OFF_TIMEOUT_STRING = "MAIN_SWITCH_OFF_TIMEOUT"; const char *DEPLOYMENT_FAILED_STRING = "DEPLOYMENT_FAILED"; const char *DEPL_SA1_GPIO_SWTICH_ON_FAILED_STRING = "DEPL_SA1_GPIO_SWTICH_ON_FAILED"; const char *DEPL_SA2_GPIO_SWTICH_ON_FAILED_STRING = "DEPL_SA2_GPIO_SWTICH_ON_FAILED"; +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"; @@ -237,6 +242,8 @@ const char * translateEvents(Event event) { return COMPONENT_TEMP_OOL_HIGH_STRING; case(5905): return TEMP_NOT_IN_OP_RANGE_STRING; + case(7101): + return FDIR_CHANGED_STATE_STRING; case(7102): return FDIR_STARTS_RECOVERY_STRING; case(7103): @@ -313,6 +320,14 @@ const char * translateEvents(Event event) { return DEPL_SA1_GPIO_SWTICH_ON_FAILED_STRING; case(11004): return DEPL_SA2_GPIO_SWTICH_ON_FAILED_STRING; + case(11101): + return MEMORY_READ_RPT_CRC_FAILURE_STRING; + case(11102): + return ACK_FAILURE_STRING; + case(11103): + return EXE_FAILURE_STRING; + case(11104): + return CRC_FAILURE_EVENT_STRING; case(11201): return SELF_TEST_I2C_FAILURE_STRING; case(11202): diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index 0e2de0ef..3412b482 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 133 translations. + * @brief Auto-generated event translation file. Contains 138 translations. * @details - * Generated on: 2022-02-03 17:06:01 + * Generated on: 2022-02-03 17:09:37 */ #include "translateEvents.h" @@ -53,6 +53,7 @@ const char *COMPONENT_TEMP_HIGH_STRING = "COMPONENT_TEMP_HIGH"; const char *COMPONENT_TEMP_OOL_LOW_STRING = "COMPONENT_TEMP_OOL_LOW"; const char *COMPONENT_TEMP_OOL_HIGH_STRING = "COMPONENT_TEMP_OOL_HIGH"; const char *TEMP_NOT_IN_OP_RANGE_STRING = "TEMP_NOT_IN_OP_RANGE"; +const char *FDIR_CHANGED_STATE_STRING = "FDIR_CHANGED_STATE"; const char *FDIR_STARTS_RECOVERY_STRING = "FDIR_STARTS_RECOVERY"; const char *FDIR_TURNS_OFF_DEVICE_STRING = "FDIR_TURNS_OFF_DEVICE"; const char *MONITOR_CHANGED_STATE_STRING = "MONITOR_CHANGED_STATE"; @@ -91,6 +92,10 @@ const char *MAIN_SWITCH_OFF_TIMEOUT_STRING = "MAIN_SWITCH_OFF_TIMEOUT"; const char *DEPLOYMENT_FAILED_STRING = "DEPLOYMENT_FAILED"; const char *DEPL_SA1_GPIO_SWTICH_ON_FAILED_STRING = "DEPL_SA1_GPIO_SWTICH_ON_FAILED"; const char *DEPL_SA2_GPIO_SWTICH_ON_FAILED_STRING = "DEPL_SA2_GPIO_SWTICH_ON_FAILED"; +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"; @@ -237,6 +242,8 @@ const char * translateEvents(Event event) { return COMPONENT_TEMP_OOL_HIGH_STRING; case(5905): return TEMP_NOT_IN_OP_RANGE_STRING; + case(7101): + return FDIR_CHANGED_STATE_STRING; case(7102): return FDIR_STARTS_RECOVERY_STRING; case(7103): @@ -313,6 +320,14 @@ const char * translateEvents(Event event) { return DEPL_SA1_GPIO_SWTICH_ON_FAILED_STRING; case(11004): return DEPL_SA2_GPIO_SWTICH_ON_FAILED_STRING; + case(11101): + return MEMORY_READ_RPT_CRC_FAILURE_STRING; + case(11102): + return ACK_FAILURE_STRING; + case(11103): + return EXE_FAILURE_STRING; + case(11104): + return CRC_FAILURE_EVENT_STRING; case(11201): return SELF_TEST_I2C_FAILURE_STRING; case(11202): diff --git a/mission/devices/PlocMPSoCHandler.h b/mission/devices/PlocMPSoCHandler.h index 28b21a00..09ad2e2a 100644 --- a/mission/devices/PlocMPSoCHandler.h +++ b/mission/devices/PlocMPSoCHandler.h @@ -53,32 +53,24 @@ class PlocMPSoCHandler : public DeviceHandlerBase { static const uint8_t INTERFACE_ID = CLASS_ID::PLOC_MPSOC_HANDLER; //! Space Packet received from PLOC has invalid CRC - static const ReturnValue_t CRC_FAILURE = - MAKE_RETURN_CODE(0xA0); + static const ReturnValue_t CRC_FAILURE = MAKE_RETURN_CODE(0xA0); //! Received ACK failure reply from PLOC - static const ReturnValue_t RECEIVED_ACK_FAILURE = - MAKE_RETURN_CODE(0xA1); + static const ReturnValue_t RECEIVED_ACK_FAILURE = MAKE_RETURN_CODE(0xA1); //! Received execution failure reply from PLOC - static const ReturnValue_t RECEIVED_EXE_FAILURE = - MAKE_RETURN_CODE(0xA2); + static const ReturnValue_t RECEIVED_EXE_FAILURE = MAKE_RETURN_CODE(0xA2); //! Received space packet with invalid APID from PLOC - static const ReturnValue_t INVALID_APID = - MAKE_RETURN_CODE(0xA3); + static const ReturnValue_t INVALID_APID = MAKE_RETURN_CODE(0xA3); static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PLOC_MPSOC_HANDLER; //! PLOC crc failure in telemetry packet - static const Event MEMORY_READ_RPT_CRC_FAILURE = - MAKE_EVENT(1, severity::LOW); + static const Event MEMORY_READ_RPT_CRC_FAILURE = MAKE_EVENT(1, severity::LOW); //! PLOC receive acknowledgment failure report - static const Event ACK_FAILURE = - MAKE_EVENT(2, severity::LOW); + static const Event ACK_FAILURE = MAKE_EVENT(2, severity::LOW); //! PLOC receive execution failure report - static const Event EXE_FAILURE = - MAKE_EVENT(3, severity::LOW); + static const Event EXE_FAILURE = MAKE_EVENT(3, severity::LOW); //! PLOC reply has invalid crc - static const Event CRC_FAILURE_EVENT = - MAKE_EVENT(4, severity::LOW); + static const Event CRC_FAILURE_EVENT = MAKE_EVENT(4, severity::LOW); static const uint16_t APID_MASK = 0x7FF; static const uint16_t PACKET_SEQUENCE_COUNT_MASK = 0x3FFF;