eive/eive-obsw
eive
/
eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests 1 Releases 117 Wiki Activity

merge conflict
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details

This commit is contained in:
Robin Müller 2022-08-26 13:46:18 +02:00
parent 0f553e3431
commit e804d433aa
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mission/devices/GomspaceDeviceHandler.cpp
View File

@ -448,7 +448,6 @@ ReturnValue_t GomspaceDeviceHandler::generateRequestFullTableCmd(SpecialRequestT
} else {
RequestFullTableCommand requestFullTableCommand(querySize, tableId);
<<<<<<< HEAD
size_t cspPacketLen = 0;
uint8_t* buffer = cspPacket;
ReturnValue_t result = requestFullTableCommand.serialize(
@ -461,17 +460,6 @@ ReturnValue_t GomspaceDeviceHandler::generateRequestFullTableCmd(SpecialRequestT
}
rawPacket = cspPacket;
rawPacketLen = cspPacketLen;
=======
size_t cspPacketLen = 0;
uint8_t* buffer = cspPacket;
ReturnValue_t result = requestFullTableCommand.serialize(
&buffer, &cspPacketLen, sizeof(cspPacket), SerializeIF::Endianness::BIG);
if (result != returnvalue::OK) {
sif::error << "GomspaceDeviceHandler::generateRequestFullHkTableCmd Failed to serialize "
"full table request command "
<< std::endl;
return result;
>>>>>>> origin/develop
}
rememberRequestedSize = querySize;