Allow TABS in config

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

diff --git a/src/modules/robot/Block.h b/src/modules/robot/Block.h
index ce7b894..63dd144 100644 (file)
--- a/src/modules/robot/Block.h
+++ b/src/modules/robot/Block.h
@@ -9,14 +9,13 @@
 #define BLOCK_H
 #include "libs/Module.h"
 #include "libs/Kernel.h"
+#include "Gcode.h"
+
 using namespace std;
 #include <string>
 #include <vector>
 
-#include "../communication/utils/Gcode.h"
-#include "Planner.h"
-class Planner;
-class Conveyor;
+
 
 float max_allowable_speed( float acceleration, float target_velocity, float distance);
 
@@ -52,14 +51,14 @@ class Block {
 
         unsigned int   steps[3];           // Number of steps for each axis for this block
         unsigned int   steps_event_count;  // Steps for the longest axis
-        unsigned int   nominal_rate;       // Nominal rate in steps per minute
-        float          nominal_speed;      // Nominal speed in mm per minute
+        unsigned int   nominal_rate;       // Nominal rate in steps per second
+        float          nominal_speed;      // Nominal speed in mm per second
         float          millimeters;        // Distance for this move
         float          entry_speed;
         float          exit_speed;
         float          rate_delta;         // Nomber of steps to add to the speed for each acceleration tick
-        unsigned int   initial_rate;       // Initial speed in steps per minute
-        unsigned int   final_rate;         // Final speed in steps per minute
+        unsigned int   initial_rate;       // Initial speed in steps per second
+        unsigned int   final_rate;         // Final speed in steps per second
         unsigned int   accelerate_until;   // Stop accelerating after this number of steps
         unsigned int   decelerate_after;   // Start decelerating after this number of steps
         unsigned int   direction_bits;     // Direction for each axis in bit form, relative to the direction port's mask