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

Update v1.1.0 - MGT - RTD - PUSC #28

Merged
meierj merged 88 commits from mueller/mgt-rtd-pusc into develop 2021-04-25 12:40:38 +02:00
Conversation 0 Commits 88 Files Changed 71 +4 -5
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit be9d11afff - Show all commits

1
mission/devices/CMakeLists.txt
View File

@ -12,6 +12,7 @@ target_sources(${TARGET_NAME} PUBLIC
ACUHandler.cpp ACUHandler.cpp
SyrlinksHkHandler.cpp SyrlinksHkHandler.cpp
Max31865PT1000Handler.cpp Max31865PT1000Handler.cpp
IMTQHandler.cpp
) )

2
mission/devices/IMTQHandler.cpp
View File

@ -68,7 +68,7 @@ ReturnValue_t IMTQHandler::buildCommandFromCommand(
void IMTQHandler::fillCommandAndReplyMap() { void IMTQHandler::fillCommandAndReplyMap() {
this->insertInCommandAndReplyMap(IMTQ::GET_ENG_HK_DATA, 1, &engHkDataset, 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, ReturnValue_t IMTQHandler::scanForReply(const uint8_t *start,

4
mission/devices/IMTQHandler.h
View File

@ -13,8 +13,7 @@
class IMTQHandler: public DeviceHandlerBase { class IMTQHandler: public DeviceHandlerBase {
public: public:
IMTQHandler(object_id_t objectId, object_id_t comIF, IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie);
CookieIF * comCookie);
virtual ~IMTQHandler(); virtual ~IMTQHandler();
/** /**
@ -38,7 +37,6 @@ protected:
uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override; uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override;
ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap, ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
LocalDataPoolManager& poolManager) override; LocalDataPoolManager& poolManager) override;
LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override;
private: private:

2
mission/devices/devicedefinitions/IMTQHandlerDefinitions.h
View File

@ -107,7 +107,7 @@ private:
* When set to 0, the dipole will be generated until a new dipole actuation * When set to 0, the dipole will be generated until a new dipole actuation
* command is sent. * 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) { xDipole(xDipole), yDipole(yDipole), zDipole(zDipole), duration(duration) {
} }
void setLinks() { void setLinks() {