Merge pull request #9019 from RomanLut/submit-fix-broken-pitot

fixed pitot sensor
iNavFlight · May 8, 2023 · cf506d5 · cf506d5
2 parents f31f6fc + 19d0992
commit cf506d5
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/src/main/sensors/pitotmeter.c b/src/main/sensors/pitotmeter.c
@@ -208,17 +208,14 @@ STATIC_PROTOTHREAD(pitotThread)
 
         pitot.dev.calculate(&pitot.dev, &pitotPressureTmp, NULL);
 #ifdef USE_SIMULATOR
-        float airSpeed;
         if (SIMULATOR_HAS_OPTION(HITL_AIRSPEED)) {
-             airSpeed = simulatorData.airSpeed;
-#if defined(USE_PITOT_FAKE)
-        } else if (pitotmeterConfig()->pitot_hardware == PITOT_FAKE) { 
-        	airSpeed = fakePitotGetAirspeed();
-#endif
-    	} else {
-            airSpeed = 0;
+            pitotPressureTmp = sq(simulatorData.airSpeed) * SSL_AIR_DENSITY / 20000.0f + SSL_AIR_PRESSURE;     
         }
-        pitotPressureTmp = sq(airSpeed) * SSL_AIR_DENSITY / 20000.0f + SSL_AIR_PRESSURE;     
+#endif
+#if defined(USE_PITOT_FAKE)
+        if (pitotmeterConfig()->pitot_hardware == PITOT_FAKE) { 
+            pitotPressureTmp = sq(fakePitotGetAirspeed()) * SSL_AIR_DENSITY / 20000.0f + SSL_AIR_PRESSURE;     
+    	} 
 #endif
         ptYield();
 
@@ -246,12 +243,11 @@ STATIC_PROTOTHREAD(pitotThread)
 #ifdef USE_SIMULATOR
         if (SIMULATOR_HAS_OPTION(HITL_AIRSPEED)) {
             pitot.airSpeed = simulatorData.airSpeed;
+        }
+#endif
 #if defined(USE_PITOT_FAKE)
-        } else if (pitotmeterConfig()->pitot_hardware == PITOT_FAKE) { 
+        if (pitotmeterConfig()->pitot_hardware == PITOT_FAKE) { 
             pitot.airSpeed = fakePitotGetAirspeed();
-#endif
-        } else {
-            pitot.airSpeed = 0;
         }
 #endif
     }