Skip to content

Commit 0913d0a

Browse files
Merge branch 'oopthescope' into rcchanges
# Conflicts: # Software/Arduino code/OpenAstroTracker/f_serial.ino
2 parents d98c9cc + ba2cea6 commit 0913d0a

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

Software/Arduino code/OpenAstroTracker/f_serial.ino

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@
110110
// Park Scope and stop motors
111111
// This slews the scope back to it's home position (RA ring centered, DEC
112112
// at 90, basically pointing at celestial pole) and stops all movement (including tracking).
113-
// Returns: 1 when the scope is parked.
113+
// Returns: Nothing
114114
//
115115
// -- PARK Extensions --
116116
// :hU#
117117
// Unpark Scope
118118
// This currently simply turns on tracking.
119-
// Returns: 1
119+
// Returns: Nothing
120120
//
121121
//------------------------------------------------------------------
122122
// QUIT MOVEMENT FAMILY
@@ -287,11 +287,10 @@ void handleMeadeMovement(String inCmd) {
287287
void handleMeadeHome(String inCmd) {
288288
if (inCmd[0] == 'P') { // Park
289289
mount.park();
290-
Serial.print("1");
290+
291291
}
292292
else if (inCmd[0] == 'U') { // Unpark
293293
mount.startSlewing(TRACKING);
294-
Serial.print("1");
295294
}
296295
}
297296

Software/OpenAstroTracker ASCOM/OpenAstroTracker ASCOM/Driver.vb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -795,9 +795,7 @@ Public Class Telescope
795795
TL.LogMessage("SlewToCoordinates", "RA " + RightAscension.ToString + ", Dec " + Declination.ToString)
796796
Dim strRAcmd = ":Sr" + utilities.HoursToHMS(RightAscension, ":", ":")
797797
Dim strDeccmd = utilities.DegreesToDMS(Declination, "*", ":", "")
798-
If Declination < 0 Then
799-
strDeccmd = "-" + strDeccmd
800-
Else
798+
If Declination >= 0 Then
801799
strDeccmd = "+" + strDeccmd
802800
End If
803801
strDeccmd = ":Sd" + strDeccmd

0 commit comments

Comments
 (0)