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

fsfw update, rm3100 update

Browse Source
This commit is contained in:
Robin Müller 2021-06-24 11:16:08 +02:00
parent 142dc29c75
commit fb29723728
No known key found for this signature in database
GPG Key ID: 9C287E88FED11DF3
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsfw

@ -1 +1 @@
Subproject commit 5f9a6bb155eb59981e7ff851b7efaa1ae25e42b4 Subproject commit c0c4a3190f1e54d4b5982656f5cc52218928d6ca

10
mission/devices/MGMHandlerRM3100.cpp
View File

@ -1,10 +1,10 @@
#include <fsfw/datapool/PoolReadGuard.h>
#include "MGMHandlerRM3100.h" #include "MGMHandlerRM3100.h"
#include <fsfw/globalfunctions/bitutility.h> #include "fsfw/datapool/PoolReadGuard.h"
#include <fsfw/devicehandlers/DeviceHandlerMessage.h> #include "fsfw/globalfunctions/bitutility.h"
#include <fsfw/objectmanager/SystemObjectIF.h> #include "fsfw/devicehandlers/DeviceHandlerMessage.h"
#include <fsfw/returnvalues/HasReturnvaluesIF.h> #include "fsfw/objectmanager/SystemObjectIF.h"
#include "fsfw/returnvalues/HasReturnvaluesIF.h"
MGMHandlerRM3100::MGMHandlerRM3100(object_id_t objectId, MGMHandlerRM3100::MGMHandlerRM3100(object_id_t objectId,

11
mission/devices/MGMHandlerRM3100.h
View File

@ -1,13 +1,12 @@
#ifndef MISSION_DEVICES_MGMRM3100HANDLER_H_ #ifndef MISSION_DEVICES_MGMRM3100HANDLER_H_
#define MISSION_DEVICES_MGMRM3100HANDLER_H_ #define MISSION_DEVICES_MGMRM3100HANDLER_H_
#include "OBSWConfig.h"
#include "devicedefinitions/MGMHandlerRM3100Definitions.h" #include "devicedefinitions/MGMHandlerRM3100Definitions.h"
#include <fsfw/devicehandlers/DeviceHandlerBase.h> #include "fsfw/devicehandlers/DeviceHandlerBase.h"
#include <OBSWConfig.h>
#if OBSW_VERBOSE_LEVEL >= 1 #if OBSW_VERBOSE_LEVEL >= 1
#include <fsfw/globalfunctions/PeriodicOperationDivider.h> #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
#endif #endif
/** /**
@ -21,11 +20,11 @@ class MGMHandlerRM3100: public DeviceHandlerBase {
public: public:
static const uint8_t INTERFACE_ID = CLASS_ID::MGM_RM3100; 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, static constexpr Event tmrcSet = event::makeEvent(SUBSYSTEM_ID::MGM_RM3100,
0x00, severity::INFO); 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 //! P1: Second two bytes new Cycle Count Y
//! P2: New cycle count Z //! P2: New cycle count Z
static constexpr Event cycleCountersSet = event::makeEvent( static constexpr Event cycleCountersSet = event::makeEvent(