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

v1.15.0 #311

Merged
muellerr merged 107 commits from develop into main 2022-10-27 11:28:49 +02:00
Conversation 0 Commits 107 Files Changed 81 +2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f939bfc469 - Show all commits

2
mission/devices/SolarArrayDeploymentHandler.cpp
View File

@ -347,10 +347,12 @@ ReturnValue_t SolarArrayDeploymentHandler::executeAction(ActionId_t actionId,
return HasActionsIF::IS_BUSY; return HasActionsIF::IS_BUSY;
} }
actionActive = true; actionActive = true;
rememberCommanderId = commandedBy;
return result; return result;
} else if (actionId == SWITCH_OFF_DEPLOYMENT) { } else if (actionId == SWITCH_OFF_DEPLOYMENT) {
startFsmOff(); startFsmOff();
actionActive = true; actionActive = true;
rememberCommanderId = commandedBy;
return result; return result;
} else { } else {
return HasActionsIF::INVALID_ACTION_ID; return HasActionsIF::INVALID_ACTION_ID;