Merge pull request #64 from OpenAstroTech/ascom-7-and-fixes

Been a while, need to bring main branch up to date

Author: ClutchplateDude

ASCOM.Driver/OpenAstroTracker/Properties/AssemblyInfo.cs

@@ -21,7 +21,7 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("6.6.7.2")]
-[assembly: AssemblyFileVersion("6.6.7.2")]
+[assembly: AssemblyVersion("6.6.7.3")]
+[assembly: AssemblyFileVersion("6.6.7.3")]
 
 [assembly: ComVisibleAttribute(false)]

ASCOM.Driver/OpenAstroTracker/README.txt

@@ -1,7 +1,7 @@
 +--------------------------------------------------------------------------+
 |                                                                          |
-|   OpenAstroTracker ASCOM Driver V6.6.7.2 Release                         |
-|   Published: 20. April 2025                                              |
+|   OpenAstroTracker ASCOM Driver V6.6.7.3 Pre-Release                         |
+|   Published: 23. June 2025                                              |
 |                                                                          |
 +--------------------------------------------------------------------------+
 
@@ -33,6 +33,8 @@ Support
 
 Testing
 -------
+ * 6.6.7.3 Not tested.
+
  * 6.6.7.2 Conformance Test (2025-Apr-20) 
     - Telescope: All tests passed, no errors, no warnings, 18 issues (all expected). 
 
@@ -73,6 +75,15 @@ So... keep your towel handy and supervise operations.
 
 Release History
 ---------------
+ - 6.6.7.3 : Pre-Released 2025-06-23
+   Added support for ASCOM driver to get and set time and date from and to mount.
+ 
+ - 6.6.7.2 : Pre-Released 2025-04-20
+   FindHome and AtHome implemented.
+   Fixed a bug that caused errors when syncing location.
+   Propagated location changes to the mount if connected.
+   Fix user-input number parsing issues for non-US locales. 
+
  - 6.6.7.1 : Pre-Released 2025-02-28
    Fixed a bug that caused errors when syncing location.
    Propagated location changes to the mount if connected.

ASCOM.Driver/TelescopeDriver/Driver.cs

@@ -10,6 +10,7 @@
 using System.Windows.Forms;
 using System.Runtime.CompilerServices;
 using static ASCOM.OpenAstroTracker.SharedResources;
+using System.Globalization;
 
 namespace ASCOM.OpenAstroTracker
 {
@@ -1268,14 +1269,29 @@ public ITrackingRates TrackingRates
 
 		public DateTime UTCDate
 		{
-			// ToDo - Can we handle this without bothering the mount?
 			get
 			{
-				DateTime utcDate = DateTime.UtcNow;
+				string localDate = CommandString(":GC#,#"); // mm/dd/yy
+				string localTime= CommandString(":GL#,#"); // HH:MM:SS in 24h format
+				DateTime now = DateTime.ParseExact(localDate + " " + localTime, "MM/dd/yy HH:mm:ss", CultureInfo.InvariantCulture);
+				DateTime utcDate = now.ToUniversalTime();
 				LogMessage(LoggingFlags.Scope, $"UTCDate Get => {utcDate}");
 				return utcDate;
 			}
-			set { throw new ASCOM.PropertyNotImplementedException("UTCDate", true); }
+			set
+			{
+				CultureInfo _oatCulture = new CultureInfo("en-US");
+				var utcNow = value;
+				var now = value.ToLocalTime();
+				
+				LogMessage(LoggingFlags.Scope,$"DateTime Set => {utcNow}UTC, {now}Local");
+				CommandString(string.Format(_oatCulture, ":SL{0,2:00}:{1,2:00}:{2,2:00}#,n", now.Hour, now.Minute, now.Second));
+				CommandString(string.Format(_oatCulture, ":SC{0,2:00}/{1,2:00}/{2,2:00}#,##", now.Month, now.Day, now.Year - 2000));
+
+				var utcOffset = Math.Round((now - utcNow).TotalHours);
+				char sign = (utcOffset < 0) ? '+' : '-';
+				CommandString(string.Format(_oatCulture, ":SG{0}{1,2:00}#,n", sign, Math.Abs(utcOffset)));
+			}
 		}
 
 		public void Unpark()

ASCOM.Driver/TelescopeDriver/Properties/AssemblyInfo.cs

@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 //
 // TODO - Set your driver's version here
-[assembly: AssemblyVersion("6.6.7.2")]
-[assembly: AssemblyFileVersion("6.6.7.2")]
+[assembly: AssemblyVersion("6.6.7.3")]
+[assembly: AssemblyFileVersion("6.6.7.3")]

OATControl/.editorconfig

@@ -204,3 +204,30 @@ dotnet_naming_style.begins_with_i.required_prefix = I
 dotnet_naming_style.begins_with_i.required_suffix = 
 dotnet_naming_style.begins_with_i.word_separator = 
 dotnet_naming_style.begins_with_i.capitalization = pascal_case
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_prefer_system_threading_lock = true:suggestion
+
+[*.{cs,vb}]
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+indent_size = 4
+end_of_line = crlf

OATControl/App.xaml

@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:OATControl"
-             StartupUri="MainWindow.xaml">
+             >
     <Application.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
@@ -13,6 +13,33 @@
 				<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Red.xaml" />
 				<ResourceDictionary Source="pack://application:,,,/;component/Resources/RedControls.xaml" />
 			</ResourceDictionary.MergedDictionaries>
-		</ResourceDictionary>
+			<DrawingImage x:Key="WaitingIcon">
+				<DrawingImage.Drawing>
+					<GeometryDrawing Brush="Red">
+						<GeometryDrawing.Geometry>
+							<Geometry>M0.60101273,29.959071C0.60101268,29.959071,0.60726115,29.959071,0.6150718,29.959071L0.6297169,29.959071 0.63850358,29.959071 0.64318994,29.959071 0.64494708,29.959071 17.834004,29.959071C18.334981,29.959071,18.536,29.959071,18.536,30.259074L18.536,31.562087C18.536,31.962081,18.334981,31.962081,17.834004,31.962081L0.70098832,31.962081C0.20001191,32.063081,-1.7566754E-07,31.962081,1.1368684E-13,31.662078L1.1368684E-13,30.359081C-1.7566754E-07,29.959071,0.20001191,29.959071,0.60101273,29.959071z M9.2179812,17.634044L8.5159864,17.935056C8.4160108,17.935056,6.4119834,18.837051,6.3120078,21.642049L9.2179812,21.642049 12.122978,21.642049C12.023003,18.837051,10.219995,18.035047,10.019007,17.935056z M3.5060097,5.8110187C3.4060036,6.9140179 3.5060097,8.3160298 4.006986,9.6190264 4.6090058,11.322033 6.0109824,12.62503 8.0150098,13.526034L9.4179935,14.12804 10.821008,13.526034C12.825004,12.62503 14.127005,11.322033 14.829001,9.6190264 15.329977,8.3160298 15.329977,6.9140179 15.329977,5.8110187L9.5179996,5.8110187z M1.302001,3.407006L9.2179812,3.407006 17.132985,3.407006C17.132985,3.4070058,20.138995,11.422039,11.42199,14.428044L11.321984,17.434047C11.321984,17.434047,18.134999,19.438051,17.43398,26.652072L17.232991,28.055074 9.1169986,28.055074 1.0020132,28.055074 0.80099442,26.652072C0.10000587,19.438051,6.91299,17.434047,6.91299,17.434047L6.8129839,14.428044C-1.7040091,11.422039,1.302001,3.4070058,1.302001,3.407006z M0.70098832,0L17.834004,0C18.334981,0,18.536,0.10000634,18.536,0.40100195L18.536,1.8040053C18.536,2.2040152,18.334981,2.1040089,17.834004,2.1040087L0.70098832,2.1040087C0.20001191,2.1040089,-1.7566754E-07,2.2040152,1.1368684E-13,1.8040053L1.1368684E-13,0.40100195C-1.7566754E-07,0.10000634,0.20001191,0,0.70098832,0z</Geometry>
+						</GeometryDrawing.Geometry>
+					</GeometryDrawing>
+				</DrawingImage.Drawing>
+			</DrawingImage>
+			<DrawingImage x:Key="CompleteIcon">
+				<DrawingImage.Drawing>
+					<GeometryDrawing Brush="Red">
+						<GeometryDrawing.Geometry>
+							<Geometry>M29.403992,0L32,3.5860286 8.3720093,21.479001 5.7740173,17.895017 5.776001,17.893002 0,9.9110087 3.5079956,7.2570179 9.2829895,15.23602z</Geometry>
+						</GeometryDrawing.Geometry>
+					</GeometryDrawing>
+				</DrawingImage.Drawing>
+			</DrawingImage>
+			<DrawingImage x:Key="InProgressIcon">
+				<DrawingImage.Drawing>
+					<GeometryDrawing Brush="Red">
+						<GeometryDrawing.Geometry>
+							<Geometry>M2,3.8790137L2,26.424095 17.708,15.066054z M12.441894,1.1261289L31.999938,15.054149 12.447936,29.192131 11.275939,27.571153 28.569945,15.066112 11.281921,2.75504z M0,0L21.138,15.054054 0,30.33811z</Geometry>
+						</GeometryDrawing.Geometry>
+					</GeometryDrawing>
+				</DrawingImage.Drawing>
+			</DrawingImage>
+		</ResourceDictionary>		
 	</Application.Resources>
 </Application>

OATControl/App.xaml.cs

@@ -5,6 +5,7 @@
 using System.Windows.Threading;
 using OATCommunications.Utilities;
 using OATControl.Properties;
+using OATControl.ViewModels;
 
 namespace OATControl
 {
@@ -26,13 +27,18 @@ public App()
 		protected override void OnStartup(StartupEventArgs e)
 		{
 			bool enableLogging = true;
+			bool autoConnect = false;
 
-			if (e.Args.Length > 0)
+			for (int i = 0; i < e.Args.Length; i++)
 			{
-				if (e.Args[0].ToLower() == "-nolog")
+				if (e.Args[i].ToLower() == "-nolog")
 				{
 					enableLogging = false;
 				}
+				if (e.Args[i].ToLower() == "-autoconnect")
+				{
+					autoConnect = true;
+				}
 			}
 
 			if (enableLogging)
@@ -54,8 +60,16 @@ protected override void OnStartup(StartupEventArgs e)
 										ThemeManager.GetAccent("RedAccent"),
 											ThemeManager.GetAppTheme("RedTheme"));
 
-
 			base.OnStartup(e);
+
+			var mainWindow = new MainWindow();
+
+			if (mainWindow.DataContext is MountVM vm)
+			{
+				vm.AutoConnect = autoConnect;
+			}
+
+			mainWindow.Show();
 		}
 
 		protected override void OnExit(ExitEventArgs e)

OATControl/Converters/BoolToFontWeightConverter.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Markup;
+
+namespace OATControl.Converters
+{
+    public class BoolToFontWeightConverter : MarkupExtension, IValueConverter
+    {
+        public FontWeight TrueWeight { get; set; } = FontWeights.Bold;
+        public FontWeight FalseWeight { get; set; } = FontWeights.Normal;
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is bool b)
+                return b ? TrueWeight : FalseWeight;
+            return FalseWeight;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override object ProvideValue(IServiceProvider serviceProvider)
+        {
+            return this;
+        }
+    }
+} 

OATControl/Converters/DebugBinding.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace OATControl.Converters
+{
+	public class DebugConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			Debug.WriteLine($"Binding value: {value}");
+			return value;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return value;
+		}
+	}
+}