Merge pull request #34 from dkavolis/airspeed

Expose IAS and EAS in FARAPI
dkavolis · Mar 25, 2019 · 777aa07 · 777aa07
2 parents 8b1dbbb + 59169f7
commit 777aa07
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 11 deletions.
diff --git a/FerramAerospaceResearch/FARAPI.cs b/FerramAerospaceResearch/FARAPI.cs
@@ -132,6 +132,26 @@ public static FlightGUI VesselFlightInfo(Vessel v)
             return Instance.GetFlightInfo(v);
         }
 
+        public static double ActiveVesselIAS()
+        {
+            return VesselIAS(FlightGlobals.ActiveVessel);
+        }
+
+        public static double VesselIAS(Vessel vessel)
+        {
+            return VesselFlightInfo(vessel)?.airSpeedGUI?.CalculateIAS() ?? 0;
+        }
+
+        public static double ActiveVesselEAS()
+        {
+            return VesselEAS(FlightGlobals.ActiveVessel);
+        }
+
+        public static double VesselEAS(Vessel vessel)
+        {
+            return VesselFlightInfo(vessel)?.airSpeedGUI?.CalculateEAS() ?? 0;
+        }
+
         public static double ActiveVesselDynPres()
         {
             return VesselDynPres(FlightGlobals.ActiveVessel);

diff --git a/FerramAerospaceResearch/FARGUI/FARFlightGUI/AirspeedSettingsGUI.cs b/FerramAerospaceResearch/FARGUI/FARFlightGUI/AirspeedSettingsGUI.cs
@@ -132,6 +132,24 @@ public bool GetVelocityDisplayString(out string value_out, out SurfaceVelMode mo
             return allEnabled && enabled && active;
         }
 
+        public double CalculateIAS()
+        {
+            double pressureRatio = FARAeroUtil.RayleighPitotTubeStagPressure(_vessel.mach); //stag pressure at pitot tube face / ambient pressure
+
+            double velocity = pressureRatio - 1;
+            velocity *= _vessel.staticPressurekPa * 1000 * 2;
+            velocity /= 1.225;
+            velocity = Math.Sqrt(velocity);
+
+            return velocity;
+        }
+
+        public double CalculateEAS()
+        {
+            double densityRatio = (FARAeroUtil.GetCurrentDensity(_vessel) / 1.225);
+            return _vessel.srfSpeed * Math.Sqrt(densityRatio);
+        }
+
         public void ChangeSurfVelocity()
         {
             // No need to build the string
@@ -152,7 +170,7 @@ public void ChangeSurfVelocity()
                 return;
 
             double unitConversion = 1;
-            string unitString;// = "m/s";
+            string unitString; // = "m/s";
             string caption;
             if (unitMode == SurfaceVelUnit.KNOTS)
             {
@@ -184,22 +202,15 @@ public void ChangeSurfVelocity()
                 {
                     caption = surfModel_str[1];
                     //double densityRatio = (FARAeroUtil.GetCurrentDensity(_vessel) / 1.225);
-                    double pressureRatio = FARAeroUtil.RayleighPitotTubeStagPressure(_vessel.mach);     //stag pressure at pitot tube face / ambient pressure
-
-                    double velocity = pressureRatio - 1;
-                    velocity *= _vessel.staticPressurekPa * 1000 * 2;
-                    velocity /= 1.225;
-                    velocity = Math.Sqrt(velocity);
 
-                    velString = (velocity * unitConversion).ToString("F1") + unitString;
+                    velString = (CalculateIAS() * unitConversion).ToString("F1") + unitString;
                 }
                 else if (velMode == SurfaceVelMode.EAS)
                 {
                     caption = surfModel_str[2];
-                    double densityRatio = (FARAeroUtil.GetCurrentDensity(_vessel) / 1.225);
-                    velString = (_vessel.srfSpeed * Math.Sqrt(densityRatio) * unitConversion).ToString("F1") + unitString;
+                    velString = (CalculateEAS() * unitConversion).ToString("F1") + unitString;
                 }
-                else// if (velMode == SurfaceVelMode.MACH)
+                else // if (velMode == SurfaceVelMode.MACH)
                 {
                     caption = surfModel_str[3];
                     velString = _vessel.mach.ToString("F3");

diff --git a/GameData/FerramAerospaceResearch/Plugins/FerramAerospaceResearch.dll b/GameData/FerramAerospaceResearch/Plugins/FerramAerospaceResearch.dll
diff --git a/README.md b/README.md
@@ -66,6 +66,7 @@ CHANGELOG
 =======================================================
 -------------------master branch-------------------
 
+Expose IAS and EAS used by FAR in FARAPI ([#34](https://github.com/dkavolis/Ferram-Aerospace-Research/pull/34))  
 Enable/disable FAR speed display on the navball from FARAPI ([#33](https://github.com/dkavolis/Ferram-Aerospace-Research/pull/33))  
 
 0.15.9.7V "Lumley"------------------------------------