From 519186d715daf69aa98fe9b247baca86edab31c7 Mon Sep 17 00:00:00 2001 From: Jerker Dahlblom Date: Mon, 1 Apr 2024 17:15:47 +0300 Subject: [PATCH] Smaller fixes (#510) * Smaller fixes ControlSpinningWheel visibility set properly DCSBIOS.Send using concurrentqueue Removed imports * Fix spelling * Update submodule --- src/DCSFPCommon | 2 +- src/DCSFlightpanels.sln.DotSettings | 1 + src/DCSFlightpanels/MainWindow.xaml.cs | 10 +- .../PanelUserControls/StreamDeck/Resources.cs | 10 +- src/DCSFlightpanels/ProfileHandler.cs | 351 +++++++++--------- .../Preprogrammed/CDU737PanelA10C.cs | 2 +- .../Preprogrammed/CDU737PanelAH64D.cs | 2 +- .../Preprogrammed/CDU737PanelF14.cs | 2 +- .../Preprogrammed/CDU737PanelFA18C.cs | 2 +- .../Preprogrammed/CDU737PanelM2000C.cs | 2 +- .../Preprogrammed/CDU737PanelSA342.cs | 2 +- src/NonVisuals/Radios/RadioPanelPZ69A10C.cs | 40 +- src/NonVisuals/Radios/RadioPanelPZ69A10CII.cs | 40 +- src/NonVisuals/Radios/RadioPanelPZ69F14B.cs | 40 +- src/NonVisuals/Radios/RadioPanelPZ69F5E.cs | 16 +- src/NonVisuals/Radios/RadioPanelPZ69FA18C.cs | 8 +- src/NonVisuals/Radios/RadioPanelPZ69Ka50.cs | 8 +- src/NonVisuals/Radios/RadioPanelPZ69Mi24P.cs | 8 +- src/NonVisuals/Radios/RadioPanelPZ69Mi8.cs | 16 +- src/NonVisuals/Radios/RadioPanelPZ69SA342.cs | 8 +- src/NonVisuals/Radios/RadioPanelPZ69T45C.cs | 32 +- src/NonVisuals/Radios/RadioPanelPZ69UH1H.cs | 42 +-- .../Radios/RadioSettings/ARC164Settings.cs | 1 - .../StreamDeckHidWriteTests.cs | 1 - .../StreamDeckIoBitmapKeyTests.cs | 1 - .../StreamDeckIoHardwareTwins.cs | 1 - .../StreamDeckIoKeyTests.cs | 1 - 27 files changed, 313 insertions(+), 336 deletions(-) diff --git a/src/DCSFPCommon b/src/DCSFPCommon index 6bcc136af..72b5b6049 160000 --- a/src/DCSFPCommon +++ b/src/DCSFPCommon @@ -1 +1 @@ -Subproject commit 6bcc136afda8f67129d3071f5febf86caf51d18f +Subproject commit 72b5b6049eae058d0d1a10b2444b56d2fcbd7bc2 diff --git a/src/DCSFlightpanels.sln.DotSettings b/src/DCSFlightpanels.sln.DotSettings index e40191991..42fdf10c9 100644 --- a/src/DCSFlightpanels.sln.DotSettings +++ b/src/DCSFlightpanels.sln.DotSettings @@ -60,6 +60,7 @@ OS OSCOMMANDS PURPLE + PZ RED REF SA diff --git a/src/DCSFlightpanels/MainWindow.xaml.cs b/src/DCSFlightpanels/MainWindow.xaml.cs index 3312a5e16..2cb0de5d8 100644 --- a/src/DCSFlightpanels/MainWindow.xaml.cs +++ b/src/DCSFlightpanels/MainWindow.xaml.cs @@ -39,6 +39,7 @@ ADF AJS ALL ALT APR BIOS BIP BIPS COM CRS DB DCS DCSBIOS DCSBIOSJSON DME DRO HDG using NonVisuals.HID; using DCS_BIOS.Serialized; using DCS_BIOS.ControlLocator; + using System.Windows.Threading; public partial class MainWindow : IGamingPanelListener, IDcsBiosConnectionListener, ISettingsModifiedListener, IProfileHandlerListener, IDisposable, IHardwareConflictResolver, IPanelEventListener, IForwardPanelEventListener, IDCSBIOSStringListener { @@ -316,6 +317,8 @@ private void CreateDCSBIOS() return; } + ControlSpinningWheel.Visibility = Visibility.Visible; + DCSBIOSControlLocator.DCSAircraft = _profileHandler.DCSAircraft; _dcsBios = new DCSBIOS(Settings.Default.DCSBiosIPFrom, @@ -323,6 +326,7 @@ private void CreateDCSBIOS() int.Parse(Settings.Default.DCSBiosPortFrom), int.Parse(Settings.Default.DCSBiosPortTo), DcsBiosNotificationMode.Parse); + if (!_dcsBios.HasLastException()) { ControlSpinningWheel.RotateGear(2000); @@ -331,6 +335,8 @@ private void CreateDCSBIOS() private void StartupDCSBIOS() { + ControlSpinningWheel.Visibility = Visibility.Visible; + if (_dcsBios.IsRunning) { return; @@ -714,7 +720,7 @@ private void MenuItemCloseProfile_OnClick(object sender, RoutedEventArgs e) } finally { - Mouse.OverrideCursor = null; + Mouse.OverrideCursor = Cursors.Arrow; } } catch (Exception ex) @@ -847,7 +853,7 @@ public void DcsBiosConnectionActive(object sender, DCSBIOSConnectionEventArgs e) { try { - Dispatcher?.BeginInvoke((Action)(() => ControlSpinningWheel.RotateGear())); + Dispatcher?.BeginInvoke(() => ControlSpinningWheel.RotateGear()); } catch (Exception ex) { diff --git a/src/DCSFlightpanels/PanelUserControls/StreamDeck/Resources.cs b/src/DCSFlightpanels/PanelUserControls/StreamDeck/Resources.cs index a68f56ef0..5260866be 100644 --- a/src/DCSFlightpanels/PanelUserControls/StreamDeck/Resources.cs +++ b/src/DCSFlightpanels/PanelUserControls/StreamDeck/Resources.cs @@ -12,17 +12,11 @@ internal static class Resources public static BitmapImage GetDefaultButtonImageNamed(EnumStreamDeckButtonNames streamDeckButtonName) { - lock (LockDefault) - { - return new BitmapImage(new Uri(StreamDeckConstants.NUMBER_BUTTON_LOCATION + StreamDeckCommon.ButtonNumber(streamDeckButtonName) + "_blue.png", UriKind.Absolute)); - } + return new BitmapImage(new Uri(StreamDeckConstants.NUMBER_BUTTON_LOCATION + StreamDeckCommon.ButtonNumber(streamDeckButtonName) + "_blue.png", UriKind.Absolute)); } public static BitmapImage GetButtonDcsBiosDecoderRule() { - lock (LockDecoder) - { - return new BitmapImage(new Uri(StreamDeckConstants.StreamDeckGalleryPathMisc + "DcsBiosDecoderRule.png", UriKind.Absolute)); - } + return new BitmapImage(new Uri(StreamDeckConstants.StreamDeckGalleryPathMisc + "DcsBiosDecoderRule.png", UriKind.Absolute)); } } } diff --git a/src/DCSFlightpanels/ProfileHandler.cs b/src/DCSFlightpanels/ProfileHandler.cs index ca663f159..bae4b5d73 100644 --- a/src/DCSFlightpanels/ProfileHandler.cs +++ b/src/DCSFlightpanels/ProfileHandler.cs @@ -224,15 +224,7 @@ public void CreateNewProfile() _isNewProfile = true; DCSAircraft = chooseProfileModuleWindow.Profile; - try - { - Mouse.OverrideCursor = Cursors.Wait; - AppEventHandler.ProfileEvent(this, ProfileEventEnum.ProfileLoaded, null, DCSAircraft); - } - finally - { - Mouse.OverrideCursor = Cursors.Hand; - } + AppEventHandler.ProfileEvent(this, ProfileEventEnum.ProfileLoaded, null, DCSAircraft); } } @@ -254,229 +246,218 @@ private int LoadProfile(string filename) { try { - Mouse.OverrideCursor = Cursors.Wait; - try - { - /* - * 0 Open specified filename (parameter) if not null - * 1 If exists open last profile used (settings) - * 2 Try and open default profile located in My Documents - * 3 If none found create default file - */ + /* + * 0 Open specified filename (parameter) if not null + * 1 If exists open last profile used (settings) + * 2 Try and open default profile located in My Documents + * 3 If none found create default file + */ - _isNewProfile = false; - ClearAll(); + _isNewProfile = false; + ClearAll(); - if (!string.IsNullOrEmpty(filename)) + if (!string.IsNullOrEmpty(filename)) + { + _filename = filename; + _lastProfileUsed = filename; + } + else + { + if (!string.IsNullOrEmpty(_lastProfileUsed) && File.Exists(_lastProfileUsed)) { - _filename = filename; - _lastProfileUsed = filename; + _filename = _lastProfileUsed; } else { - if (!string.IsNullOrEmpty(_lastProfileUsed) && File.Exists(_lastProfileUsed)) + return 0; + } + } + + if (string.IsNullOrEmpty(_filename) || !File.Exists(_filename)) + { + // Main window will handle this + return 0; + } + + //Profile AutoBackup + //If there is an error during autobackup, warning message will be issued and log files will be completed + //But this won't prevent to load the profile. + try + { + if (Settings.Default.AutoBackupActive) + { + string folder = string.Empty; + if (Settings.Default.AutoBackupDefaultFolderActive == false && !string.IsNullOrEmpty(Settings.Default.AutoBackupCustomFolderPath)) + { + folder = Settings.Default.AutoBackupCustomFolderPath; + } + ProfileAutoBackup profilesAutoBackup = new(folder); + profilesAutoBackup.BackupProfile(_filename); + } + } + catch (Exception ex) + { + MessageBox.Show($"Warning. Auto profile backup could not be done: {ex.Message}"); + } + + /* + * Read all information and add HIDInstance(ID) to all lines using BeginPanel and EndPanel + * + * PanelType=PZ55SwitchPanel + * PanelInstanceID=\\?\hid#vid_06a3&pid_0d06#8&3f11a32&0&0000#{4d1e55b2-f16f-11cf-88cb-001111000030} + * BeginPanel + * SwitchPanelKey{1KNOB_ENGINE_RIGHT}\o/OSKeyPress{FiftyMilliSec,LSHIFT + VK_Q} + * SwitchPanelKey{1KNOB_ENGINE_LEFT}\o/OSKeyPress{FiftyMilliSec,LCONTROL + VK_Q} + * SwitchPanelKey{1KNOB_ENGINE_BOTH}\o/OSKeyPress{FiftyMilliSec,LSHIFT + VK_C} + * EndPanel + * + */ + Common.ResetEmulationModesFlag(); + _profileLoaded = true; + Debug.WriteLine($"ProfileHandler reading file {_filename}"); + var fileLines = File.ReadAllLines(_filename); + var currentPanelType = GamingPanelEnum.Unknown; + string currentPanelInstance = null; + string currentBindingHash = null; + var insidePanel = false; + var insideJSONPanel = false; + DCSAircraft tmpProfile = null; + GenericPanelBinding genericPanelBinding = null; + foreach (var fileLine in fileLines) + { + if (fileLine.StartsWith("Airframe=")) + { + // <== Backward compability + if (fileLine.StartsWith("Airframe=NONE")) { - _filename = _lastProfileUsed; + // Backward compability + tmpProfile = DCSAircraft.GetKeyEmulator(); } else { - return 0; + // Backward compability + var airframeAsString = fileLine.Replace("Airframe=", string.Empty).Trim(); + tmpProfile = DCSAircraft.GetBackwardCompatible(airframeAsString); } } - - if (string.IsNullOrEmpty(_filename) || !File.Exists(_filename)) + else if (fileLine.StartsWith("Profile=")) { - // Main window will handle this - return 0; + tmpProfile = DCSAircraft.GetAircraft(int.Parse(fileLine.Replace("Profile=", string.Empty))); } + else if (fileLine.StartsWith("OperationLevelFlag=")) + { + Common.SetEmulationModesFlag(int.Parse(fileLine.Replace("OperationLevelFlag=", string.Empty).Trim())); // backward compat 13.03.2021 - //Profile AutoBackup - //If there is an error during autobackup, warning message will be issued and log files will be completed - //But this won't prevent to load the profile. - try + if (Common.PartialDCSBIOSEnabled() || Common.FullDCSBIOSEnabled()) + { + VerifyDCSBIOSLocation(); + } + } + else if (fileLine.StartsWith("EmulationModesFlag=")) { - if (Settings.Default.AutoBackupActive) + Common.SetEmulationModesFlag(int.Parse(fileLine.Replace("EmulationModesFlag=", string.Empty).Trim())); + + if (Common.PartialDCSBIOSEnabled() || Common.FullDCSBIOSEnabled()) { - string folder = string.Empty; - if (Settings.Default.AutoBackupDefaultFolderActive == false && !string.IsNullOrEmpty(Settings.Default.AutoBackupCustomFolderPath)) - { - folder = Settings.Default.AutoBackupCustomFolderPath; - } - ProfileAutoBackup profilesAutoBackup = new(folder); - profilesAutoBackup.BackupProfile(_filename); + VerifyDCSBIOSLocation(); } } - catch (Exception ex) + else if (fileLine.StartsWith("UseGenericRadio=")) { - MessageBox.Show($"Warning. Auto profile backup could not be done: {ex.Message}"); + tmpProfile.UseGenericRadio = bool.Parse(fileLine.Replace("UseGenericRadio=", string.Empty).Trim()); } - - /* - * Read all information and add HIDInstance(ID) to all lines using BeginPanel and EndPanel - * - * PanelType=PZ55SwitchPanel - * PanelInstanceID=\\?\hid#vid_06a3&pid_0d06#8&3f11a32&0&0000#{4d1e55b2-f16f-11cf-88cb-001111000030} - * BeginPanel - * SwitchPanelKey{1KNOB_ENGINE_RIGHT}\o/OSKeyPress{FiftyMilliSec,LSHIFT + VK_Q} - * SwitchPanelKey{1KNOB_ENGINE_LEFT}\o/OSKeyPress{FiftyMilliSec,LCONTROL + VK_Q} - * SwitchPanelKey{1KNOB_ENGINE_BOTH}\o/OSKeyPress{FiftyMilliSec,LSHIFT + VK_C} - * EndPanel - * - */ - Common.ResetEmulationModesFlag(); - _profileLoaded = true; - Debug.WriteLine($"ProfileHandler reading file {_filename}"); - var fileLines = File.ReadAllLines(_filename); - var currentPanelType = GamingPanelEnum.Unknown; - string currentPanelInstance = null; - string currentBindingHash = null; - var insidePanel = false; - var insideJSONPanel = false; - DCSAircraft tmpProfile = null; - GenericPanelBinding genericPanelBinding = null; - foreach (var fileLine in fileLines) + else if (fileLine.StartsWith("Option1=")) { - if (fileLine.StartsWith("Airframe=")) + tmpProfile.Option1 = bool.Parse(fileLine.Replace("Option1=", string.Empty).Trim()); + } + else if (!fileLine.StartsWith("#") && fileLine.Length > 0) + { + // Process all these lines. + if (fileLine.StartsWith("PanelType=")) { - // <== Backward compability - if (fileLine.StartsWith("Airframe=NONE")) - { - // Backward compability - tmpProfile = DCSAircraft.GetKeyEmulator(); - } - else + currentPanelType = (GamingPanelEnum)Enum.Parse(typeof(GamingPanelEnum), fileLine.Replace("PanelType=", string.Empty).Trim()); + genericPanelBinding = new GenericPanelBinding { - // Backward compability - var airframeAsString = fileLine.Replace("Airframe=", string.Empty).Trim(); - tmpProfile = DCSAircraft.GetBackwardCompatible(airframeAsString); - } + PanelType = currentPanelType + }; } - else if (fileLine.StartsWith("Profile=")) + else if (fileLine.StartsWith("PanelInstanceID=")) { - tmpProfile = DCSAircraft.GetAircraft(int.Parse(fileLine.Replace("Profile=", string.Empty))); + currentPanelInstance = fileLine.Replace("PanelInstanceID=", string.Empty).Trim(); + genericPanelBinding.HIDInstance = currentPanelInstance; + _profileFileHIDInstances.Add(new KeyValuePair(currentPanelInstance, currentPanelType)); } - else if (fileLine.StartsWith("OperationLevelFlag=")) + else if (fileLine.StartsWith("BindingHash=")) { - Common.SetEmulationModesFlag(int.Parse(fileLine.Replace("OperationLevelFlag=", string.Empty).Trim())); // backward compat 13.03.2021 - - if (Common.PartialDCSBIOSEnabled() || Common.FullDCSBIOSEnabled()) - { - VerifyDCSBIOSLocation(); - } + currentBindingHash = fileLine.Replace("BindingHash=", string.Empty).Trim(); + genericPanelBinding.BindingHash = currentBindingHash; } - else if (fileLine.StartsWith("EmulationModesFlag=")) + else if (fileLine.StartsWith("PanelSettingsVersion=")) { - Common.SetEmulationModesFlag(int.Parse(fileLine.Replace("EmulationModesFlag=", string.Empty).Trim())); - - if (Common.PartialDCSBIOSEnabled() || Common.FullDCSBIOSEnabled()) - { - VerifyDCSBIOSLocation(); - } - } - else if (fileLine.StartsWith("UseGenericRadio=")) - { - tmpProfile.UseGenericRadio = bool.Parse(fileLine.Replace("UseGenericRadio=", string.Empty).Trim()); + // do nothing, this will be phased out } - else if (fileLine.StartsWith("Option1=")) + else if (fileLine.Equals("BeginPanel")) { - tmpProfile.Option1 = bool.Parse(fileLine.Replace("Option1=", string.Empty).Trim()); + insidePanel = true; } - else if (!fileLine.StartsWith("#") && fileLine.Length > 0) + else if (fileLine.Equals("EndPanel")) { - // Process all these lines. - if (fileLine.StartsWith("PanelType=")) - { - currentPanelType = (GamingPanelEnum)Enum.Parse(typeof(GamingPanelEnum), fileLine.Replace("PanelType=", string.Empty).Trim()); - genericPanelBinding = new GenericPanelBinding - { - PanelType = currentPanelType - }; - } - else if (fileLine.StartsWith("PanelInstanceID=")) - { - currentPanelInstance = fileLine.Replace("PanelInstanceID=", string.Empty).Trim(); - genericPanelBinding.HIDInstance = currentPanelInstance; - _profileFileHIDInstances.Add(new KeyValuePair(currentPanelInstance, currentPanelType)); - } - else if (fileLine.StartsWith("BindingHash=")) - { - currentBindingHash = fileLine.Replace("BindingHash=", string.Empty).Trim(); - genericPanelBinding.BindingHash = currentBindingHash; - } - else if (fileLine.StartsWith("PanelSettingsVersion=")) + if (genericPanelBinding != null) { - // do nothing, this will be phased out + BindingMappingManager.RegisterBindingFromFile(genericPanelBinding); } - else if (fileLine.Equals("BeginPanel")) + + insidePanel = false; + } + else if (fileLine.Equals("BeginPanelJSON")) + { + insideJSONPanel = true; + } + else if (fileLine.Equals("EndPanelJSON")) + { + if (genericPanelBinding != null) { - insidePanel = true; + BindingMappingManager.RegisterBindingFromFile(genericPanelBinding); } - else if (fileLine.Equals("EndPanel")) - { - if (genericPanelBinding != null) - { - BindingMappingManager.RegisterBindingFromFile(genericPanelBinding); - } - insidePanel = false; - } - else if (fileLine.Equals("BeginPanelJSON")) + insideJSONPanel = false; + } + else + { + if (insidePanel) { - insideJSONPanel = true; + genericPanelBinding.Settings.Add(fileLine.Trim()); } - else if (fileLine.Equals("EndPanelJSON")) - { - if (genericPanelBinding != null) - { - BindingMappingManager.RegisterBindingFromFile(genericPanelBinding); - } - insideJSONPanel = false; - } - else + if (insideJSONPanel) { - if (insidePanel) - { - genericPanelBinding.Settings.Add(fileLine.Trim()); - } - - if (insideJSONPanel) - { - genericPanelBinding.JSONAddLine(fileLine); - } + genericPanelBinding.JSONAddLine(fileLine); } } } - DCSAircraft.SelectedAircraft = tmpProfile; - DCSAircraft = tmpProfile; - - AppEventHandler.ProfileEvent(this, ProfileEventEnum.ProfileLoaded, null, DCSAircraft); - - return 1; } - catch (Exception ex) - { - Mouse.OverrideCursor = Cursors.Arrow; - CloseProfile(); - Common.ShowErrorMessageBox(ex); + DCSAircraft.SelectedAircraft = tmpProfile; + DCSAircraft = tmpProfile; - if (DCSAircraft.DCSBIOSModulesCount == 0) - { - VerifyDCSBIOSLocation(); - } - else - { - MessageBox.Show( - $"Failed to open profile." - , "", MessageBoxButton.OK, MessageBoxImage.Information); + AppEventHandler.ProfileEvent(this, ProfileEventEnum.ProfileLoaded, null, DCSAircraft); - } - return -1; - } + return 1; } - finally + catch (Exception ex) { - Mouse.OverrideCursor = Cursors.Arrow; + CloseProfile(); + Common.ShowErrorMessageBox(ex); + + if (DCSAircraft.DCSBIOSModulesCount == 0) + { + VerifyDCSBIOSLocation(); + } + else + { + MessageBox.Show($"Failed to open profile.", "", MessageBoxButton.OK, MessageBoxImage.Information); + } + + return -1; } } @@ -508,14 +489,14 @@ private void SetEmulationModeFlag() { Common.SetEmulationModes(EmulationMode.KeyboardEmulationOnly); } - else if (DCSAircraft.IsKeyEmulatorSRS(DCSAircraft)) + else if (DCSAircraft.IsKeyEmulatorSRS(DCSAircraft)) { Common.SetEmulationModes(EmulationMode.KeyboardEmulationOnly); Common.SetEmulationModes(EmulationMode.SRSEnabled); - } + } else if (DCSAircraft.IsFlamingCliff(DCSAircraft)) { - Common.SetEmulationModes(EmulationMode.SRSEnabled); //??? + Common.SetEmulationModes(EmulationMode.SRSEnabled); //??? Common.SetEmulationModes(EmulationMode.DCSBIOSOutputEnabled); } else @@ -657,7 +638,7 @@ public void SaveProfile() { stringBuilder.AppendLine(genericPanelBinding.ExportBinding()); } - + stringBuilder.AppendLine(GetFooter()); File.WriteAllText(_filename, stringBuilder.ToString(), Encoding.ASCII); diff --git a/src/NonVisuals/CockpitMaster/Preprogrammed/CDU737PanelA10C.cs b/src/NonVisuals/CockpitMaster/Preprogrammed/CDU737PanelA10C.cs index c1bd47f47..f54f2ed1b 100644 --- a/src/NonVisuals/CockpitMaster/Preprogrammed/CDU737PanelA10C.cs +++ b/src/NonVisuals/CockpitMaster/Preprogrammed/CDU737PanelA10C.cs @@ -100,7 +100,7 @@ protected override void GamingPanelKnobChanged(bool isFirstReport, IEnumerable 0; + return Interlocked.Read(ref _vhfAmThreadNowSyncing) > 0; } private bool UhfNowSyncing() { - return Interlocked.Read(ref _uhfThreadNowSynching) > 0; + return Interlocked.Read(ref _uhfThreadNowSyncing) > 0; } private bool VhfFmNowSyncing() { - return Interlocked.Read(ref _vhfFmThreadNowSynching) > 0; + return Interlocked.Read(ref _vhfFmThreadNowSyncing) > 0; } private bool IlsNowSyncing() { - return Interlocked.Read(ref _ilsThreadNowSynching) > 0; + return Interlocked.Read(ref _ilsThreadNowSyncing) > 0; } private bool TacanNowSyncing() { - return Interlocked.Read(ref _tacanThreadNowSynching) > 0; + return Interlocked.Read(ref _tacanThreadNowSyncing) > 0; } public override void RemoveSwitchFromList(object controlList, PanelSwitchOnOff panelSwitchOnOff) diff --git a/src/NonVisuals/Radios/RadioPanelPZ69A10CII.cs b/src/NonVisuals/Radios/RadioPanelPZ69A10CII.cs index 5f47d384b..d780f0ee5 100644 --- a/src/NonVisuals/Radios/RadioPanelPZ69A10CII.cs +++ b/src/NonVisuals/Radios/RadioPanelPZ69A10CII.cs @@ -72,7 +72,7 @@ private enum CurrentA10RadioMode private const string ARC210_VHF_FREQ_4DIAL_COMMAND = "ARC210_100KHZ_SEL "; private const string ARC210_VHF_FREQ_5DIAL_COMMAND = "ARC210_25KHZ_SEL "; private Thread _arc210VhfSyncThread; - private long _arc210VhfThreadNowSynching; + private long _arc210VhfThreadNowSyncing; private long _arc210VhfDial1WaitingForFeedback; private long _arc210VhfDial2WaitingForFeedback; private long _arc210VhfDial3WaitingForFeedback; @@ -126,7 +126,7 @@ private enum CurrentA10RadioMode private const string UHF_FREQ_4DIAL_COMMAND = "UHF_POINT1MHZ_SEL "; // 0 1 2 3 4 5 6 7 8 9 private const string UHF_FREQ_5DIAL_COMMAND = "UHF_POINT25_SEL "; // "00" "25" "50" "75" private Thread _uhfSyncThread; - private long _uhfThreadNowSynching; + private long _uhfThreadNowSyncing; private long _uhfDial1WaitingForFeedback; private long _uhfDial2WaitingForFeedback; private long _uhfDial3WaitingForFeedback; @@ -173,7 +173,7 @@ private enum CurrentA10RadioMode private const string VHF_FM_FREQ_3DIAL_COMMAND = "VHFFM_FREQ3 "; private const string VHF_FM_FREQ_4DIAL_COMMAND = "VHFFM_FREQ4 "; private Thread _vhfFmSyncThread; - private long _vhfFmThreadNowSynching; + private long _vhfFmThreadNowSyncing; private long _vhfFmDial1WaitingForFeedback; private long _vhfFmDial2WaitingForFeedback; private long _vhfFmDial3WaitingForFeedback; @@ -211,7 +211,7 @@ private enum CurrentA10RadioMode private const string ILS_FREQ1_DIAL_COMMAND = "ILS_MHZ "; private const string ILS_FREQ2_DIAL_COMMAND = "ILS_KHZ "; private Thread _ilsSyncThread; - private long _ilsThreadNowSynching; + private long _ilsThreadNowSyncing; private long _ilsDial1WaitingForFeedback; private long _ilsDial2WaitingForFeedback; @@ -237,7 +237,7 @@ private enum CurrentA10RadioMode private const string TACAN_FREQ2_DIAL_COMMAND = "TACAN_1 "; private const string TACAN_FREQ3_DIAL_COMMAND = "TACAN_XY "; private Thread _tacanSyncThread; - private long _tacanThreadNowSynching; + private long _tacanThreadNowSyncing; private long _tacanDial1WaitingForFeedback; private long _tacanDial2WaitingForFeedback; private long _tacanDial3WaitingForFeedback; @@ -882,7 +882,7 @@ private void ARC210VhfSynchThreadMethod(int desiredPositionDial1, int desiredPos * Small dial 0.000-0.975 [step of 0.05] */ - Interlocked.Exchange(ref _arc210VhfThreadNowSynching, 1); + Interlocked.Exchange(ref _arc210VhfThreadNowSyncing, 1); var dial1Timeout = DateTime.Now.Ticks; var dial2Timeout = DateTime.Now.Ticks; var dial3Timeout = DateTime.Now.Ticks; @@ -1067,7 +1067,7 @@ private void ARC210VhfSynchThreadMethod(int desiredPositionDial1, int desiredPos } finally { - Interlocked.Exchange(ref _arc210VhfThreadNowSynching, 0); + Interlocked.Exchange(ref _arc210VhfThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); @@ -1232,7 +1232,7 @@ private void UhfSynchThreadMethod(int desiredPosition1, int desiredPosition2, in { try { - Interlocked.Exchange(ref _uhfThreadNowSynching, 1); + Interlocked.Exchange(ref _uhfThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; long dial3Timeout = DateTime.Now.Ticks; @@ -1463,7 +1463,7 @@ private void UhfSynchThreadMethod(int desiredPosition1, int desiredPosition2, in } finally { - Interlocked.Exchange(ref _uhfThreadNowSynching, 0); + Interlocked.Exchange(ref _uhfThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); @@ -1543,7 +1543,7 @@ private void VhfFmSynchThreadMethod(int desiredPositionDial1, int desiredPositio { try { - Interlocked.Exchange(ref _vhfFmThreadNowSynching, 1); + Interlocked.Exchange(ref _vhfFmThreadNowSyncing, 1); var dial1Timeout = DateTime.Now.Ticks; var dial2Timeout = DateTime.Now.Ticks; var dial3Timeout = DateTime.Now.Ticks; @@ -1701,7 +1701,7 @@ private void VhfFmSynchThreadMethod(int desiredPositionDial1, int desiredPositio } finally { - Interlocked.Exchange(ref _vhfFmThreadNowSynching, 0); + Interlocked.Exchange(ref _vhfFmThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); @@ -1749,7 +1749,7 @@ private void ILSSynchThreadMethod(int position1, int position2) { try { - Interlocked.Exchange(ref _ilsThreadNowSynching, 1); + Interlocked.Exchange(ref _ilsThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; @@ -1852,7 +1852,7 @@ private void ILSSynchThreadMethod(int position1, int position2) } finally { - Interlocked.Exchange(ref _ilsThreadNowSynching, 0); + Interlocked.Exchange(ref _ilsThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); @@ -1895,7 +1895,7 @@ private void TacanSynchThreadMethod(int desiredPositionDial1, int desiredPositio { try { - Interlocked.Exchange(ref _tacanThreadNowSynching, 1); + Interlocked.Exchange(ref _tacanThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; @@ -2020,7 +2020,7 @@ private void TacanSynchThreadMethod(int desiredPositionDial1, int desiredPositio } finally { - Interlocked.Exchange(ref _tacanThreadNowSynching, 0); + Interlocked.Exchange(ref _tacanThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); @@ -4333,27 +4333,27 @@ private bool UhfPresetSelected() private bool ARC210VhfNowSyncing() { - return Interlocked.Read(ref _arc210VhfThreadNowSynching) > 0; + return Interlocked.Read(ref _arc210VhfThreadNowSyncing) > 0; } private bool UhfNowSyncing() { - return Interlocked.Read(ref _uhfThreadNowSynching) > 0; + return Interlocked.Read(ref _uhfThreadNowSyncing) > 0; } private bool VhfFmNowSyncing() { - return Interlocked.Read(ref _vhfFmThreadNowSynching) > 0; + return Interlocked.Read(ref _vhfFmThreadNowSyncing) > 0; } private bool IlsNowSyncing() { - return Interlocked.Read(ref _ilsThreadNowSynching) > 0; + return Interlocked.Read(ref _ilsThreadNowSyncing) > 0; } private bool TacanNowSyncing() { - return Interlocked.Read(ref _tacanThreadNowSynching) > 0; + return Interlocked.Read(ref _tacanThreadNowSyncing) > 0; } public override void RemoveSwitchFromList(object controlList, PanelSwitchOnOff panelSwitchOnOff) diff --git a/src/NonVisuals/Radios/RadioPanelPZ69F14B.cs b/src/NonVisuals/Radios/RadioPanelPZ69F14B.cs index c6e145e08..bf3a58885 100644 --- a/src/NonVisuals/Radios/RadioPanelPZ69F14B.cs +++ b/src/NonVisuals/Radios/RadioPanelPZ69F14B.cs @@ -101,7 +101,7 @@ private enum CurrentF14RadioMode private volatile uint _uhfCockpitMode; // OFF = 0 private readonly ClickSpeedDetector _uhfModeClickSpeedDetector = new(8); private byte _skipUhfSmallFreqChange; - private long _uhfThreadNowSynching; + private long _uhfThreadNowSyncing; private Thread _uhfSyncThread; private long _uhfDial1WaitingForFeedback; private long _uhfDial2WaitingForFeedback; @@ -169,7 +169,7 @@ This is a RIO radio. private volatile uint _vuhfCockpitMode; // OFF = 0 private readonly ClickSpeedDetector _vuhfModeClickSpeedDetector = new(8); private byte _skipVuhfSmallFreqChange; - private long _vuhfThreadNowSynching; + private long _vuhfThreadNowSyncing; private Thread _vuhfSyncThread; private long _vuhfDial1WaitingForFeedback; private long _vuhfDial2WaitingForFeedback; @@ -199,7 +199,7 @@ This is a RIO radio. private const string PILOT_TACAN_ONES_DIAL_COMMAND = "PLT_TACAN_DIAL_ONES "; private const string PILOT_TACAN_XY_DIAL_COMMAND = "PLT_TACAN_CHANNEL "; // X = 0 | Y = 1 private Thread _pilotTacanSyncThread; - private long _pilotTacanThreadNowSynching; + private long _pilotTacanThreadNowSyncing; private long _pilotTacanTensWaitingForFeedback; private long _pilotTacanOnesWaitingForFeedback; private long _pilotTacanXYWaitingForFeedback; @@ -227,7 +227,7 @@ This is a RIO radio. private const string RIO_TACAN_ONES_DIAL_COMMAND = "RIO_TACAN_DIAL_ONES "; private const string RIO_TACAN_XY_DIAL_COMMAND = "RIO_TACAN_CHANNEL "; // X = 0 | Y = 1 private Thread _rioTacanSyncThread; - private long _rioTacanThreadNowSynching; + private long _rioTacanThreadNowSyncing; private long _rioTacanTensWaitingForFeedback; private long _rioTacanOnesWaitingForFeedback; private long _rioTacanXYWaitingForFeedback; @@ -257,7 +257,7 @@ This is a RIO radio. private const string RIO_LINK4_POWER_COMMAND_INC = "RIO_DATALINK_PW INC\n"; private const string RIO_LINK4_POWER_COMMAND_DEC = "RIO_DATALINK_PW DEC\n"; private Thread _rioLink4SyncThread; - private long _rioLink4ThreadNowSynching; + private long _rioLink4ThreadNowSyncing; private long _rioLinkHundredsWaitingForFeedback; private long _rioLinkTensWaitingForFeedback; private long _rioLinkOnesWaitingForFeedback; @@ -766,7 +766,7 @@ private void UHFSynchThreadMethod(int desiredValueDial1, int desiredValueDial2, { try { - Interlocked.Exchange(ref _uhfThreadNowSynching, 1); + Interlocked.Exchange(ref _uhfThreadNowSyncing, 1); var dial1Timeout = DateTime.Now.Ticks; var dial2Timeout = DateTime.Now.Ticks; var dial3Timeout = DateTime.Now.Ticks; @@ -908,7 +908,7 @@ private void UHFSynchThreadMethod(int desiredValueDial1, int desiredValueDial2, } finally { - Interlocked.Exchange(ref _uhfThreadNowSynching, 0); + Interlocked.Exchange(ref _uhfThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); } @@ -961,7 +961,7 @@ private void VUHFSynchThreadMethod(int desiredValueDial1, int desiredValueDial2, { try { - Interlocked.Exchange(ref _vuhfThreadNowSynching, 1); + Interlocked.Exchange(ref _vuhfThreadNowSyncing, 1); var dial1Timeout = DateTime.Now.Ticks; var dial2Timeout = DateTime.Now.Ticks; var dial3Timeout = DateTime.Now.Ticks; @@ -1101,7 +1101,7 @@ private void VUHFSynchThreadMethod(int desiredValueDial1, int desiredValueDial2, } finally { - Interlocked.Exchange(ref _vuhfThreadNowSynching, 0); + Interlocked.Exchange(ref _vuhfThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); } @@ -1130,7 +1130,7 @@ private void RioDatalink4SynchThreadMethod(int desiredPositionDial1, int desired { try { - Interlocked.Exchange(ref _rioLink4ThreadNowSynching, 1); + Interlocked.Exchange(ref _rioLink4ThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; @@ -1242,7 +1242,7 @@ private void RioDatalink4SynchThreadMethod(int desiredPositionDial1, int desired } finally { - Interlocked.Exchange(ref _rioLink4ThreadNowSynching, 0); + Interlocked.Exchange(ref _rioLink4ThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); } @@ -1284,7 +1284,7 @@ private void PilotTacanSynchThreadMethod(int desiredPositionDial1, int desiredPo { try { - Interlocked.Exchange(ref _pilotTacanThreadNowSynching, 1); + Interlocked.Exchange(ref _pilotTacanThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; @@ -1399,7 +1399,7 @@ private void PilotTacanSynchThreadMethod(int desiredPositionDial1, int desiredPo } finally { - Interlocked.Exchange(ref _pilotTacanThreadNowSynching, 0); + Interlocked.Exchange(ref _pilotTacanThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); @@ -1427,7 +1427,7 @@ private void RioTacanSynchThreadMethod(int desiredPositionDial1, int desiredPosi { try { - Interlocked.Exchange(ref _rioTacanThreadNowSynching, 1); + Interlocked.Exchange(ref _rioTacanThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; @@ -1543,7 +1543,7 @@ private void RioTacanSynchThreadMethod(int desiredPositionDial1, int desiredPosi } finally { - Interlocked.Exchange(ref _rioTacanThreadNowSynching, 0); + Interlocked.Exchange(ref _rioTacanThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); } @@ -3287,17 +3287,17 @@ private bool VuhfPresetSelected() private bool PilotTacanNowSyncing() { - return Interlocked.Read(ref _pilotTacanThreadNowSynching) > 0; + return Interlocked.Read(ref _pilotTacanThreadNowSyncing) > 0; } private bool Link4NowSyncing() { - return Interlocked.Read(ref _rioLink4ThreadNowSynching) > 0; + return Interlocked.Read(ref _rioLink4ThreadNowSyncing) > 0; } private bool RioTacanNowSyncing() { - return Interlocked.Read(ref _rioTacanThreadNowSynching) > 0; + return Interlocked.Read(ref _rioTacanThreadNowSyncing) > 0; } public override void RemoveSwitchFromList(object controlList, PanelSwitchOnOff panelSwitchOnOff) @@ -3326,12 +3326,12 @@ public override void AddOrUpdateOSCommandBinding(PanelSwitchOnOff panelSwitchOnO private bool UHFNowSyncing() { - return Interlocked.Read(ref _uhfThreadNowSynching) > 0; + return Interlocked.Read(ref _uhfThreadNowSyncing) > 0; } private bool VUHFNowSyncing() { - return Interlocked.Read(ref _vuhfThreadNowSynching) > 0; + return Interlocked.Read(ref _vuhfThreadNowSyncing) > 0; } private static string GetCommandDirection10Dial(int desiredDialPosition, uint actualDialPosition) diff --git a/src/NonVisuals/Radios/RadioPanelPZ69F5E.cs b/src/NonVisuals/Radios/RadioPanelPZ69F5E.cs index 3bea06651..0e36dcb17 100644 --- a/src/NonVisuals/Radios/RadioPanelPZ69F5E.cs +++ b/src/NonVisuals/Radios/RadioPanelPZ69F5E.cs @@ -76,7 +76,7 @@ private enum CurrentF5ERadioMode private const string UHF_FREQ_4DIAL_COMMAND = "UHF_01MHZ_SEL "; // 0 1 2 3 4 5 6 7 8 9 private const string UHF_FREQ_5DIAL_COMMAND = "UHF_0025MHZ_SEL "; // "00" "25" "50" "75" private Thread _uhfSyncThread; - private long _uhfThreadNowSynching; + private long _uhfThreadNowSyncing; private long _uhfDial1WaitingForFeedback; private long _uhfDial2WaitingForFeedback; private long _uhfDial3WaitingForFeedback; @@ -122,7 +122,7 @@ private enum CurrentF5ERadioMode private const string TACAN_FREQ_2DIAL_COMMAND = "TACAN_1 "; private const string TACAN_FREQ_3DIAL_COMMAND = "TACAN_XY "; private Thread _tacanSyncThread; - private long _tacanThreadNowSynching; + private long _tacanThreadNowSyncing; private long _tacanDial1WaitingForFeedback; private long _tacanDial2WaitingForFeedback; private long _tacanDial3WaitingForFeedback; @@ -481,7 +481,7 @@ private void UhfSynchThreadMethod(int desiredPosition1, int desiredPosition2, in { try { - Interlocked.Exchange(ref _uhfThreadNowSynching, 1); + Interlocked.Exchange(ref _uhfThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; long dial3Timeout = DateTime.Now.Ticks; @@ -712,7 +712,7 @@ private void UhfSynchThreadMethod(int desiredPosition1, int desiredPosition2, in } finally { - Interlocked.Exchange(ref _uhfThreadNowSynching, 0); + Interlocked.Exchange(ref _uhfThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); @@ -755,7 +755,7 @@ private void TacanSynchThreadMethod(int desiredPositionDial1, int desiredPositio { try { - Interlocked.Exchange(ref _tacanThreadNowSynching, 1); + Interlocked.Exchange(ref _tacanThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; @@ -879,7 +879,7 @@ private void TacanSynchThreadMethod(int desiredPositionDial1, int desiredPositio } finally { - Interlocked.Exchange(ref _tacanThreadNowSynching, 0); + Interlocked.Exchange(ref _tacanThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); @@ -2056,12 +2056,12 @@ private bool UhfPresetSelected() private bool UhfNowSyncing() { - return Interlocked.Read(ref _uhfThreadNowSynching) > 0; + return Interlocked.Read(ref _uhfThreadNowSyncing) > 0; } private bool TacanNowSyncing() { - return Interlocked.Read(ref _tacanThreadNowSynching) > 0; + return Interlocked.Read(ref _tacanThreadNowSyncing) > 0; } public override void RemoveSwitchFromList(object controlList, PanelSwitchOnOff panelSwitchOnOff) diff --git a/src/NonVisuals/Radios/RadioPanelPZ69FA18C.cs b/src/NonVisuals/Radios/RadioPanelPZ69FA18C.cs index 9ceae3ee6..10d60d0c4 100644 --- a/src/NonVisuals/Radios/RadioPanelPZ69FA18C.cs +++ b/src/NonVisuals/Radios/RadioPanelPZ69FA18C.cs @@ -86,7 +86,7 @@ private enum CurrentFA18CRadioMode private volatile uint _ilsCockpitChannel = 1; private const string ILS_CHANNEL_COMMAND = "COM_ILS_CHANNEL_SW "; private Thread _ilsSyncThread; - private long _ilsThreadNowSynching; + private long _ilsThreadNowSyncing; private long _ilsDialWaitingForFeedback; private readonly object _lockShowFrequenciesOnPanelObject = new(); private long _doUpdatePanelLCD; @@ -327,7 +327,7 @@ private void ILSSynchThreadMethod(uint standbyPosition) { try { - Interlocked.Exchange(ref _ilsThreadNowSynching, 1); + Interlocked.Exchange(ref _ilsThreadNowSyncing, 1); long dialTimeout = DateTime.Now.Ticks; long dialOkTime = 0; @@ -394,7 +394,7 @@ private void ILSSynchThreadMethod(uint standbyPosition) } finally { - Interlocked.Exchange(ref _ilsThreadNowSynching, 0); + Interlocked.Exchange(ref _ilsThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); @@ -1225,7 +1225,7 @@ private void SwapCockpitStandbyFrequencyIls() private bool IlsNowSyncing() { - return Interlocked.Read(ref _ilsThreadNowSynching) > 0; + return Interlocked.Read(ref _ilsThreadNowSyncing) > 0; } public override void RemoveSwitchFromList(object controlList, PanelSwitchOnOff panelSwitchOnOff) diff --git a/src/NonVisuals/Radios/RadioPanelPZ69Ka50.cs b/src/NonVisuals/Radios/RadioPanelPZ69Ka50.cs index 95d0631b5..eb4168495 100644 --- a/src/NonVisuals/Radios/RadioPanelPZ69Ka50.cs +++ b/src/NonVisuals/Radios/RadioPanelPZ69Ka50.cs @@ -90,7 +90,7 @@ private enum CurrentKa50RadioMode private const string R800_L1_FREQ_3DIAL_COMMAND = "R800_FREQ3 "; private const string R800_L1_FREQ_4DIAL_COMMAND = "R800_FREQ4 "; private Thread _r800L1SyncThread; - private long _r800L1ThreadNowSynching; + private long _r800L1ThreadNowSyncing; private long _r800L1Dial1WaitingForFeedback; private long _r800L1Dial2WaitingForFeedback; private long _r800L1Dial3WaitingForFeedback; @@ -468,7 +468,7 @@ private void R800L1SynchThreadMethod() /* * Ka-50 R-800L1 VHF 2 */ - Interlocked.Exchange(ref _r800L1ThreadNowSynching, 1); + Interlocked.Exchange(ref _r800L1ThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; long dial3Timeout = DateTime.Now.Ticks; @@ -663,7 +663,7 @@ private void R800L1SynchThreadMethod() } finally { - Interlocked.Exchange(ref _r800L1ThreadNowSynching, 0); + Interlocked.Exchange(ref _r800L1ThreadNowSyncing, 0); } } catch (Exception ex) @@ -1759,7 +1759,7 @@ private void SetLowerRadioMode(CurrentKa50RadioMode currentKa50RadioMode) private bool R800L1NowSyncing() { - return Interlocked.Read(ref _r800L1ThreadNowSynching) > 0; + return Interlocked.Read(ref _r800L1ThreadNowSyncing) > 0; } private void SaveCockpitFrequencyR800L1() diff --git a/src/NonVisuals/Radios/RadioPanelPZ69Mi24P.cs b/src/NonVisuals/Radios/RadioPanelPZ69Mi24P.cs index db952e9f2..6ba733957 100644 --- a/src/NonVisuals/Radios/RadioPanelPZ69Mi24P.cs +++ b/src/NonVisuals/Radios/RadioPanelPZ69Mi24P.cs @@ -79,7 +79,7 @@ private enum CurrentMi24PRadioMode private const string YADRO1_A_FREQ_3DIAL_COMMAND = "PLT_JADRO_10K "; private const string YADRO1_A_FREQ_4DIAL_COMMAND = "PLT_JADRO_1K "; private Thread _yadro1ASyncThread; - private long _yadro1AThreadNowSynching; + private long _yadro1AThreadNowSyncing; private long _yadro1ADial1WaitingForFeedback; private long _yadro1ADial2WaitingForFeedback; private long _yadro1ADial3WaitingForFeedback; @@ -555,7 +555,7 @@ private void YaDRO1ASynchThreadMethod() try { // Mi-24P YaDRO-1A - Interlocked.Exchange(ref _yadro1AThreadNowSynching, 1); + Interlocked.Exchange(ref _yadro1AThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; long dial3Timeout = DateTime.Now.Ticks; @@ -712,7 +712,7 @@ private void YaDRO1ASynchThreadMethod() } finally { - Interlocked.Exchange(ref _yadro1AThreadNowSynching, 0); + Interlocked.Exchange(ref _yadro1AThreadNowSyncing, 0); } } catch (Exception ex) @@ -1694,7 +1694,7 @@ private void SetLowerRadioMode(bool radioKnobIsOn, CurrentMi24PRadioMode Current private bool YaDRO1ANowSyncing() { - return Interlocked.Read(ref _yadro1AThreadNowSynching) > 0; + return Interlocked.Read(ref _yadro1AThreadNowSyncing) > 0; } private void SaveCockpitFrequencyYaDRO1A() diff --git a/src/NonVisuals/Radios/RadioPanelPZ69Mi8.cs b/src/NonVisuals/Radios/RadioPanelPZ69Mi8.cs index b2dc2eae5..56c56434c 100644 --- a/src/NonVisuals/Radios/RadioPanelPZ69Mi8.cs +++ b/src/NonVisuals/Radios/RadioPanelPZ69Mi8.cs @@ -75,7 +75,7 @@ private enum CurrentMi8RadioMode private const string R863_MANUAL_FREQ_3DIAL_COMMAND = "R863_FREQ3 "; private const string R863_MANUAL_FREQ_4DIAL_COMMAND = "R863_FREQ4 "; private Thread _r863ManualSyncThread; - private long _r863ManualThreadNowSynching; + private long _r863ManualThreadNowSyncing; private long _r863ManualDial1WaitingForFeedback; private long _r863ManualDial2WaitingForFeedback; private long _r863ManualDial3WaitingForFeedback; @@ -126,7 +126,7 @@ private enum CurrentMi8RadioMode private const string YADRO1_A_FREQ_3DIAL_COMMAND = "YADRO1A_FREQ3 "; private const string YADRO1_A_FREQ_4DIAL_COMMAND = "YADRO1A_FREQ4 "; private Thread _yadro1ASyncThread; - private long _yadro1AThreadNowSynching; + private long _yadro1AThreadNowSyncing; private long _yadro1ADial1WaitingForFeedback; private long _yadro1ADial2WaitingForFeedback; private long _yadro1ADial3WaitingForFeedback; @@ -740,7 +740,7 @@ private void R863ManualSynchThreadMethod() /* * Mi-8 R-863 COM1 */ - Interlocked.Exchange(ref _r863ManualThreadNowSynching, 1); + Interlocked.Exchange(ref _r863ManualThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; long dial3Timeout = DateTime.Now.Ticks; @@ -945,7 +945,7 @@ So only go down with it } finally { - Interlocked.Exchange(ref _r863ManualThreadNowSynching, 0); + Interlocked.Exchange(ref _r863ManualThreadNowSyncing, 0); } } catch (Exception ex) @@ -1006,7 +1006,7 @@ private void YaDRO1ASynchThreadMethod() /* * Mi-8 YaDRO-1A */ - Interlocked.Exchange(ref _yadro1AThreadNowSynching, 1); + Interlocked.Exchange(ref _yadro1AThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; long dial3Timeout = DateTime.Now.Ticks; @@ -1171,7 +1171,7 @@ private void YaDRO1ASynchThreadMethod() } finally { - Interlocked.Exchange(ref _yadro1AThreadNowSynching, 0); + Interlocked.Exchange(ref _yadro1AThreadNowSyncing, 0); } } catch (Exception ex) @@ -2620,12 +2620,12 @@ private void SetLowerRadioMode(CurrentMi8RadioMode currentMi8RadioMode) private bool R863ManualNowSyncing() { - return Interlocked.Read(ref _r863ManualThreadNowSynching) > 0; + return Interlocked.Read(ref _r863ManualThreadNowSyncing) > 0; } private bool YaDRO1ANowSyncing() { - return Interlocked.Read(ref _yadro1AThreadNowSynching) > 0; + return Interlocked.Read(ref _yadro1AThreadNowSyncing) > 0; } private void SaveCockpitFrequencyR863Manual() diff --git a/src/NonVisuals/Radios/RadioPanelPZ69SA342.cs b/src/NonVisuals/Radios/RadioPanelPZ69SA342.cs index 97da48cf8..ee267e3fc 100644 --- a/src/NonVisuals/Radios/RadioPanelPZ69SA342.cs +++ b/src/NonVisuals/Radios/RadioPanelPZ69SA342.cs @@ -92,7 +92,7 @@ private enum AdfDigit private volatile uint _vhfAmCockpitDecimal100SFrequencyValue = 6553; private Thread _vhfAmSyncThread; - private long _vhfAmThreadNowSynching; + private long _vhfAmThreadNowSyncing; private long _vhfAmValue1WaitingForFeedback; // 10s private long _vhfAmValue2WaitingForFeedback; // 1s private long _vhfAmValue3WaitingForFeedback; // Decimal 10s @@ -470,7 +470,7 @@ private void VhfAmSynchThreadMethod(int desiredPositionDialWholeNumbers, int des * COM1 VHF AM * */ - Interlocked.Exchange(ref _vhfAmThreadNowSynching, 1); + Interlocked.Exchange(ref _vhfAmThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; long dial1Time = 0; @@ -582,7 +582,7 @@ private void VhfAmSynchThreadMethod(int desiredPositionDialWholeNumbers, int des } finally { - Interlocked.Exchange(ref _vhfAmThreadNowSynching, 0); + Interlocked.Exchange(ref _vhfAmThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); } @@ -1871,7 +1871,7 @@ private bool CorrectPositionDecimal100S(uint value) private bool VhfAmNowSyncing() { - return Interlocked.Read(ref _vhfAmThreadNowSynching) > 0; + return Interlocked.Read(ref _vhfAmThreadNowSyncing) > 0; } private static bool SwitchVhfAmDecimalDirectionUp(int cockpitValue, int desiredValue) diff --git a/src/NonVisuals/Radios/RadioPanelPZ69T45C.cs b/src/NonVisuals/Radios/RadioPanelPZ69T45C.cs index 521a5b1ed..f67efa712 100644 --- a/src/NonVisuals/Radios/RadioPanelPZ69T45C.cs +++ b/src/NonVisuals/Radios/RadioPanelPZ69T45C.cs @@ -93,7 +93,7 @@ Small dial private volatile uint _vuhf1CockpitMode; // OFF = 0*/ //private readonly ClickSpeedDetector _vuhf1ModeClickSpeedDetector = new(8); private byte _skipVuhf1SmallFreqChange; - private long _vuhf1ThreadNowSynching; + private long _vuhf1ThreadNowSyncing; private Thread _vuhf1SyncThread; private long _vuhf1Dial1WaitingForFeedback; private long _vuhf1Dial2WaitingForFeedback; @@ -148,7 +148,7 @@ Small dial private volatile uint _vuhf2CockpitMode; // OFF = 0 private readonly ClickSpeedDetector _vuhf2ModeClickSpeedDetector = new(8);*/ private byte _skipVuhf2SmallFreqChange; - private long _vuhf2ThreadNowSynching; + private long _vuhf2ThreadNowSyncing; private Thread _vuhf2SyncThread; private long _vuhf2Dial1WaitingForFeedback; private long _vuhf2Dial2WaitingForFeedback; @@ -171,7 +171,7 @@ Small dial private const string TACAN_TENS_DIAL_COMMAND = "TACAN_CHAN_10 "; private const string TACAN_ONES_DIAL_COMMAND = "TACAN_CHAN_1 "; private Thread _tacanSyncThread; - private long _tacanThreadNowSynching; + private long _tacanThreadNowSyncing; private long _tacanTensWaitingForFeedback; private long _tacanOnesWaitingForFeedback; @@ -191,7 +191,7 @@ Small dial private const string VOR_MHZ_DIAL_COMMAND = "VOR_ILS_FREQ_1 "; private const string VOR_KHZ_DIAL_COMMAND = "VOR_ILS_FREQ_50 "; private Thread _vorSyncThread; - private long _vorThreadNowSynching; + private long _vorThreadNowSyncing; private long _vorMhzWaitingForFeedback; private long _vorKhzWaitingForFeedback; @@ -537,7 +537,7 @@ private void VUHF1SynchThreadMethod(int desiredValueDial1, int desiredValueDial2 { try { - Interlocked.Exchange(ref _vuhf1ThreadNowSynching, 1); + Interlocked.Exchange(ref _vuhf1ThreadNowSyncing, 1); var dial1Timeout = DateTime.Now.Ticks; var dial2Timeout = DateTime.Now.Ticks; var dial3Timeout = DateTime.Now.Ticks; @@ -677,7 +677,7 @@ private void VUHF1SynchThreadMethod(int desiredValueDial1, int desiredValueDial2 } finally { - Interlocked.Exchange(ref _vuhf1ThreadNowSynching, 0); + Interlocked.Exchange(ref _vuhf1ThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); } @@ -730,7 +730,7 @@ private void VUHF2SynchThreadMethod(int desiredValueDial1, int desiredValueDial2 { try { - Interlocked.Exchange(ref _vuhf2ThreadNowSynching, 1); + Interlocked.Exchange(ref _vuhf2ThreadNowSyncing, 1); var dial1Timeout = DateTime.Now.Ticks; var dial2Timeout = DateTime.Now.Ticks; var dial3Timeout = DateTime.Now.Ticks; @@ -870,7 +870,7 @@ private void VUHF2SynchThreadMethod(int desiredValueDial1, int desiredValueDial2 } finally { - Interlocked.Exchange(ref _vuhf2ThreadNowSynching, 0); + Interlocked.Exchange(ref _vuhf2ThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); } @@ -908,7 +908,7 @@ private void TacanSynchThreadMethod(int desiredPositionDial1, int desiredPositio { try { - Interlocked.Exchange(ref _tacanThreadNowSynching, 1); + Interlocked.Exchange(ref _tacanThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; @@ -992,7 +992,7 @@ private void TacanSynchThreadMethod(int desiredPositionDial1, int desiredPositio } finally { - Interlocked.Exchange(ref _tacanThreadNowSynching, 0); + Interlocked.Exchange(ref _tacanThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); @@ -1020,7 +1020,7 @@ private void VorSynchThreadMethod(int desiredPositionDial1, int desiredPositionD { try { - Interlocked.Exchange(ref _vorThreadNowSynching, 1); + Interlocked.Exchange(ref _vorThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; @@ -1106,7 +1106,7 @@ private void VorSynchThreadMethod(int desiredPositionDial1, int desiredPositionD } finally { - Interlocked.Exchange(ref _vorThreadNowSynching, 0); + Interlocked.Exchange(ref _vorThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); } @@ -2292,12 +2292,12 @@ private void SwapStandbyFrequencyVor() private bool TacanNowSyncing() { - return Interlocked.Read(ref _tacanThreadNowSynching) > 0; + return Interlocked.Read(ref _tacanThreadNowSyncing) > 0; } private bool VorNowSyncing() { - return Interlocked.Read(ref _vorThreadNowSynching) > 0; + return Interlocked.Read(ref _vorThreadNowSyncing) > 0; } public override void RemoveSwitchFromList(object controlList, PanelSwitchOnOff panelSwitchOnOff) @@ -2326,12 +2326,12 @@ public override void AddOrUpdateOSCommandBinding(PanelSwitchOnOff panelSwitchOnO private bool VUHF1NowSyncing() { - return Interlocked.Read(ref _vuhf1ThreadNowSynching) > 0; + return Interlocked.Read(ref _vuhf1ThreadNowSyncing) > 0; } private bool VUHF2NowSyncing() { - return Interlocked.Read(ref _vuhf2ThreadNowSynching) > 0; + return Interlocked.Read(ref _vuhf2ThreadNowSyncing) > 0; } /*private static string GetCommandDirection10Dial(int desiredDialPosition, uint actualDialPosition) diff --git a/src/NonVisuals/Radios/RadioPanelPZ69UH1H.cs b/src/NonVisuals/Radios/RadioPanelPZ69UH1H.cs index 9ae8c53df..fb4309a69 100644 --- a/src/NonVisuals/Radios/RadioPanelPZ69UH1H.cs +++ b/src/NonVisuals/Radios/RadioPanelPZ69UH1H.cs @@ -68,7 +68,7 @@ private enum CurrentUH1HRadioMode private volatile uint _vhfCommSavedCockpitSmallFrequency; private volatile uint _vhfCommSavedCockpitBigFrequency = 116; private double _vhfCommCockpitFrequency = 116.00; - private long _vhfCommThreadNowSynching; + private long _vhfCommThreadNowSyncing; private volatile uint _vhfCommCockpitDial1Frequency = 116; private volatile uint _vhfCommCockpitDial2Frequency = 95; private long _vhfCommDial1FreqWaitingForFeedback; @@ -105,7 +105,7 @@ private enum CurrentUH1HRadioMode private const string UHF_FREQ2_DIAL_COMMAND = "UHF_1MHZ "; // 0 1 2 3 4 5 6 7 8 9 private const string UHF_FREQ3_DIAL_COMMAND = "UHF_50KHZ "; // 00 - 95 private Thread _uhfSyncThread; - private long _uhfThreadNowSynching; + private long _uhfThreadNowSyncing; private long _uhfDial1WaitingForFeedback; private long _uhfDial2WaitingForFeedback; private long _uhfDial3WaitingForFeedback; @@ -127,7 +127,7 @@ private enum CurrentUH1HRadioMode private const string VHF_NAV_FREQ1_DIAL_COMMAND = "VHFNAV_MHZ "; private const string VHF_NAV_FREQ2_DIAL_COMMAND = "VHFNAV_KHZ "; private Thread _vhfNavSyncThread; - private long _vhfNavThreadNowSynching; + private long _vhfNavThreadNowSyncing; private long _vhfNavDial1WaitingForFeedback; private long _vhfNavDial2WaitingForFeedback; @@ -154,7 +154,7 @@ private enum CurrentUH1HRadioMode private const string VHF_FM_FREQ_3DIAL_COMMAND = "VHFFM_FREQ3 "; // 0 1 2 3 4 5 6 7 8 9 private const string VHF_FM_FREQ_4DIAL_COMMAND = "VHFFM_FREQ4 "; // 0 5 private Thread _vhfFmSyncThread; - private long _vhfFmThreadNowSynching; + private long _vhfFmThreadNowSyncing; private long _vhfFmDial1WaitingForFeedback; private long _vhfFmDial2WaitingForFeedback; private long _vhfFmDial3WaitingForFeedback; @@ -190,7 +190,7 @@ STANDBY SCREEN - SIGNAL STRENGTH private const string ADF_GAIN_KNOB_COMMAND_DEC = "ADF_GAIN +2000\n"; private const string ADF_FREQUENCY_BAND_COMMAND = "ADF_BAND "; private Thread _adfSyncThread; - private long _adfThreadNowSynching; + private long _adfThreadNowSyncing; private long _adfFrequencyBandWaitingForFeedback; private readonly object _lockShowFrequenciesOnPanelObject = new(); private long _doUpdatePanelLCD; @@ -700,7 +700,7 @@ private void IntercommSynchThreadMethod() try { String str; - Interlocked.Exchange(ref _intercommThreadNowSynching, 1); + Interlocked.Exchange(ref _intercommThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial1OkTime = 0; var dial1SendCount = 0; @@ -752,7 +752,7 @@ private void IntercommSynchThreadMethod() } finally { - ResetWaitingForFeedBack(ref _intercommThreadNowSynching); + ResetWaitingForFeedBack(ref _intercommThreadNowSyncing); } } catch (ThreadAbortException) @@ -793,7 +793,7 @@ private void VhfCommSynchThreadMethod() { try { - Interlocked.Exchange(ref _vhfCommThreadNowSynching, 1); + Interlocked.Exchange(ref _vhfCommThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; long dial1OkTime = 0; @@ -885,7 +885,7 @@ private void VhfCommSynchThreadMethod() } finally { - Interlocked.Exchange(ref _vhfCommThreadNowSynching, 0); + Interlocked.Exchange(ref _vhfCommThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); } @@ -924,7 +924,7 @@ private void UhfSynchThreadMethod() { try { - Interlocked.Exchange(ref _uhfThreadNowSynching, 1); + Interlocked.Exchange(ref _uhfThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; long dial3Timeout = DateTime.Now.Ticks; @@ -1054,7 +1054,7 @@ private void UhfSynchThreadMethod() } finally { - Interlocked.Exchange(ref _uhfThreadNowSynching, 0); + Interlocked.Exchange(ref _uhfThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); } @@ -1081,7 +1081,7 @@ private void VhfNavSynchThreadMethod() { try { - Interlocked.Exchange(ref _vhfNavThreadNowSynching, 1); + Interlocked.Exchange(ref _vhfNavThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; long dial1OkTime = 0; @@ -1183,7 +1183,7 @@ private void VhfNavSynchThreadMethod() } finally { - Interlocked.Exchange(ref _vhfNavThreadNowSynching, 0); + Interlocked.Exchange(ref _vhfNavThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); } @@ -1209,7 +1209,7 @@ private void VhfFmSynchThreadMethod() { try { - Interlocked.Exchange(ref _vhfFmThreadNowSynching, 1); + Interlocked.Exchange(ref _vhfFmThreadNowSyncing, 1); long dial1Timeout = DateTime.Now.Ticks; long dial2Timeout = DateTime.Now.Ticks; long dial3Timeout = DateTime.Now.Ticks; @@ -1431,7 +1431,7 @@ private void VhfFmSynchThreadMethod() } finally { - Interlocked.Exchange(ref _vhfFmThreadNowSynching, 0); + Interlocked.Exchange(ref _vhfFmThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); } @@ -1452,7 +1452,7 @@ private void AdfBandChangeSynchThreadMethod() { try { - Interlocked.Exchange(ref _adfThreadNowSynching, 1); + Interlocked.Exchange(ref _adfThreadNowSyncing, 1); long freqBandDialTimeout = DateTime.Now.Ticks; long freqBandDialOkTime = 0; var freqBandDialSendCount = 0; @@ -1552,7 +1552,7 @@ private void AdfBandChangeSynchThreadMethod() } finally { - Interlocked.Exchange(ref _adfThreadNowSynching, 0); + Interlocked.Exchange(ref _adfThreadNowSyncing, 0); } Interlocked.Increment(ref _doUpdatePanelLCD); @@ -3088,22 +3088,22 @@ private void SwapCockpitStandbyFrequencyVhfNav() private bool VhfCommSyncing() { - return Interlocked.Read(ref _vhfCommThreadNowSynching) > 0; + return Interlocked.Read(ref _vhfCommThreadNowSyncing) > 0; } private bool VhfFmSyncing() { - return Interlocked.Read(ref _vhfFmThreadNowSynching) > 0; + return Interlocked.Read(ref _vhfFmThreadNowSyncing) > 0; } private bool UhfSyncing() { - return Interlocked.Read(ref _uhfThreadNowSynching) > 0; + return Interlocked.Read(ref _uhfThreadNowSyncing) > 0; } private bool VhfNavSyncing() { - return Interlocked.Read(ref _vhfNavThreadNowSynching) > 0; + return Interlocked.Read(ref _vhfNavThreadNowSyncing) > 0; } public override void RemoveSwitchFromList(object controlList, PanelSwitchOnOff panelSwitchOnOff) diff --git a/src/NonVisuals/Radios/RadioSettings/ARC164Settings.cs b/src/NonVisuals/Radios/RadioSettings/ARC164Settings.cs index 023cab8e1..7c96d2341 100644 --- a/src/NonVisuals/Radios/RadioSettings/ARC164Settings.cs +++ b/src/NonVisuals/Radios/RadioSettings/ARC164Settings.cs @@ -1,7 +1,6 @@ using NonVisuals.Helpers; using NonVisuals.Interfaces; using NonVisuals.Radios.RadioControls; -using System.Runtime.CompilerServices; namespace NonVisuals.Radios.RadioSettings diff --git a/src/StreamDeckSharp.Tests/StreamDeckHidWriteTests.cs b/src/StreamDeckSharp.Tests/StreamDeckHidWriteTests.cs index a49b44198..8ab6613f9 100644 --- a/src/StreamDeckSharp.Tests/StreamDeckHidWriteTests.cs +++ b/src/StreamDeckSharp.Tests/StreamDeckHidWriteTests.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using VerifyXunit; using Xunit; namespace StreamDeckSharp.Tests diff --git a/src/StreamDeckSharp.Tests/StreamDeckIoBitmapKeyTests.cs b/src/StreamDeckSharp.Tests/StreamDeckIoBitmapKeyTests.cs index 6cdfb7374..f79c1ec83 100644 --- a/src/StreamDeckSharp.Tests/StreamDeckIoBitmapKeyTests.cs +++ b/src/StreamDeckSharp.Tests/StreamDeckIoBitmapKeyTests.cs @@ -4,7 +4,6 @@ using StreamDeckSharp.Tests.VerifyStuff; using System; using System.Threading.Tasks; -using VerifyXunit; using Xunit; diff --git a/src/StreamDeckSharp.Tests/StreamDeckIoHardwareTwins.cs b/src/StreamDeckSharp.Tests/StreamDeckIoHardwareTwins.cs index 306f34d9d..fe0a884ba 100644 --- a/src/StreamDeckSharp.Tests/StreamDeckIoHardwareTwins.cs +++ b/src/StreamDeckSharp.Tests/StreamDeckIoHardwareTwins.cs @@ -1,7 +1,6 @@ using Newtonsoft.Json; using StreamDeckSharp.Internals; using System.Threading.Tasks; -using VerifyXunit; using Xunit; using Newtonsoft.Json.Serialization; using System.Linq; diff --git a/src/StreamDeckSharp.Tests/StreamDeckIoKeyTests.cs b/src/StreamDeckSharp.Tests/StreamDeckIoKeyTests.cs index 2eb625a38..f73be12af 100644 --- a/src/StreamDeckSharp.Tests/StreamDeckIoKeyTests.cs +++ b/src/StreamDeckSharp.Tests/StreamDeckIoKeyTests.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using VerifyXunit; using Xunit; namespace StreamDeckSharp.Tests