Added manual tracking

Active tracking mode shown in the main window under tracking toggle. Added manual tracking under Mount Settings

Author: christian-kardach

OATControl/MainWindow.xaml

@@ -648,7 +648,7 @@
 
 			<StackPanel Grid.Column="0" Grid.Row="1" Orientation="Vertical">
 				<TextBlock Text="Tracking" Margin="0,5,0,0"  Style="{StaticResource TextBlockHeading}" />
-				<TextBlock Text="Sidereal" Margin="5,0,0,0"  Style="{StaticResource TextBlockLabelTiny}" HorizontalAlignment="Left" />
+                <TextBlock Text="{Binding TrackingMode}" Margin="5,0,0,0"  Style="{StaticResource TextBlockLabelTiny}" HorizontalAlignment="Left" />
 			</StackPanel>
 			<Controls:ToggleSwitchButton  Grid.Column="1" Grid.Row="1"  Margin="0,6,0,0" VerticalAlignment="Center" IsEnabled="{Binding MountConnected}" IsChecked="{Binding IsTracking}" ThumbIndicatorBrush="#E00" />
 			<Grid Grid.Row="1" Grid.Column="2" Visibility="{Binding MountConnected, Converter={StaticResource bool2VisibilityConverter}}">

OATControl/SettingsDialog.xaml

@@ -390,10 +390,30 @@
 		<Button Grid.Row="16" Grid.Column="4" Margin="8,4" Padding="20,0" Content="Factory Reset" HorizontalAlignment="Right" Style="{StaticResource CommandButtonStyle}" Command="{Binding FactoryResetCommand}"/>
 
 		<TextBlock Grid.Row ="17" Grid.Column="3" Margin="0,0" HorizontalAlignment="Left" Text="Open the OATControl logfile folder" ToolTip="OATControl keeps logfiles from the last 6 sessions around in case you need to check something or the devs ask for them to debug a issue yopu might have." TextWrapping="Wrap" Style="{StaticResource SmallTextBlockLabel}" />
-		<Button Grid.Row="17" Grid.Column="4" Margin="8,4" Padding="20,0" Content="Open Log Folder" HorizontalAlignment="Right" Style="{StaticResource CommandButtonStyle}" Command="{Binding ShowLogFolderCommand}"/>
+        <Button Grid.Row="17" Grid.Column="4" Margin="8,4" Padding="20,0" Content="Open Log Folder" HorizontalAlignment="Right" Style="{StaticResource CommandButtonStyle}" Command="{Binding ShowLogFolderCommand}"/>
 
-		<TextBlock Grid.Row ="18" Grid.Column="3" Margin="0,0" HorizontalAlignment="Left" Text="Tracking Rate" ToolTip="Change mount tracking rate" TextWrapping="Wrap" Style="{StaticResource SmallTextBlockLabel}" />
-		<ComboBox Grid.Row="18" Grid.Column="4" 
+        <Grid Grid.Row="18" Grid.Column="3" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" Margin="-2,0,6,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Grid.Row ="0" Grid.Column="0" Margin="0,0" HorizontalAlignment="Left" Text="Tracking Rate" ToolTip="Change mount tracking rate" TextWrapping="Wrap" Style="{StaticResource SmallTextBlockLabel}" />
+            <Grid Grid.Row="0" Grid.Column="1" HorizontalAlignment="Center" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <controls:PushButton Grid.Column="0" Width="20" Height="20" Direction="W" IsEnabled="{Binding IsManualTrackingMode}" Command="{Binding StartChangingCommand}" CommandParameter="TR-" />
+                <TextBlock Grid.Column="1" Text="{Binding ManualTrackingRateEdit,StringFormat={}{0:0.00}}"  Style="{StaticResource TextBlockLabelValue}" HorizontalAlignment="Stretch" TextAlignment="Center"/>
+                <controls:PushButton Grid.Column="2" Width="20" Height="20" Direction="E" IsEnabled="{Binding IsManualTrackingMode}" Command="{Binding StartChangingCommand}" CommandParameter="TR+" />
+            </Grid>
+
+        </Grid>
+
+        <ComboBox Grid.Row="18" Grid.Column="4" 
 					  ItemsSource="{Binding AvailableTrackingModes}" 
 					  SelectedValue="{Binding SelectedTrackingMode}"
 					  Width="120" 

OATControl/ViewModels/MountVM.cs

@@ -78,6 +78,7 @@ public class MountVM : ViewModelBase
 		DateTime _connectedAt = DateTime.UtcNow;
 		string _lastDirection = string.Empty;
 		bool _useCustomParkPosition = false;
+		bool _isManualTrackingMode = false;
 
 		private float _maxMotorSpeed = 2.5f;
 		double _speed = 1.0;
@@ -175,6 +176,7 @@ public class MountVM : ViewModelBase
 		private ICommunicationHandler _commHandler;
 		private string _serialBaudRate;
 		private string _trackingMode = "Sidereal";
+		float _manualTrackingRateEdit = 0.0f;
 
 		private OatmealTelescopeCommandHandlers _oatMount;
 		private PointsOfInterest _pointsOfInterest;
@@ -900,11 +902,12 @@ private void OnStartChangingParameter(object p)
 					case "SR": RAStepsPerDegreeEdit += 0.1f * _incrDirection; break;
 					case "SD": DECStepsPerDegreeEdit += 0.1f * _incrDirection; break;
 					case "SS": SpeedCalibrationFactorEdit += _incrDirection; break;
+					case "TR": ManualTrackingRateEdit += 0.1f * _incrDirection; break;
 					default: OnAdjustTarget(_incrVar + (_incrDirection == 1 ? "+" : "-")); break;
 				}
 			}
 		}
-
+		
 		void SetDECStepsPerDegree(float steps)
 		{
 			DECStepsPerDegree = steps;
@@ -925,6 +928,7 @@ private void OnIncrementVariable(object sender, EventArgs e)
 				case "SR": RAStepsPerDegreeEdit += 0.2f * _incrDirection; break;
 				case "SD": DECStepsPerDegreeEdit += 0.2f * _incrDirection; break;
 				case "SS": SpeedCalibrationFactorEdit += _incrDirection; break;
+				case "TR": ManualTrackingRateEdit += 0.1f* _incrDirection; break;
 				default: OnAdjustTarget(_incrVar + (_incrDirection == 1 ? "+" : "-")); break;
 			}
 			_timer.Interval = TimeSpan.FromMilliseconds(_incrementalDelay);
@@ -1601,7 +1605,11 @@ public void UpdateRealtimeParameters(bool editable)
 					this.SendOatCommand(":GC#,#", (a) => { localDate = a.Data; failed |= !a.Success; });
 					if (FirmwareVersion >= 11314)
 					{
-						this.SendOatCommand(":TZ#,#", (a) => { trkMode = a.Data; failed |= !a.Success; });
+						this.SendOatCommand(":Gk#,#", (a) => { trkMode = a.Data; failed |= !a.Success; });
+						this.SendOatCommand(":GT#,#", (a) => {
+							ManualTrackingRateEdit = float.Parse(a.Data, _oatCulture);
+							failed |= !a.Success;
+						});
 					}
 					this.SendOatCommand(":XGH#,#", (a) => { ha = a.Data; failed |= !a.Success; });
 					if (FirmwareVersion >= 11206)
@@ -2152,6 +2160,22 @@ public async Task UpdateInitialScopeValues()
 					doneEvent.Set();
 				});
 
+				this.SendOatCommand(":Gk#,#", (trkMode) =>
+				{
+					Log.WriteLine("MOUNT: Current Tracking Mode is {0}...", trkMode.Data);
+					if (trkMode.Success)
+					{
+						IsManualTrackingMode = false;
+						TrackingMode = trkMode.Data;
+						if(trkMode.Data == "Manual")
+						{
+							IsManualTrackingMode = true;
+						}
+					}
+					
+					doneEvent.Set();
+				});
+
 				await doneEvent.WaitAsync();
 
 				ShowDECLimits = AppSettings.Instance.ShowDecLimits;
@@ -3540,6 +3564,15 @@ public float DECStepsPerDegreeEdit
 			set { SetPropertyValue(ref _decStepsPerDegreeEdit, value); }
 		}
 
+		public float ManualTrackingRateEdit
+		{
+			get { return _manualTrackingRateEdit; }
+			set {
+				SetPropertyValue(ref _manualTrackingRateEdit, value);
+				_oatMount?.SendCommand(string.Format(_oatCulture, ":Sq{0:0.0000}#", ManualTrackingRateEdit), (a) => { });
+			}
+		}
+
 		/// <summary>
 		/// Gets or sets the DEC steps per degree
 		/// </summary>
@@ -3998,6 +4031,12 @@ public bool UseCustomParkPosition
 			set { SetPropertyValue(ref _useCustomParkPosition, value, OnUseCustomParkPositionChanged); }
 		}
 
+		public bool IsManualTrackingMode
+		{
+			get { return _isManualTrackingMode; }
+			set { SetPropertyValue(ref _isManualTrackingMode, value); }
+		}
+
 		/// <summary>
 		/// Sends command to enable/disable Custom Park Position to the mount
 		/// </summary>
@@ -4317,8 +4356,9 @@ public String SelectedTrackingMode
 			get { return _trackingMode; }
 			set
 			{
-				if (FirmwareVersion > 11314)
+				if (FirmwareVersion >= 11314)
 				{
+					IsManualTrackingMode = false;
 					if (value == "Sidereal")
 					{
 						this.SendOatCommand(":TQ#,n", (a) => { });
@@ -4335,15 +4375,27 @@ public String SelectedTrackingMode
 					{
 						this.SendOatCommand(":TK#,n", (a) => { });
 					}
+					else if (value == "Manual")
+					{
+						this.SendOatCommand(":TM#,n", (a) => { });
+						IsManualTrackingMode = true;
+					}
 					else
 					{
 						this.SendOatCommand(":TQ#,n", (a) => { });
 					}
 
 					Log.WriteLine("MOUNT: Changing tracking rate to " + value);
-					_trackingMode = value;
+					// _trackingMode = value;
+					SetPropertyValue(ref _trackingMode, value);
+					
+					OnPropertyChanged("TrackingMode");
+					OnPropertyChanged("SelectedTrackingMode");
+					
 					AppSettings.Instance.TrackingRate = value;
 					AppSettings.Instance.Save();
+
+					
 				}
 			}
 		}
@@ -4380,7 +4432,8 @@ public IEnumerable<String> AvailableTrackingModes
 					"Sidereal",
 					"Lunar",
 					"Solar",
-					"King"
+					"King",
+					"Manual"
 				};