Astronomy/MeadeGeneric
1
0
Fork 0
Code Pull Requests Wiki Activity

Fixed a few code inspections

Browse Source
This commit is contained in:
Colin Dawson
2021-03-01 11:19:27 +00:00
parent b0ef75ae66
commit f57a73843a
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Meade.net.Telescope/Telescope.cs
+9 -9
View File
@@ -1392,6 +1392,7 @@ namespace ASCOM.Meade.net
//We're going faster than Guide speed, so need to wait for the scope to settle. //We're going faster than Guide speed, so need to wait for the scope to settle.
SetSlewingMinEndTime(); SetSlewingMinEndTime();
} }
_movingPrimary = false; _movingPrimary = false;
SharedResourcesWrapper.SendBlind(":Qe#"); SharedResourcesWrapper.SendBlind(":Qe#");
//:Qe# Halt eastward Slews //:Qe# Halt eastward Slews
@@ -1580,7 +1581,7 @@ namespace ASCOM.Meade.net
/// <summary> /// <summary>
/// convert a HH:MM.T (classic LX200 RA Notation) string to a double hours. T is the decimal part of minutes which is converted into seconds /// convert a HH:MM.T (classic LX200 RA Notation) string to a double hours. T is the decimal part of minutes which is converted into seconds
/// </summary> /// </summary>
public double HMToHours(string hm) public double HmToHours(string hm)
{ {
var token = hm.Split('.'); var token = hm.Split('.');
if (token.Length != 2) if (token.Length != 2)
@@ -1601,7 +1602,7 @@ namespace ASCOM.Meade.net
//Returns: HH:MM.T# or HH:MM:SS# //Returns: HH:MM.T# or HH:MM:SS#
//Depending which precision is set for the telescope //Depending which precision is set for the telescope
double rightAscension = HMToHours(result); double rightAscension = HmToHours(result);
LogMessage("RightAscension", $"Get - {result} convert to {rightAscension} {_utilitiesExtra.HoursToHMS(rightAscension)}"); LogMessage("RightAscension", $"Get - {result} convert to {rightAscension} {_utilitiesExtra.HoursToHMS(rightAscension)}");
return rightAscension; return rightAscension;
@@ -1686,7 +1687,7 @@ namespace ASCOM.Meade.net
CheckConnected("SiteElevation Set"); CheckConnected("SiteElevation Set");
LogMessage("SiteElevation", $"Set: {value}"); LogMessage("SiteElevation", $"Set: {value}");
if (value == base.SiteElevation) if (Math.Abs(value - base.SiteElevation) < 0.1)
{ {
LogMessage("SiteElevation", $"Set: no change detected"); LogMessage("SiteElevation", $"Set: no change detected");
return; return;
@@ -2119,14 +2120,14 @@ namespace ASCOM.Meade.net
// At least the classic LX200 low precision might not slew to the exact target position // At least the classic LX200 low precision might not slew to the exact target position
// This Requires to retrieve the aimed target ra de from the telescope // This Requires to retrieve the aimed target ra de from the telescope
double ra = RightAscension; double ra = RightAscension;
if (_targetRightAscension != InvalidParameter && if (Math.Abs(_targetRightAscension - InvalidParameter) > 0.1 &&
_utilities.HoursToHMS(ra, ":", ":", ":", _digitsRa) != _utilities.HoursToHMS(_targetRightAscension, ":", ":", ":", _digitsRa)) _utilities.HoursToHMS(ra, ":", ":", ":", _digitsRa) != _utilities.HoursToHMS(_targetRightAscension, ":", ":", ":", _digitsRa))
{ {
LogMessage("SyncToTarget", $"differ RA real {ra} targeted {_targetRightAscension}"); LogMessage("SyncToTarget", $"differ RA real {ra} targeted {_targetRightAscension}");
_targetRightAscension = ra; _targetRightAscension = ra;
} }
double de = Declination; double de = Declination;
if (_targetDeclination != InvalidParameter && if (Math.Abs(_targetDeclination - InvalidParameter) > 0.1 &&
_utilities.DegreesToDMS(de, "*", ":", ":", _digitsDe) != _utilities.DegreesToDMS(_targetDeclination, "*", ":", ":", _digitsDe)) _utilities.DegreesToDMS(de, "*", ":", ":", _digitsDe) != _utilities.DegreesToDMS(_targetDeclination, "*", ":", ":", _digitsDe))
{ {
LogMessage("SyncToTarget", $"differ DE real {de} targeted {_targetDeclination}"); LogMessage("SyncToTarget", $"differ DE real {de} targeted {_targetDeclination}");
@@ -2167,10 +2168,9 @@ namespace ASCOM.Meade.net
throw new InvalidValueException("Declination cannot be less than -90."); throw new InvalidValueException("Declination cannot be less than -90.");
var dms = ""; var dms = "";
if (IsLongFormat) dms = IsLongFormat ?
dms = _utilities.DegreesToDMS(value, "*", ":", ":", _digitsDe); _utilities.DegreesToDMS(value, "*", ":", ":", _digitsDe) :
else _utilities.DegreesToDM(value, "*", "", _digitsDe);
dms = _utilities.DegreesToDM(value, "*", "", _digitsDe);
var s = value < 0 ? string.Empty : "+"; var s = value < 0 ? string.Empty : "+";
Meade.net/LocalServer.cs
+16 -11
View File
@@ -337,18 +337,23 @@ namespace ASCOM.Meade.net
{ {
key?.SetValue(null, progid); // Could be assyTitle/Desc??, but .NET components show ProgId here key?.SetValue(null, progid); // Could be assyTitle/Desc??, but .NET components show ProgId here
key?.SetValue("AppId", _sAppId); key?.SetValue("AppId", _sAppId);
using (RegistryKey key2 = key.CreateSubKey("Implemented Categories")) if (key != null)
{ {
key2?.CreateSubKey("{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}"); using (RegistryKey key2 = key.CreateSubKey("Implemented Categories"))
} {
using (RegistryKey key2 = key.CreateSubKey("ProgId")) key2?.CreateSubKey("{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}");
{ }
key2?.SetValue(null, progid);
} using (RegistryKey key2 = key.CreateSubKey("ProgId"))
key.CreateSubKey("Programmable"); {
using (RegistryKey key2 = key.CreateSubKey("LocalServer32")) key2?.SetValue(null, progid);
{ }
key2?.SetValue(null, Application.ExecutablePath);
key.CreateSubKey("Programmable");
using (RegistryKey key2 = key.CreateSubKey("LocalServer32"))
{
key2?.SetValue(null, Application.ExecutablePath);
}
} }
} }
// //
Meade.net/SharedResources.cs
+1 -1
View File
@@ -164,7 +164,7 @@ namespace ASCOM.Meade.net
driverProfile.WriteValue(DriverId, BacklashCompensationName, profileProperties.BacklashCompensation.ToString()); driverProfile.WriteValue(DriverId, BacklashCompensationName, profileProperties.BacklashCompensation.ToString());
driverProfile.WriteValue(DriverId, ReverseFocusDirectionName, profileProperties.ReverseFocusDirection.ToString()); driverProfile.WriteValue(DriverId, ReverseFocusDirectionName, profileProperties.ReverseFocusDirection.ToString());
driverProfile.WriteValue(DriverId, DynamicBreakingName, profileProperties.DynamicBreaking.ToString()); driverProfile.WriteValue(DriverId, DynamicBreakingName, profileProperties.DynamicBreaking.ToString());
driverProfile.WriteValue(DriverId, SiteElevationName, profileProperties.SiteElevation.ToString()); driverProfile.WriteValue(DriverId, SiteElevationName, profileProperties.SiteElevation.ToString(CultureInfo.InvariantCulture));
driverProfile.WriteValue(DriverId, SettleTimeName, profileProperties.SettleTime.ToString()); driverProfile.WriteValue(DriverId, SettleTimeName, profileProperties.SettleTime.ToString());
} }
} }