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

ASTP 1.1.0 Merge Development in Master #441

Merged
gaisser merged 265 commits from development into master 2021-06-29 14:11:46 +02:00
Conversation 0 Commits 265 Files Changed 203 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1c7c532ef6 - Show all commits

16
devicehandlers/DeviceHandlerBase.cpp
View File

@ -226,15 +226,15 @@ ReturnValue_t DeviceHandlerBase::initialize() {
} }
void DeviceHandlerBase::decrementDeviceReplyMap() { void DeviceHandlerBase::decrementDeviceReplyMap() {
for (auto pair: deviceReplyMap) { for (auto replyPair: deviceReplyMap) {
if (pair.second.delayCycles != 0) { if (replyPair.second.delayCycles != 0) {
pair.second.delayCycles--; replyPair.second.delayCycles--;
if (pair.second.delayCycles == 0) { if (replyPair.second.delayCycles == 0) {
if (pair.second.periodic) { if (replyPair.second.periodic) {
pair.second.delayCycles = pair.second.maxDelayCycles; replyPair.second.delayCycles = replyPair.second.maxDelayCycles;
} }
replyToReply(pair.first, pair.second, TIMEOUT); replyToReply(replyPair.first, replyPair.second, TIMEOUT);
missedReply(pair.first); missedReply(replyPair.first);
} }
} }
} }