Implement Johanns method of specifying segments for delta bots in segments per second.

[clinton/Smoothieware.git] / src / modules / robot / Robot.h

diff --git a/src/modules/robot/Robot.h b/src/modules/robot/Robot.h
index f3d2ecd..e3d5087 100644 (file)
--- a/src/modules/robot/Robot.h
+++ b/src/modules/robot/Robot.h
@@ -19,14 +19,20 @@ using std::string;
 #include "libs/StepperMotor.h"
 
 
-#define default_seek_rate_checksum             47357
-#define default_feed_rate_checksum             6633
-#define mm_per_line_segment_checksum           30176
-#define mm_per_arc_segment_checksum            15470
-#define arc_correction_checksum                5074
-#define x_axis_max_speed_checksum              64935
-#define y_axis_max_speed_checksum              3752
-#define z_axis_max_speed_checksum              7849
+#define default_seek_rate_checksum             CHECKSUM("default_seek_rate")
+#define default_feed_rate_checksum             CHECKSUM("default_feed_rate")
+#define mm_per_line_segment_checksum           CHECKSUM("mm_per_line_segment")
+#define delta_segments_per_second_checksum     CHECKSUM("delta_segments_per_second")
+#define mm_per_arc_segment_checksum            CHECKSUM("mm_per_arc_segment")
+#define arc_correction_checksum                CHECKSUM("arc_correction")
+#define x_axis_max_speed_checksum              CHECKSUM("x_axis_max_speed")
+#define y_axis_max_speed_checksum              CHECKSUM("y_axis_max_speed")
+#define z_axis_max_speed_checksum              CHECKSUM("z_axis_max_speed")
+#define arm_solution_checksum                  CHECKSUM("arm_solution")
+#define cartesian_checksum                     CHECKSUM("cartesian")
+#define rotatable_cartesian_checksum           CHECKSUM("rotatable_cartesian")
+#define rostock_checksum                       CHECKSUM("rostock")
+#define delta_checksum                         CHECKSUM("delta")
 
 #define NEXT_ACTION_DEFAULT 0
 #define NEXT_ACTION_DWELL 1
@@ -57,6 +63,9 @@ class Robot : public Module {
         void on_module_loaded();
         void on_config_reload(void* argument);
         void on_gcode_received(void* argument);
+        void reset_axis_position(double position, int axis);
+
+    private:
         void execute_gcode(Gcode* gcode);
         void append_milestone( double target[], double feed_rate);
         void append_line( Gcode* gcode, double target[], double feed_rate);
@@ -73,14 +82,15 @@ class Robot : public Module {
         double last_milestone[3];                             // Last position, in millimeters
         bool inch_mode;                                       // true for inch mode, false for millimeter mode ( default )
         bool absolute_mode;                                   // true for absolute mode ( default ), false for relative mode
-        uint8_t motion_mode;                                  // Motion mode for the current received Gcode
+        int8_t motion_mode;                                   // Motion mode for the current received Gcode
         double seek_rate;                                     // Current rate for seeking moves ( mm/s )
         double feed_rate;                                     // Current rate for feeding moves ( mm/s )
         uint8_t plane_axis_0, plane_axis_1, plane_axis_2;     // Current plane ( XY, XZ, YZ )
         BaseSolution* arm_solution;                           // Selected Arm solution ( millimeters to step calculation )
         double mm_per_line_segment;                           // Setting : Used to split lines into segments
         double mm_per_arc_segment;                            // Setting : Used to split arcs into segmentrs
-        
+        double delta_segments_per_second;                     // Setting : Used to split lines into segments for delta based on speed
+
         // Number of arc generation iterations by small angle approximation before exact arc trajectory
         // correction. This parameter maybe decreased if there are issues with the accuracy of the arc
         // generations. In general, the default value is more than enough for the intended CNC applications
@@ -89,21 +99,23 @@ class Robot : public Module {
         int arc_correction;                                   // Setting : how often to rectify arc computation
         double max_speeds[3];                                 // Setting : max allowable speed in mm/m for each axis
 
-        Pin* alpha_step_pin;
-        Pin* beta_step_pin;
-        Pin* gamma_step_pin;
-        Pin* alpha_dir_pin;
-        Pin* beta_dir_pin;
-        Pin* gamma_dir_pin;
-        Pin* alpha_en_pin;
-        Pin* beta_en_pin;
-        Pin* gamma_en_pin;
- 
+    // Used by Stepper
+    public:
+        Pin alpha_step_pin;
+        Pin alpha_dir_pin;
+        Pin alpha_en_pin;
+        Pin beta_step_pin;
+        Pin beta_dir_pin;
+        Pin beta_en_pin;
+        Pin gamma_step_pin;
+        Pin gamma_dir_pin;
+        Pin gamma_en_pin;
+
         StepperMotor* alpha_stepper_motor;
         StepperMotor* beta_stepper_motor;
         StepperMotor* gamma_stepper_motor;
 
-
+        double seconds_per_minute;                            // for realtime speed change
 };
 
 #endif