From 14ba11738b42a125dcc2aa2c995029409c5c07bb Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 25 Nov 2021 14:09:06 +0100 Subject: [PATCH] adapted event name --- generators/bsp_q7s_events.csv | 2 +- generators/events/translateEvents.cpp | 6 +++--- linux/fsfwconfig/events/translateEvents.cpp | 6 +++--- linux/obc/PdecHandler.cpp | 2 +- linux/obc/PdecHandler.h | 2 +- mission/tmtc/CCSDSHandler.cpp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/generators/bsp_q7s_events.csv b/generators/bsp_q7s_events.csv index 7de6a92c..8dfa9e78 100644 --- a/generators/bsp_q7s_events.csv +++ b/generators/bsp_q7s_events.csv @@ -117,4 +117,4 @@ 11901;INVALID_TC_FRAME;HIGH;;/home/eive/EIVE/Robin/eive-obsw/linux/obc/PdecHandler.h 11902;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;/home/eive/EIVE/Robin/eive-obsw/linux/obc/PdecHandler.h 11903;CARRIER_LOCK;INFO;Carrier lock detected;/home/eive/EIVE/Robin/eive-obsw/linux/obc/PdecHandler.h -11904;BIT_LOCK;INFO;Bit lock detected (data valid);/home/eive/EIVE/Robin/eive-obsw/linux/obc/PdecHandler.h +11904;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);/home/eive/EIVE/Robin/eive-obsw/linux/obc/PdecHandler.h diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index 4b8a407b..943468c5 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 120 translations. * @details - * Generated on: 2021-11-25 14:06:54 + * Generated on: 2021-11-25 14:09:00 */ #include "translateEvents.h" @@ -124,7 +124,7 @@ const char *MRAM_DUMP_FINISHED_STRING = "MRAM_DUMP_FINISHED"; const char *INVALID_TC_FRAME_STRING = "INVALID_TC_FRAME"; const char *INVALID_FAR_STRING = "INVALID_FAR"; const char *CARRIER_LOCK_STRING = "CARRIER_LOCK"; -const char *BIT_LOCK_STRING = "BIT_LOCK"; +const char *BIT_LOCK_PDEC_STRING = "BIT_LOCK_PDEC"; const char * translateEvents(Event event) { switch( (event & 0xffff) ) { @@ -367,7 +367,7 @@ const char * translateEvents(Event event) { case(11903): return CARRIER_LOCK_STRING; case(11904): - return BIT_LOCK_STRING; + return BIT_LOCK_PDEC_STRING; default: return "UNKNOWN_EVENT"; } diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index 4b8a407b..943468c5 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 120 translations. * @details - * Generated on: 2021-11-25 14:06:54 + * Generated on: 2021-11-25 14:09:00 */ #include "translateEvents.h" @@ -124,7 +124,7 @@ const char *MRAM_DUMP_FINISHED_STRING = "MRAM_DUMP_FINISHED"; const char *INVALID_TC_FRAME_STRING = "INVALID_TC_FRAME"; const char *INVALID_FAR_STRING = "INVALID_FAR"; const char *CARRIER_LOCK_STRING = "CARRIER_LOCK"; -const char *BIT_LOCK_STRING = "BIT_LOCK"; +const char *BIT_LOCK_PDEC_STRING = "BIT_LOCK_PDEC"; const char * translateEvents(Event event) { switch( (event & 0xffff) ) { @@ -367,7 +367,7 @@ const char * translateEvents(Event event) { case(11903): return CARRIER_LOCK_STRING; case(11904): - return BIT_LOCK_STRING; + return BIT_LOCK_PDEC_STRING; default: return "UNKNOWN_EVENT"; } diff --git a/linux/obc/PdecHandler.cpp b/linux/obc/PdecHandler.cpp index f99a1a30..027cac80 100644 --- a/linux/obc/PdecHandler.cpp +++ b/linux/obc/PdecHandler.cpp @@ -246,7 +246,7 @@ void PdecHandler::checkLocks() { } if (!(clcw & NO_BITLOCK_MASK) && (lastClcw & NO_BITLOCK_MASK)) { // Bit lock changed from 0 to 1 - triggerEvent(BIT_LOCK); + triggerEvent(BIT_LOCK_PDEC); } lastClcw = clcw; } diff --git a/linux/obc/PdecHandler.h b/linux/obc/PdecHandler.h index 83e4a253..8819df22 100644 --- a/linux/obc/PdecHandler.h +++ b/linux/obc/PdecHandler.h @@ -82,7 +82,7 @@ public: //! [EXPORT] : [COMMENT] Carrier lock detected static const Event CARRIER_LOCK = MAKE_EVENT(3, severity::INFO); //! [EXPORT] : [COMMENT] Bit lock detected (data valid) - static const Event BIT_LOCK = MAKE_EVENT(4, severity::INFO); + static const Event BIT_LOCK_PDEC = MAKE_EVENT(4, severity::INFO); private: diff --git a/mission/tmtc/CCSDSHandler.cpp b/mission/tmtc/CCSDSHandler.cpp index 71307bd9..01894cbc 100644 --- a/mission/tmtc/CCSDSHandler.cpp +++ b/mission/tmtc/CCSDSHandler.cpp @@ -226,7 +226,7 @@ void CCSDSHandler::checkEvents() { void CCSDSHandler::handleEvent(EventMessage* eventMessage) { Event event = eventMessage->getEvent(); switch(event){ - case PdecHandler::BIT_LOCK: { + case PdecHandler::BIT_LOCK_PDEC: { handleBitLockEvent(); break; }