V1.1.24.0 Fixes

Author: ClutchplateDude

OATControl/DlgAppSettings.xaml.cs

@@ -47,9 +47,9 @@ public partial class DlgAppSettings : MetroWindow, INotifyPropertyChanged
 		private bool _invertALTCorrections;
 		private bool _invertAZCorrections;
 		private bool _monitorNinaForPA;
-		private string _ninaLogFolder;
+		private string _ninaLogFolder = String.Empty;
 		private bool _monitorSharpCapForPA;
-		private string _sharpCapLogFolder;
+		private string _sharpCapLogFolder = String.Empty;
 
 		private List<PointOfInterest> _pointsOfInterest;
 		private PointOfInterest _selectedPoint;
@@ -78,6 +78,15 @@ public DlgAppSettings(MountVM mount)
 			DecStartSouth = AppSettings.Instance.AutoHomeDecDirection == "South";
 			DecDistance = AppSettings.Instance.AutoHomeDecDistance;
 			ShowChecklist = AppSettings.Instance.ShowChecklist;
+			ALTLimit = AppSettings.Instance.ALTLimit;
+			AZLimit = AppSettings.Instance.AZLimit;
+			PolarAlignmentMinimumTotalError = AppSettings.Instance.PolarAlignmentMinimumTotalError;
+			InvertALTCorrections = AppSettings.Instance.InvertALTCorrections;
+			InvertAZCorrections = AppSettings.Instance.InvertAZCorrections;
+			MonitorNinaForPA = AppSettings.Instance.MonitorNinaPA;
+			NinaLogFolder = AppSettings.Instance.NinaLogFolder;
+			MonitorSharpCapForPA = AppSettings.Instance.MonitorSharpCapPA;
+			SharpCapLogFolder = AppSettings.Instance.SharpCapLogFolder;
 
 			ContentTabs.SelectedIndex = 0;
 			CategorySelector.SelectedIndex = 0;
@@ -101,7 +110,7 @@ public void OnAddPoint()
 			dlg.ShowDialog();
 			this.OnPropertyChanged("AllPointsOfInterest");
 		}
-				public bool IsPointSelected
+		public bool IsPointSelected
 		{
 			get { return _selectedPoint != null; }
 		}
@@ -139,7 +148,7 @@ public String NinaLogFolder
 					_ninaLogFolder = value;
 					OnPropertyChanged();
 				}
-			}	
+			}
 		}
 
 		public bool MonitorNinaForPA
@@ -240,7 +249,7 @@ public float ALTLimit
 				OnPropertyChanged();
 			}
 		}
-		
+
 		public float PolarAlignmentMinimumTotalError
 		{
 			get { return _totalErrorLimit; }
@@ -343,18 +352,18 @@ private void OnCloseClick(object sender, RoutedEventArgs e)
 			AppSettings.Instance.AutoHomeDecDirection = DecStartSouth ? "South" : "North";
 			AppSettings.Instance.AutoHomeDecDistance = DecDistance;
 			AppSettings.Instance.ShowChecklist = ShowChecklist;
-			AppSettings.Instance.AZLimit= AZLimit;
+			AppSettings.Instance.AZLimit = AZLimit;
 			AppSettings.Instance.ALTLimit = ALTLimit;
-			AppSettings.Instance.PolarAlignmentMinimumTotalError= PolarAlignmentMinimumTotalError;
+			AppSettings.Instance.PolarAlignmentMinimumTotalError = PolarAlignmentMinimumTotalError;
 			AppSettings.Instance.InvertALTCorrections = InvertALTCorrections;
 			AppSettings.Instance.InvertAZCorrections = InvertAZCorrections;
 			AppSettings.Instance.MonitorNinaPA = MonitorNinaForPA;
 			AppSettings.Instance.NinaLogFolder = NinaLogFolder;
 			AppSettings.Instance.MonitorSharpCapPA = MonitorSharpCapForPA;
-			AppSettings.Instance.SharpCapLogFolder= SharpCapLogFolder;
+			AppSettings.Instance.SharpCapLogFolder = SharpCapLogFolder;
 
 			AppSettings.Instance.Save();
-			_mount.SelectedBaudRate = _serialBaudRate; 
+			_mount.SelectedBaudRate = _serialBaudRate;
 			_mount.AutoHomeDecDirection = AppSettings.Instance.AutoHomeDecDirection;
 			_mount.AutoHomeRaDirection = AppSettings.Instance.AutoHomeRaDirection;
 			_mount.AutoHomeDecDistance = AppSettings.Instance.AutoHomeDecDistance;

OATControl/ViewModels/MountVM.cs

@@ -5032,6 +5032,7 @@ internal bool AddPointOfInterest(PointOfInterest newPt)
 
 		private void OnPolarAlignCorrectionRequired(object sender, PolarAlignCorrectionEventArgs e)
 		{
+			if (_oatMount == null) return;
 			_oatMount.SendCommand($":MAL{e.AltAdjust:F4}#", (a) => { });
 			_oatMount.SendCommand($":MAZ{e.AzAdjust:F4}#", (a) => { });
 		}

OATControl/ViewModels/NinaPolarAlignLogProcessor.cs

@@ -175,12 +175,12 @@ protected override void ProcessLogLines()
 									}
 
 									var totalAdjust = ParseMinutes(totalError, @"^([+-]?\d+)[°\s]+(\d+)[\'\s]+(\d+)[\""\s]*$");
-									if (totalAdjust*60 < 20)
+									if (totalAdjust * 60 < AppSettings.Instance.PolarAlignmentMinimumTotalError)
 									{
-										Log.WriteLine($"NINALOG: Total error is below 20 arcsecs, alignment succeeded!!");
+										Log.WriteLine($"NINALOG: Total error is below {AppSettings.Instance.PolarAlignmentMinimumTotalError} arcsecs, alignment succeeded!!");
 										_examinedLines = lineCount;
 										_polarAlignState = "Complete";
-										ShowDialogStatus("Succeeded", "Polar Alignment succeeded, error below 20 arcsecs.");
+										ShowDialogStatus("Succeeded", $"Polar Alignment succeeded, error below {AppSettings.Instance.PolarAlignmentMinimumTotalError} arcsecs.");
 										return;
 
 									}