fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

fdir update #158

Merged
gaisser merged 6 commits from KSat/fsfw:mueller/devices/FDIR into master 2020-09-01 12:21:51 +02:00
Conversation 0 Commits 6 Files Changed 4 +5 -6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8f2d5a5528 - Show all commits

6
devicehandlers/DeviceHandlerFailureIsolation.cpp
View File

@ -5,7 +5,8 @@
#include "../serviceinterface/ServiceInterfaceStream.h"
#include "../thermal/ThermalComponentIF.h"
object_id_t DeviceHandlerFailureIsolation::powerConfirmationId = 0;
object_id_t DeviceHandlerFailureIsolation::powerConfirmationId =
objects::NO_OBJECT;
DeviceHandlerFailureIsolation::DeviceHandlerFailureIsolation(object_id_t owner,
object_id_t parent) :
@ -70,7 +71,7 @@ ReturnValue_t DeviceHandlerFailureIsolation::eventReceived(EventMessage* event)
break;
//****Power*****
case PowerSwitchIF::SWITCH_WENT_OFF:
if(hasPowerConfirmation) {
if(powerConfirmation != MessageQueueIF::NO_QUEUE) {
result = sendConfirmationRequest(event, powerConfirmation);
if (result == RETURN_OK) {
setFdirState(DEVICE_MIGHT_BE_OFF);
@ -171,7 +172,6 @@ ReturnValue_t DeviceHandlerFailureIsolation::initialize() {
powerConfirmationId);
if (power != nullptr) {
powerConfirmation = power->getEventReceptionQueue();
gaisser commented 2020-08-25 13:54:15 +02:00
Outdated
Review
Copy Link

Can we avoid the aditional bool by checking powerConfirmation != NO_QUEUE?

Can we avoid the aditional bool by checking powerConfirmation != NO_QUEUE?
muellerr commented 2020-08-27 20:01:52 +02:00
Outdated
Review
Copy Link

Yeah it's better like that.

Yeah it's better like that.
hasPowerConfirmation = true;
}
return RETURN_OK;

5
devicehandlers/DeviceHandlerFailureIsolation.h
View File

@ -3,11 +3,11 @@
#include "../fdir/FaultCounter.h"
#include "../fdir/FailureIsolationBase.h"
namespace Factory{
void setStaticFrameworkObjectIds();
}
class DeviceHandlerFailureIsolation: public FailureIsolationBase {
friend void (Factory::setStaticFrameworkObjectIds)();
friend class Heater;
@ -28,8 +28,7 @@ protected:
NONE, RECOVERY_ONGOING, DEVICE_MIGHT_BE_OFF, AWAIT_SHUTDOWN
};
FDIRState fdirState;
bool hasPowerConfirmation = false;
MessageQueueId_t powerConfirmation;
MessageQueueId_t powerConfirmation = MessageQueueIF::NO_QUEUE;
static object_id_t powerConfirmationId;
// TODO: Are those hardcoded value? How can they be changed.
static const uint32_t MAX_REBOOT = 1;
gaisser commented 2020-08-13 19:35:15 +02:00
Outdated
Review
Copy Link

These values are used to initialize the defaults. Can be overwritten by child implementations.

These values are used to initialize the defaults. Can be overwritten by child implementations.
muellerr commented 2020-08-19 19:27:57 +02:00
Outdated
Review
Copy Link

ahhh that makes sense. maybe put DEFAULT_ in name to make it more explicit?

ahhh that makes sense. maybe put DEFAULT_ in name to make it more explicit?