From fb297237287741f2d060103d50de458153554973 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 24 Jun 2021 11:16:08 +0200 Subject: [PATCH] fsfw update, rm3100 update --- fsfw | 2 +- mission/devices/MGMHandlerRM3100.cpp | 10 +++++----- mission/devices/MGMHandlerRM3100.h | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/fsfw b/fsfw index 5f9a6bb1..c0c4a319 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 5f9a6bb155eb59981e7ff851b7efaa1ae25e42b4 +Subproject commit c0c4a3190f1e54d4b5982656f5cc52218928d6ca diff --git a/mission/devices/MGMHandlerRM3100.cpp b/mission/devices/MGMHandlerRM3100.cpp index 4fd654d3..0f7fc729 100644 --- a/mission/devices/MGMHandlerRM3100.cpp +++ b/mission/devices/MGMHandlerRM3100.cpp @@ -1,10 +1,10 @@ -#include #include "MGMHandlerRM3100.h" -#include -#include -#include -#include +#include "fsfw/datapool/PoolReadGuard.h" +#include "fsfw/globalfunctions/bitutility.h" +#include "fsfw/devicehandlers/DeviceHandlerMessage.h" +#include "fsfw/objectmanager/SystemObjectIF.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" MGMHandlerRM3100::MGMHandlerRM3100(object_id_t objectId, diff --git a/mission/devices/MGMHandlerRM3100.h b/mission/devices/MGMHandlerRM3100.h index 95175b47..48173e65 100644 --- a/mission/devices/MGMHandlerRM3100.h +++ b/mission/devices/MGMHandlerRM3100.h @@ -1,13 +1,12 @@ #ifndef MISSION_DEVICES_MGMRM3100HANDLER_H_ #define MISSION_DEVICES_MGMRM3100HANDLER_H_ +#include "OBSWConfig.h" #include "devicedefinitions/MGMHandlerRM3100Definitions.h" -#include - -#include +#include "fsfw/devicehandlers/DeviceHandlerBase.h" #if OBSW_VERBOSE_LEVEL >= 1 -#include +#include "fsfw/globalfunctions/PeriodicOperationDivider.h" #endif /** @@ -21,11 +20,11 @@ class MGMHandlerRM3100: public DeviceHandlerBase { public: static const uint8_t INTERFACE_ID = CLASS_ID::MGM_RM3100; - //! P1: TMRC value which was set, P2: 0 + //! [EXPORT] : [COMMENT] P1: TMRC value which was set, P2: 0 static constexpr Event tmrcSet = event::makeEvent(SUBSYSTEM_ID::MGM_RM3100, 0x00, severity::INFO); - //! P1: First two bytes new Cycle Count X + //! [EXPORT] : [COMMENT] Cycle counter set. P1: First two bytes new Cycle Count X //! P1: Second two bytes new Cycle Count Y //! P2: New cycle count Z static constexpr Event cycleCountersSet = event::makeEvent(