From 881a03fbed3d8117a05a684b41d14249c32399d3 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 20 Mar 2023 15:49:41 +0100
Subject: [PATCH] direct transition to normal works again

---
 fsfw                                             | 2 +-
 linux/devices/startracker/StarTrackerHandler.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fsfw b/fsfw
index 43fd0b2f..227524a2 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 43fd0b2f59c3aeb2d3f4db10cfad56ee3709d68d
+Subproject commit 227524a21da755d125bcb1a5ff67bcbc452f8cf9
diff --git a/linux/devices/startracker/StarTrackerHandler.cpp b/linux/devices/startracker/StarTrackerHandler.cpp
index a195f596..9e75c910 100644
--- a/linux/devices/startracker/StarTrackerHandler.cpp
+++ b/linux/devices/startracker/StarTrackerHandler.cpp
@@ -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;