eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

re-work some FDIR logic #172

Merged
muellerr merged 2 commits from improve-dev-fdir into develop 2024-04-09 10:47:33 +02:00
Conversation 1 Commits 2 Files Changed 4 +5 -7
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c5159fb645 - Show all commits

6
src/fsfw/devicehandlers/DeviceHandlerFailureIsolation.cpp
View File

@ -26,10 +26,8 @@ ReturnValue_t DeviceHandlerFailureIsolation::eventReceived(EventMessage* event)
if (isFdirInActionOrAreWeFaulty(event)) { if (isFdirInActionOrAreWeFaulty(event)) {
return returnvalue::OK; return returnvalue::OK;
} }
// No FDIR reactions if we are in external control by default. If the user commands the device // As mentioned in the function documentation, no FDIR reaction are performed when the device
// manually, this might be related to debugging to testing the device in a low-level way. FDIR // is in external control.
// reactions might get in the way of this process by restarting the device or putting it in
// the faulty state.
if (owner->getHealth() == HasHealthIF::EXTERNAL_CONTROL) { if (owner->getHealth() == HasHealthIF::EXTERNAL_CONTROL) {
return returnvalue::OK; return returnvalue::OK;
} }

4
src/fsfw/devicehandlers/DeviceHandlerFailureIsolation.h
View File

@ -46,8 +46,8 @@ class DeviceHandlerFailureIsolation : public FailureIsolationBase {
* It will perform recoveries or failures on a pre-defined set of events. If the user wants * It will perform recoveries or failures on a pre-defined set of events. If the user wants
* to add handling for custom events, this function should be overriden. * to add handling for custom events, this function should be overriden.
* *
* It should be noted that this function will not perform FDIR reactions if the handler is * It should be noted that the default implementation will not perform FDIR reactions if the
* faulty or in external control by default. If the user commands the device * handler is faulty or in external control by default. If the user commands the device
* manually, this might be related to debugging to testing the device in a low-level way. FDIR * manually, this might be related to debugging to testing the device in a low-level way. FDIR
* reactions might get in the way of this process by restarting the device or putting it in * reactions might get in the way of this process by restarting the device or putting it in
* the faulty state. If the user still requires FDIR handling in the EXTERNAL_CONTROL case, * the faulty state. If the user still requires FDIR handling in the EXTERNAL_CONTROL case,

2
src/fsfw/fdir/FailureIsolationBase.h
View File

@ -53,4 +53,4 @@ class FailureIsolationBase : public ConfirmsFailuresIF, public HasParametersIF {
void doConfirmFault(EventMessage* event); void doConfirmFault(EventMessage* event);
}; };
#endif /* FRAMEWORK_FDIR #endif /* FRAMEWORK_FDIR */