OATControl V0.9.9.13 - Updates

- Improved detection of connection error conditions.

Author: ClutchplateDude

Software/OpenAstroTracker ASCOM/OATControl/DlgChooseOat.xaml.cs

@@ -81,6 +81,8 @@ public DlgChooseOat(MountVM mountViewModel, Func<string, Task<string>> sendComma
 			this.DataContext = this;
 			InitializeComponent();
 
+			this.Result = false;
+
 			stateTimer.Start();
 		}
 
@@ -275,6 +277,9 @@ protected override void OnClosed(EventArgs e)
 			base.OnClosed(e);
 		}
 
+		public bool? Result { get; set; }
+
+
 		private void AdvanceStateMachine()
 		{
 			switch (CurrentStep)
@@ -328,7 +333,7 @@ private void AdvanceStateMachine()
 					break;
 
 				case Steps.Completed:
-					this.DialogResult = true;
+					this.Result = true;
 					this.Close();
 					break;
 
@@ -345,11 +350,19 @@ private async void ProcessStateMachine(object sender, EventArgs e)
 					break;
 
 				case Steps.CheckHardware:
-					await _mountViewModel.ConnectToOat(SelectedDevice);
+					var connectResult = await _mountViewModel.ConnectToOat(SelectedDevice);
 
 					ShowGPSStatus = false;
 					GPSStatus = string.Empty;
 
+					if (!connectResult)
+					{
+						this.Result = null;
+						this.Close();
+						CurrentStep = Steps.WaitForConnect;
+						return;
+					}
+
 					if (_mountViewModel.IsAddonSupported("GYRO"))
 					{
 						CurrentStep = Steps.WaitForLevel;
@@ -446,7 +459,7 @@ private async void ProcessStateMachine(object sender, EventArgs e)
 					break;
 
 				case Steps.Completed:
-					this.DialogResult = true;
+					this.Result = true;
 					this.Close();
 					return;
 

Software/OpenAstroTracker ASCOM/OATControl/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.9.12")]
+[assembly: AssemblyVersion("0.9.9.13")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

Software/OpenAstroTracker ASCOM/OATControl/ViewModels/MountVM.cs

@@ -135,6 +135,12 @@ public MountVM()
 			{
 				XDocument doc = XDocument.Load(poiFile);
 				_pointsOfInterest = doc.Element("PointsOfInterest").Elements("Object").Select(e => new PointOfInterest(e)).ToList();
+				_pointsOfInterest.Sort((p1, p2) =>
+				{
+					if (p1.Name.StartsWith("Polaris")) return -1;
+					if (p2.Name.StartsWith("Polaris")) return 1;
+					return p1.Name.CompareTo(p2.Name);
+				});
 				_pointsOfInterest.Insert(0, new PointOfInterest("--- Select Target Object ---"));
 				_selectedPointOfInterest = 0;
 				Log.WriteLine("Mount: Successfully read {0} Points of Interest.", _pointsOfInterest.Count - 1);
@@ -514,10 +520,19 @@ private async void OnConnectToTelescope()
 						MountConnected = true;
 						Log.WriteLine("Mount: Successfully connected and configured!");
 					}
+					catch (FormatException fex)
+					{
+						ScopeName = string.Empty;
+						ScopeHardware = string.Empty;
+						Log.WriteLine("Mount: Failed to connect and configure OAT! {0}", fex.Message);
+						MessageBox.Show("Connected to OpenAstroTracker, but protocol could not be established.\n\nIs the firmware compiled with DEBUG_LEVEL set to DEBUG_NONE?", "Protocol Error", MessageBoxButton.OK, MessageBoxImage.Error);
+					}
 					catch (Exception ex)
 					{
+						ScopeName = string.Empty;
+						ScopeHardware = string.Empty;
 						Log.WriteLine("Mount: Failed to connect and configure OAT! {0}", ex.Message);
-						MessageBox.Show("Error trying to connect to OpenAstroTracker. " + ex.Message, "Connection Error", MessageBoxButton.OK, MessageBoxImage.Error);
+						MessageBox.Show("Error trying to connect to OpenAstroTracker.\n\n" + ex.Message, "Connection Error", MessageBoxButton.OK, MessageBoxImage.Error);
 					}
 					finally
 					{
@@ -646,14 +661,24 @@ private bool ChooseTelescope()
 			var dlg = new DlgChooseOat(this, this.RunCustomOATCommandAsync) { Owner = Application.Current.MainWindow, WindowStartupLocation = WindowStartupLocation.CenterOwner };
 
 			Log.WriteLine("Mount: Showing OAT comms Chooser Wizard");
+			dlg.ShowDialog();
 
-			var result = dlg.ShowDialog();
-
-			if (result == true)
+			if (dlg.Result == true)
 			{
 				Log.WriteLine("OAT Connected!");
 				return true;
 			}
+			else if (dlg.Result == null)
+			{
+				Log.WriteLine("Mount: Unable to connect");
+				string extraMessage = "Is something else connected?";
+				if (Process.GetProcesses().FirstOrDefault(d => d.ProcessName.Contains("ASCOM.OpenAstroTracker")) != null)
+				{
+					extraMessage = "Another process is connected via ASCOM.";
+				}
+				MessageBox.Show("Cannot connect to mount. " + extraMessage, "Connection Error", MessageBoxButton.OK, MessageBoxImage.Error);
+				return false;
+			}
 
 			RequeryCommands();
 			Log.WriteLine("Mount: Chooser cancelled");