From d92b1b170ddb13d97bf061c8d33629940cc6ff66 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 27 Jul 2022 23:09:05 +0200 Subject: [PATCH] Boilerplate Code to make ploc and star tracker compile --- .../devicedefinitions/PlocMPSoCDefinitions.h | 2 +- linux/devices/ploc/PlocMPSoCHandler.cpp | 2 +- linux/devices/ploc/PlocSupervisorHandler.cpp | 13 ++++++++----- linux/devices/ploc/PlocSupervisorHandler.h | 3 +-- linux/devices/startracker/StarTrackerHandler.cpp | 10 +++++++--- linux/devices/startracker/StarTrackerHandler.h | 3 +-- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h b/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h index 06c9957e..23687a6d 100644 --- a/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h +++ b/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h @@ -154,7 +154,7 @@ class TcMemWrite : public TcBase { protected: ReturnValue_t initPacket(void *actionIn) { - auto action = dynamic_cast(actionIn); + auto action = (PlocMpSoCMemWriteAction *)(actionIn); //TODO ReturnValue_t result = HasReturnvaluesIF::RETURN_OK; // faking until framework code is ready // uint16_t length = action->memoryData.length; diff --git a/linux/devices/ploc/PlocMPSoCHandler.cpp b/linux/devices/ploc/PlocMPSoCHandler.cpp index 69e0f420..fd6991b6 100644 --- a/linux/devices/ploc/PlocMPSoCHandler.cpp +++ b/linux/devices/ploc/PlocMPSoCHandler.cpp @@ -480,7 +480,7 @@ ReturnValue_t PlocMPSoCHandler::handleAction(PlocMpSoCCamCmdSendAction* action) } ReturnValue_t PlocMPSoCHandler::handleAction(PlocMpSoCFlashWriteAction* action) { - ReturnValue_t result; + ReturnValue_t result = RETURN_OK; // if (size > config::MAX_PATH_SIZE + config::MAX_FILENAME_SIZE) { // return MPSoCReturnValuesIF::FILENAME_TOO_LONG; // } diff --git a/linux/devices/ploc/PlocSupervisorHandler.cpp b/linux/devices/ploc/PlocSupervisorHandler.cpp index 7d38d0c2..ff3a195b 100644 --- a/linux/devices/ploc/PlocSupervisorHandler.cpp +++ b/linux/devices/ploc/PlocSupervisorHandler.cpp @@ -80,12 +80,15 @@ void PlocSupervisorHandler::performOperationHook() { } } -ReturnValue_t PlocSupervisorHandler::executeAction(ActionId_t actionId, - MessageQueueId_t commandedBy, - const uint8_t* data, size_t size) { +ReturnValue_t PlocSupervisorHandler::executeAction(Action* action) { using namespace supv; ReturnValue_t result = RETURN_OK; + //TODO + ActionId_t actionId = 0; + uint8_t *data = nullptr; + size_t size = 0; + switch (actionId) { case TERMINATE_SUPV_HELPER: { supvHelper->stopProcess(); @@ -138,7 +141,7 @@ ReturnValue_t PlocSupervisorHandler::executeAction(ActionId_t actionId, default: break; } - return DeviceHandlerBase::executeAction(actionId, commandedBy, data, size); + return DeviceHandlerBase::executeAction(action); } void PlocSupervisorHandler::doStartUp() { @@ -828,7 +831,7 @@ void PlocSupervisorHandler::handleEvent(EventMessage* eventMessage) { event == PlocSupvHelper::SUPV_UPDATE_SUCCESSFUL || event == PlocSupvHelper::SUPV_CONTINUE_UPDATE_FAILED || event == PlocSupvHelper::SUPV_CONTINUE_UPDATE_SUCCESSFUL) { - result = this->executeAction(supv::SHUTDOWN_MPSOC, NO_COMMANDER, nullptr, 0); + //TODO result = this->executeAction(supv::SHUTDOWN_MPSOC, NO_COMMANDER, nullptr, 0); if (result != RETURN_OK) { triggerEvent(SUPV_MPSOC_SHUWDOWN_BUILD_FAILED); sif::warning << "PlocSupervisorHandler::handleEvent: Failed to build MPSoC shutdown " diff --git a/linux/devices/ploc/PlocSupervisorHandler.h b/linux/devices/ploc/PlocSupervisorHandler.h index 9946a1d5..ac9b3ddb 100644 --- a/linux/devices/ploc/PlocSupervisorHandler.h +++ b/linux/devices/ploc/PlocSupervisorHandler.h @@ -34,8 +34,7 @@ class PlocSupervisorHandler : public DeviceHandlerBase { virtual ReturnValue_t initialize() override; void performOperationHook() override; - ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy, - const uint8_t* data, size_t size) override; + ReturnValue_t executeAction(Action* action) override; protected: void doStartUp() override; diff --git a/linux/devices/startracker/StarTrackerHandler.cpp b/linux/devices/startracker/StarTrackerHandler.cpp index 9b3c7721..5c4ba73e 100644 --- a/linux/devices/startracker/StarTrackerHandler.cpp +++ b/linux/devices/startracker/StarTrackerHandler.cpp @@ -91,10 +91,14 @@ ReturnValue_t StarTrackerHandler::initialize() { return RETURN_OK; } -ReturnValue_t StarTrackerHandler::executeAction(ActionId_t actionId, MessageQueueId_t commandedBy, - const uint8_t* data, size_t size) { +ReturnValue_t StarTrackerHandler::executeAction(Action* action) { ReturnValue_t result = RETURN_OK; + //TODO + ActionId_t actionId = 0; + uint8_t *data = nullptr; + size_t size = 0; + switch (actionId) { case (startracker::STOP_IMAGE_LOADER): { strHelper->stopProcess(); @@ -209,7 +213,7 @@ ReturnValue_t StarTrackerHandler::executeAction(ActionId_t actionId, MessageQueu default: break; } - return DeviceHandlerBase::executeAction(actionId, commandedBy, data, size); + return DeviceHandlerBase::executeAction(action); } void StarTrackerHandler::performOperationHook() { diff --git a/linux/devices/startracker/StarTrackerHandler.h b/linux/devices/startracker/StarTrackerHandler.h index 90a30966..7fb8be90 100644 --- a/linux/devices/startracker/StarTrackerHandler.h +++ b/linux/devices/startracker/StarTrackerHandler.h @@ -44,8 +44,7 @@ class StarTrackerHandler : public DeviceHandlerBase { * @brief Overwrite this function from DHB to handle commands executed by the str image * loader task. */ - ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy, - const uint8_t* data, size_t size) override; + ReturnValue_t executeAction(Action* action) override; void performOperationHook() override;