RaRate updates

rmorgan001 · Mar 18, 2023 · 3349a11 · 3349a11
1 parent 521fd7f
commit 3349a11
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/GS.Server/SkyTelescope/SkyServer.cs b/GS.Server/SkyTelescope/SkyServer.cs
@@ -2923,11 +2923,11 @@ private static double GetRaRateDirection(double rate)
 
             if (SouthernHemisphere)
             {
-                if (east) { rate = -rate; }
+                if (!east) { rate = -rate; }
             }
             else
             {
-                if (!east) { rate = -rate; }
+                if (east) { rate = -rate; }
             }
 
             return rate;

diff --git a/GS.SkyWatcher/Commands.cs b/GS.SkyWatcher/Commands.cs
@@ -554,32 +554,31 @@ internal double GetLastGoToTarget(AxisId axis)
         }
 
         /// <summary>
-        /// i or X0007 Get Current "slew" speed
+        /// i or X0007 Get last "slew" speed
         /// </summary>
         /// <param name="axis">AxisId.Axis1 or AxisId.Axis2</param>
-        internal long GetCurrentSlewSpeed(AxisId axis)
+        internal long GetLastSlewSpeed(AxisId axis)
         {
             string response;
             long iSpeed;
             if (SupportAdvancedCommandSet && AllowAdvancedCommandSet)
             {
                 response = CmdToMount(axis, 'X', "0007");    // 0x07（’07’）: Current slewing speed in ticks /1024 seconds
                 iSpeed = String32ToInt(response, true, _resolutionFactor[(int)axis]);
-                return iSpeed;
             }
             else
             {
                 response = CmdToMount(axis, 'i', null);
                 iSpeed = StringToLong(response);
-                return iSpeed;
             }
+            return iSpeed;
         }
 
         /// <summary>
         /// j or X0003 Gets radians position of an axis
         /// </summary>
         /// <param name="axis">AxisId.Axis1 or AxisId.Axis2</param>
-        /// <returns>Radians of the axis</returns>
+        /// <returns>Radians of the axis</returns> 
         internal double GetAxisPosition(AxisId axis)
         {
             if (SupportAdvancedCommandSet && AllowAdvancedCommandSet)

diff --git a/GS.SkyWatcher/SkyWatcher.cs b/GS.SkyWatcher/SkyWatcher.cs
@@ -835,7 +835,7 @@ internal double GetLastGoToTarget(AxisId axis)
 
         internal long GetLastSlewSpeed(AxisId axis)
         {
-            return _commands.GetCurrentSlewSpeed(axis);
+            return _commands.GetLastSlewSpeed(axis);
         }
 
         internal long? GetHomePosition(AxisId axis)