diff --git a/AutoPA/Software/source/autopa_v2.py b/AutoPA/Software/source/autopa_v2.py index beb5221..87068db 100644 --- a/AutoPA/Software/source/autopa_v2.py +++ b/AutoPA/Software/source/autopa_v2.py @@ -20,7 +20,7 @@ from PyQt5.QtCore import QObject, QThread, pyqtSignal # Application version -VERSION = "2.7" +VERSION = "2.8" class ElapsedTimeFormatter(logging.Formatter): def __init__(self, start_time): @@ -386,8 +386,9 @@ def parseError(self, software, input, azimuthOffset, altitudeOffset): error = [] if software == "NINA3.x": # Log file lists Az, then Alt error - error.append(self.parseNINA3deg(input[4], input[5], input[6]) - altitudeOffset) - error.append(self.parseNINA3deg(input[1], input[2], input[3]) - azimuthOffset) + # Convert degrees to arcminutes using degToArcmin() + error.append(self.degToArcmin(self.parseNINA3deg(input[4], input[5], input[6])) - altitudeOffset) + error.append(self.degToArcmin(self.parseNINA3deg(input[1], input[2], input[3])) - azimuthOffset) error.append(math.hypot(error[0], error[1])) elif software.startswith("Sharpcap"): error.append(self.degToArcmin(self.altitudeError(input[1], input[3])) - altitudeOffset) @@ -612,11 +613,11 @@ def handle_command_result(self, label, result): softwareTypes = { "NINA3.x":{ "expression": r"[\d-]*T(.*?)\|.*PolarAlignment.cs\|.*Calculated Error: Az: (-*\d{2}).*?(\d{2})' (\d{2})\", Alt: (-*\d{2}).*?(\d{2})' (\d{2})\",.*", "logpath": fr"{os.getenv('LOCALAPPDATA')}\NINA\Logs\*.log"}, -"Sharpcap3.2":{ "expression": "(?:Info:)\t(\d{2}:\d{2}:\d{2}.\d{7}).*(?:AltAzCor=)(?:Alt=)(.*)[,](?:Az=)(.*).\s(?:AltAzPole=)(?:Alt=)(.*)[,](?:Az=)(.*).[,]\s(?:AltAzOffset=).*", +"Sharpcap3.2":{ "expression": r"(?:Info:)\t(\d{2}:\d{2}:\d{2}.\d{7}).*(?:AltAzCor=)(?:Alt=)(.*)[,](?:Az=)(.*).\s(?:AltAzPole=)(?:Alt=)(.*)[,](?:Az=)(.*).[,]\s(?:AltAzOffset=).*", "logpath": fr"{os.getenv('LOCALAPPDATA')}\SharpCap\logs\*.log"}, -"Sharpcap4.x":{ "expression": "(?:Info)\W*(\d{2}:\d{2}:\d{2}.\d{6}).*(?:AltAzCor=)(?:Alt=)(.*)[,](?:Az=)(.*).\s(?:AltAzPole=)(?:Alt=)(.*)[,](?:Az=)(.*).[,]\s(?:AltAzOffset=).*", +"Sharpcap4.x":{ "expression": r"(?:Info)\W*(\d{2}:\d{2}:\d{2}.\d{6}).*(?:AltAzCor=)(?:Alt=)(.*)[,](?:Az=)(.*).\s(?:AltAzPole=)(?:Alt=)(.*)[,](?:Az=)(.*).[,]\s(?:AltAzOffset=).*", "logpath": fr"{os.getenv('LOCALAPPDATA')}\SharpCap\logs\*.log"}, -"Ekos":{ "expression": "(\d{2}:\d{2}:\d{2}.\d{3}).*(?:PAA Refresh).*(?:Corrected az:).*(?:\()(\s?-?\d\.\d{3}).*(?:alt:).*(\s?-?\d\.\d{3}).*(?:total:)", +"Ekos":{ "expression": r"(\d{2}:\d{2}:\d{2}.\d{3}).*(?:PAA Refresh).*(?:Corrected az:).*(?:\()(\s?-?\d\.\d{3}).*(?:alt:).*(\s?-?\d\.\d{3}).*(?:total:)", "logpath": f"{Path.home()}/.local/share/kstars/logs/{today}/*.txt"} } diff --git a/AutoPA/Software/source/setup.py b/AutoPA/Software/source/setup.py index 779ae66..fda78fe 100644 --- a/AutoPA/Software/source/setup.py +++ b/AutoPA/Software/source/setup.py @@ -4,9 +4,9 @@ def getTargetName(): myOS = platform.system() if myOS == 'Linux': - return "AutoPA_v2.7.0" + return "AutoPA_v2.8.0" elif myOS == 'Windows': - return "AutoPA_v2.7.0.exe" + return "AutoPA_v2.8.0.exe" base = None if sys.platform == "win32": @@ -36,7 +36,7 @@ def getTargetName(): setup( name="AutoPA", - version="2.7.0", + version="2.8.0", description="AutoPA Polar Alignment Tool", executables=[ Executable(