Merge branch 'main' into psb-update
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good

This commit is contained in:
Robin Müller 2024-02-19 17:25:43 +01:00
commit 1fd6db8138
3 changed files with 16 additions and 1 deletions

View File

@ -23,6 +23,8 @@ will consitute of a breaking change warranting a new major release:
- PLOC SUPV latchup report could not be handled previously. - PLOC SUPV latchup report could not be handled previously.
- Bugfix in PLOC SUPV latchup report parsing. - Bugfix in PLOC SUPV latchup report parsing.
- Bugfix in PLOC MPSoC HK set: Set and variables were not set valid. - Bugfix in PLOC MPSoC HK set: Set and variables were not set valid.
- The `PTG_CTRL_NO_ATTITUDE_INFORMATION` will now actually trigger a fallback into safe mode
and is triggered by the `AcsController` now.
## Changed ## Changed

View File

@ -1,6 +1,8 @@
#include "StrFdir.h" #include "StrFdir.h"
#include "mission/acs/defs.h" #include <eive/objects.h>
#include <fsfw/events/EventManagerIF.h>
#include <mission/acs/defs.h>
StrFdir::StrFdir(object_id_t strObject) StrFdir::StrFdir(object_id_t strObject)
: DeviceHandlerFailureIsolation(strObject, objects::NO_OBJECT) {} : DeviceHandlerFailureIsolation(strObject, objects::NO_OBJECT) {}
@ -12,3 +14,13 @@ ReturnValue_t StrFdir::eventReceived(EventMessage* event) {
} }
return DeviceHandlerFailureIsolation::eventReceived(event); return DeviceHandlerFailureIsolation::eventReceived(event);
} }
ReturnValue_t StrFdir::initialize() {
ReturnValue_t result = DeviceHandlerFailureIsolation::initialize();
if (result != returnvalue::OK) {
return result;
}
EventManagerIF* manager = ObjectManager::instance()->get<EventManagerIF>(objects::EVENT_MANAGER);
return manager->subscribeToEvent(eventQueue->getId(),
event::getEventId(acs::PTG_CTRL_NO_ATTITUDE_INFORMATION));
}

View File

@ -6,6 +6,7 @@
class StrFdir : public DeviceHandlerFailureIsolation { class StrFdir : public DeviceHandlerFailureIsolation {
public: public:
StrFdir(object_id_t strObject); StrFdir(object_id_t strObject);
ReturnValue_t initialize() override;
ReturnValue_t eventReceived(EventMessage* event) override; ReturnValue_t eventReceived(EventMessage* event) override;
}; };