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

13
mission/devices/SolarArrayDeploymentHandler.cpp
View File

@ -184,17 +184,13 @@ void SolarArrayDeploymentHandler::handleStateMachine() {
mainLineSwitcher.sendSwitchCommand(mainLineSwitch, PowerSwitchIF::SWITCH_ON); mainLineSwitcher.sendSwitchCommand(mainLineSwitch, PowerSwitchIF::SWITCH_ON);
mainSwitchCountdown.setTimeout(mainLineSwitcher.getSwitchDelayMs()); mainSwitchCountdown.setTimeout(mainLineSwitcher.getSwitchDelayMs());
stateMachine = WAIT_MAIN_POWER_ON; stateMachine = WAIT_MAIN_POWER_ON;
if (DEBUG_MODE) { sif::info << "S/A Deployment: Deployment power line on" << std::endl;
sif::debug << "SA DEPL FSM: MAIN_POWER_ON done -> WAIT_MAIN_POWER_ON" << std::endl;
}
} }
if (stateMachine == MAIN_POWER_OFF) { if (stateMachine == MAIN_POWER_OFF) {
// These should never fail // These should never fail
allOff(); allOff();
stateMachine = WAIT_MAIN_POWER_OFF; stateMachine = WAIT_MAIN_POWER_OFF;
if (DEBUG_MODE) { sif::info << "S/A Deployment: Deployment power line off" << std::endl;
sif::debug << "SA DEPL FSM: MAIN_POWER_OFF done -> WAIT_MAIN_POWER_OFF" << std::endl;
}
} }
if (stateMachine == WAIT_MAIN_POWER_ON) { if (stateMachine == WAIT_MAIN_POWER_ON) {
if (checkMainPowerOn()) { if (checkMainPowerOn()) {
@ -209,6 +205,7 @@ void SolarArrayDeploymentHandler::handleStateMachine() {
if (DEBUG_MODE) { if (DEBUG_MODE) {
sif::debug << "SA DEPL FSM: WAIT_MAIN_POWER_OFF done -> FSM DONE" << std::endl; sif::debug << "SA DEPL FSM: WAIT_MAIN_POWER_OFF done -> FSM DONE" << std::endl;
} }
sif::info << "S/A Deployment: FSM done" << std::endl;
finishFsm(returnvalue::OK); finishFsm(returnvalue::OK);
} }
} }
@ -221,9 +218,7 @@ void SolarArrayDeploymentHandler::handleStateMachine() {
sa1On(); sa1On();
fsmInfo.alternationDummy = true; fsmInfo.alternationDummy = true;
} }
if (DEBUG_MODE) { sif::info << "S/A Deployment: Burning" << std::endl;
sif::debug << "SA DEPL FSM: SWITCH_DEPL_GPIOS done -> BURNING" << std::endl;
}
stateMachine = BURNING; stateMachine = BURNING;
} }
if (stateMachine == BURNING) { if (stateMachine == BURNING) {