Release v1.2.0 #47

Merged
meierj merged 229 commits from develop into master 2021-06-21 17:58:40 +02:00
72 changed files with 2240 additions and 450 deletions
Showing only changes of commit 986ee97721 - Show all commits

2
fsfw

Submodule fsfw updated: 42720e6f7d...e7d2456350

Submodule fsfw_hal updated: 14fe32572d...a85c01465b

View File

@@ -388,6 +388,11 @@ void PlocHandler::handleDeviceTM(const uint8_t* data, size_t dataSize, DeviceCom
ReturnValue_t result = RETURN_OK;
if (wiretappingMode == RAW) {
/* Data already sent in doGetRead() */
return result;
}
DeviceReplyMap::iterator iter = deviceReplyMap.find(replyId);
if (iter == deviceReplyMap.end()) {
sif::debug << "PlocHandler::handleDeviceTM: Unknown reply id" << std::endl;

2
thirdparty/etl vendored

2
tmtc

Submodule tmtc updated: 7310513805...3e466f06ef