Updated to match changes in radiostack.[ch]xx

[flightgear.git] / src / FDM / JSBSim / FGPiston.cpp

diff --git a/src/FDM/JSBSim/FGPiston.cpp b/src/FDM/JSBSim/FGPiston.cpp
index ea54f7c206c337ede577c2b8740dc10e508a7673..46eaaccf10892e9bafca2650d78dc87406d04183 100644 (file)
--- a/src/FDM/JSBSim/FGPiston.cpp
+++ b/src/FDM/JSBSim/FGPiston.cpp
@@ -154,19 +154,23 @@ double FGPiston::Calculate(double PowerRequired)
     
   IAS = Auxiliary->GetVcalibratedKTS();
 
-  if (Mixture >= 0.3) {
     doEngineStartup();
     doManifoldPressure();
     doAirFlow();
     doFuelFlow();
-    doEnginePower();
+
+  //Now that the fuel flow is done check if the mixture is too lean to run the engine
+  //Assume lean limit at 22 AFR for now - thats a thi of 0.668
+  //This might be a bit generous, but since there's currently no audiable warning of impending
+  //cutout in the form of misfiring and/or rough running its probably reasonable for now.
+  if (equivalence_ratio < 0.668)
+    Running = false;
+
+  doEnginePower();
     doEGT();
     doCHT();
     doOilTemperature();
     doOilPressure();
-  } else {
-    HP = 0;
-  }
 
   PowerAvailable = (HP * hptoftlbssec) - PowerRequired;
   return PowerAvailable;
@@ -227,11 +231,16 @@ void FGPiston::doEngineStartup(void)
 
   if ((!Running) && (spark) && (fuel)) {
   // start the engine if revs high enough
-    if ((RPM > 450) && (crank_counter > 175)) {
-      // For now just instantaneously start but later we should maybe crank for
-      // a bit
-      Running = true;
-      // RPM = 600;
+    if (Cranking) {
+      if ((RPM > 450) && (crank_counter > 175)) {
+        //Add a little delay to startup on the starter
+        Running = true;
+      }
+    } else {
+      if (RPM > 450) {
+        Running = true;
+        //This allows us to in-air start when windmilling
+      }
     }
   }
 
@@ -346,7 +355,7 @@ void FGPiston::doFuelFlow(void)
 void FGPiston::doEnginePower(void)
 {
   ManifoldPressure_inHg *= p_amb / p_amb_sea_level;
-  if(Running) {        
+  if (Running) {       
     double ManXRPM = ManifoldPressure_inHg * RPM;
         // FIXME: this needs to be generalized
     Percentage_Power = (6e-9 * ManXRPM * ManXRPM) + (8e-4 * ManXRPM) - 1.0;