This commit is contained in:
parent
20328f89ae
commit
5a92b9e616
@ -184,7 +184,6 @@ void ScexUartReader::handleFoundDlePacket(uint8_t *packet, size_t len) {
|
|||||||
if (result != RETURN_OK) {
|
if (result != RETURN_OK) {
|
||||||
sif::warning << "ScexUartReader::handleFoundDlePacket: IPCRingBuf error" << std::endl;
|
sif::warning << "ScexUartReader::handleFoundDlePacket: IPCRingBuf error" << std::endl;
|
||||||
}
|
}
|
||||||
// sif::info << "DLE handler done" << std::endl;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ReturnValue_t ScexUartReader::readReceivedMessage(CookieIF *cookie, uint8_t **buffer,
|
ReturnValue_t ScexUartReader::readReceivedMessage(CookieIF *cookie, uint8_t **buffer,
|
||||||
|
@ -150,7 +150,7 @@ ReturnValue_t ScexDeviceHandler::interpretDeviceReply(DeviceCommandId_t id, cons
|
|||||||
auto multiFileHandler = [&](std::string cmdName) {
|
auto multiFileHandler = [&](std::string cmdName) {
|
||||||
if ((helper.getPacketCounter() == 1) or (not fileNameSet)) {
|
if ((helper.getPacketCounter() == 1) or (not fileNameSet)) {
|
||||||
finishCountdown.setTimeout(LONG_CD);
|
finishCountdown.setTimeout(LONG_CD);
|
||||||
// countdown starten
|
// countdown starts
|
||||||
finishCountdown.resetTimer();
|
finishCountdown.resetTimer();
|
||||||
|
|
||||||
fileId = random_string(6);
|
fileId = random_string(6);
|
||||||
@ -223,7 +223,7 @@ void ScexDeviceHandler::performOperationHook() {
|
|||||||
if (commandActive and finishCountdown.hasTimedOut()) {
|
if (commandActive and finishCountdown.hasTimedOut()) {
|
||||||
triggerEvent(scex::EXPERIMENT_TIMEDOUT, currCmd, 0);
|
triggerEvent(scex::EXPERIMENT_TIMEDOUT, currCmd, 0);
|
||||||
reader.finish();
|
reader.finish();
|
||||||
sif::warning << "ScexDeviceHandler::interpretDiviceReply: Reader timeout" << std::endl;
|
sif::warning << "ScexDeviceHandler::performOperationHook: Reader timeout" << std::endl;
|
||||||
fileNameSet = false;
|
fileNameSet = false;
|
||||||
commandActive = false;
|
commandActive = false;
|
||||||
}
|
}
|
||||||
|
2
tmtc
2
tmtc
@ -1 +1 @@
|
|||||||
Subproject commit 67500e88edbf684e79775333c69735ac88b31fd0
|
Subproject commit dbae41cb5810c45ee783080dd0c0f5580e258876
|
Loading…
Reference in New Issue
Block a user