Compare commits

...

7 Commits

Author SHA1 Message Date
ColinD 7a80ad4662 Merged in develop (pull request #15)
Develop
2019-08-24 21:49:00 +00:00
ColinD 3eddc52c6a Tidy up a few code inspection issues and add the MIT License to the installer. 2019-08-24 22:38:16 +01:00
ColinD 64a72560bc Fixed missing closing bracket 2019-08-24 17:40:25 +01:00
ColinD 0a6ba16c61 Merge branch 'master' into develop 2019-08-24 17:31:38 +01:00
ColinD b932bd8eb6 Merged in develop (pull request #14)
Adding log message when making connections using a telescope device to show that if it's the first or secondary connection.
2019-08-24 16:31:22 +00:00
ColinD 5aec81b45f Adding log message when making connections using a telescope device to show that if it's the first or secondary connection. 2019-08-24 17:30:28 +01:00
ColinD d68d51bd9c Merge branch 'master' into develop 2019-08-24 17:12:06 +01:00
5 changed files with 16 additions and 22 deletions
Binary file not shown.
+1
View File
@@ -48,6 +48,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Config.wxi" /> <Content Include="Config.wxi" />
<Content Include="License.rtf" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Meade.net.focuser\Meade.net.focuser.csproj"> <ProjectReference Include="..\Meade.net.focuser\Meade.net.focuser.csproj">
+2 -6
View File
@@ -30,12 +30,7 @@
<![CDATA[Installed OR NETFRAMEWORK40FULL]]> <![CDATA[Installed OR NETFRAMEWORK40FULL]]>
</Condition> </Condition>
<!--todo create a method to check if ASCOM is installed.--> <!-- <Condition Message="Please use the correct installer for your operating system - x86 for 32-bit, x64 for 64-bit.">
<!--<Condition Message="This application requires ASCOM Platform 6.4 or later. Please install this and try again.">
<![CDATA[Installed or WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED]]>
</Condition>-->
<!-- <Condition Message="Please use the correct installer for your operating system - x86 for 32-bit, x64 for 64-bit.">
<?if $(var.Win64) = "yes" ?> <?if $(var.Win64) = "yes" ?>
VersionNT64 VersionNT64
<?else?> <?else?>
@@ -46,6 +41,7 @@
<UIRef Id="InstallationUI"/> <UIRef Id="InstallationUI"/>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" /> <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
<WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
<FeatureGroupRef Id="fgRoot"/> <FeatureGroupRef Id="fgRoot"/>
</Product> </Product>
+7 -2
View File
@@ -388,6 +388,7 @@ namespace ASCOM.Meade.net
if (connectionInfo.SameDevice == 1) if (connectionInfo.SameDevice == 1)
{ {
LogMessage("Connected Set", $"Making first connection telescope adjustments");
//These settings are applied only when the first device connects to the telescope. //These settings are applied only when the first device connects to the telescope.
SetLongFormat(true); SetLongFormat(true);
@@ -398,6 +399,10 @@ namespace ASCOM.Meade.net
SetTelescopePrecision("Connect"); SetTelescopePrecision("Connect");
} }
else
{
LogMessage("Connected Set", $"Skipping first connection telescope adjustments (current connections: {connectionInfo.SameDevice})");
}
} }
catch (Exception) catch (Exception)
{ {
@@ -520,7 +525,7 @@ namespace ASCOM.Meade.net
return highPrecision; return highPrecision;
} }
public void TelescopePointingPrecision(bool high) private void TelescopePointingPrecision(bool high)
{ {
var currentPrecision = TogglePrecision(); var currentPrecision = TogglePrecision();
@@ -2308,7 +2313,7 @@ namespace ASCOM.Meade.net
/// <summary> /// <summary>
/// Read the device configuration from the ASCOM Profile store /// Read the device configuration from the ASCOM Profile store
/// </summary> /// </summary>
internal void ReadProfile() private void ReadProfile()
{ {
ProfileProperties profileProperties = _sharedResourcesWrapper.ReadProfile(); ProfileProperties profileProperties = _sharedResourcesWrapper.ReadProfile();
_tl.Enabled = profileProperties.TraceLogger; _tl.Enabled = profileProperties.TraceLogger;
+6 -14
View File
@@ -37,7 +37,7 @@ namespace ASCOM.Meade.net
/// The DeviceID is used by ASCOM applications to load the driver at runtime. /// The DeviceID is used by ASCOM applications to load the driver at runtime.
/// </summary> /// </summary>
//internal static string driverID = "ASCOM.Meade.net.Focuser"; //internal static string driverID = "ASCOM.Meade.net.Focuser";
private static readonly string DriverId = Marshal.GenerateProgIdForType(MethodBase.GetCurrentMethod().DeclaringType); private static readonly string DriverId = Marshal.GenerateProgIdForType(MethodBase.GetCurrentMethod().DeclaringType ?? throw new System.InvalidOperationException());
// TODO Change the descriptive string for your driver then remove this line // TODO Change the descriptive string for your driver then remove this line
/// <summary> /// <summary>
/// Driver description that displays in the ASCOM Chooser. /// Driver description that displays in the ASCOM Chooser.
@@ -54,7 +54,7 @@ namespace ASCOM.Meade.net
/// <summary> /// <summary>
/// Variable to hold the trace logger object (creates a diagnostic log file with information that you specify) /// Variable to hold the trace logger object (creates a diagnostic log file with information that you specify)
/// </summary> /// </summary>
internal static TraceLogger Tl; private static TraceLogger Tl;
private readonly ISharedResourcesWrapper _sharedResourcesWrapper; private readonly ISharedResourcesWrapper _sharedResourcesWrapper;
@@ -358,16 +358,7 @@ namespace ASCOM.Meade.net
if (position == 0) if (position == 0)
return; return;
if (position > 0) MoveFocuser(position > 0, Math.Abs(position));
{
//desired move direction is out
MoveFocuser(true, Math.Abs(position));
}
else
{
//desired move direction is in
MoveFocuser(false, Math.Abs(position));
}
} }
private void MoveFocuser(bool directionOut, int steps) private void MoveFocuser(bool directionOut, int steps)
@@ -426,6 +417,7 @@ namespace ASCOM.Meade.net
Tl.LogMessage("TempComp Get", false.ToString()); Tl.LogMessage("TempComp Get", false.ToString());
return false; return false;
} }
// ReSharper disable once ValueParameterNotUsed
set set
{ {
Tl.LogMessage("TempComp Set", "Not implemented"); Tl.LogMessage("TempComp Set", "Not implemented");
@@ -551,7 +543,7 @@ namespace ASCOM.Meade.net
/// <summary> /// <summary>
/// Read the device configuration from the ASCOM Profile store /// Read the device configuration from the ASCOM Profile store
/// </summary> /// </summary>
internal void ReadProfile() private void ReadProfile()
{ {
var profileProperties = _sharedResourcesWrapper.ReadProfile(); var profileProperties = _sharedResourcesWrapper.ReadProfile();
Tl.Enabled = profileProperties.TraceLogger; Tl.Enabled = profileProperties.TraceLogger;
@@ -567,7 +559,7 @@ namespace ASCOM.Meade.net
/// <param name="identifier"></param> /// <param name="identifier"></param>
/// <param name="message"></param> /// <param name="message"></param>
/// <param name="args"></param> /// <param name="args"></param>
internal static void LogMessage(string identifier, string message, params object[] args) private static void LogMessage(string identifier, string message, params object[] args)
{ {
var msg = string.Format(message, args); var msg = string.Format(message, args);
Tl.LogMessage(identifier, msg); Tl.LogMessage(identifier, msg);