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

str transition fixes #498

Merged
muellerr merged 9 commits from bugfix_str_mode_transitions into develop 2023-03-20 17:56:11 +01:00
Conversation 1 Commits 9 Files Changed 4 +5 -2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 881a03fbed - Show all commits

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;
boot = false;
}
if (dhbSubmode == SUBMODE_NONE) {
bootFirmware(MODE_ON);
}
if (dhbSubmode == SUBMODE_BOOTLOADER && subModeFrom == SUBMODE_FIRMWARE) {
bootBootloader();
} else if (dhbSubmode == SUBMODE_FIRMWARE && subModeFrom == SUBMODE_FIRMWARE) {
@ -759,7 +762,7 @@ void StarTrackerHandler::bootFirmware(Mode_t toMode) {
if (toMode == MODE_NORMAL) {
setMode(toMode, 0);
} else {
setMode(toMode);
setMode(toMode, SUBMODE_FIRMWARE);
}
internalState = InternalState::IDLE;
break;