changes in plocDefinitions and plocHandler

2021-04-19 17:17:22 +02:00
parent cc075844fd
commit a973d67d07
3 changed files with 27 additions and 0 deletions
--- a/mission/devices/PlocHandler.cpp
+++ b/mission/devices/PlocHandler.cpp
@ -106,8 +106,21 @@ ReturnValue_t PlocHandler::scanForReply(const uint8_t *start,
 		break;
 	case(PLOC::APID_ACK_FAILURE):
        *foundLen = PLOC::SIZE_ACK_REPORT;
+<<<<<<< Updated upstream
 	    *foundId = rememberCommandId;
 	    break;
+=======
+		break;
+	case(PLOC::TM_READ_REPORT):
+        *foundLen = PLOC::SIZE_ACK_REPORT;
+		break;
+	case(PLOC::EXE_SUCCESS):
+        *foundLen = PLOC::SIZE_EXE_REPORT;
+		break;
+	case(PLOC::EXE_FAILURE):
+        *foundLen = PLOC::SIZE_EXE_REPORT;
+		break;
+>>>>>>> Stashed changes
 	default:
        sif::debug << "PlocHandler::scanForReply: Reply has invalid apid" << std::endl;
        return IGNORE_REPLY_DATA;