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

Solar Array Deployment Update #305

Merged
muellerr merged 36 commits from mueller/solar-array-depl-autonomous into develop 2022-10-17 10:26:10 +02:00
Conversation 0 Commits 36 Files Changed 18 +609 -267
10 changed files with 609 additions and 267 deletions
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;