OATControl V0.9.8.0 - Updates

- Fixed Polar Alignment wizard

Author: ClutchplateDude

Software/OpenAstroTracker ASCOM/OATControl/DlgRunPolarAlignment.xaml

@@ -6,7 +6,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:OATControl" xmlns:controls="clr-namespace:OATControl.Converters"
 		mc:Ignorable="d"
-        Title="Polar Alignment" Height="275" Width="480" ResizeMode="NoResize" WindowStyle="ToolWindow" FontSize="16" FontWeight="Bold" >
+        Title="Polar Alignment" Height="220" Width="480" ResizeMode="NoResize" WindowStyle="ToolWindow" FontSize="16" FontWeight="Bold" >
 	<Controls:MetroWindow.Resources>
 		<Style x:Key="StateText" TargetType="TextBlock">
 			<Setter Property="Margin" Value="10,0" />
@@ -26,11 +26,9 @@
 		<controls:IntToVisibilityConverter x:Key="State1Visible" VisibleValue="1" Operator=">="/>
 		<controls:IntToVisibilityConverter x:Key="State2Visible" VisibleValue="2" Operator=">=" />
 		<controls:IntToVisibilityConverter x:Key="State3Visible" VisibleValue="3" Operator=">=" />
-		<controls:IntToVisibilityConverter x:Key="State4Visible" VisibleValue="4" Operator=">=" />
 		<controls:IntToBoolConverter x:Key="State1Enabled" TrueValue="1" Operator="=="/>
 		<controls:IntToBoolConverter x:Key="State2Enabled" TrueValue="2" Operator="==" />
 		<controls:IntToBoolConverter x:Key="State3Enabled" TrueValue="3" Operator="==" />
-		<controls:IntToBoolConverter x:Key="State4Enabled" TrueValue="4" Operator="==" />
 	</Controls:MetroWindow.Resources>
 	<Grid>
 		<Grid.ColumnDefinitions>
@@ -59,40 +57,26 @@
 	 			IsEnabled="{Binding State, Converter={StaticResource State1Enabled}}"
 				/>
 
-		<TextBlock Grid.Row="1" Grid.Column="0" 
-				   Text="Move the mount such that Polaris is in the center of your cameras viewfinder." 
-				   Style="{StaticResource StateText}" 
-		 		   IsEnabled="{Binding State, Converter={StaticResource State2Enabled}}"
- 	 			   Visibility="{Binding State, Converter={StaticResource State2Visible}}"
-/>
-		<Button Grid.Row="1" Grid.Column="1" 
-				Content="Done" 
-				Command="{Binding OKCommand}" 
-				Style="{StaticResource StateButton}" 
-	 			IsEnabled="{Binding State, Converter={StaticResource State2Enabled}}"
-				Visibility="{Binding State, Converter={StaticResource State2Visible}}"
-				/>
-
 		<TextBlock Grid.Row="2" Grid.Column="0" 
-				   Text="Again move the mount such that Polaris is in the center of your cameras viewfinder." 
+				   Text="Move the mount such that Polaris is in the center of your cameras viewfinder." 
 				   Style="{StaticResource StateText}" 
-	 			   IsEnabled="{Binding State, Converter={StaticResource State3Enabled}}"
-				   Visibility="{Binding State, Converter={StaticResource State3Visible}}"
+	 			   IsEnabled="{Binding State, Converter={StaticResource State2Enabled}}"
+				   Visibility="{Binding State, Converter={StaticResource State2Visible}}"
 				   />
 
 		<Button Grid.Row="2" Grid.Column="1" 
 				Content="Done" 
 				Command="{Binding OKCommand}" 
-	 			   IsEnabled="{Binding State, Converter={StaticResource State3Enabled}}"
-				   Visibility="{Binding State, Converter={StaticResource State3Visible}}"
+	 			   IsEnabled="{Binding State, Converter={StaticResource State2Enabled}}"
+				   Visibility="{Binding State, Converter={StaticResource State2Visible}}"
 				Style="{StaticResource StateButton}" 
 		/>
 
 		<TextBlock Grid.Row="3" Grid.Column="0"  
 				   Text="Your mount is now polar aligned." 
 				   Style="{StaticResource StateText}" 
-	 			   IsEnabled="{Binding State, Converter={StaticResource State4Enabled}}"
-				   Visibility="{Binding State, Converter={StaticResource State4Visible}}"
+	 			   IsEnabled="{Binding State, Converter={StaticResource State3Enabled}}"
+				   Visibility="{Binding State, Converter={StaticResource State3Visible}}"
 		/>
 
 		<Button Grid.Row="3" Grid.Column="2" 

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

@@ -22,7 +22,7 @@ namespace OATControl
 	/// <summary>
 	/// Interaction logic for DlgChooseOat.xaml
 	/// </summary>
-	public partial class DlgRunPolarAlignment: MetroWindow, INotifyPropertyChanged
+	public partial class DlgRunPolarAlignment : MetroWindow, INotifyPropertyChanged
 	{
 		private DelegateCommand _okCommand;
 		private DelegateCommand _closeCommand;
@@ -43,30 +43,31 @@ public DlgRunPolarAlignment(Func<string, Task<string>> sendCommand)
 				this.State++;
 				if (_state == 2)
 				{
-					await _sendCommand($":Sr02:58:15#,n");
+					// Move RA to Polaris
+					await _sendCommand($":Sr02:58:51#,n");
 
-					// Now set DEC to move to Home position
+					// Move DEC to twice Polaris Dec
 					if (Settings.Default.SiteLatitude > 0) // Northern hemisphere
 					{
-						await _sendCommand($":Sd+90*00:00#,n");
+						await _sendCommand($":Sd+88*42:12#,n");
 					}
 					else
 					{
-						await _sendCommand($":Sd-90*00:00#,n");
+						await _sendCommand($":Sd-88*42:12#,n");
 					}
 					await _sendCommand($":MS#,n");
 				}
 				else if (_state == 3)
 				{
+					// Sync the mount to Polaris coordinates
 					if (Settings.Default.SiteLatitude > 0) // Northern hemisphere
 					{
-						await _sendCommand($":Sd+89*21:03#,n");
+						await _sendCommand($":SY+89*21:06.02:58:51#,n");
 					}
 					else
 					{
-						await _sendCommand($":Sd-89*21:03#,n");
+						await _sendCommand($":SY-89*21:06.02:58:51#,n");
 					}
-					await _sendCommand($":MS#,n");
 				}
 			});
 
@@ -86,8 +87,8 @@ public int State
 			set
 			{
 				if (value != _state)
-				{ 
-					_state= value;
+				{
+					_state = value;
 					OnPropertyChanged("State");
 				}
 			}

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.7.0")]
+[assembly: AssemblyVersion("0.9.8.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]