eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

WIP: SCEX Init #272

Closed
muellerr wants to merge 62 commits from irini into develop
pull from: irini
merge into: eive:develop
Conversation 1 Commits 62 Files Changed 40 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 201ef9cb0c - Show all commits

8
mission/devices/ScexDeviceHandler.cpp
View File

@ -84,7 +84,7 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
break; break;
} }
case (FRAM): { case (FRAM): {
finishCountdown.setTimeout(SHORT_CD); finishCountdown.setTimeout(LONG_CD);
// countdown starten // countdown starten
finishCountdown.resetTimer(); finishCountdown.resetTimer();
prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen, prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
@ -123,11 +123,11 @@ void ScexDeviceHandler::fillCommandAndReplyMap() {
insertInCommandAndReplyMap(scex::Cmds::EXP_STATUS_CMD, 3); insertInCommandAndReplyMap(scex::Cmds::EXP_STATUS_CMD, 3);
insertInCommandAndReplyMap(scex::Cmds::ALL_CELLS_CMD, 0, nullptr, 0, false, false, 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, 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, insertInCommandAndReplyMap(scex::Cmds::FRAM, 0, nullptr, 0, false, false,
DeviceHandlerIF::UNKNOWN_DEVICE_REPLY, &finishCountdown); scex::Cmds::FRAM, &finishCountdown);
insertInReplyMap(scex::Cmds::ERROR_REPLY, 3); insertInReplyMap(scex::Cmds::ERROR_REPLY, 3);
} }

2
tmtc

@ -1 +1 @@
Subproject commit 0a655f51d4803d5561911101823e611d1f4a19ad Subproject commit 937eb4829883b17e3a7a842528675c3609e24768