eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

SW tweaks #112

Merged
meierj merged 11 commits from mueller/sw-tweaks into develop 2021-11-26 09:14:04 +01:00
Conversation 0 Commits 11 Files Changed 32 +10 -10
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 14ba11738b - Show all commits

2
generators/bsp_q7s_events.csv
View File

@ -117,4 +117,4 @@
11901;INVALID_TC_FRAME;HIGH;;/home/eive/EIVE/Robin/eive-obsw/linux/obc/PdecHandler.h 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 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 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

1 2200 STORE_SEND_WRITE_FAILED LOW C:\Users\jakob\OneDrive\Work\EIVE\Q7S\Software\eive_obsw/fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h /home/eive/EIVE/Robin/eive-obsw/fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
117 11901 INVALID_TC_FRAME HIGH /home/eive/EIVE/Robin/eive-obsw/linux/obc/PdecHandler.h
118 11902 INVALID_FAR HIGH Read invalid FAR from PDEC after startup /home/eive/EIVE/Robin/eive-obsw/linux/obc/PdecHandler.h
119 11903 CARRIER_LOCK INFO Carrier lock detected /home/eive/EIVE/Robin/eive-obsw/linux/obc/PdecHandler.h
120 11904 BIT_LOCK_PDEC INFO Bit lock detected (data valid) /home/eive/EIVE/Robin/eive-obsw/linux/obc/PdecHandler.h

6
generators/events/translateEvents.cpp
View File

@ -1,7 +1,7 @@
/** /**
* @brief Auto-generated event translation file. Contains 120 translations. * @brief Auto-generated event translation file. Contains 120 translations.
* @details * @details
* Generated on: 2021-11-25 14:06:54 * Generated on: 2021-11-25 14:09:00
*/ */
#include "translateEvents.h" #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_TC_FRAME_STRING = "INVALID_TC_FRAME";
const char *INVALID_FAR_STRING = "INVALID_FAR"; const char *INVALID_FAR_STRING = "INVALID_FAR";
const char *CARRIER_LOCK_STRING = "CARRIER_LOCK"; 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) { const char * translateEvents(Event event) {
switch( (event & 0xffff) ) { switch( (event & 0xffff) ) {
@ -367,7 +367,7 @@ const char * translateEvents(Event event) {
case(11903): case(11903):
return CARRIER_LOCK_STRING; return CARRIER_LOCK_STRING;
case(11904): case(11904):
return BIT_LOCK_STRING; return BIT_LOCK_PDEC_STRING;
default: default:
return "UNKNOWN_EVENT"; return "UNKNOWN_EVENT";
} }

6
linux/fsfwconfig/events/translateEvents.cpp
View File

@ -1,7 +1,7 @@
/** /**
* @brief Auto-generated event translation file. Contains 120 translations. * @brief Auto-generated event translation file. Contains 120 translations.
* @details * @details
* Generated on: 2021-11-25 14:06:54 * Generated on: 2021-11-25 14:09:00
*/ */
#include "translateEvents.h" #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_TC_FRAME_STRING = "INVALID_TC_FRAME";
const char *INVALID_FAR_STRING = "INVALID_FAR"; const char *INVALID_FAR_STRING = "INVALID_FAR";
const char *CARRIER_LOCK_STRING = "CARRIER_LOCK"; 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) { const char * translateEvents(Event event) {
switch( (event & 0xffff) ) { switch( (event & 0xffff) ) {
@ -367,7 +367,7 @@ const char * translateEvents(Event event) {
case(11903): case(11903):
return CARRIER_LOCK_STRING; return CARRIER_LOCK_STRING;
case(11904): case(11904):
return BIT_LOCK_STRING; return BIT_LOCK_PDEC_STRING;
default: default:
return "UNKNOWN_EVENT"; return "UNKNOWN_EVENT";
} }

2
linux/obc/PdecHandler.cpp
View File

@ -246,7 +246,7 @@ void PdecHandler::checkLocks() {
} }
if (!(clcw & NO_BITLOCK_MASK) && (lastClcw & NO_BITLOCK_MASK)) { if (!(clcw & NO_BITLOCK_MASK) && (lastClcw & NO_BITLOCK_MASK)) {
// Bit lock changed from 0 to 1 // Bit lock changed from 0 to 1
triggerEvent(BIT_LOCK); triggerEvent(BIT_LOCK_PDEC);
} }
lastClcw = clcw; lastClcw = clcw;
} }

2
linux/obc/PdecHandler.h
View File

@ -82,7 +82,7 @@ public:
//! [EXPORT] : [COMMENT] Carrier lock detected //! [EXPORT] : [COMMENT] Carrier lock detected
static const Event CARRIER_LOCK = MAKE_EVENT(3, severity::INFO); static const Event CARRIER_LOCK = MAKE_EVENT(3, severity::INFO);
//! [EXPORT] : [COMMENT] Bit lock detected (data valid) //! [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: private:

2
mission/tmtc/CCSDSHandler.cpp
View File

@ -226,7 +226,7 @@ void CCSDSHandler::checkEvents() {
void CCSDSHandler::handleEvent(EventMessage* eventMessage) { void CCSDSHandler::handleEvent(EventMessage* eventMessage) {
Event event = eventMessage->getEvent(); Event event = eventMessage->getEvent();
switch(event){ switch(event){
case PdecHandler::BIT_LOCK: { case PdecHandler::BIT_LOCK_PDEC: {
handleBitLockEvent(); handleBitLockEvent();
break; break;
} }