From a3b5993fdc93844a03a4abbffb899ffda3f52fd1 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 17 Aug 2022 19:19:49 +0200 Subject: [PATCH] compiles, does not link yet --- .../devices/devicedefinitions/GPSHyperionLinuxDefinitions.h | 2 ++ linux/obc/PdecHandler.cpp | 6 +++--- linux/obc/PdecHandler.h | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/linux/devices/devicedefinitions/GPSHyperionLinuxDefinitions.h b/linux/devices/devicedefinitions/GPSHyperionLinuxDefinitions.h index d313dc82..1269b8e5 100644 --- a/linux/devices/devicedefinitions/GPSHyperionLinuxDefinitions.h +++ b/linux/devices/devicedefinitions/GPSHyperionLinuxDefinitions.h @@ -1,3 +1,5 @@ +#pragma once + #include #include #include diff --git a/linux/obc/PdecHandler.cpp b/linux/obc/PdecHandler.cpp index 500b6d85..c7d52060 100644 --- a/linux/obc/PdecHandler.cpp +++ b/linux/obc/PdecHandler.cpp @@ -79,6 +79,8 @@ ReturnValue_t PdecHandler::initialize() { MessageQueueId_t PdecHandler::getCommandQueue() const { return commandQueue->getId(); } +ActionHelper* PdecHandler::getActionHelper() { return &actionHelper; } + void PdecHandler::writePdecConfig() { PdecConfig pdecConfig; @@ -509,9 +511,7 @@ std::string PdecHandler::getMonStatusString(uint32_t status) { } } -ReturnValue_t PdecHandler::executeAction(Action* action) { - return action->handle(); -} +ReturnValue_t PdecHandler::executeAction(Action* action) { return action->handle(); } ReturnValue_t PdecHandler::handleAction(PdecPrintClcwAction* action) { printClcw(); diff --git a/linux/obc/PdecHandler.h b/linux/obc/PdecHandler.h index 4183d92c..58a19a1c 100644 --- a/linux/obc/PdecHandler.h +++ b/linux/obc/PdecHandler.h @@ -58,6 +58,7 @@ class PdecHandler : public SystemObject, MessageQueueId_t getCommandQueue() const; + ActionHelper *getActionHelper() override; ReturnValue_t executeAction(Action* action) override; ReturnValue_t handleAction(PdecPrintClcwAction * action); ReturnValue_t handleAction(PdecPrintMonAction * action);