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

2
common/config/eive/definitions.h
View File

@ -41,7 +41,7 @@ static constexpr uint32_t SA_DEPL_WAIT_TIME_SECS = 45 * 60;
// HW constraints (current limit) mean that the GPIO channels need to be switched on in alternation // HW constraints (current limit) mean that the GPIO channels need to be switched on in alternation
static constexpr uint32_t SA_DEPL_CHANNEL_ALTERNATION_INTERVAL_SECS = 5; static constexpr uint32_t SA_DEPL_CHANNEL_ALTERNATION_INTERVAL_SECS = 5;
// Maximum allowed burn time allowed by the software. // Maximum allowed burn time allowed by the software.
static constexpr uint32_t SA_DEPL_MAX_BURN_TIME = 120; static constexpr uint32_t SA_DEPL_MAX_BURN_TIME = 180;
} // namespace config } // namespace config

2
mission/devices/SolarArrayDeploymentHandler.cpp
View File

@ -89,7 +89,6 @@ bool SolarArrayDeploymentHandler::autonomousDeplForFile(const char* filename, bo
bool stateSwitch = false; bool stateSwitch = false;
uint32_t secsSinceBoot = 0; uint32_t secsSinceBoot = 0;
while (std::getline(file, line)) { while (std::getline(file, line)) {
if (lineNum == 0) {
std::istringstream iss(line); std::istringstream iss(line);
if (lineNum == 0) { if (lineNum == 0) {
iss >> word; iss >> word;
@ -140,7 +139,6 @@ bool SolarArrayDeploymentHandler::autonomousDeplForFile(const char* filename, bo
switchCheck(AutonomousDeplState::DONE); switchCheck(AutonomousDeplState::DONE);
} }
} }
}
lineNum++; lineNum++;
} }
bool updateUptime = false; bool updateUptime = false;