Merge pull request #10245 from breadoven/abo_flight_timer_fix

Inflight timer fix
iNavFlight · Jul 19, 2024 · 2e2f69a · 2e2f69a
2 parents b67d58a + 2379a53
commit 2e2f69a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c
@@ -880,7 +880,9 @@ void taskMainPidLoop(timeUs_t currentTimeUs)
     cycleTime = getTaskDeltaTime(TASK_SELF);
     dT = (float)cycleTime * 0.000001f;
 
-    if (ARMING_FLAG(ARMED) && (!STATE(FIXED_WING_LEGACY) || !isNavLaunchEnabled() || (isNavLaunchEnabled() && fixedWingLaunchStatus() >= FW_LAUNCH_DETECTED))) {
+    bool fwLaunchIsActive = STATE(AIRPLANE) && isNavLaunchEnabled() && armTime == 0;
+
+    if (ARMING_FLAG(ARMED) && (!STATE(AIRPLANE) || !fwLaunchIsActive || fixedWingLaunchStatus() >= FW_LAUNCH_DETECTED)) {
         flightTime += cycleTime;
         armTime += cycleTime;
         updateAccExtremes();