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

Moved IsTargetCoordinateInitRequired to SharedResourcesWrapper

Browse Source
This commit is contained in:
Sebastian Godelet
2021-06-28 12:53:05 +10:00
parent 90713de34b
commit 631aa91d94
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Meade.net.Telescope/Telescope.cs
+13 -14
View File
@@ -142,7 +142,6 @@ namespace ASCOM.Meade.net
private bool _isGuiding;
private bool _isTargetCoordinateInitRequired = true;
//
// PUBLIC COM INTERFACE ITelescopeV3 IMPLEMENTATION
//
@@ -648,16 +647,16 @@ namespace ASCOM.Meade.net
if (SharedResourcesWrapper.ProductName != TelescopeList.LX200CLASSIC)
return false;
if (!_isTargetCoordinateInitRequired)
return _isTargetCoordinateInitRequired;
if (!SharedResourcesWrapper.IsTargetCoordinateInitRequired)
return SharedResourcesWrapper.IsTargetCoordinateInitRequired;
if (!IsConnected)
return true;
if (SharedResourcesWrapper.ProductName != TelescopeList.LX200CLASSIC)
{
_isTargetCoordinateInitRequired = false;
return _isTargetCoordinateInitRequired;
SharedResourcesWrapper.IsTargetCoordinateInitRequired = false;
return SharedResourcesWrapper.IsTargetCoordinateInitRequired;
}
const double eps = 0.00001d;
@@ -666,16 +665,16 @@ namespace ASCOM.Meade.net
//target RA == 0
if (Math.Abs(rightTargetAscension) > eps)
{
_isTargetCoordinateInitRequired = false;
return _isTargetCoordinateInitRequired;
SharedResourcesWrapper.IsTargetCoordinateInitRequired = false;
return SharedResourcesWrapper.IsTargetCoordinateInitRequired;
}
double targetDeclination = Declination;
//target DE == 0
if (Math.Abs(targetDeclination) > eps)
{
_isTargetCoordinateInitRequired = false;
return _isTargetCoordinateInitRequired;
SharedResourcesWrapper.IsTargetCoordinateInitRequired = false;
return SharedResourcesWrapper.IsTargetCoordinateInitRequired;
}
//target coordinates are equal current coordinates
@@ -683,12 +682,12 @@ namespace ASCOM.Meade.net
(Math.Abs(Declination - targetDeclination) <= eps))
{
LogMessage("IsTargetCoordinateInitRequired", "0 diff -> false");
_isTargetCoordinateInitRequired = false;
return _isTargetCoordinateInitRequired;
SharedResourcesWrapper.IsTargetCoordinateInitRequired = false;
return SharedResourcesWrapper.IsTargetCoordinateInitRequired;
}
LogMessage("IsTargetCoordinateInitRequired", $"{_isTargetCoordinateInitRequired}");
return _isTargetCoordinateInitRequired;
LogMessage("IsTargetCoordinateInitRequired", $"{SharedResourcesWrapper.IsTargetCoordinateInitRequired}");
return SharedResourcesWrapper.IsTargetCoordinateInitRequired;
}
private void InitTargetCoordinates()
@@ -702,7 +701,7 @@ namespace ASCOM.Meade.net
SyncToCoordinates(raAndDec.RightAscension, raAndDec.Declination);
//do it only once
_isTargetCoordinateInitRequired = false;
SharedResourcesWrapper.IsTargetCoordinateInitRequired = false;
}
catch (Exception ex)
{
Meade.net/SharedResources.cs
+7
View File
@@ -576,5 +576,12 @@ namespace ASCOM.Meade.net
get => _earliestNonSlewingTime;
internal set => _earliestNonSlewingTime.Set(value);
}
private static readonly ThreadSafeValue<bool> _isTargetCoordinateInitRequired = true;
public static bool IsTargetCoordinateInitRequired
{
get => _isTargetCoordinateInitRequired;
internal set => _isTargetCoordinateInitRequired.Set(value);
}
}
}
Meade.net/Wrapper/SharedResourcesWrapper.cs
+8
View File
@@ -47,6 +47,8 @@ namespace ASCOM.Meade.net.Wrapper
bool MovingSecondary { get; set; }
DateTime EarliestNonSlewingTime { get; set; }
bool IsTargetCoordinateInitRequired { get; set; }
}
public class SharedResourcesWrapper : ISharedResourcesWrapper
@@ -181,5 +183,11 @@ namespace ASCOM.Meade.net.Wrapper
get => SharedResources.EarliestNonSlewingTime;
set => SharedResources.EarliestNonSlewingTime = value;
}
public bool IsTargetCoordinateInitRequired
{
get => SharedResources.IsTargetCoordinateInitRequired;
set => SharedResources.IsTargetCoordinateInitRequired = value;
}
}
}