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

7
mission/devices/SolarArrayDeploymentHandler.cpp
View File

@ -141,11 +141,15 @@ bool SolarArrayDeploymentHandler::autonomousDeplForFile(const char* filename) {
} }
lineNum++; lineNum++;
} }
bool updateUptime = false;
if(opDivider.checkAndIncrement()) {
if (initUptime) { if (initUptime) {
secsSinceBoot = initUptime.value(); secsSinceBoot = initUptime.value();
} }
// Uptime has increased by X seconds so we need to update the uptime count inside the file // Uptime has increased by X seconds so we need to update the uptime count inside the file
secsSinceBoot += Clock::getUptime().tv_sec; secsSinceBoot += Clock::getUptime().tv_sec;
updateUptime = true;
}
if (stateSwitch) { if (stateSwitch) {
if (deplState == AutonomousDeplState::FIRST_BURN or if (deplState == AutonomousDeplState::FIRST_BURN or
deplState == AutonomousDeplState::SECOND_BURN) { deplState == AutonomousDeplState::SECOND_BURN) {
@ -154,6 +158,9 @@ bool SolarArrayDeploymentHandler::autonomousDeplForFile(const char* filename) {
startFsm(false, false); startFsm(false, false);
} }
} }
if(stateSwitch or updateUptime) {
// TODO: Write new file here
}
return true; return true;
} }

2
mission/devices/SolarArrayDeploymentHandler.h
View File

@ -1,6 +1,7 @@
#ifndef MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_ #ifndef MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
#define MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_ #define MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
#include <fsfw/globalfunctions/PeriodicOperationDivider.h>
#include <unordered_map> #include <unordered_map>
#include "devices/powerSwitcherList.h" #include "devices/powerSwitcherList.h"
@ -109,6 +110,7 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
bool actionActive = false; bool actionActive = false;
ActionId_t activeCmd = HasActionsIF::INVALID_ACTION_ID; ActionId_t activeCmd = HasActionsIF::INVALID_ACTION_ID;
std::optional<uint64_t> initUptime; std::optional<uint64_t> initUptime;
PeriodicOperationDivider opDivider = PeriodicOperationDivider(5);
uint8_t retryCounter = 3; uint8_t retryCounter = 3;
struct FsmInfo { struct FsmInfo {
// false if OFF, true is ON // false if OFF, true is ON