Skip to content

Commit 657f9a9

Browse files
ClutchplateDudeClutchplateDude
committed
ASCOM 0.3.0.0 - Updates
- Added Slew rate support to MoveAxis
1 parent aa92dc9 commit 657f9a9

File tree

6 files changed

+47
-19
lines changed

6 files changed

+47
-19
lines changed

‎Software/OpenAstroTracker ASCOM/ASCOM Methods and Properties.xlsx

131 Bytes
Binary file not shown.

‎Software/OpenAstroTracker ASCOM/OpenAstroTracker/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
[assembly: AssemblyTitle("ASCOM OpenAstroTracker server")]
99
[assembly: AssemblyDescription("ASCOM multi-interface server for OpenAstroTracker")]
1010
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("ASCOM Initiative")]
11+
[assembly: AssemblyCompany("OpenAstroTech")]
1212
[assembly: AssemblyProduct("")]
13-
[assembly: AssemblyCopyright("Copyright © 2020, EorEquis")]
13+
[assembly: AssemblyCopyright("Copyright © 2020, OpenAstroTech")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -21,7 +21,7 @@
2121
// Build Number
2222
// Revision
2323
//
24-
[assembly: AssemblyVersion("0.2.0.0")]
25-
[assembly: AssemblyFileVersion("0.2.0.0")]
24+
[assembly: AssemblyVersion("0.3.0.0")]
25+
[assembly: AssemblyFileVersion("0.3.0.0")]
2626

2727
[assembly: ComVisibleAttribute(false)]

‎Software/OpenAstroTracker ASCOM/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OpenAstroTracker ASCOM driver 0.2.0.0b : 2020-04-23
1+
OpenAstroTracker ASCOM driver 0.3.0.0 : 2020-10-21
22

33
This driver is still in a great deal of flux. Capacitor levels of flux. Use at your own risk!
44

@@ -10,12 +10,13 @@ This driver is still in a great deal of flux. Capacitor levels of flux. Use at
1010
* 0.1.4.1b 2020-04-18 : BUGFIX : Driver not correctly handling return value from Halt
1111
* 0.1.4.2b 2020-04-20 : CHANGE : Driver uses :CM LX200 Protocol command to sync
1212
* 0.2.0.0b 2020-04-20 : CHANGE : Local Server version of driver, first release
13+
* 0.3.0.0b 2020-04-20 : CHANGE : Added move with slewrate support
1314
1415
* Arduino information
15-
* Tested on Arduino Uno. No other variants of Arduino have been tested.
16-
* Currently built for Version V1.6.32 and above of the Arduino Code (As of 2020-04-23)
17-
* Uncomment #define SUPPORT_SERIAL_CONTROL in Globals.h
18-
* Leave #define DEBUG_MODE in Globals.h commented.
16+
* Tested on Arduino Mega. No other variants of Arduino have been tested.
17+
* Currently built for Version V1.8.42 and above of the Arduino Code (As of 2020-10-21)
18+
* Uncomment #define SUPPORT_SERIAL_CONTROL in Configuration.hpp
19+
* Leave #define DEBUG_MODE in Configuration_adv.hpp commented out.
1920

2021
* Supported ASCOM Properties and Methods
2122
* Documented in included spreadsheet
@@ -28,10 +29,9 @@ This driver is still in a great deal of flux. Capacitor levels of flux. Use at
2829
with some gadget you've printed and added, or results in an untennable position for your camera, or any number of other "Bad Things (tm)". So...keep track of your own towel.
2930

3031
* Known Issues
31-
* All known current issues are probably documented at https://github.com/ClutchplateDude/OpenAstroTracker/issues
32+
* All known current issues are probably documented at https://github.com/OpenAstroTech/OpenAstroTracker/issues
3233

3334
* Work in Progress / Coming soon
34-
* A simple PC Control application is being developed.
3535
* Implementation of AltAz methods and properties
3636
* Ability to set home position of mount via ASCOM
3737

‎Software/OpenAstroTracker ASCOM/TelescopeDriver/Driver.cs

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,7 @@ public bool IsPulseGuiding {
507507

508508

509509
private bool _trackingPriorToMove;
510+
private double _ratePriorToMove;
510511
public void MoveAxis(TelescopeAxes Axis, double Rate) {
511512
if (Axis == TelescopeAxes.axisTertiary) {
512513
throw new ASCOM.NotImplementedException("MoveAxis Tertiary Not Supported.");
@@ -521,21 +522,41 @@ public void MoveAxis(TelescopeAxes Axis, double Rate) {
521522
throw new ASCOM.InvalidValueException("Invalid speed for Axis");
522523
}
523524

524-
525525
var sAxis = Enum.GetName(typeof(TelescopeAxes), Axis);
526526
string cmd = "Q";
527527

528528
LogMessage("MoveAxis", $"{sAxis} Rate {Rate}");
529529

530-
531530
if (Rate == 0) {
532531
// if at some point we support multiple tracking rates this should set
533532
// the value back to the previous rate...
534533
CommandBlind($":{cmd}");
534+
// Restore slewing rate
535+
CommandBlind($":RS");
535536
Tracking = _trackingPriorToMove;
536537
}
537538
else {
538539
_trackingPriorToMove = Tracking;
540+
//_ratePriorToMove = Rate;
541+
if (Math.Abs(Rate) == 10)
542+
{
543+
cmd = "G";
544+
}
545+
else if (Math.Abs(Rate) == 20)
546+
{
547+
cmd = "C";
548+
}
549+
else if (Math.Abs(Rate) == 30)
550+
{
551+
cmd = "M";
552+
}
553+
else
554+
{
555+
cmd = "S";
556+
}
557+
558+
CommandBlind($":R{cmd}");
559+
539560
switch (Axis)
540561
{
541562
case TelescopeAxes.axisPrimary:
@@ -545,6 +566,7 @@ public void MoveAxis(TelescopeAxes Axis, double Rate) {
545566
cmd = Rate > 0 ? "Mn" : "Ms";
546567
break;
547568
}
569+
548570
CommandBlind($":{cmd}");
549571
}
550572
}

‎Software/OpenAstroTracker ASCOM/TelescopeDriver/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
[assembly: AssemblyTitle("ASCOM.OpenAstroTracker.Telescope")]
1111
[assembly: AssemblyDescription("ASCOM Telescope driver for OpenAstroTracker")]
1212
[assembly: AssemblyConfiguration("")]
13-
[assembly: AssemblyCompany("The ASCOM Initiative")]
13+
[assembly: AssemblyCompany("OpenAstroTech")]
1414
[assembly: AssemblyProduct("OpenAstroTracker")]
15-
[assembly: AssemblyCopyright("Copyright © 2020 The ASCOM Initiative")]
15+
[assembly: AssemblyCopyright("Copyright © 2020 OpenAstroTech")]
1616
[assembly: AssemblyTrademark("")]
1717
[assembly: AssemblyCulture("")]
1818

@@ -35,5 +35,5 @@
3535
// by using the '*' as shown below:
3636
//
3737
// TODO - Set your driver's version here
38-
[assembly: AssemblyVersion("6.4.0.0")]
39-
[assembly: AssemblyFileVersion("6.4.0.0")]
38+
[assembly: AssemblyVersion("6.5.0.0")]
39+
[assembly: AssemblyFileVersion("6.5.0.0")]

‎Software/OpenAstroTracker ASCOM/TelescopeDriver/Rates.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,18 @@ internal AxisRates(TelescopeAxes axis)
9797
case TelescopeAxes.axisPrimary:
9898
// Example: m_Rates = new Rate[] { new Rate(10.5, 30.2), new Rate(54.0, 43.6) }
9999
rates = new Rate[] {
100-
new Rate(10d, 10d)
100+
new Rate(10d, 10d),
101+
new Rate(20d, 20d),
102+
new Rate(30d, 30d),
103+
new Rate(40d, 40d)
101104
};
102105
break;
103106
case TelescopeAxes.axisSecondary:
104107
rates = new Rate[] {
105-
new Rate(10d, 10d)
108+
new Rate(10d, 10d),
109+
new Rate(20d, 20d),
110+
new Rate(30d, 30d),
111+
new Rate(40d, 40d)
106112
};
107113
break;
108114
case TelescopeAxes.axisTertiary:

0 commit comments

Comments
 (0)