v1.12.0 #269

Merged
muellerr merged 493 commits from develop into main 2022-07-04 11:19:05 +02:00
2 changed files with 3 additions and 2 deletions
Showing only changes of commit 9bd5595999 - Show all commits

View File

@ -147,7 +147,8 @@ void PlocSupervisorHandler::doStartUp() {
case StartupState::BOOTING: { case StartupState::BOOTING: {
if (bootTimeout.hasTimedOut()) { if (bootTimeout.hasTimedOut()) {
uartIsolatorSwitch.pullHigh(); uartIsolatorSwitch.pullHigh();
startupState = StartupState::SET_TIME; // startupState = StartupState::SET_TIME;
startupState = StartupState::ON;
} }
} }
case StartupState::SET_TIME_EXECUTING: case StartupState::SET_TIME_EXECUTING:

2
tmtc

@ -1 +1 @@
Subproject commit 2e24f764a65042fda2ea12e2b13cfab49ccc7b55 Subproject commit 2b8fa356c9f9de5fa4037eb836662f509327138b