From 201ef9cb0c9ced2b60bad8ea41dbc56f7d0a7ab0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 13 Jul 2022 15:51:21 +0200 Subject: [PATCH] smaller bugfixes --- mission/devices/ScexDeviceHandler.cpp | 8 ++++---- tmtc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mission/devices/ScexDeviceHandler.cpp b/mission/devices/ScexDeviceHandler.cpp index 5cc11d7c..edd9e6e9 100644 --- a/mission/devices/ScexDeviceHandler.cpp +++ b/mission/devices/ScexDeviceHandler.cpp @@ -84,7 +84,7 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic break; } case (FRAM): { - finishCountdown.setTimeout(SHORT_CD); + finishCountdown.setTimeout(LONG_CD); // countdown starten finishCountdown.resetTimer(); prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen, @@ -123,11 +123,11 @@ void ScexDeviceHandler::fillCommandAndReplyMap() { insertInCommandAndReplyMap(scex::Cmds::EXP_STATUS_CMD, 3); insertInCommandAndReplyMap(scex::Cmds::ALL_CELLS_CMD, 0, nullptr, 0, false, false, - DeviceHandlerIF::UNKNOWN_DEVICE_REPLY, &finishCountdown); + scex::Cmds::ALL_CELLS_CMD, &finishCountdown); insertInCommandAndReplyMap(scex::Cmds::ONE_CELL, 0, nullptr, 0, false, false, - DeviceHandlerIF::UNKNOWN_DEVICE_REPLY, &finishCountdown); + scex::Cmds::ONE_CELL, &finishCountdown); insertInCommandAndReplyMap(scex::Cmds::FRAM, 0, nullptr, 0, false, false, - DeviceHandlerIF::UNKNOWN_DEVICE_REPLY, &finishCountdown); + scex::Cmds::FRAM, &finishCountdown); insertInReplyMap(scex::Cmds::ERROR_REPLY, 3); } diff --git a/tmtc b/tmtc index 0a655f51..937eb482 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 0a655f51d4803d5561911101823e611d1f4a19ad +Subproject commit 937eb4829883b17e3a7a842528675c3609e24768