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

moved ccsds object creation back to core object factory and run auto formatter
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Jakob Meier
2022-06-27 10:58:46 +02:00
parent b5ff0edbc9
commit a2e7c6cca6
12 changed files with 125 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linux/ObjectFactory.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <fsfw/returnvalues/HasReturnvaluesIF.h>
#include <fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
#include <fsfw/returnvalues/HasReturnvaluesIF.h>
#include <string>

10
linux/obc/PdecHandler.cpp
View File

@ -190,19 +190,17 @@ bool PdecHandler::newTcReceived() {
void PdecHandler::checkLocks() {
uint32_t clcw = getClcw();
if (not (clcw & NO_RF_MASK) && not carrierLock) {
if (not(clcw & NO_RF_MASK) && not carrierLock) {
triggerEvent(CARRIER_LOCK);
carrierLock = true;
}
else if ((clcw & NO_RF_MASK) && carrierLock) {
} else if ((clcw & NO_RF_MASK) && carrierLock) {
carrierLock = false;
triggerEvent(LOST_CARRIER_LOCK_PDEC);
}
if (not (clcw & NO_BITLOCK_MASK) && not bitLock) {
if (not(clcw & NO_BITLOCK_MASK) && not bitLock) {
triggerEvent(BIT_LOCK_PDEC);
bitLock = true;
}
else if ((clcw & NO_BITLOCK_MASK) && bitLock) {
} else if ((clcw & NO_BITLOCK_MASK) && bitLock) {
bitLock = false;
triggerEvent(LOST_BIT_LOCK_PDEC);
}