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

apply afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
EIVE/eive-obsw/pipeline/pr-irini This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller
2022-08-31 16:12:32 +02:00
parent 839851914a
commit 7c15ecbad2
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mission/devices/ScexDeviceHandler.cpp
View File

@ -132,8 +132,8 @@ void ScexDeviceHandler::fillCommandAndReplyMap() {
insertInCommandAndReplyMap(scex::Cmds::ALL_CELLS_CMD, 0, nullptr, 0, true, false,
scex::Cmds::ALL_CELLS_CMD, &finishCountdown);
insertInCommandAndReplyMap(scex::Cmds::ONE_CELL, 0, nullptr, 0, true, false,
scex::Cmds::ONE_CELL, &finishCountdown);
insertInCommandAndReplyMap(scex::Cmds::ONE_CELL, 0, nullptr, 0, true, false, scex::Cmds::ONE_CELL,
&finishCountdown);
insertInCommandAndReplyMap(scex::Cmds::FRAM, 0, nullptr, 0, true, false, scex::Cmds::FRAM,
&finishCountdown);
@ -260,15 +260,15 @@ ReturnValue_t ScexDeviceHandler::interpretDeviceReply(DeviceCommandId_t id, cons
status = oneFileHandler("exp_status_");
break;
}
case(FRAM): {
case (FRAM): {
status = multiFileHandler("fram_");
break;
}
case(ONE_CELL): {
case (ONE_CELL): {
status = multiFileHandler("one_cell_");
break;
}
case(ALL_CELLS_CMD): {
case (ALL_CELLS_CMD): {
status = multiFileHandler("multi_cell_");
break;
}
@ -280,10 +280,9 @@ ReturnValue_t ScexDeviceHandler::interpretDeviceReply(DeviceCommandId_t id, cons
reader.finish();
commandActive = false;
if (id != PING) {
sif::info << "ScexDeviceHandler::interpretDeviceReply:Reader is finished" << std::endl;
fileNameSet = false;
}
if(id == FRAM or id == ALL_CELLS_CMD or id == ONE_CELL) {
if (id == FRAM or id == ALL_CELLS_CMD or id == ONE_CELL) {
triggerEvent(MULTI_PACKET_COMMAND_DONE, id);
updatePeriodicReply(false, id);
}