eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

direct transition to normal works again
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-03-20 15:49:41 +01:00
parent d8f84ed00d
commit 881a03fbed
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsfw

@ -1 +1 @@
Subproject commit 43fd0b2f59c3aeb2d3f4db10cfad56ee3709d68d Subproject commit 227524a21da755d125bcb1a5ff67bcbc452f8cf9

5
linux/devices/startracker/StarTrackerHandler.cpp
View File

@ -716,6 +716,9 @@ void StarTrackerHandler::doOnTransition(Submode_t subModeFrom) {
subModeFrom = SUBMODE_BOOTLOADER; subModeFrom = SUBMODE_BOOTLOADER;
boot = false; boot = false;
} }
if (dhbSubmode == SUBMODE_NONE) {
bootFirmware(MODE_ON);
}
if (dhbSubmode == SUBMODE_BOOTLOADER && subModeFrom == SUBMODE_FIRMWARE) { if (dhbSubmode == SUBMODE_BOOTLOADER && subModeFrom == SUBMODE_FIRMWARE) {
bootBootloader(); bootBootloader();
} else if (dhbSubmode == SUBMODE_FIRMWARE && subModeFrom == SUBMODE_FIRMWARE) { } else if (dhbSubmode == SUBMODE_FIRMWARE && subModeFrom == SUBMODE_FIRMWARE) {
@ -759,7 +762,7 @@ void StarTrackerHandler::bootFirmware(Mode_t toMode) {
if (toMode == MODE_NORMAL) { if (toMode == MODE_NORMAL) {
setMode(toMode, 0); setMode(toMode, 0);
} else { } else {
setMode(toMode); setMode(toMode, SUBMODE_FIRMWARE);
} }
internalState = InternalState::IDLE; internalState = InternalState::IDLE;
break; break;