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

ACS updates #365

Merged
muellerr merged 14 commits from acs_updates into develop 2023-02-03 14:28:07 +01:00
Conversation 0 Commits 14 Files Changed 17 +13 -10
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ef0a78dedb - Show all commits

5
mission/acsDefs.h
View File

@ -19,8 +19,9 @@ enum CtrlSubmode {
static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::ACS_SUBSYSTEM; static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::ACS_SUBSYSTEM;
//!< The limits for the rotation in safe mode were violated. //!< The limits for the rotation in safe mode were violated.
static const Event SAFE_RATE_VIOLATION = static const Event SAFE_RATE_VIOLATION = MAKE_EVENT(0, severity::MEDIUM);
MAKE_EVENT(0, severity::MEDIUM); static constexpr Event SAFE_RATE_RECOVERY = MAKE_EVENT(1, severity::MEDIUM); //!< The system has recovered from a safe rate rotation violation.
static constexpr Event SAFE_RATE_RECOVERY = MAKE_EVENT(1, severity::MEDIUM);
} // namespace acs } // namespace acs

18
mission/system/objects/AcsSubsystem.cpp
View File

@ -32,20 +32,22 @@ ReturnValue_t AcsSubsystem::initialize() {
return ObjectManagerIF::CHILD_INIT_FAILED; return ObjectManagerIF::CHILD_INIT_FAILED;
; ;
} }
result = manager->subscribeToEvent(eventQueue->getId(), event::getEventId(acs::SAFE_RATE_VIOLATION)); result =
if(result != returnvalue::OK) { manager->subscribeToEvent(eventQueue->getId(), event::getEventId(acs::SAFE_RATE_VIOLATION));
sif::error << "AcsSubsystem: Subscribing for acs::SAFE_RATE_VIOLATION failed" << std::endl; if (result != returnvalue::OK) {
sif::error << "AcsSubsystem: Subscribing for acs::SAFE_RATE_VIOLATION failed" << std::endl;
} }
result = manager->subscribeToEvent(eventQueue->getId(), event::getEventId(acs::SAFE_RATE_RECOVERY)); result =
if(result != returnvalue::OK) { manager->subscribeToEvent(eventQueue->getId(), event::getEventId(acs::SAFE_RATE_RECOVERY));
sif::error << "AcsSubsystem: Subscribing for acs::SAFE_RATE_RECOVERY failed" << std::endl; if (result != returnvalue::OK) {
sif::error << "AcsSubsystem: Subscribing for acs::SAFE_RATE_RECOVERY failed" << std::endl;
} }
return Subsystem::initialize(); return Subsystem::initialize();
} }
void AcsSubsystem::performChildOperation() { void AcsSubsystem::performChildOperation() {
handleEventMessages(); handleEventMessages();
return Subsystem::performChildOperation(); return Subsystem::performChildOperation();
} }
void AcsSubsystem::handleEventMessages() { void AcsSubsystem::handleEventMessages() {