|
4 | 4 | #include "Mount.hpp"
|
5 | 5 | #include "Utility.hpp"
|
6 | 6 | #include "EPROMStore.hpp"
|
7 |
| -#include "Sidereal.hpp" |
8 | 7 | #include "../Configuration_adv.hpp"
|
9 | 8 | #include "../Configuration_pins.hpp"
|
10 | 9 | #include "inc/Globals.hpp"
|
@@ -652,7 +651,7 @@ void Mount::setSpeedCalibration(float val, bool saveToStorage) {
|
652 | 651 | // The tracker simply needs to rotate at 15degrees/hour, adjusted for sidereal
|
653 | 652 | // time (i.e. the 15degrees is per 23h56m04s. 86164s/86400 = 0.99726852. 3590/3600 is the same ratio) So we only go 15 x 0.99726852 in an hour.
|
654 | 653 | #if RA_DRIVER_TYPE == DRIVER_TYPE_TMC2209_UART
|
655 |
| - _trackingSpeed = _trackingSpeedCalibration * ((_stepsPerRADegree / SET_MICROSTEPPING) * TRACKING_MICROSTEPPING) * siderealDegreesInHour / 3600.0f; |
| 654 | + _trackingSpeed = _trackingSpeedCalibration * _stepsPerRADegree * TRACKING_MICROSTEPPING * siderealDegreesInHour / (3600.0f * SET_MICROSTEPPING); |
656 | 655 | #else
|
657 | 656 | _trackingSpeed = _trackingSpeedCalibration * _stepsPerRADegree * siderealDegreesInHour / 3600.0f;
|
658 | 657 | #endif
|
@@ -1123,10 +1122,9 @@ void Mount::guidePulse(byte direction, int duration) {
|
1123 | 1122 | #if RA_STEPPER_TYPE == STEPPER_TYPE_28BYJ48
|
1124 | 1123 | float raTrackingSpeed = _stepsPerRADegree * siderealDegreesInHour / 3600.0f;
|
1125 | 1124 | #else
|
1126 |
| - float raTrackingSpeed = ((_stepsPerRADegree / SET_MICROSTEPPING) * TRACKING_MICROSTEPPING) * siderealDegreesInHour / 3600.0f; |
| 1125 | + float raTrackingSpeed = 1.0 * _stepsPerRADegree * TRACKING_MICROSTEPPING * siderealDegreesInHour / (3600.0f * SET_MICROSTEPPING); |
1127 | 1126 | #endif
|
1128 | 1127 |
|
1129 |
| - |
1130 | 1128 | // TODO: Do we need to track how many steps the steppers took and add them to the GoHome calculation?
|
1131 | 1129 | // If so, we need to remember where we were when we started the guide pulse. Then at the end,
|
1132 | 1130 | // we can calculate the difference.
|
|
0 commit comments