Skip to content

Commit 914a7f7

Browse files
author
Cameron Tetford
committed
AutoPA Update
1 parent dc9f211 commit 914a7f7

File tree

3 files changed

+3
-121
lines changed

3 files changed

+3
-121
lines changed

Software/Addons/AutoPA/altaz.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import re
55

66
def altaz(axis, errorvalue, serialport):
7-
if not re.match(r"^[-+]?([0-9]*\.[0-9]+|[0-9]+)$", errorvalue):
7+
if not re.match(r"^[-+]?([0-9]*\.[0-9]+|[0-9]+)$", str(errorvalue)):
88
print("Error value not valid")
99
return
1010

@@ -20,9 +20,7 @@ def altaz(axis, errorvalue, serialport):
2020
return
2121

2222
#print(command) #For debugging
23-
2423
ser = serial.Serial(serialport, 57600, timeout = 1)
25-
#commandToSend = ':Sr16:00:00#:MS#'
2624
ser.write(str(commandToSend).encode())
2725
return
2826

Software/Addons/AutoPA/polaralign.py

Lines changed: 0 additions & 116 deletions
This file was deleted.

Software/Addons/AutoPA/polaralign_calibration.py renamed to Software/Addons/AutoPA/polaralign_manualcalibration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def polarcalibrate(mylat, mylong, myelev):
1111
#iers.conf.auto_max_age = None
1212

1313
#Create location object based on lat/long/elev
14-
observing_location = EarthLocation(lat=mylat*u.deg, lon=mylong*u.deg, height=177*u.m)
14+
observing_location = EarthLocation(lat=mylat*u.deg, lon=mylong*u.deg, height=myelev*u.m)
1515

1616
p1RA = input("Enter first RA value in 00h00m00.0s format: ")
1717
p1DEC = input("Enter first DEC value in 00d00m00.0s format: ")
@@ -52,6 +52,6 @@ def polarcalibrate(mylat, mylong, myelev):
5252
mylong = float(sys.argv[2])
5353

5454
#Elevation in meters
55-
myelev = sys.argv[3]
55+
myelev = float(sys.argv[3])
5656

5757
polarcalibrate(mylat, mylong, myelev)

0 commit comments

Comments
 (0)