whitespace changes...

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

diff --git a/src/modules/robot/Block.h b/src/modules/robot/Block.h
index 68b47a7..6f5b4fe 100644 (file)
--- a/src/modules/robot/Block.h
+++ b/src/modules/robot/Block.h
@@ -42,23 +42,23 @@ class Block {
 
         std::vector<Gcode> gcodes;
 
-        std::array<int, k_max_actuators>   steps; // 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 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;         // Number of steps to add to the speed for each acceleration tick
-        float          acceleration;       // the acceleratoin for this block
-        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
+        std::array<uint32_t, k_max_actuators> steps; // Number of steps for each axis for this block
+        uint32_t steps_event_count;  // Steps for the longest axis
+        uint32_t 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;         // Number of steps to add to the speed for each acceleration tick
+        float acceleration;       // the acceleratoin for this block
+        uint32_t initial_rate;       // Initial speed in steps per second
+        uint32_t final_rate;         // Final speed in steps per second
+        uint32_t accelerate_until;   // Stop accelerating after this number of steps
+        uint32_t decelerate_after;   // Start decelerating after this number of steps
 
         float max_entry_speed;
 
-        short times_taken;    // A block can be "taken" by any number of modules, and the next block is not moved to until all the modules have "released" it. This value serves as a tracker.
+        int16_t times_taken;    // A block can be "taken" by any number of modules, and the next block is not moved to until all the modules have "released" it. This value serves as a tracker.
 
         std::bitset<k_max_actuators> direction_bits;     // Direction for each axis in bit form, relative to the direction port's mask
         struct {