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

fix

This commit is contained in:
Robin Müller 2020-04-06 14:02:33 +02:00
parent 511c0db8c7
commit ee23a7c0b5
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devicehandlers/DeviceHandlerBase.cpp
View File

@ -557,9 +557,6 @@ void DeviceHandlerBase::doSendRead() {
if (result == RETURN_OK) {
cookieInfo.state = COOKIE_READ_SENT;
}
/* else if(result == DeviceCommunicationIF::NO_READ_REQUEST) {
return;
}*/
else {
triggerEvent(DEVICE_REQUESTING_REPLY_FAILED, result);
//We can't inform anyone, because we don't know which command was sent last.
@ -594,7 +591,7 @@ void DeviceHandlerBase::doGetRead() {
return;
}
if (receivedDataLen == 0)
if (receivedDataLen == 0 or result == DeviceCommunicationIF::NO_REPLY_RECEIVED)
return;
if (wiretappingMode == RAW) {
@ -1152,9 +1149,6 @@ ReturnValue_t DeviceHandlerBase::executeAction(ActionId_t actionId,
if (result != HasReturnvaluesIF::RETURN_OK) {
return result;
}
if(size == 0) {
return NO_COMMAND_DATA;
}
DeviceCommandMap::iterator iter = deviceCommandMap.find(actionId);
if (iter == deviceCommandMap.end()) {