KSat/fsfw
16
5
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

ksat_master #5

Manually merged
muellerr merged 169 commits from ksat_master into master 2020-04-08 19:35:26 +02:00
Conversation 0 Commits 169 Files Changed 150 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f7bd661e69 - Show all commits

3
devicehandlers/DeviceHandlerBase.cpp
View File

@ -66,7 +66,7 @@ ReturnValue_t DeviceHandlerBase::performOperation(uint8_t counter) {
return RETURN_OK;
}
switch (getRmapAction()) {
switch (getComAction()) {
case SEND_WRITE:
if ((cookieInfo.state == COOKIE_UNUSED)) {
buildInternalCommand();
@ -1050,6 +1050,7 @@ ReturnValue_t DeviceHandlerBase::handleDeviceHandlerMessage(
replyReturnvalueToCommand(WRONG_MODE_FOR_COMMAND);
} else {
// rework in progress
result = RETURN_OK;
//result = switchCookieChannel(
// DeviceHandlerMessage::getIoBoardObjectId(message));
if (result == RETURN_OK) {