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

run auto-formatter

Browse Source
This commit is contained in:
Jakob Meier
2022-06-06 11:55:42 +02:00
parent 4fba2704aa
commit ae2f7219fd
17 changed files with 136 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/fsfw/devicehandlers/DeviceHandlerBase.cpp
View File

@ -66,7 +66,7 @@ void DeviceHandlerBase::setThermalStateRequestPoolIds(lp_id_t thermalStatePoolId
DeviceHandlerBase::~DeviceHandlerBase() {
if (comCookie != nullptr) {
delete comCookie;
delete comCookie;
}
if (defaultFDIRUsed) {
delete fdirInstance;
@ -256,7 +256,7 @@ void DeviceHandlerBase::decrementDeviceReplyMap() {
missedReply(replyPair.first);
timedOut = false;
if (not replyPair.second.periodic) {
replyPair.second.active = false;
replyPair.second.active = false;
}
}
}
@ -1396,8 +1396,7 @@ uint8_t DeviceHandlerBase::getReplyDelayCycles(DeviceCommandId_t deviceCommand)
DeviceReplyMap::iterator iter = deviceReplyMap.find(deviceCommand);
if (iter == deviceReplyMap.end()) {
return 0;
}
else if (iter->second.countdown != nullptr) {
} else if (iter->second.countdown != nullptr) {
return 0;
}
return iter->second.delayCycles;

6
src/fsfw/devicehandlers/DeviceHandlerBase.h
View File

@ -792,7 +792,7 @@ class DeviceHandlerBase : public DeviceHandlerIF,
DeviceCommandMap::iterator command;
//! Instead of using delayCycles to specify the maximum time to wait for the device reply, it
//! is also possible specify a countdown
Countdown* countdown = nullptr;
Countdown *countdown = nullptr;
//! will be set to true when reply is enabled
bool active = false;
};
@ -1259,13 +1259,13 @@ class DeviceHandlerBase : public DeviceHandlerIF,
/**
* @brief Handles disabling of replies which use a timeout to detect missed replies.
*/
void disableTimeoutControlledReply(DeviceReplyInfo* info);
void disableTimeoutControlledReply(DeviceReplyInfo *info);
/**
* @brief Handles disabling of replies which use a number of maximum delay cycles to detect
* missed replies.
*/
void disableDelayCyclesControlledReply(DeviceReplyInfo* info);
void disableDelayCyclesControlledReply(DeviceReplyInfo *info);
/**
* Retrive data from the #IPCStore.