eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 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 +6 -5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 19c73167c9 - Show all commits

9
mission/devices/SolarArrayDeploymentHandler.cpp
View File

@ -371,14 +371,15 @@ ReturnValue_t SolarArrayDeploymentHandler::saGpioAlternation() {
status = result; status = result;
} }
} else { } else {
result = sa1On();
if (result != returnvalue::OK) {
status = result;
}
result = sa2Off(); result = sa2Off();
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
status = result; status = result;
} }
result = sa1On();
if (result != returnvalue::OK) {
status = result;
}
} }
fsmInfo.alternationDummy = not fsmInfo.alternationDummy; fsmInfo.alternationDummy = not fsmInfo.alternationDummy;
channelAlternationCd.resetTimer(); channelAlternationCd.resetTimer();

2
mission/devices/SolarArrayDeploymentHandler.h
View File

@ -174,7 +174,7 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
*/ */
Countdown burnCountdown; Countdown burnCountdown;
Countdown channelAlternationCd = Countdown(config::SA_DEPL_CHANNEL_ALTERNATION_INTERVAL_SECS); Countdown channelAlternationCd = Countdown(config::SA_DEPL_CHANNEL_ALTERNATION_INTERVAL_SECS * 1000);
/** /**
* The message queue id of the component commanding an action will be stored in this variable. * The message queue id of the component commanding an action will be stored in this variable.