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

countdown to ensure periodic lock checking
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2022-10-27 10:51:34 +02:00
parent 95d2bc0887
commit 24c050765b
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
linux/obc/PdecHandler.cpp
View File

@ -167,6 +167,7 @@ ReturnValue_t PdecHandler::irqOperation() {
if (ret == 0) { if (ret == 0) {
// No TCs for timeout period // No TCs for timeout period
checkLocks(); checkLocks();
lockCheckCd.resetTimer();
} else if (ret >= 1) { } else if (ret >= 1) {
nb = read(fd, &info, sizeof(info)); nb = read(fd, &info, sizeof(info));
if (nb == static_cast<ssize_t>(sizeof(info))) { if (nb == static_cast<ssize_t>(sizeof(info))) {
@ -182,6 +183,10 @@ ReturnValue_t PdecHandler::irqOperation() {
// Read FAR here // Read FAR here
CURRENT_FAR = readFar(); CURRENT_FAR = readFar();
} }
if (lockCheckCd.hasTimedOut()) {
checkLocks();
lockCheckCd.resetTimer();
}
// Clear interrupts with dummy read // Clear interrupts with dummy read
ret = *(registerBaseAddress + PDEC_PIR_OFFSET); ret = *(registerBaseAddress + PDEC_PIR_OFFSET);
} }

3
linux/obc/PdecHandler.h
View File

@ -1,6 +1,8 @@
#ifndef LINUX_OBC_PDECHANDLER_H_ #ifndef LINUX_OBC_PDECHANDLER_H_
#define LINUX_OBC_PDECHANDLER_H_ #define LINUX_OBC_PDECHANDLER_H_
#include <fsfw/timemanager/Countdown.h>
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "PdecConfig.h" #include "PdecConfig.h"
#include "fsfw/action/ActionHelper.h" #include "fsfw/action/ActionHelper.h"
@ -200,6 +202,7 @@ class PdecHandler : public SystemObject, public ExecutableObjectIF, public HasAc
static uint32_t CURRENT_FAR; static uint32_t CURRENT_FAR;
Countdown lockCheckCd = Countdown(IRQ_TIMEOUT_MS);
object_id_t tcDestinationId; object_id_t tcDestinationId;
AcceptsTelecommandsIF* tcDestination = nullptr; AcceptsTelecommandsIF* tcDestination = nullptr;