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 +10 -6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bcef1f5d33 - Show all commits

5
mission/devices/SolarArrayDeploymentHandler.cpp
View File

@ -1,5 +1,7 @@
#include "SolarArrayDeploymentHandler.h" #include "SolarArrayDeploymentHandler.h"
#include <fsfw/tasks/TaskFactory.h>
#include <filesystem> #include <filesystem>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
@ -366,6 +368,7 @@ ReturnValue_t SolarArrayDeploymentHandler::saGpioAlternation() {
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
status = result; status = result;
} }
TaskFactory::delayTask(1);
result = sa2On(); result = sa2On();
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
status = result; status = result;
@ -375,11 +378,11 @@ ReturnValue_t SolarArrayDeploymentHandler::saGpioAlternation() {
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
status = result; status = result;
} }
TaskFactory::delayTask(1);
result = sa1On(); result = sa1On();
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
status = result; status = result;
} }
} }
fsmInfo.alternationDummy = not fsmInfo.alternationDummy; fsmInfo.alternationDummy = not fsmInfo.alternationDummy;
channelAlternationCd.resetTimer(); channelAlternationCd.resetTimer();

3
mission/devices/SolarArrayDeploymentHandler.h
View File

@ -174,7 +174,8 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
*/ */
Countdown burnCountdown; Countdown burnCountdown;
Countdown channelAlternationCd = Countdown(config::SA_DEPL_CHANNEL_ALTERNATION_INTERVAL_SECS * 1000); 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.