From 34ef313ab0983497b89eda0fb8bd27632f7d58b0 Mon Sep 17 00:00:00 2001 From: "Jakob.Meier" Date: Fri, 26 Mar 2021 13:55:32 +0100 Subject: [PATCH] imqt handler compiled --- mission/devices/CMakeLists.txt | 1 + mission/devices/IMTQHandler.cpp | 2 +- mission/devices/IMTQHandler.h | 4 +--- mission/devices/devicedefinitions/IMTQHandlerDefinitions.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mission/devices/CMakeLists.txt b/mission/devices/CMakeLists.txt index a1617d07..6e8518b0 100644 --- a/mission/devices/CMakeLists.txt +++ b/mission/devices/CMakeLists.txt @@ -12,6 +12,7 @@ target_sources(${TARGET_NAME} PUBLIC ACUHandler.cpp SyrlinksHkHandler.cpp Max31865PT1000Handler.cpp + IMTQHandler.cpp ) diff --git a/mission/devices/IMTQHandler.cpp b/mission/devices/IMTQHandler.cpp index 8e592cac..cc740409 100644 --- a/mission/devices/IMTQHandler.cpp +++ b/mission/devices/IMTQHandler.cpp @@ -68,7 +68,7 @@ ReturnValue_t IMTQHandler::buildCommandFromCommand( void IMTQHandler::fillCommandAndReplyMap() { this->insertInCommandAndReplyMap(IMTQ::GET_ENG_HK_DATA, 1, &engHkDataset, - IMTQ::SIZE_ENG_HK_COMMAND, false, true, IMTQ::SIZE_ENG_HK_DATA); + IMTQ::SIZE_ENG_HK_DATA_REPLY, false, true, IMTQ::SIZE_ENG_HK_DATA_REPLY); } ReturnValue_t IMTQHandler::scanForReply(const uint8_t *start, diff --git a/mission/devices/IMTQHandler.h b/mission/devices/IMTQHandler.h index 207b7560..2e2a7612 100644 --- a/mission/devices/IMTQHandler.h +++ b/mission/devices/IMTQHandler.h @@ -13,8 +13,7 @@ class IMTQHandler: public DeviceHandlerBase { public: - IMTQHandler(object_id_t objectId, object_id_t comIF, - CookieIF * comCookie); + IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie); virtual ~IMTQHandler(); /** @@ -38,7 +37,6 @@ protected: uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override; ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap, LocalDataPoolManager& poolManager) override; - LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override; private: diff --git a/mission/devices/devicedefinitions/IMTQHandlerDefinitions.h b/mission/devices/devicedefinitions/IMTQHandlerDefinitions.h index 117dc91a..21ad7dec 100644 --- a/mission/devices/devicedefinitions/IMTQHandlerDefinitions.h +++ b/mission/devices/devicedefinitions/IMTQHandlerDefinitions.h @@ -107,7 +107,7 @@ private: * When set to 0, the dipole will be generated until a new dipole actuation * command is sent. */ - CommandDipolePacket(uint16_t xDipole, uint16_t yDipole, uint16_t zDipole) : + CommandDipolePacket(uint16_t xDipole, uint16_t yDipole, uint16_t zDipole, uint16_t duration) : xDipole(xDipole), yDipole(yDipole), zDipole(zDipole), duration(duration) { } void setLinks() {