mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

Merge remote-tracking branch 'upstram/master' into mueller_FixedSequenceImprovements

Browse Source
This commit is contained in:
Robin Müller
2020-05-11 17:16:25 +02:00
parent 3d8a152496 6dc05e4951
commit fc4f9156b9
43 changed files with 181 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
devicehandlers/FixedSlotSequence.cpp
View File

@ -82,7 +82,7 @@ uint32_t FixedSlotSequence::getLengthMs() const {
ReturnValue_t FixedSlotSequence::checkSequence() const {
if(slotList.empty()) {
error << "Fixed Slot Sequence: Slot list is empty!" << std::endl;
sif::error << "Fixed Slot Sequence: Slot list is empty!" << std::endl;
return HasReturnvaluesIF::RETURN_FAILED;
}
@ -90,12 +90,12 @@ ReturnValue_t FixedSlotSequence::checkSequence() const {
uint32_t count = 0;
uint32_t time = 0;
while (slotIt != slotList.end()) {
if (slotIt->handler == NULL) {
error << "FixedSlotSequene::initialize: ObjectId does not exist!"
if (slotIt->handler == nullptr) {
sif::error << "FixedSlotSequene::initialize: ObjectId does not exist!"
<< std::endl;
count++;
} else if (slotIt->pollingTimeMs < time) {
error << "FixedSlotSequence::initialize: Time: "
sif::error << "FixedSlotSequence::initialize: Time: "
<< slotIt->pollingTimeMs
<< " is smaller than previous with " << time << std::endl;
count++;