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/CartesianKinematics.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/CartesianKinematics.cpp')
| -rw-r--r-- | src/Movement/Kinematics/CartesianKinematics.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Movement/Kinematics/CartesianKinematics.cpp b/src/Movement/Kinematics/CartesianKinematics.cpp index a6a75994..5aa8a1f9 100644 --- a/src/Movement/Kinematics/CartesianKinematics.cpp +++ b/src/Movement/Kinematics/CartesianKinematics.cpp @@ -18,9 +18,9 @@ const char *CartesianKinematics::GetName(bool forStatusReport) const } // Convert Cartesian coordinates to motor coordinates -bool CartesianKinematics::CartesianToMotorSteps(const float machinePos[], const float stepsPerMm[], size_t numAxes, int32_t motorPos[]) const +bool CartesianKinematics::CartesianToMotorSteps(const float machinePos[], const float stepsPerMm[], size_t numVisibleAxes, size_t numTotalAxes, int32_t motorPos[]) const { - for (size_t axis = 0; axis < numAxes; ++axis) + for (size_t axis = 0; axis < numVisibleAxes; ++axis) { motorPos[axis] = (int32_t)roundf(machinePos[axis] * stepsPerMm[axis]); } @@ -28,10 +28,10 @@ bool CartesianKinematics::CartesianToMotorSteps(const float machinePos[], const } // Convert motor coordinates to machine coordinates. Used after homing and after individual motor moves. -void CartesianKinematics::MotorStepsToCartesian(const int32_t motorPos[], const float stepsPerMm[], size_t numDrives, float machinePos[]) const +void CartesianKinematics::MotorStepsToCartesian(const int32_t motorPos[], const float stepsPerMm[], size_t numVisibleAxes, size_t numTotalAxes, float machinePos[]) const { - // Convert all axes and the extruders - for (size_t drive = 0; drive < numDrives; ++drive) + // Convert all axes + for (size_t drive = 0; drive < numVisibleAxes; ++drive) { machinePos[drive] = motorPos[drive]/stepsPerMm[drive]; } |