X-Git-Url: https://git.hcoop.net/clinton/Smoothieware.git/blobdiff_plain/459052f9d0a632e28b6f84a4f8ee605dfcdc95c5..78d0e16a0cac2aeb3a4c5c71832ce441e4377fcd:/src/modules/robot/arm_solutions/RotatableCartesianSolution.cpp

diff --git a/src/modules/robot/arm_solutions/RotatableCartesianSolution.cpp b/src/modules/robot/arm_solutions/RotatableCartesianSolution.cpp
dissimilarity index 90%
index 3bc24d71..8b20f23a 100644
--- a/src/modules/robot/arm_solutions/RotatableCartesianSolution.cpp
+++ b/src/modules/robot/arm_solutions/RotatableCartesianSolution.cpp
@@ -1,53 +1,25 @@
-#include "RotatableCartesianSolution.h"
-#include <math.h>
-
-#define PIOVER180       0.01745329251994329576923690768489
-
-RotatableCartesianSolution::RotatableCartesianSolution(Config* passed_config) : config(passed_config){
-    this->alpha_steps_per_mm = this->config->value(alpha_steps_per_mm_checksum)->as_number();
-    this->beta_steps_per_mm  = this->config->value( beta_steps_per_mm_checksum)->as_number();
-    this->gamma_steps_per_mm = this->config->value(gamma_steps_per_mm_checksum)->as_number();
-
-    double alpha_angle  = PIOVER180 * this->config->value(alpha_angle_checksum)->by_default(0.0)->as_number();
-    this->sin_alpha     = sin(alpha_angle);
-    this->cos_alpha     = cos(alpha_angle);
-}
-
-void RotatableCartesianSolution::millimeters_to_steps( double millimeters[], int steps[] ){
-    double rotated[3];
-    rotate( millimeters, rotated, this->sin_alpha, this->cos_alpha );
-
-    steps[ALPHA_STEPPER] = lround( rotated[X_AXIS] * this->alpha_steps_per_mm );
-    steps[BETA_STEPPER ] = lround( rotated[Y_AXIS] * this->beta_steps_per_mm );
-    steps[GAMMA_STEPPER] = lround( rotated[Z_AXIS] * this->gamma_steps_per_mm );
-}
-
-void RotatableCartesianSolution::steps_to_millimeters( int steps[], double millimeters[] ){
-    double rotated[3];
-
-    rotated[ALPHA_STEPPER] = steps[X_AXIS] / this->alpha_steps_per_mm;
-    rotated[BETA_STEPPER ] = steps[Y_AXIS] / this->beta_steps_per_mm;
-    rotated[GAMMA_STEPPER] = steps[Z_AXIS] / this->gamma_steps_per_mm;
-
-    rotate( rotated, millimeters, - this->sin_alpha, this->cos_alpha );
-}
-
-void RotatableCartesianSolution::rotate(double in[], double out[], double sin, double cos ){
-    out[X_AXIS] = cos * in[X_AXIS] - sin * in[Y_AXIS];
-    out[Y_AXIS] = sin * in[X_AXIS] + cos * in[Y_AXIS];
-    out[Z_AXIS] = in[Z_AXIS];
-}
-
-void RotatableCartesianSolution::set_steps_per_millimeter( double steps[] )
-{
-    this->alpha_steps_per_mm = steps[0];
-    this->beta_steps_per_mm  = steps[1];
-    this->gamma_steps_per_mm = steps[2];
-}
-
-void RotatableCartesianSolution::get_steps_per_millimeter( double steps[] )
-{
-    steps[0] = this->alpha_steps_per_mm;
-    steps[1] = this->beta_steps_per_mm;
-    steps[2] = this->gamma_steps_per_mm;
-}
+#include "RotatableCartesianSolution.h"
+#include <math.h>
+
+// degrees * (pi / 180) = radians
+#define DEG2RAD       0.01745329251994329576923690768489
+
+RotatableCartesianSolution::RotatableCartesianSolution(Config* config) {
+    float alpha_angle  = config->value(alpha_angle_checksum)->by_default(0.0f)->as_number() * DEG2RAD;
+    sin_alpha          = sinf(alpha_angle);
+    cos_alpha          = cosf(alpha_angle);
+}
+
+void RotatableCartesianSolution::cartesian_to_actuator( float millimeters[], float steps[] ){
+    rotate( millimeters, steps, sin_alpha, cos_alpha );
+}
+
+void RotatableCartesianSolution::actuator_to_cartesian( float steps[], float millimeters[] ){
+    rotate( steps, millimeters, - sin_alpha, cos_alpha );
+}
+
+void RotatableCartesianSolution::rotate(float in[], float out[], float sin, float cos ){
+    out[X_AXIS] = cos * in[X_AXIS] - sin * in[Y_AXIS];
+    out[Y_AXIS] = sin * in[X_AXIS] + cos * in[Y_AXIS];
+    out[Z_AXIS] = in[Z_AXIS];
+}