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 +17 -17
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3289a40320 - Show all commits

34
mission/devices/SolarArrayDeploymentHandler.cpp
View File

@ -62,9 +62,9 @@ void SolarArrayDeploymentHandler::handleStateMachine() {
// case SWITCH_DEPL_GPIOS: // case SWITCH_DEPL_GPIOS:
// deploymentTransistorsOn(); // deploymentTransistorsOn();
// break; // break;
//// case WAIT_ON_DEPLOYMENT_FINISH: // case WAIT_ON_DEPLOYMENT_FINISH:
//// handleDeploymentFinish(); // handleDeploymentFinish();
//// break; // break;
// case WAIT_FOR_MAIN_SWITCH_OFF: // case WAIT_FOR_MAIN_SWITCH_OFF:
// if (mainLineSwitcher.getSwitchState(mainLineSwitch) == PowerSwitchIF::SWITCH_OFF) { // if (mainLineSwitcher.getSwitchState(mainLineSwitch) == PowerSwitchIF::SWITCH_OFF) {
// stateMachine = WAIT_ON_DELOYMENT_COMMAND; // stateMachine = WAIT_ON_DELOYMENT_COMMAND;
@ -126,20 +126,20 @@ void SolarArrayDeploymentHandler::deploymentTransistorsOn() {
// void SolarArrayDeploymentHandler::handleDeploymentFinish() { // void SolarArrayDeploymentHandler::handleDeploymentFinish() {
// ReturnValue_t result = returnvalue::OK; // ReturnValue_t result = returnvalue::OK;
//// if (deploymentCountdown.hasTimedOut()) { // if (deploymentCountdown.hasTimedOut()) {
//// actionHelper.finish(true, rememberCommanderId, DEPLOY_SOLAR_ARRAYS, returnvalue::OK); // actionHelper.finish(true, rememberCommanderId, DEPLOY_SOLAR_ARRAYS, returnvalue::OK);
//// result = gpioInterface->pullLow(deplSA1); // result = gpioInterface->pullLow(deplSA1);
//// if (result != returnvalue::OK) { // if (result != returnvalue::OK) {
//// sif::debug << "SolarArrayDeploymentHandler::handleStateMachine: Failed to pull solar" // sif::debug << "SolarArrayDeploymentHandler::handleStateMachine: Failed to pull solar"
//// " array deployment switch 1 low " // " array deployment switch 1 low "
//// << std::endl; // << std::endl;
//// } // }
//// result = gpioInterface->pullLow(deplSA2); // result = gpioInterface->pullLow(deplSA2);
//// if (result != returnvalue::OK) { // if (result != returnvalue::OK) {
//// sif::debug << "SolarArrayDeploymentHandler::handleStateMachine: Failed to pull solar" // sif::debug << "SolarArrayDeploymentHandler::handleStateMachine: Failed to pull solar"
//// " array deployment switch 2 low " // " array deployment switch 2 low "
//// << std::endl; // << std::endl;
//// } // }
// mainLineSwitcher.sendSwitchCommand(mainLineSwitch, PowerSwitchIF::SWITCH_OFF); // mainLineSwitcher.sendSwitchCommand(mainLineSwitch, PowerSwitchIF::SWITCH_OFF);
// mainSwitchCountdown.setTimeout(mainLineSwitcher.getSwitchDelayMs()); // mainSwitchCountdown.setTimeout(mainLineSwitcher.getSwitchDelayMs());
// stateMachine = WAIT_FOR_MAIN_SWITCH_OFF; // stateMachine = WAIT_FOR_MAIN_SWITCH_OFF;