Fixed using Showcase camera leading to App reset / Fixed Aircraft not being recognized and App using wrong Payload Stations / Fixed App taking long Time to shutdown after Sim was closed / Updates Libraries

Fragtality · Fragtality · commit 557d0e63e235 · 2024-10-01T00:19:41.000+02:00
diff --git a/Installer/AppPackage.zip b/Installer/AppPackage.zip
diff --git a/Installer/Installer.csproj b/Installer/Installer.csproj
@@ -26,7 +26,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.4.3.0</ApplicationVersion>
+    <ApplicationVersion>0.4.4.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
diff --git a/Installer/InstallerFunctions.cs b/Installer/InstallerFunctions.cs
@@ -327,13 +327,7 @@ public static bool CheckFSUIPC(string version = null)
             {
                 string regVersion = (string)Registry.GetValue(Parameters.ipcRegPath, Parameters.ipcRegValue, null);
                 if (!string.IsNullOrWhiteSpace(regVersion))
-                {
-                    regVersion = regVersion.Substring(1);
-                    int index = regVersion.IndexOf("(beta)");
-                    if (index > 0)
-                        regVersion = regVersion.Substring(0, index).TrimEnd();
-                    result = CheckVersion(regVersion, ipcVersion, true, false);
-                }
+                    result = CheckVersion(regVersion, VersionCompare.GREATER_EQUAL, ipcVersion, out bool compareable) && compareable;
             }
             catch (Exception e)
             {
@@ -342,61 +336,68 @@ public static bool CheckFSUIPC(string version = null)
 
             return result;
         }
-        public static bool CheckVersion(string versionInstalled, string versionRequired, bool majorEqual, bool ignoreBuild)
-        {
-            bool majorMatch = false;
-            bool minorMatch = false;
-            bool patchMatch = false;
 
-            string[] strInst = versionInstalled.Split('.');
-            string[] strReq = versionRequired.Split('.');
-            int vInst;
-            int vReq;
-            bool prevWasEqual = false;
+        public static readonly Regex rxNumberMatch = new Regex(@"\D*(\d+)\D*", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-            for (int i = 0; i < strInst.Length; i++)
+        public static string[] CleanNumbers(string[] versions)
+        {
+            for (int i = 0; i < versions.Length; i++)
             {
-                if (Regex.IsMatch(strInst[i], @"(\d+)\D"))
-                    strInst[i] = strInst[i].Substring(0, strInst[i].Length - 1);
+                var match = rxNumberMatch.Match(versions[i]);
+                if (match?.Groups?.Count == 2 && !string.IsNullOrWhiteSpace(match?.Groups[1]?.Value))
+                    versions[i] = match.Groups[1].Value;
+                else
+                    return null;
             }
 
-            //Major
-            if (int.TryParse(strInst[0], out vInst) && int.TryParse(strReq[0], out vReq))
-            {
-                if (majorEqual)
-                    majorMatch = vInst == vReq;
-                else
-                    majorMatch = vInst >= vReq;
+            return versions;
+        }
 
-                prevWasEqual = vInst == vReq;
-            }
+        public enum VersionCompare
+        {
+            EQUAL = 1,
+            LESS,
+            LESS_EQUAL,
+            GREATER,
+            GREATER_EQUAL
+        }
 
-            //Minor
-            if (int.TryParse(strInst[1], out vInst) && int.TryParse(strReq[1], out vReq))
-            {
-                if (prevWasEqual)
-                    minorMatch = vInst >= vReq;
-                else
-                    minorMatch = true;
+        public static bool CheckVersion(string leftVersion, VersionCompare comparison, string rightVersion, out bool compareable, int digits = 3)
+        {
+            compareable = false;
 
-                prevWasEqual = vInst == vReq;
-            }
+            if (string.IsNullOrWhiteSpace(leftVersion) || string.IsNullOrWhiteSpace(rightVersion))
+                return false;
+
+            string[] leftParts = leftVersion.Split('.');
+            string[] rightParts = rightVersion.Split('.');
+            if (leftParts.Length < digits || rightParts.Length < digits)
+                return false;
 
-            //Patch
-            if (!ignoreBuild)
+            leftParts = CleanNumbers(leftParts);
+            rightParts = CleanNumbers(rightParts);
+            if (leftParts == null || rightParts == null)
+                return false;
+
+            leftVersion = string.Join(".", leftParts);
+            rightVersion = string.Join(".", rightParts);
+            if (!Version.TryParse(leftVersion, out Version left) || !Version.TryParse(rightVersion, out Version right))
+                return false;
+
+            compareable = true;
+            switch (comparison)
             {
-                if (int.TryParse(strInst[2], out vInst) && int.TryParse(strReq[2], out vReq))
-                {
-                    if (prevWasEqual)
-                        patchMatch = vInst >= vReq;
-                    else
-                        patchMatch = true;
-                }
+                case VersionCompare.LESS:
+                    return left < right;
+                case VersionCompare.LESS_EQUAL:
+                    return left <= right;
+                case VersionCompare.GREATER:
+                    return left > right;
+                case VersionCompare.GREATER_EQUAL:
+                    return left >= right;
+                default:
+                    return left == right;
             }
-            else
-                patchMatch = true;
-
-            return majorMatch && minorMatch && patchMatch;
         }
 
         public static bool CheckPackageVersion(string packagePath, string packageName, string version)
@@ -412,8 +413,8 @@ public static bool CheckPackageVersion(string packagePath, string packageName, s
                         if (Parameters.wasmRegex.IsMatch(line))
                         {
                             var matches = Parameters.wasmRegex.Matches(line);
-                            if (matches.Count == 1 && matches[0].Groups.Count >= 2)
-                                return CheckVersion(matches[0].Groups[1].Value, version, false, false);
+                            if (matches?.Count == 1 && matches[0]?.Groups?.Count >= 2)
+                                return CheckVersion(matches[0]?.Groups[1]?.Value, VersionCompare.GREATER_EQUAL, version, out bool compareable) && compareable;
                         }
                     }
                 }
diff --git a/Installer/Parameters.cs b/Installer/Parameters.cs
@@ -18,21 +18,21 @@ public static class Parameters
 
         public static readonly int netMajor = 7;
         public static readonly int netMinor = 0;
-        public static readonly int netPatch = 14;
+        public static readonly int netPatch = 20;
         public static readonly string netVersion = $"{netMajor}.{netMinor}.{netPatch}";
-        public static readonly string netUrl = "https://download.visualstudio.microsoft.com/download/pr/8f5b0079-2bb4-49cd-874e-0f58703eff6e/7010b5f213a2c436a307eb385dbb16ff/windowsdesktop-runtime-7.0.14-win-x64.exe";
-        public static readonly string netUrlFile = "windowsdesktop-runtime-7.0.14-win-x64.exe";
+        public static readonly string netUrl = "https://download.visualstudio.microsoft.com/download/pr/08bbfe8f-812d-479f-803b-23ea0bffce47/c320e4b037f3e92ab7ea92c3d7ea3ca1/windowsdesktop-runtime-7.0.20-win-x64.exe";
+        public static readonly string netUrlFile = "windowsdesktop-runtime-7.0.20-win-x64.exe";
 
         public static readonly string ipcRegPath = @"HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\FSUIPC7";
         public static readonly string ipcRegInstallDirValue = "InstallDir";
         public static readonly string ipcRegValue = "DisplayVersion";
-        public static readonly string ipcVersion = "7.3.24";
+        public static readonly string ipcVersion = "7.4.17";
 
         public static readonly Regex wasmRegex = new Regex("^\\s*\"package_version\":\\s*\"([0-9\\.]+)\"\\s*,\\s*$", RegexOptions.Compiled);
         public static readonly string wasmMobiName = "mobiflight-event-module";
-        public static readonly string wasmMobiVersion = "0.7.1";
-        public static readonly string wasmUrl = "https://github.com/MobiFlight/MobiFlight-WASM-Module/releases/download/0.7.1/mobiflight-event-module-0.7.1.zip";
-        public static readonly string wasmUrlFile = "mobiflight-event-module-0.7.1.zip";
+        public static readonly string wasmMobiVersion = "1.0.1";
+        public static readonly string wasmUrl = "https://github.com/MobiFlight/MobiFlight-WASM-Module/releases/download/1.0.1/mobiflight-event-module.1.0.1.zip";
+        public static readonly string wasmUrlFile = "mobiflight-event-module.1.0.1.zip";
 
         public static readonly string msConfigStore = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Packages\Microsoft.FlightSimulator_8wekyb3d8bbwe\LocalCache\UserCfg.opt";
         public static readonly string msConfigSteam = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\Microsoft Flight Simulator\UserCfg.opt";
diff --git a/Installer/Properties/AssemblyInfo.cs b/Installer/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.3.0")]
-[assembly: AssemblyFileVersion("0.4.3.0")]
+[assembly: AssemblyVersion("0.4.4.0")]
+[assembly: AssemblyFileVersion("0.4.4.0")]
diff --git a/WorkingTitle2GSX/Aircraft.cs b/WorkingTitle2GSX/Aircraft.cs
@@ -327,7 +327,7 @@ public void StopDeboarding()
 
         public void SetEmpty()
         {
-            Logger.Log(LogLevel.Information, "Aircraft:SetEmpty", $"Resetting Paylod & Fuel (Empty Plane)");
+            Logger.Log(LogLevel.Information, "Aircraft:SetEmpty", $"Resetting Payload & Fuel (Empty Plane)");
             Stations.Refresh();
             fuelLeftOffset.Reconnect();
             fuelRightOffset.Reconnect();
diff --git a/WorkingTitle2GSX/ConfigurationFile.cs b/WorkingTitle2GSX/ConfigurationFile.cs
@@ -36,8 +36,8 @@ public void SaveConfiguration()
 
         public string GetSetting(string key, string defaultValue = "")
         {
-            if (appSettings.ContainsKey(key))
-                return appSettings[key];
+            if (appSettings.TryGetValue(key, out string value))
+                return value;
             else
             {
                 XmlNode newNode = xmlDoc.CreateElement("add");
diff --git a/WorkingTitle2GSX/FlightPlan.cs b/WorkingTitle2GSX/FlightPlan.cs
@@ -96,7 +96,7 @@ public bool Load()
                 WeightPax = Convert.ToDouble(sbOFP["weights"]["pax_weight"].InnerText, new RealInvariantFormat(sbOFP["weights"]["pax_weight"].InnerText));
                 WeightBag = Convert.ToDouble(sbOFP["weights"]["bag_weight"].InnerText, new RealInvariantFormat(sbOFP["weights"]["bag_weight"].InnerText));
 
-                if (lastID != FlightPlanID && Model.AcIndentified == sbOFP["aircraft"]["name"].InnerText)
+                if (lastID != FlightPlanID)
                 {
                     Logger.Log(LogLevel.Information, "FlightPlan:Load", $"New OFP for Flight {Flight} loaded. ({Origin} -> {Destination})");
                 }
diff --git a/WorkingTitle2GSX/IPCManager.cs b/WorkingTitle2GSX/IPCManager.cs
@@ -76,13 +76,13 @@ public bool WaitForConnection()
                 Logger.Log(LogLevel.Critical, "IPCManager:WaitForConnection", $"Exception while opening FSUIPC! (Exception: {ex.GetType()})");
             }
 
-            if (!FSUIPCConnection.IsOpen)
+            if (!FSUIPCConnection.IsOpen && IsSimRunning())
             {
                 Logger.Log(LogLevel.Information, "IPCManager:WaitForConnection", $"FSUIPC Connection not established - waiting {waitDuration / 2 / 1000}s");
                 Thread.Sleep(waitDuration / 2);
             }
 
-            return FSUIPCConnection.IsOpen && offInMenu.IsConnected;
+            return FSUIPCConnection.IsOpen && offInMenu.IsConnected && IsSimRunning();
         }
 
         public string CheckAircraft(ServiceModel model)
@@ -159,7 +159,7 @@ public bool WaitForSessionReady(ServiceModel model)
                 isReady = IsCamReady();
             }
 
-            if (!isReady)
+            if (!isReady || !IsSimRunning())
             {
                 Logger.Log(LogLevel.Error, "IPCManager:WaitForSessionReady", $"SimConnect or Simulator not available - aborting");
                 return false;
@@ -179,9 +179,8 @@ public bool IsCamReady()
         {
             FSUIPCConnection.Process(ServiceModel.IpcGroupName);
             short value = offCamReady.Value;
-            byte menu = offInMenu.Value;
 
-            return value >= 2 && value <= 5 && menu == 0;
+            return value < 11;
         }
 
         public void CloseSafe()
diff --git a/WorkingTitle2GSX/PayloadStations.cs b/WorkingTitle2GSX/PayloadStations.cs
@@ -52,17 +52,17 @@ public void SetWeights(FlightPlan OFP)
 
         public static void SelectDistribution(ServiceModel model, out string distPax, out string distCargo)
         {
-            if (model.AcIndentified.Contains("HorizonSim_B787_9"))
+            if (model.AcIndentified.Contains("HorizonSim_B787_9", StringComparison.InvariantCultureIgnoreCase))
             {
                 distPax = model.DistributionPaxHS;
                 distCargo = model.DistributionCargoHS;
             }
-            else if (model.AcIndentified.Contains("Kuro_B787_8"))
+            else if (model.AcIndentified.Contains("Kuro_B787_8", StringComparison.InvariantCultureIgnoreCase))
             {
                 distPax = model.DistributionPaxKU;
                 distCargo = model.DistributionCargoKU;
             }
-            else if (model.AcIndentified.Contains("B787_9"))
+            else if (model.AcIndentified.Contains("B787_9", StringComparison.InvariantCultureIgnoreCase))
             {
                 distPax = model.DistributionPaxWT;
                 distCargo = model.DistributionCargoWT;
@@ -93,9 +93,15 @@ public void SetPax(int num)
                 weightPax = (double)num * paxWeight * station.Value;
                 weightPilots = 2 * (85 / Model.ConstKilo) * station.Value;
                 if (weightPax - weightPilots >= 0)
+                {
+                    Logger.Log(LogLevel.Debug, "PayloadStations:SetPax", $"Setting {weightPax - weightPilots}lbs ({(weightPax - weightPilots) * Model.ConstKilo}kg) to Station '{station.Key}' ({ipcStations[station.Key].Name})");
                     ipcStations[station.Key].WeightLbs = weightPax - weightPilots;
+                }
                 else
+                {
+                    Logger.Log(LogLevel.Debug, "PayloadStations:SetPax", $"Setting {weightPax}lbs ({weightPax * Model.ConstKilo}kg) to Station '{station.Key}' ({ipcStations[station.Key].Name})");
                     ipcStations[station.Key].WeightLbs = weightPax;
+                }
             }
             FSUIPCConnection.PayloadServices.WriteChanges();
         }
@@ -114,15 +120,15 @@ public int GetPax()
 
         public void SetCargo(double percent)
         {
-            if (Model.AcIndentified.Contains("HorizonSim_B787_9"))
+            if (Model.AcIndentified.Contains("HorizonSim_B787_9", StringComparison.InvariantCultureIgnoreCase))
             {
                 SetCargoHS(percent);
             }
-            else if (Model.AcIndentified.Contains("Kuro_B787_8"))
+            else if (Model.AcIndentified.Contains("Kuro_B787_8", StringComparison.InvariantCultureIgnoreCase))
             {
                 SetCargoKU(percent);
             }
-            else if (Model.AcIndentified.Contains("B787_9"))
+            else if (Model.AcIndentified.Contains("B787_9", StringComparison.InvariantCultureIgnoreCase))
             {
                 SetCargoWT(percent);
             }
@@ -137,10 +143,15 @@ private void SetCargoHS(double percent)
         {
             var ipcStations = FSUIPCConnection.PayloadServices.PayloadStations;
             if (percent * payloadCargo < Model.RearCargoMaxHS)
+            {
+                Logger.Log(LogLevel.Debug, "PayloadStations:SetCargoHS", $"Setting {percent * payloadCargo}lbs ({(percent * payloadCargo) * Model.ConstKilo}kg) to Station '{cargoStations[1].Key}' ({ipcStations[cargoStations[1].Key].Name})");
                 ipcStations[cargoStations[1].Key].WeightLbs = percent * payloadCargo;
+            }
             else
             {
+                Logger.Log(LogLevel.Debug, "PayloadStations:SetCargoHS", $"Setting {Model.RearCargoMaxHS}lbs ({Model.RearCargoMaxHS * Model.ConstKilo}kg) to Station '{cargoStations[1].Key}' ({ipcStations[cargoStations[1].Key].Name})");
                 ipcStations[cargoStations[1].Key].WeightLbs = Model.RearCargoMaxHS;
+                Logger.Log(LogLevel.Debug, "PayloadStations:SetCargoHS", $"Setting {(percent * payloadCargo) - Model.RearCargoMaxHS}lbs ({((percent * payloadCargo) - Model.RearCargoMaxHS) * Model.ConstKilo}kg) to Station '{cargoStations[0].Key}' ({ipcStations[cargoStations[0].Key].Name})");
                 ipcStations[cargoStations[0].Key].WeightLbs = (percent * payloadCargo) - Model.RearCargoMaxHS;
             }
         }
diff --git a/WorkingTitle2GSX/ServiceController.cs b/WorkingTitle2GSX/ServiceController.cs
@@ -33,6 +33,7 @@ public void Run()
                         {
                             Model.CancellationRequested = true;
                             Model.ServiceExited = true;
+                            App.Current.Shutdown();
                             Logger.Log(LogLevel.Critical, "ServiceController:Run", $"Session aborted, Retry not possible - exiting Program");
                             return;
                         }
@@ -110,7 +111,8 @@ protected void ServiceLoop()
 
             Offset<short> offsetGround = new(ServiceModel.IpcGroupName, 0x0366);
             int state = 0;
-            int sleep = 3000;
+            int sleep = 2000;
+            int sleepCounter = 0;
             bool refueling = false;
             bool refuelPaused = false;
             bool refuelFinished = false;
@@ -124,7 +126,16 @@ protected void ServiceLoop()
             {
                 try
                 {
-                    Thread.Sleep(sleep);
+                    if (sleepCounter < sleep)
+                    {
+                        Thread.Sleep(1000);
+                        sleepCounter += 1000;
+                        continue;
+                    }
+                    else
+                        sleepCounter = 0;
+
+
                     if (firstStart && offsetGround.Value == 1 && !Model.TestArrival && Model.ResetFuel)
                     {
                         aircraft.SetEmpty();
@@ -141,6 +152,7 @@ protected void ServiceLoop()
                             sleep = 5000;
                             continue;
                         }
+                        FSUIPCConnection.WriteLVar("FSDT_GSX_SET_PROGRESS_REFUEL", -1);
                         flightPlan.SetPassengersGSX();
                         aircraft.SetPayload(flightPlan);
                         state = 1;
@@ -158,7 +170,7 @@ protected void ServiceLoop()
                         continue;
                     }
                     //Special Case: loaded in Flight
-                    if (state == 0 && offsetGround.Value == 0)
+                    if (state == 0 && offsetGround.Value == 0 && IPCManager.IsCamReady() && IPCManager.IsSimRunning())
                     {
                         flightPlan.Load();
                         flightPlan.SetPassengersGSX();
@@ -243,7 +255,7 @@ protected void ServiceLoop()
                     if (state <= 3)
                     {
                         //Taxi Out -> Flight
-                        if (state <= 2 && offsetGround.Value == 0)
+                        if (state <= 2 && offsetGround.Value == 0 && IPCManager.IsCamReady() && IPCManager.IsSimRunning())
                         {
                             state = 3;
                             sleep = 180000;
diff --git a/WorkingTitle2GSX/WorkingTitle2GSX.csproj b/WorkingTitle2GSX/WorkingTitle2GSX.csproj

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ public void StopDeboarding()`
`327`	`327`
`328`	`328`	`public void SetEmpty()`
`329`	`329`	`{`
`330`		`- Logger.Log(LogLevel.Information, "Aircraft:SetEmpty", $"Resetting Paylod & Fuel (Empty Plane)");`
	`330`	`+ Logger.Log(LogLevel.Information, "Aircraft:SetEmpty", $"Resetting Payload & Fuel (Empty Plane)");`
`331`	`331`	`Stations.Refresh();`
`332`	`332`	`fuelLeftOffset.Reconnect();`
`333`	`333`	`fuelRightOffset.Reconnect();`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ public void SaveConfiguration()`
`36`	`36`
`37`	`37`	`public string GetSetting(string key, string defaultValue = "")`
`38`	`38`	`{`
`39`		`- if (appSettings.ContainsKey(key))`
`40`		`- return appSettings[key];`
	`39`	`+ if (appSettings.TryGetValue(key, out string value))`
	`40`	`+ return value;`
`41`	`41`	`else`
`42`	`42`	`{`
`43`	`43`	`XmlNode newNode = xmlDoc.CreateElement("add");`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public bool Load()`
`96`	`96`	`WeightPax = Convert.ToDouble(sbOFP["weights"]["pax_weight"].InnerText, new RealInvariantFormat(sbOFP["weights"]["pax_weight"].InnerText));`
`97`	`97`	`WeightBag = Convert.ToDouble(sbOFP["weights"]["bag_weight"].InnerText, new RealInvariantFormat(sbOFP["weights"]["bag_weight"].InnerText));`
`98`	`98`
`99`		`- if (lastID != FlightPlanID && Model.AcIndentified == sbOFP["aircraft"]["name"].InnerText)`
	`99`	`+ if (lastID != FlightPlanID)`
`100`	`100`	`{`
`101`	`101`	`Logger.Log(LogLevel.Information, "FlightPlan:Load", $"New OFP for Flight {Flight} loaded. ({Origin} -> {Destination})");`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,13 +76,13 @@ public bool WaitForConnection()`
`76`	`76`	`Logger.Log(LogLevel.Critical, "IPCManager:WaitForConnection", $"Exception while opening FSUIPC! (Exception: {ex.GetType()})");`
`77`	`77`	`}`
`78`	`78`
`79`		`- if (!FSUIPCConnection.IsOpen)`
	`79`	`+ if (!FSUIPCConnection.IsOpen && IsSimRunning())`
`80`	`80`	`{`
`81`	`81`	`Logger.Log(LogLevel.Information, "IPCManager:WaitForConnection", $"FSUIPC Connection not established - waiting {waitDuration / 2 / 1000}s");`
`82`	`82`	`Thread.Sleep(waitDuration / 2);`
`83`	`83`	`}`
`84`	`84`
`85`		`- return FSUIPCConnection.IsOpen && offInMenu.IsConnected;`
	`85`	`+ return FSUIPCConnection.IsOpen && offInMenu.IsConnected && IsSimRunning();`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`public string CheckAircraft(ServiceModel model)`
`@@ -159,7 +159,7 @@ public bool WaitForSessionReady(ServiceModel model)`
`159`	`159`	`isReady = IsCamReady();`
`160`	`160`	`}`
`161`	`161`
`162`		`- if (!isReady)`
	`162`	`+ if (!isReady \|\| !IsSimRunning())`
`163`	`163`	`{`
`164`	`164`	`Logger.Log(LogLevel.Error, "IPCManager:WaitForSessionReady", $"SimConnect or Simulator not available - aborting");`
`165`	`165`	`return false;`
`@@ -179,9 +179,8 @@ public bool IsCamReady()`
`179`	`179`	`{`
`180`	`180`	`FSUIPCConnection.Process(ServiceModel.IpcGroupName);`
`181`	`181`	`short value = offCamReady.Value;`
`182`		`- byte menu = offInMenu.Value;`
`183`	`182`
`184`		`- return value >= 2 && value <= 5 && menu == 0;`
	`183`	`+ return value < 11;`
`185`	`184`	`}`
`186`	`185`
`187`	`186`	`public void CloseSafe()`
Original file line number	Diff line number	Diff line change
`@@ -52,17 +52,17 @@ public void SetWeights(FlightPlan OFP)`
`52`	`52`
`53`	`53`	`public static void SelectDistribution(ServiceModel model, out string distPax, out string distCargo)`
`54`	`54`	`{`
`55`		`- if (model.AcIndentified.Contains("HorizonSim_B787_9"))`
	`55`	`+ if (model.AcIndentified.Contains("HorizonSim_B787_9", StringComparison.InvariantCultureIgnoreCase))`
`56`	`56`	`{`
`57`	`57`	`distPax = model.DistributionPaxHS;`
`58`	`58`	`distCargo = model.DistributionCargoHS;`
`59`	`59`	`}`
`60`		`- else if (model.AcIndentified.Contains("Kuro_B787_8"))`
	`60`	`+ else if (model.AcIndentified.Contains("Kuro_B787_8", StringComparison.InvariantCultureIgnoreCase))`
`61`	`61`	`{`
`62`	`62`	`distPax = model.DistributionPaxKU;`
`63`	`63`	`distCargo = model.DistributionCargoKU;`
`64`	`64`	`}`
`65`		`- else if (model.AcIndentified.Contains("B787_9"))`
	`65`	`+ else if (model.AcIndentified.Contains("B787_9", StringComparison.InvariantCultureIgnoreCase))`
`66`	`66`	`{`
`67`	`67`	`distPax = model.DistributionPaxWT;`
`68`	`68`	`distCargo = model.DistributionCargoWT;`
`@@ -93,9 +93,15 @@ public void SetPax(int num)`
`93`	`93`	`weightPax = (double)num * paxWeight * station.Value;`
`94`	`94`	`weightPilots = 2 * (85 / Model.ConstKilo) * station.Value;`
`95`	`95`	`if (weightPax - weightPilots >= 0)`
	`96`	`+ {`
	`97`	`+ Logger.Log(LogLevel.Debug, "PayloadStations:SetPax", $"Setting {weightPax - weightPilots}lbs ({(weightPax - weightPilots) * Model.ConstKilo}kg) to Station '{station.Key}' ({ipcStations[station.Key].Name})");`
`96`	`98`	`ipcStations[station.Key].WeightLbs = weightPax - weightPilots;`
	`99`	`+ }`
`97`	`100`	`else`
	`101`	`+ {`
	`102`	`+ Logger.Log(LogLevel.Debug, "PayloadStations:SetPax", $"Setting {weightPax}lbs ({weightPax * Model.ConstKilo}kg) to Station '{station.Key}' ({ipcStations[station.Key].Name})");`
`98`	`103`	`ipcStations[station.Key].WeightLbs = weightPax;`
	`104`	`+ }`
`99`	`105`	`}`
`100`	`106`	`FSUIPCConnection.PayloadServices.WriteChanges();`
`101`	`107`	`}`
`@@ -114,15 +120,15 @@ public int GetPax()`
`114`	`120`
`115`	`121`	`public void SetCargo(double percent)`
`116`	`122`	`{`
`117`		`- if (Model.AcIndentified.Contains("HorizonSim_B787_9"))`
	`123`	`+ if (Model.AcIndentified.Contains("HorizonSim_B787_9", StringComparison.InvariantCultureIgnoreCase))`
`118`	`124`	`{`
`119`	`125`	`SetCargoHS(percent);`
`120`	`126`	`}`
`121`		`- else if (Model.AcIndentified.Contains("Kuro_B787_8"))`
	`127`	`+ else if (Model.AcIndentified.Contains("Kuro_B787_8", StringComparison.InvariantCultureIgnoreCase))`
`122`	`128`	`{`
`123`	`129`	`SetCargoKU(percent);`
`124`	`130`	`}`
`125`		`- else if (Model.AcIndentified.Contains("B787_9"))`
	`131`	`+ else if (Model.AcIndentified.Contains("B787_9", StringComparison.InvariantCultureIgnoreCase))`
`126`	`132`	`{`
`127`	`133`	`SetCargoWT(percent);`
`128`	`134`	`}`
`@@ -137,10 +143,15 @@ private void SetCargoHS(double percent)`
`137`	`143`	`{`
`138`	`144`	`var ipcStations = FSUIPCConnection.PayloadServices.PayloadStations;`
`139`	`145`	`if (percent * payloadCargo < Model.RearCargoMaxHS)`
	`146`	`+ {`
	`147`	`+ Logger.Log(LogLevel.Debug, "PayloadStations:SetCargoHS", $"Setting {percent * payloadCargo}lbs ({(percent * payloadCargo) * Model.ConstKilo}kg) to Station '{cargoStations[1].Key}' ({ipcStations[cargoStations[1].Key].Name})");`
`140`	`148`	`ipcStations[cargoStations[1].Key].WeightLbs = percent * payloadCargo;`
	`149`	`+ }`
`141`	`150`	`else`
`142`	`151`	`{`
	`152`	`+ Logger.Log(LogLevel.Debug, "PayloadStations:SetCargoHS", $"Setting {Model.RearCargoMaxHS}lbs ({Model.RearCargoMaxHS * Model.ConstKilo}kg) to Station '{cargoStations[1].Key}' ({ipcStations[cargoStations[1].Key].Name})");`
`143`	`153`	`ipcStations[cargoStations[1].Key].WeightLbs = Model.RearCargoMaxHS;`
	`154`	`+ Logger.Log(LogLevel.Debug, "PayloadStations:SetCargoHS", $"Setting {(percent * payloadCargo) - Model.RearCargoMaxHS}lbs ({((percent * payloadCargo) - Model.RearCargoMaxHS) * Model.ConstKilo}kg) to Station '{cargoStations[0].Key}' ({ipcStations[cargoStations[0].Key].Name})");`
`144`	`155`	`ipcStations[cargoStations[0].Key].WeightLbs = (percent * payloadCargo) - Model.RearCargoMaxHS;`
`145`	`156`	`}`
`146`	`157`	`}`