Skip to content

Commit de77c83

Browse files
OATControl and ASCOM 7 fixes (#59)
* V6.6.6.9 Updates Fixed some bugs related to input formats and timeouts. Ran Conform for ASCOM 7. Added TRK stepper display. * V6.6.7.1 ASCOM Driver Updates * Fixed incorrect merge * V1.1.8.0 Updates - Made Autohoming from connection screen use the same settings as the homing commands from the main UI and Settings dialog.
1 parent f31e83f commit de77c83

File tree

4 files changed

+48
-38
lines changed

4 files changed

+48
-38
lines changed

OATControl/OATControl Setup.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "OATControl"
5-
#define MyAppVersion "1.1.7.0"
5+
#define MyAppVersion "1.1.8.0"
66
#define MyAppPublisher "OpenAstroTech"
77
#define MyAppURL "https://wiki.openastrotech.com/"
88
#define MyAppExeName "OATControl.exe"

OATControl/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[assembly: AssemblyConfiguration("")]
1313
[assembly: AssemblyCompany("")]
1414
[assembly: AssemblyProduct("OATControl")]
15-
[assembly: AssemblyCopyright("Copyright © 2019-2024 by OpenAstroTech")]
15+
[assembly: AssemblyCopyright("Copyright © 2019-2025 by OpenAstroTech")]
1616
[assembly: AssemblyTrademark("")]
1717
[assembly: AssemblyCulture("")]
1818

@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.1.7.0")]
55-
[assembly: AssemblyFileVersion("1.1.7.0")]
54+
[assembly: AssemblyVersion("1.1.8.0")]
55+
[assembly: AssemblyFileVersion("1.1.8.0")]

OATControl/Readme.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Revision History
22
----------------
33

4+
OATControl V1.1.8.0 7 Mar 2025
5+
- Made Autohoming from connection screen use the same settings as the homing
6+
commands from the main UI and Settings dialog.
7+
48
OATControl V1.1.7.0 28 Sept 2024
59
- Removed OAT Simulation code for standalone tool.
610
- Checklist title can be changed and the list can be edited directly from

OATControl/ViewModels/MountVM.cs

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -680,13 +680,15 @@ public void OnAutoHomeRA()
680680
{
681681
string dir = AutoHomeRaDirection == "East" ? "R" : "L";
682682
string dist = AutoHomeRaDistance.ToString("0");
683+
Log.WriteLine($"MOUNT: Sending Autohome command MHR{dir} command in direction {AutoHomeRaDirection} for {AutoHomeRaDistance} degrees");
683684
_oatMount.SendCommand($":MHR{dir}{dist}#,n", (a) => { });
684685
}
685686

686687
public void OnAutoHomeDEC()
687688
{
688689
string dir = AutoHomeDecDirection == "South" ? "D" : "U";
689690
string dist = AutoHomeDecDistance.ToString("0");
691+
Log.WriteLine($"MOUNT: Sending Autohome command MHD{dir} command in direction {AutoHomeDecDirection} for {AutoHomeDecDistance} degrees");
690692
_oatMount.SendCommand($":MHD{dir}{dist}#,n", (a) => { });
691693
}
692694

@@ -2623,9 +2625,11 @@ private async Task<bool> ChooseTelescope()
26232625
Log.WriteLine("MOUNT: RA Auto Home starting");
26242626
var statuses = new List<string>();
26252627
var doneEvent = new AsyncAutoResetEvent();
2626-
// The MHRR command actually returns 0 or 1, but we ignore it, so that we can monitor progress
2627-
Log.WriteLine("MOUNT: Sending MHRR command....");
2628-
_oatMount.SendCommand($":MHRR#", (a) => { doneEvent.Set(); });
2628+
// The MHRR/L command actually returns 0 or 1, but we ignore it, so that we can monitor progress
2629+
string dir = AutoHomeRaDirection == "East" ? "R" : "L";
2630+
string dist = AutoHomeRaDistance.ToString("0");
2631+
Log.WriteLine($"MOUNT: Sending Autohome command MHR{dir} command in direction {AutoHomeRaDirection} for {AutoHomeRaDistance} degrees");
2632+
_oatMount.SendCommand($":MHR{dir}{dist}#,n", (a) => { doneEvent.Set(); });
26292633
await doneEvent.WaitAsync();
26302634

26312635
Log.WriteLine("MOUNT: Waiting for homing to end....");
@@ -2657,9 +2661,11 @@ private async Task<bool> ChooseTelescope()
26572661
Log.WriteLine("MOUNT: DEC Auto Home starting");
26582662
var statuses = new List<string>();
26592663
var doneEvent = new AsyncAutoResetEvent();
2660-
// The MHDU command actually returns 0 or 1, but we ignore it, so that we can monitor progress
2661-
Log.WriteLine("MOUNT: Sending MHDU command");
2662-
_oatMount.SendCommand($":MHDU#", (a) => { doneEvent.Set(); });
2664+
// The MHDU/D command actually returns 0 or 1, but we ignore it, so that we can monitor progress
2665+
string dir = AutoHomeDecDirection == "South" ? "D" : "U";
2666+
string dist = AutoHomeDecDistance.ToString("0");
2667+
Log.WriteLine($"MOUNT: Sending Autohome command MHD{dir} command in {AutoHomeDecDirection} for {AutoHomeDecDistance} degrees");
2668+
_oatMount.SendCommand($":MHD{dir}{dist}#,n", (a) => { doneEvent.Set(); });
26632669
await doneEvent.WaitAsync();
26642670
Log.WriteLine("MOUNT: Waiting for homing to end....");
26652671

@@ -4118,37 +4124,37 @@ public static string CoordToString(double dpos, CoordSeparators sep = CoordSepar
41184124
switch (sep)
41194125
{
41204126
case CoordSeparators.NoSeparators:
4121-
{
4122-
var ra = new DayTime(pos);
4123-
int hours, mins, secs;
4124-
ra.GetTime(out hours, out mins, out secs);
4125-
return string.Format("{0} {1} {2}", hours, mins, secs);
4126-
}
4127+
{
4128+
var ra = new DayTime(pos);
4129+
int hours, mins, secs;
4130+
ra.GetTime(out hours, out mins, out secs);
4131+
return string.Format("{0} {1} {2}", hours, mins, secs);
4132+
}
41274133
case CoordSeparators.Colons:
4128-
{
4129-
var ra = new DayTime(pos);
4130-
int hours, mins, secs;
4131-
ra.GetTime(out hours, out mins, out secs);
4132-
return string.Format("{0:00}:{1:00}:{2:00}", hours, mins, secs);
4133-
}
4134+
{
4135+
var ra = new DayTime(pos);
4136+
int hours, mins, secs;
4137+
ra.GetTime(out hours, out mins, out secs);
4138+
return string.Format("{0:00}:{1:00}:{2:00}", hours, mins, secs);
4139+
}
41344140
case CoordSeparators.RaSeparators:
4135-
{
4136-
var ra = new DayTime(pos);
4137-
int hours, mins, secs;
4138-
ra.GetTime(out hours, out mins, out secs);
4139-
int absHours = Math.Abs(hours);
4140-
string sign = ra.TotalSeconds < 0 ? "-" : "";
4141-
return string.Format($"{sign}{absHours:00}h {mins:00}m {secs:00}s");
4142-
}
4141+
{
4142+
var ra = new DayTime(pos);
4143+
int hours, mins, secs;
4144+
ra.GetTime(out hours, out mins, out secs);
4145+
int absHours = Math.Abs(hours);
4146+
string sign = ra.TotalSeconds < 0 ? "-" : "";
4147+
return string.Format($"{sign}{absHours:00}h {mins:00}m {secs:00}s");
4148+
}
41434149
case CoordSeparators.DecSeparators:
4144-
{
4145-
var dec = new Declination(pos);
4146-
int degrees, mins, secs;
4147-
dec.GetTime(out degrees, out mins, out secs);
4148-
int absDegrees = Math.Abs(degrees);
4149-
string sign = dec.TotalSeconds < 0 ? "-" : "";
4150-
return string.Format($"{sign}{absDegrees:00}° {mins:00}\" {secs:00}'");
4151-
}
4150+
{
4151+
var dec = new Declination(pos);
4152+
int degrees, mins, secs;
4153+
dec.GetTime(out degrees, out mins, out secs);
4154+
int absDegrees = Math.Abs(degrees);
4155+
string sign = dec.TotalSeconds < 0 ? "-" : "";
4156+
return string.Format($"{sign}{absDegrees:00}° {mins:00}\" {secs:00}'");
4157+
}
41524158
}
41534159
return "what";
41544160
}

0 commit comments

Comments
 (0)