diff options
| author | David Crocker <dcrocker@eschertech.com> | 2017-06-11 00:19:50 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2017-06-11 00:23:47 +0300 |
| commit | 310b7c0e1ae92d65421276c3779efeddfb6977ff (patch) | |
| tree | 56afba8162017646c4f1a47b8da0512482c7f336 /src/Movement/Kinematics/CoreXYKinematics.cpp | |
| parent | d026b0e4d2a7d5fda771e843cfca12e0370440d7 (diff) | |
Version 1.19beta6
Refactored temperatyure sensor code
Refactored fan control code
Support invisible axes (M584 P parameter)
Supprt user-defined virtual heaters
Support heater names
Support proportional thermostatic fan control
Fix G10 retraction command
Removed delta probe code
Diffstat (limited to 'src/Movement/Kinematics/CoreXYKinematics.cpp')
| -rw-r--r-- | src/Movement/Kinematics/CoreXYKinematics.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Movement/Kinematics/CoreXYKinematics.cpp b/src/Movement/Kinematics/CoreXYKinematics.cpp index 583b370d..55258509 100644 --- a/src/Movement/Kinematics/CoreXYKinematics.cpp +++ b/src/Movement/Kinematics/CoreXYKinematics.cpp @@ -18,7 +18,7 @@ const char *CoreXYKinematics::GetName(bool forStatusReport) const } // Convert motor coordinates to machine coordinates. Used after homing and after individual motor moves. -void CoreXYKinematics::MotorStepsToCartesian(const int32_t motorPos[], const float stepsPerMm[], size_t numDrives, float machinePos[]) const +void CoreXYKinematics::MotorStepsToCartesian(const int32_t motorPos[], const float stepsPerMm[], size_t numVisibleAxes, size_t numTotalAxes, float machinePos[]) const { // Convert the axes machinePos[X_AXIS] = ((motorPos[X_AXIS] * stepsPerMm[Y_AXIS]) - (motorPos[Y_AXIS] * stepsPerMm[X_AXIS])) @@ -27,8 +27,8 @@ void CoreXYKinematics::MotorStepsToCartesian(const int32_t motorPos[], const flo /(2 * axisFactors[Y_AXIS] * stepsPerMm[X_AXIS] * stepsPerMm[Y_AXIS]); machinePos[Z_AXIS] = motorPos[Z_AXIS]/stepsPerMm[Z_AXIS]; - // Convert any additional axes and the extruders - for (size_t drive = MIN_AXES; drive < numDrives; ++drive) + // Convert any additional axes + for (size_t drive = XYZ_AXES; drive < numVisibleAxes; ++drive) { machinePos[drive] = motorPos[drive]/stepsPerMm[drive]; } |