KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

A lot of new features and tweaks #12

Merged
muellerr merged 17 commits from mueller_framework into front_branch 2020-07-08 18:49:10 +02:00
Conversation 0 Commits 17 Files Changed 47 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dd48f7ccad - Show all commits

6
pus/Service2DeviceAccess.cpp
View File

@ -144,7 +144,7 @@ void Service2DeviceAccess::sendWiretappingTm(CommandMessage *reply,
store_address_t storeAddress = DeviceHandlerMessage::getStoreAddress(reply); store_address_t storeAddress = DeviceHandlerMessage::getStoreAddress(reply);
const uint8_t* data = nullptr; const uint8_t* data = nullptr;
size_t size = 0; size_t size = 0;
ReturnValue_t result = IPCStore->getData(storeAddress,&data,&size); ReturnValue_t result = IPCStore->getData(storeAddress, &data, &size);
if(result != HasReturnvaluesIF::RETURN_OK){ if(result != HasReturnvaluesIF::RETURN_OK){
sif::error << "Service2DeviceAccess::sendWiretappingTm: Data Lost in " sif::error << "Service2DeviceAccess::sendWiretappingTm: Data Lost in "
"handleUnrequestedReply with failure ID "<< result "handleUnrequestedReply with failure ID "<< result
@ -157,8 +157,8 @@ void Service2DeviceAccess::sendWiretappingTm(CommandMessage *reply,
WiretappingPacket TmPacket(DeviceHandlerMessage::getDeviceObjectId(reply), WiretappingPacket TmPacket(DeviceHandlerMessage::getDeviceObjectId(reply),
data); data);
TmPacket.objectId = EndianConverter::convertBigEndian(TmPacket.objectId); TmPacket.objectId = EndianConverter::convertBigEndian(TmPacket.objectId);
sendTmPacket(subservice,TmPacket.data,size,reinterpret_cast<uint8_t*>( sendTmPacket(subservice, TmPacket.data,size, reinterpret_cast<uint8_t*>(
&TmPacket.objectId),sizeof(TmPacket.objectId)); &TmPacket.objectId), sizeof(TmPacket.objectId));
} }
MessageQueueId_t Service2DeviceAccess::getDeviceQueue() { MessageQueueId_t Service2DeviceAccess::getDeviceQueue() {