From c85f65c3e9cfc69c782c9c47385640db6c8a73d1 Mon Sep 17 00:00:00 2001 From: Colin Dawson Date: Sat, 8 Jun 2019 19:53:30 +0000 Subject: [PATCH] Merged in develop (pull request #7) Develop * Removed unwanted files * Adding git ignore file * Started working on getting the basic communications with the scope working. Working on routines to get and set the date and time in the handbox. * Switched the serial port over to using the .net frameworks serial port. Extracted the serial port into it's own class and created a simpler command processing mechanism. * Implemented AbortSlew and did some code tidy up. * Forced all code to 64-bit only, will make this 32/64 bit before release. Fixed issue in the SerialProcessor when setting the time, makes sure that there's no chance of thread stealing when pulling out the junk messages Added ConformanceResult.txt to show the progress of the driver development * Added code for the site latitude and started work on the longitude. * Added unit tests for reading and writing the utcDate. Fixed a couple of defects in the code that was setting the utcDate. * Corrected Longitude value range * Added support for UTC offset. * Pulse guiding support added * Added SiteLatitude unit tests * Added unit tests for SiteLongitude * Added unit tests for the new Pulse guide implementation. * Added support for AlignmentMode * Added support for AtPark and Park * Added support for parking the scope Added support for reading the scope Azimuth * Added support for reading Declination * Added 5 second timeout for the serial port. Fixed problem with the GW command not working on the Autostar 497. * Fixed broken unit test * Added support for altitude * Tidying up resharper warinings * Implemented RightAscension TargetRightAscension TargetDec SlewToCoord and SlewToCoordAsync * Sorted out the target RA and Dec exceptions to be compliant with ascom. * Implemented SlewToAltAz and SlewToAltAzAsync * Implemented SyncToTarget functionality * Implemented slew to target * Added support for MoveAxis * Added support for tracking rate * Added IFocuserV3 to the driver and made sure that it's registered for ASCOM as a focuser as well. * Fixed issue with Target RA and Dec loosing precision * Telescope driver now passes the Ascom conformance. * Upgraded driver version to 0.1 * Added explicit locks around all sequences of commands. * Basic implementation of the IFocusserV3 * Focuser passes validation, this makes the code V0.2 * Added support for CommandBlind and CommandString Modified the tracking rates to be setable. However, the get is now simulated. * Merged in feature/LocalServer (pull request #5) Feature/LocalServer * Major refactor. Switching over to a local server hub style driver allowing multiple programs to control the telescope at one time without the need for the POTH Hub * Unified the setup dialog * Implemented shared serial port, Both Telescope and Driver can connect at the same time. * Ported the focuser implementation from the non server based version. * Ported the telescope driver code. * Fixed problem with # not being stripped from the returned string ends. Fixed issue with RA being returned as degress rather than hours. * Telescope passes validation * Added a lock around the focuser move. * Reimplemented CommandBlind and CommandString * Corrected version information * Removed the Altitude support as there's a bug in the Autostar and Audiostar firmware * Added comments for all meade commands. Fixed the Site Lat and Long setters * Re instated the Altitude value and ran conformance for both the telescope and focuser. * Redesigned the Altitude and Azimuth readings to use the Right Ascension and Declination co-ordinates and perform the transformation using the date and site details from the scope. This will correct the problem of the Altitude reading from the handset being incorrect. * Added code to make sure that the scope returns values in high precision mode. * Fixed problem where SlewToAltAz didn't work correctly. Now uses the RA/Dec slew for everything, and converts the values as needed. * Upgraded the error handling to ensure that all serial commands are executed after checking that there is a connection open. * Added some code to the focuser connect to make it consistent with the telescope connect in that it will now test that the connection is to an Autostar. Upgraded the move code to make it less unreliable. * Added localisation support * First draft of the installer * Sorted out the registry settings needed to get the driver working properly on install. * Modified the solution to be able to create as 32-bit install that works on 64bit windows 10. * Added a call to activate when the setup dialog is shown. * Downgraded required .net to v4.0. Added suppoer for "Handbox" custom action Changes how the focuser in and out functions. Now sends multiple :F+/-# and multiple stop commands to help get over problems with the #909 missing commands. Added support for checking for the older firmware that does not support the guiding commands, so uses guide rate slew instead. * Slight modification to make sure that the focuser is poked less often --- .../AstroMath.UnitTests.csproj | 2 +- .../Properties/AssemblyInfo.cs | 4 +- FocuserTestConsole/FocuserTestConsole.csproj | 4 +- FocuserTestConsole/Properties/AssemblyInfo.cs | 4 +- FocuserTestConsole/app.config | 2 +- Meade.net.Setup/Config.wxi | 2 +- Meade.net.Setup/Product.wxs | 6 +- .../Meade.net.Telescope.csproj | 8 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 2 +- Meade.net.Telescope/Telescope.cs | 114 ++++++++++++++++-- Meade.net.Telescope/app.config | 2 +- Meade.net.focuser/Focuser.cs | 33 +++-- Meade.net.focuser/Meade.net.focuser.csproj | 4 +- Meade.net.focuser/Properties/AssemblyInfo.cs | 4 +- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 2 +- Meade.net.focuser/app.config | 2 +- Meade.net.sln | 19 +-- Meade.net/Localization/LocalisationHelper.cs | 4 +- Meade.net/Meade.net.csproj | 4 +- Meade.net/Properties/AssemblyInfo.cs | 4 +- Meade.net/Properties/Resources.Designer.cs | 2 +- Meade.net/SharedResources.cs | 14 ++- Meade.net/app.config | 2 +- TelescopeTestConsole/Program.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../TelescopeTestConsole.csproj | 4 +- TelescopeTestConsole/app.config | 2 +- 30 files changed, 197 insertions(+), 69 deletions(-) diff --git a/AstroMath.UnitTests/AstroMath.UnitTests.csproj b/AstroMath.UnitTests/AstroMath.UnitTests.csproj index cf9d11f..d066d8f 100644 --- a/AstroMath.UnitTests/AstroMath.UnitTests.csproj +++ b/AstroMath.UnitTests/AstroMath.UnitTests.csproj @@ -24,7 +24,7 @@ DEBUG;TRACE prompt 4 - AnyCPU + x86 pdbonly diff --git a/AstroMath.UnitTests/Properties/AssemblyInfo.cs b/AstroMath.UnitTests/Properties/AssemblyInfo.cs index 11e0a8b..1ebc9b6 100644 --- a/AstroMath.UnitTests/Properties/AssemblyInfo.cs +++ b/AstroMath.UnitTests/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("0.6.0.0")] +[assembly: AssemblyFileVersion("0.6.0.0")] diff --git a/FocuserTestConsole/FocuserTestConsole.csproj b/FocuserTestConsole/FocuserTestConsole.csproj index 207d96f..09329fa 100644 --- a/FocuserTestConsole/FocuserTestConsole.csproj +++ b/FocuserTestConsole/FocuserTestConsole.csproj @@ -10,7 +10,7 @@ Properties ASCOM.MeadeGeneric ASCOM.MeadeGeneric.Test - v4.7.1 + v4.0 512 @@ -24,7 +24,7 @@ DEBUG;TRACE prompt 4 - false + true x86 diff --git a/FocuserTestConsole/Properties/AssemblyInfo.cs b/FocuserTestConsole/Properties/AssemblyInfo.cs index 5100d4b..b979463 100644 --- a/FocuserTestConsole/Properties/AssemblyInfo.cs +++ b/FocuserTestConsole/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("6.4.0.0")] -[assembly: AssemblyFileVersion("6.4.0.0")] +[assembly: AssemblyVersion("0.6.0.0")] +[assembly: AssemblyFileVersion("0.6.0.0")] diff --git a/FocuserTestConsole/app.config b/FocuserTestConsole/app.config index 70dcdba..e365603 100644 --- a/FocuserTestConsole/app.config +++ b/FocuserTestConsole/app.config @@ -1,3 +1,3 @@ - + diff --git a/Meade.net.Setup/Config.wxi b/Meade.net.Setup/Config.wxi index ec90b40..0040fe9 100644 --- a/Meade.net.Setup/Config.wxi +++ b/Meade.net.Setup/Config.wxi @@ -44,5 +44,5 @@ - + \ No newline at end of file diff --git a/Meade.net.Setup/Product.wxs b/Meade.net.Setup/Product.wxs index 73b314e..d9d14de 100644 --- a/Meade.net.Setup/Product.wxs +++ b/Meade.net.Setup/Product.wxs @@ -15,9 +15,9 @@ - - - ="#461308"]]> + + + diff --git a/Meade.net.Telescope/Meade.net.Telescope.csproj b/Meade.net.Telescope/Meade.net.Telescope.csproj index 3fa86d7..35f9b0b 100644 --- a/Meade.net.Telescope/Meade.net.Telescope.csproj +++ b/Meade.net.Telescope/Meade.net.Telescope.csproj @@ -15,7 +15,7 @@ 3.5 - v4.7.1 + v4.0 ASCOM.ico true ASCOMDriverTemplate.snk @@ -46,7 +46,7 @@ prompt 4 true - AnyCPU + x86 false @@ -63,6 +63,10 @@ ..\bin\Release\ + + ..\bin\Debug\ + x86 + diff --git a/Meade.net.Telescope/Properties/AssemblyInfo.cs b/Meade.net.Telescope/Properties/AssemblyInfo.cs index 8e8df09..dcf1e41 100644 --- a/Meade.net.Telescope/Properties/AssemblyInfo.cs +++ b/Meade.net.Telescope/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // // TODO - Set your driver's version here -[assembly: AssemblyVersion("0.5.0.0")] -[assembly: AssemblyFileVersion("0.5.0.0")] +[assembly: AssemblyVersion("0.6.0.0")] +[assembly: AssemblyFileVersion("0.6.0.0")] diff --git a/Meade.net.Telescope/Properties/Resources.Designer.cs b/Meade.net.Telescope/Properties/Resources.Designer.cs index 67f90ec..7df2b0c 100644 --- a/Meade.net.Telescope/Properties/Resources.Designer.cs +++ b/Meade.net.Telescope/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace ASCOM.Meade.net.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Meade.net.Telescope/Properties/Settings.Designer.cs b/Meade.net.Telescope/Properties/Settings.Designer.cs index f1cc444..67ea42d 100644 --- a/Meade.net.Telescope/Properties/Settings.Designer.cs +++ b/Meade.net.Telescope/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace ASCOM.Meade.net.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs index 275329a..da76b38 100644 --- a/Meade.net.Telescope/Telescope.cs +++ b/Meade.net.Telescope/Telescope.cs @@ -165,15 +165,92 @@ namespace ASCOM.Meade.net get { tl.LogMessage("SupportedActions Get", "Returning empty arraylist"); - return new ArrayList(); + var supportedActions = new ArrayList(); + supportedActions.Add("handbox"); + return supportedActions; } } public string Action(string actionName, string actionParameters) { - LogMessage("", "Action {0}, parameters {1} not implemented", actionName, actionParameters); - throw new ASCOM.ActionNotImplementedException("Action " + actionName + - " is not implemented by this driver"); + switch (actionName.ToLower()) + { + case "handbox": + switch (actionParameters.ToLower()) + { + //Read the screen + case "readdisplay": + var output = SharedResources.SendString(":ED#"); + return output; + + //top row of buttons + case "enter": + SharedResources.SendBlind(":EK13#"); + break; + case "mode": + SharedResources.SendBlind(":EK9#"); + break; + case "goto": + SharedResources.SendBlind(":EK24#"); + break; + + case "0": //light and 0 + SharedResources.SendBlind(":EK48#"); + break; + case "1": + SharedResources.SendBlind(":EK49#"); + break; + case "2": + SharedResources.SendBlind(":EK50#"); + break; + case "3": + SharedResources.SendBlind(":EK51#"); + break; + case "4": + SharedResources.SendBlind(":EK52#"); + break; + case "5": + SharedResources.SendBlind(":EK53#"); + break; + case "6": + SharedResources.SendBlind(":EK54#"); + break; + case "7": + SharedResources.SendBlind(":EK55#"); + break; + case "8": + SharedResources.SendBlind(":EK56#"); + break; + case "9": + SharedResources.SendBlind(":EK57#"); + break; + + case "up": + SharedResources.SendBlind(":EK94#"); + break; + case "down": + SharedResources.SendBlind(":EK118#"); + break; + case "back": + SharedResources.SendBlind(":EK87#"); + break; + case "forward": + SharedResources.SendBlind(":EK69#"); + break; + case "?": + SharedResources.SendBlind(":EK63#"); + break; + default: + LogMessage("", "Action {0}, parameters {1} not implemented", actionName, actionParameters); + throw new ASCOM.ActionNotImplementedException($"Action {actionName}({actionParameters}) is not implemented by this driver"); + } + break; + default: + LogMessage("", "Action {0}, parameters {1} not implemented", actionName, actionParameters); + throw new ASCOM.ActionNotImplementedException($"Action {actionName} is not implemented by this driver"); + } + + return string.Empty; } public void CommandBlind(string command, bool raw) @@ -240,9 +317,15 @@ namespace ASCOM.Meade.net SharedResources.Connect("Serial"); try { + LogMessage("Connected Set", $"Commented to port {comPort}. Product: {SharedResources.ProductName} Version:{SharedResources.FirmwareVersion}"); + + SelectSite(1); SetLongFormat(true); + + _userNewerPulseGuiding = IsNewPulseGuidingSupported(); + _connectedState = true; } catch (Exception) @@ -265,6 +348,23 @@ namespace ASCOM.Meade.net } } + private bool IsNewPulseGuidingSupported() + { + if (SharedResources.ProductName == SharedResources.AUTOSTAR497) + { + return FirmwareIsGreaterThan(SharedResources.AUTOSTAR497_31EE); + } + + return false; + } + + private bool FirmwareIsGreaterThan(string minVersion) + { + var currentVersion = SharedResources.FirmwareVersion; + var comparison = currentVersion.CompareTo(minVersion); + return (comparison >= 0); + } + private void SetLongFormat(bool setLongFormat) { SharedResources.Lock(() => @@ -312,8 +412,7 @@ namespace ASCOM.Meade.net { Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; // TODO customise this driver description - string driverInfo = "Information about the driver itself. Version: " + - String.Format(CultureInfo.InvariantCulture, "{0}.{1}", version.Major, + string driverInfo = "Meade Generic .net driver. Version: " + String.Format(CultureInfo.InvariantCulture, "{0}.{1}", version.Major, version.Minor); tl.LogMessage("DriverInfo Get", driverInfo); return driverInfo; @@ -948,8 +1047,7 @@ namespace ASCOM.Meade.net AtPark = true; } - private readonly bool - _userNewerPulseGuiding = true; //todo make this a device setting based on firmware revision + private bool _userNewerPulseGuiding = true; public void PulseGuide(GuideDirections direction, int duration) { diff --git a/Meade.net.Telescope/app.config b/Meade.net.Telescope/app.config index 56895a9..762f9a3 100644 --- a/Meade.net.Telescope/app.config +++ b/Meade.net.Telescope/app.config @@ -5,4 +5,4 @@
- + diff --git a/Meade.net.focuser/Focuser.cs b/Meade.net.focuser/Focuser.cs index 14e8b26..75a6f18 100644 --- a/Meade.net.focuser/Focuser.cs +++ b/Meade.net.focuser/Focuser.cs @@ -350,9 +350,16 @@ namespace ASCOM.Meade.net CheckConnected("Halt"); - SharedResources.SendBlind(":FQ#"); - //:FQ# Halt Focuser Motion - //Returns: Nothing + //A single halt command is sometimes missed by the #909 apm, so let's do it a few times to be safe. + Stopwatch stopwatch = Stopwatch.StartNew(); + while (stopwatch.ElapsedMilliseconds < 1000) + { + SharedResources.SendBlind(":FQ#"); + //:FQ# Halt Focuser Motion + //Returns: Nothing + + utilities.WaitForMilliseconds(250); + } } public bool IsMoving @@ -431,7 +438,7 @@ namespace ASCOM.Meade.net { SharedResources.Lock(() => { - SharedResources.SendBlind(":FF#"); + //SharedResources.SendBlind(":FF#"); //:FF# Set Focus speed to fastest setting //Returns: Nothing @@ -443,17 +450,23 @@ namespace ASCOM.Meade.net //All others – Not Supported utilities.WaitForMilliseconds(100); - SharedResources.SendBlind(directionOut ? ":F+#" : ":F-#"); - //:F+# Start Focuser moving inward (toward objective) - //Returns: None + //A Single focus command sometimes gets lost on the #909, so sending lots of them solves the issue. + Stopwatch stopwatch = Stopwatch.StartNew(); + while (stopwatch.ElapsedMilliseconds < steps) + { + SharedResources.SendBlind(directionOut ? ":F+#" : ":F-#"); + //:F+# Start Focuser moving inward (toward objective) + //Returns: None - //:F-# Start Focuser moving outward (away from objective) - //Returns: None + //:F-# Start Focuser moving outward (away from objective) + //Returns: None - utilities.WaitForMilliseconds(steps); + utilities.WaitForMilliseconds(250); + } Halt(); + //This gives the focuser time to physically stop. utilities.WaitForMilliseconds(1000); }); } diff --git a/Meade.net.focuser/Meade.net.focuser.csproj b/Meade.net.focuser/Meade.net.focuser.csproj index a1fd243..bafde48 100644 --- a/Meade.net.focuser/Meade.net.focuser.csproj +++ b/Meade.net.focuser/Meade.net.focuser.csproj @@ -15,7 +15,7 @@ 3.5 - v4.7.1 + v4.0 ASCOM.ico true ASCOMDriverTemplate.snk @@ -62,7 +62,7 @@ true - bin\x86\Debug\ + ..\bin\Debug\ DEBUG;TRACE true full diff --git a/Meade.net.focuser/Properties/AssemblyInfo.cs b/Meade.net.focuser/Properties/AssemblyInfo.cs index a02a8e6..c0f0c5b 100644 --- a/Meade.net.focuser/Properties/AssemblyInfo.cs +++ b/Meade.net.focuser/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // // TODO - Set your driver's version here -[assembly: AssemblyVersion("0.5.0.0")] -[assembly: AssemblyFileVersion("0.5.0.0")] +[assembly: AssemblyVersion("0.6.0.0")] +[assembly: AssemblyFileVersion("0.6.0.0")] diff --git a/Meade.net.focuser/Properties/Resources.Designer.cs b/Meade.net.focuser/Properties/Resources.Designer.cs index 67f90ec..7df2b0c 100644 --- a/Meade.net.focuser/Properties/Resources.Designer.cs +++ b/Meade.net.focuser/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace ASCOM.Meade.net.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Meade.net.focuser/Properties/Settings.Designer.cs b/Meade.net.focuser/Properties/Settings.Designer.cs index f1cc444..67ea42d 100644 --- a/Meade.net.focuser/Properties/Settings.Designer.cs +++ b/Meade.net.focuser/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace ASCOM.Meade.net.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Meade.net.focuser/app.config b/Meade.net.focuser/app.config index 56895a9..762f9a3 100644 --- a/Meade.net.focuser/app.config +++ b/Meade.net.focuser/app.config @@ -5,4 +5,4 @@
- + diff --git a/Meade.net.sln b/Meade.net.sln index d8f177e..96aacec 100644 --- a/Meade.net.sln +++ b/Meade.net.sln @@ -35,8 +35,8 @@ Global {3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|Any CPU.Build.0 = Debug|Any CPU {3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|x64.ActiveCfg = Debug|Any CPU {3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|x64.Build.0 = Debug|Any CPU - {3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|x86.ActiveCfg = Debug|Any CPU - {3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|x86.Build.0 = Debug|Any CPU + {3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|x86.ActiveCfg = Debug|x86 + {3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|x86.Build.0 = Debug|x86 {3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Release|Any CPU.ActiveCfg = Release|Any CPU {3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Release|Any CPU.Build.0 = Release|Any CPU {3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Release|x64.ActiveCfg = Release|Any CPU @@ -47,8 +47,8 @@ Global {64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|Any CPU.Build.0 = Debug|Any CPU {64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|x64.ActiveCfg = Debug|Any CPU {64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|x64.Build.0 = Debug|Any CPU - {64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|x86.ActiveCfg = Debug|Any CPU - {64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|x86.Build.0 = Debug|Any CPU + {64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|x86.ActiveCfg = Debug|x86 + {64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|x86.Build.0 = Debug|x86 {64308775-BD4A-469C-BCAB-3ED830B811AF}.Release|Any CPU.ActiveCfg = Release|Any CPU {64308775-BD4A-469C-BCAB-3ED830B811AF}.Release|Any CPU.Build.0 = Release|Any CPU {64308775-BD4A-469C-BCAB-3ED830B811AF}.Release|x64.ActiveCfg = Release|Any CPU @@ -59,8 +59,8 @@ Global {A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|Any CPU.Build.0 = Debug|Any CPU {A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|x64.ActiveCfg = Debug|Any CPU {A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|x64.Build.0 = Debug|Any CPU - {A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|x86.ActiveCfg = Debug|Any CPU - {A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|x86.Build.0 = Debug|Any CPU + {A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|x86.ActiveCfg = Debug|x86 + {A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|x86.Build.0 = Debug|x86 {A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Release|Any CPU.ActiveCfg = Release|Any CPU {A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Release|Any CPU.Build.0 = Release|Any CPU {A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Release|x64.ActiveCfg = Release|Any CPU @@ -69,6 +69,7 @@ Global {A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Release|x86.Build.0 = Release|x86 {D5207217-61C7-4E94-8097-91DBACE57D2A}.Debug|Any CPU.ActiveCfg = Debug|x86 {D5207217-61C7-4E94-8097-91DBACE57D2A}.Debug|x64.ActiveCfg = Debug|x86 + {D5207217-61C7-4E94-8097-91DBACE57D2A}.Debug|x64.Build.0 = Debug|x86 {D5207217-61C7-4E94-8097-91DBACE57D2A}.Debug|x86.ActiveCfg = Debug|x86 {D5207217-61C7-4E94-8097-91DBACE57D2A}.Debug|x86.Build.0 = Debug|x86 {D5207217-61C7-4E94-8097-91DBACE57D2A}.Release|Any CPU.ActiveCfg = Release|x86 @@ -77,6 +78,7 @@ Global {D5207217-61C7-4E94-8097-91DBACE57D2A}.Release|x86.Build.0 = Release|x86 {AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Debug|Any CPU.ActiveCfg = Debug|x86 {AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Debug|x64.ActiveCfg = Debug|x86 + {AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Debug|x64.Build.0 = Debug|x86 {AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Debug|x86.ActiveCfg = Debug|x86 {AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Debug|x86.Build.0 = Debug|x86 {AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Release|Any CPU.ActiveCfg = Release|x86 @@ -87,8 +89,8 @@ Global {AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|Any CPU.Build.0 = Debug|Any CPU {AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|x64.ActiveCfg = Debug|Any CPU {AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|x64.Build.0 = Debug|Any CPU - {AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|x86.ActiveCfg = Debug|Any CPU - {AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|x86.Build.0 = Debug|Any CPU + {AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|x86.ActiveCfg = Debug|x86 + {AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|x86.Build.0 = Debug|x86 {AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Release|Any CPU.ActiveCfg = Release|Any CPU {AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Release|Any CPU.Build.0 = Release|Any CPU {AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Release|x64.ActiveCfg = Release|Any CPU @@ -98,7 +100,6 @@ Global {8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Debug|Any CPU.ActiveCfg = Debug|x64 {8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Debug|Any CPU.Build.0 = Debug|x64 {8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Debug|x64.ActiveCfg = Debug|x64 - {8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Debug|x64.Build.0 = Debug|x64 {8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Debug|x86.ActiveCfg = Debug|x86 {8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Debug|x86.Build.0 = Debug|x86 {8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Release|Any CPU.ActiveCfg = Release|x86 diff --git a/Meade.net/Localization/LocalisationHelper.cs b/Meade.net/Localization/LocalisationHelper.cs index a8ac3a7..9c4b4bf 100644 --- a/Meade.net/Localization/LocalisationHelper.cs +++ b/Meade.net/Localization/LocalisationHelper.cs @@ -21,8 +21,8 @@ namespace ASCOM.Meade.net.Localization { var cultureInfo = new CultureInfo(name); - CultureInfo.DefaultThreadCurrentCulture = cultureInfo; - CultureInfo.DefaultThreadCurrentUICulture = cultureInfo; + //CultureInfo.DefaultThreadCurrentCulture = cultureInfo; + //CultureInfo.DefaultThreadCurrentUICulture = cultureInfo; Thread.CurrentThread.CurrentCulture = cultureInfo; Thread.CurrentThread.CurrentUICulture = cultureInfo; diff --git a/Meade.net/Meade.net.csproj b/Meade.net/Meade.net.csproj index 6be15b8..e1d415b 100644 --- a/Meade.net/Meade.net.csproj +++ b/Meade.net/Meade.net.csproj @@ -10,7 +10,7 @@ Properties ASCOM.Meade.net ASCOM.Meade.net.Server - v4.7.1 + v4.0 2.0 @@ -65,7 +65,7 @@ true - bin\x86\Debug\ + ..\bin\Debug\ DEBUG;TRACE full x86 diff --git a/Meade.net/Properties/AssemblyInfo.cs b/Meade.net/Properties/AssemblyInfo.cs index 9570023..cb667c7 100644 --- a/Meade.net/Properties/AssemblyInfo.cs +++ b/Meade.net/Properties/AssemblyInfo.cs @@ -21,7 +21,7 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("0.5.0.0")] -[assembly: AssemblyFileVersion("0.5.0.0")] +[assembly: AssemblyVersion("0.6.0.0")] +[assembly: AssemblyFileVersion("0.6.0.0")] [assembly: ComVisibleAttribute(false)] diff --git a/Meade.net/Properties/Resources.Designer.cs b/Meade.net/Properties/Resources.Designer.cs index 0255290..67c41c7 100644 --- a/Meade.net/Properties/Resources.Designer.cs +++ b/Meade.net/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace ASCOM.Meade.net.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Meade.net/SharedResources.cs b/Meade.net/SharedResources.cs index 733506b..6afc65e 100644 --- a/Meade.net/SharedResources.cs +++ b/Meade.net/SharedResources.cs @@ -234,8 +234,19 @@ namespace ASCOM.Meade.net #endregion + #region AutostarProducts + + public const string AUTOSTAR497 = "Autostar"; + + public const string AUTOSTAR497_31EE = "31Ee"; + + #endregion + #region Multi Driver handling + public static string ProductName { get; private set; } = string.Empty; + public static string FirmwareVersion { get; private set; } = string.Empty; + // this section illustrates how multiple drivers could be handled, // it's for drivers where multiple connections to the hardware can be made and ensures that the // hardware is only disconnected from when all the connected devices have disconnected. @@ -280,7 +291,8 @@ namespace ASCOM.Meade.net SharedResources.SharedSerial.Handshake = SerialHandshake.None; SharedResources.SharedSerial.Connected = true; - string firmware = SendString(":GVN#"); + ProductName = SendString(":GVP#"); + FirmwareVersion = SendString(":GVN#"); } } } diff --git a/Meade.net/app.config b/Meade.net/app.config index 70dcdba..e365603 100644 --- a/Meade.net/app.config +++ b/Meade.net/app.config @@ -1,3 +1,3 @@ - + diff --git a/TelescopeTestConsole/Program.cs b/TelescopeTestConsole/Program.cs index 420046a..98c8e2b 100644 --- a/TelescopeTestConsole/Program.cs +++ b/TelescopeTestConsole/Program.cs @@ -22,7 +22,7 @@ namespace ASCOM // Uncomment the code that's required #if UseChooser // choose the device - string id = ASCOM.DriverAccess.Telescope.Choose("ASCOM.Meade.net.Telescope"); + string id = ASCOM.DriverAccess.Telescope.Choose("ASCOM.MeadeGeneric.Telescope"); if (string.IsNullOrEmpty(id)) return; // create this device @@ -44,7 +44,7 @@ namespace ASCOM device.Connected = true; - device.SlewToAltAz(150, 50); + //device.SlewToAltAz(150, 50); //device.CommandBlind(":Sa+30*00'00#", true); //device.CommandBlind(":Sz50*00#", true); diff --git a/TelescopeTestConsole/Properties/AssemblyInfo.cs b/TelescopeTestConsole/Properties/AssemblyInfo.cs index 2b89b32..6db7d58 100644 --- a/TelescopeTestConsole/Properties/AssemblyInfo.cs +++ b/TelescopeTestConsole/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("6.4.0.0")] -[assembly: AssemblyFileVersion("6.4.0.0")] +[assembly: AssemblyVersion("0.6.0.0")] +[assembly: AssemblyFileVersion("0.6.0.0")] diff --git a/TelescopeTestConsole/TelescopeTestConsole.csproj b/TelescopeTestConsole/TelescopeTestConsole.csproj index 61210c5..7fb2a6a 100644 --- a/TelescopeTestConsole/TelescopeTestConsole.csproj +++ b/TelescopeTestConsole/TelescopeTestConsole.csproj @@ -10,7 +10,7 @@ Properties ASCOM.Meade.net ASCOM.Meade.net.Test - v4.7.1 + v4.0 512 @@ -24,7 +24,7 @@ DEBUG;TRACE prompt 4 - false + true x86 diff --git a/TelescopeTestConsole/app.config b/TelescopeTestConsole/app.config index 70dcdba..e365603 100644 --- a/TelescopeTestConsole/app.config +++ b/TelescopeTestConsole/app.config @@ -1,3 +1,3 @@ - +