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

Merge branch 'mueller_sifRenaming_soooMany' into mueller_framework

Browse Source
This commit is contained in:
Robin Müller
2020-04-23 19:21:12 +02:00
parent 1415cd2339 2c6b446500
commit 01195093e3
36 changed files with 117 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devicehandlers/DeviceHandlerBase.cpp
View File

@ -1177,7 +1177,7 @@ void DeviceHandlerBase::buildInternalCommand(void) {
if (mode == MODE_NORMAL) {
result = buildNormalDeviceCommand(&deviceCommandId);
if (result == BUSY) {
debug << std::hex << getObjectId()
sif::debug << std::hex << getObjectId()
<< ": DHB::buildInternalCommand busy" << std::endl; //so we can track misconfigurations
result = NOTHING_TO_SEND; //no need to report this
}
@ -1199,7 +1199,7 @@ void DeviceHandlerBase::buildInternalCommand(void) {
if (iter == deviceCommandMap.end()) {
result = COMMAND_NOT_SUPPORTED;
} else if (iter->second.isExecuting) {
debug << std::hex << getObjectId()
sif::debug << std::hex << getObjectId()
<< ": DHB::buildInternalCommand: Command "
<< deviceCommandId << " isExecuting" << std::endl; //so we can track misconfigurations
return; //this is an internal command, no need to report a failure here, missed reply will track if a reply is too late, otherwise, it's ok

6
devicehandlers/FixedSlotSequence.cpp
View File

@ -89,7 +89,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;
// does check sequence have to be const?
// if I want to check a class, I need the ability to set
// internal class states.
@ -103,11 +103,11 @@ ReturnValue_t FixedSlotSequence::checkSequence() const {
uint32_t time = 0;
while (slotIt != slotList.end()) {
if (slotIt->handler == NULL) {
error << "FixedSlotSequene::initialize: ObjectId does not exist!"
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++;