Added code to include the settle time in the Moving Axis commands (except when moving at Guide Rate)
This commit is contained in:
@@ -819,6 +819,7 @@ namespace ASCOM.Meade.net
|
|||||||
|
|
||||||
_movingPrimary = false;
|
_movingPrimary = false;
|
||||||
_movingSecondary = false;
|
_movingSecondary = false;
|
||||||
|
SetSlewingMinEndTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
public AlignmentModes AlignmentMode
|
public AlignmentModes AlignmentMode
|
||||||
@@ -1341,6 +1342,9 @@ namespace ASCOM.Meade.net
|
|||||||
private bool _movingPrimary;
|
private bool _movingPrimary;
|
||||||
private bool _movingSecondary;
|
private bool _movingSecondary;
|
||||||
|
|
||||||
|
private double _primaryRate;
|
||||||
|
private double _secondaryRate;
|
||||||
|
|
||||||
public void MoveAxis(TelescopeAxes axis, double rate)
|
public void MoveAxis(TelescopeAxes axis, double rate)
|
||||||
{
|
{
|
||||||
LogMessage("MoveAxis", $"Axis={axis} rate={rate}");
|
LogMessage("MoveAxis", $"Axis={axis} rate={rate}");
|
||||||
@@ -1383,6 +1387,11 @@ namespace ASCOM.Meade.net
|
|||||||
switch (rate.Compare(0))
|
switch (rate.Compare(0))
|
||||||
{
|
{
|
||||||
case ComparisonResult.Equals:
|
case ComparisonResult.Equals:
|
||||||
|
if (_primaryRate > 1)
|
||||||
|
{
|
||||||
|
//We're going faster than Guide speed, so need to wait for the scope to settle.
|
||||||
|
SetSlewingMinEndTime();
|
||||||
|
}
|
||||||
_movingPrimary = false;
|
_movingPrimary = false;
|
||||||
SharedResourcesWrapper.SendBlind(":Qe#");
|
SharedResourcesWrapper.SendBlind(":Qe#");
|
||||||
//:Qe# Halt eastward Slews
|
//:Qe# Halt eastward Slews
|
||||||
@@ -1390,19 +1399,21 @@ namespace ASCOM.Meade.net
|
|||||||
SharedResourcesWrapper.SendBlind(":Qw#");
|
SharedResourcesWrapper.SendBlind(":Qw#");
|
||||||
//:Qw# Halt westward Slews
|
//:Qw# Halt westward Slews
|
||||||
//Returns: Nothing
|
//Returns: Nothing
|
||||||
|
_primaryRate = 0;
|
||||||
break;
|
break;
|
||||||
case ComparisonResult.Greater:
|
case ComparisonResult.Greater:
|
||||||
|
|
||||||
SharedResourcesWrapper.SendBlind(":Me#");
|
SharedResourcesWrapper.SendBlind(":Me#");
|
||||||
//:Me# Move Telescope East at current slew rate
|
//:Me# Move Telescope East at current slew rate
|
||||||
//Returns: Nothing
|
//Returns: Nothing
|
||||||
_movingPrimary = true;
|
_movingPrimary = true;
|
||||||
|
_primaryRate = absRate;
|
||||||
break;
|
break;
|
||||||
case ComparisonResult.Lower:
|
case ComparisonResult.Lower:
|
||||||
SharedResourcesWrapper.SendBlind(":Mw#");
|
SharedResourcesWrapper.SendBlind(":Mw#");
|
||||||
//:Mw# Move Telescope West at current slew rate
|
//:Mw# Move Telescope West at current slew rate
|
||||||
//Returns: Nothing
|
//Returns: Nothing
|
||||||
_movingPrimary = true;
|
_movingPrimary = true;
|
||||||
|
_primaryRate = absRate;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -1410,6 +1421,11 @@ namespace ASCOM.Meade.net
|
|||||||
switch (rate.Compare(0))
|
switch (rate.Compare(0))
|
||||||
{
|
{
|
||||||
case ComparisonResult.Equals:
|
case ComparisonResult.Equals:
|
||||||
|
if (_secondaryRate > 1)
|
||||||
|
{
|
||||||
|
//We're going faster than Guide speed, so need to wait for the scope to settle.
|
||||||
|
SetSlewingMinEndTime();
|
||||||
|
}
|
||||||
_movingSecondary = false;
|
_movingSecondary = false;
|
||||||
SharedResourcesWrapper.SendBlind(":Qn#");
|
SharedResourcesWrapper.SendBlind(":Qn#");
|
||||||
//:Qn# Halt northward Slews
|
//:Qn# Halt northward Slews
|
||||||
@@ -1417,18 +1433,22 @@ namespace ASCOM.Meade.net
|
|||||||
SharedResourcesWrapper.SendBlind(":Qs#");
|
SharedResourcesWrapper.SendBlind(":Qs#");
|
||||||
//:Qs# Halt southward Slews
|
//:Qs# Halt southward Slews
|
||||||
//Returns: Nothing
|
//Returns: Nothing
|
||||||
|
|
||||||
|
_secondaryRate = 0;
|
||||||
break;
|
break;
|
||||||
case ComparisonResult.Greater:
|
case ComparisonResult.Greater:
|
||||||
SharedResourcesWrapper.SendBlind(":Mn#");
|
SharedResourcesWrapper.SendBlind(":Mn#");
|
||||||
//:Mn# Move Telescope North at current slew rate
|
//:Mn# Move Telescope North at current slew rate
|
||||||
//Returns: Nothing
|
//Returns: Nothing
|
||||||
_movingSecondary = true;
|
_movingSecondary = true;
|
||||||
|
_secondaryRate = absRate;
|
||||||
break;
|
break;
|
||||||
case ComparisonResult.Lower:
|
case ComparisonResult.Lower:
|
||||||
SharedResourcesWrapper.SendBlind(":Ms#");
|
SharedResourcesWrapper.SendBlind(":Ms#");
|
||||||
//:Ms# Move Telescope South at current slew rate
|
//:Ms# Move Telescope South at current slew rate
|
||||||
//Returns: Nothing
|
//Returns: Nothing
|
||||||
_movingSecondary = true;
|
_movingSecondary = true;
|
||||||
|
_secondaryRate = absRate;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user