Browse Source

Adjust formatting in Planner

Scott Lahteine 8 years ago
parent
commit
0dfe95eaba
2 changed files with 10 additions and 11 deletions
  1. 2
    3
      Marlin/planner.cpp
  2. 8
    8
      Marlin/planner.h

+ 2
- 3
Marlin/planner.cpp View File

78
  * A ring buffer of moves described in steps
78
  * A ring buffer of moves described in steps
79
  */
79
  */
80
 block_t Planner::block_buffer[BLOCK_BUFFER_SIZE];
80
 block_t Planner::block_buffer[BLOCK_BUFFER_SIZE];
81
-volatile uint8_t Planner::block_buffer_head = 0;           // Index of the next block to be pushed
82
-volatile uint8_t Planner::block_buffer_tail = 0;
81
+volatile uint8_t Planner::block_buffer_head = 0,           // Index of the next block to be pushed
82
+                 Planner::block_buffer_tail = 0;
83
 
83
 
84
 float Planner::max_feedrate_mm_s[NUM_AXIS], // Max speeds in mm per second
84
 float Planner::max_feedrate_mm_s[NUM_AXIS], // Max speeds in mm per second
85
       Planner::axis_steps_per_mm[NUM_AXIS],
85
       Planner::axis_steps_per_mm[NUM_AXIS],
1375
   #endif
1375
   #endif
1376
 }
1376
 }
1377
 
1377
 
1378
-
1379
 /**
1378
 /**
1380
  * Sync from the stepper positions. (e.g., after an interrupted move)
1379
  * Sync from the stepper positions. (e.g., after an interrupted move)
1381
  */
1380
  */

+ 8
- 8
Marlin/planner.h View File

140
      * A ring buffer of moves described in steps
140
      * A ring buffer of moves described in steps
141
      */
141
      */
142
     static block_t block_buffer[BLOCK_BUFFER_SIZE];
142
     static block_t block_buffer[BLOCK_BUFFER_SIZE];
143
-    static volatile uint8_t block_buffer_head;           // Index of the next block to be pushed
144
-    static volatile uint8_t block_buffer_tail;
143
+    static volatile uint8_t block_buffer_head,  // Index of the next block to be pushed
144
+                            block_buffer_tail;
145
 
145
 
146
     static float max_feedrate_mm_s[NUM_AXIS]; // Max speeds in mm per second
146
     static float max_feedrate_mm_s[NUM_AXIS]; // Max speeds in mm per second
147
     static float axis_steps_per_mm[NUM_AXIS];
147
     static float axis_steps_per_mm[NUM_AXIS];
150
     static unsigned long max_acceleration_mm_per_s2[NUM_AXIS]; // Use M201 to override by software
150
     static unsigned long max_acceleration_mm_per_s2[NUM_AXIS]; // Use M201 to override by software
151
 
151
 
152
     static millis_t min_segment_time;
152
     static millis_t min_segment_time;
153
-    static float min_feedrate_mm_s;
154
-    static float acceleration;         // Normal acceleration mm/s^2  DEFAULT ACCELERATION for all printing moves. M204 SXXXX
155
-    static float retract_acceleration; // Retract acceleration mm/s^2 filament pull-back and push-forward while standing still in the other axes M204 TXXXX
156
-    static float travel_acceleration;  // Travel acceleration mm/s^2  DEFAULT ACCELERATION for all NON printing moves. M204 MXXXX
157
-    static float max_jerk[XYZE];       // The largest speed change requiring no acceleration
158
-    static float min_travel_feedrate_mm_s;
153
+    static float min_feedrate_mm_s,
154
+                 acceleration,         // Normal acceleration mm/s^2  DEFAULT ACCELERATION for all printing moves. M204 SXXXX
155
+                 retract_acceleration, // Retract acceleration mm/s^2 filament pull-back and push-forward while standing still in the other axes M204 TXXXX
156
+                 travel_acceleration,  // Travel acceleration mm/s^2  DEFAULT ACCELERATION for all NON printing moves. M204 MXXXX
157
+                 max_jerk[XYZE],       // The largest speed change requiring no acceleration
158
+                 min_travel_feedrate_mm_s;
159
 
159
 
160
     #if HAS_ABL
160
     #if HAS_ABL
161
       static bool abl_enabled;            // Flag that bed leveling is enabled
161
       static bool abl_enabled;            // Flag that bed leveling is enabled

Loading…
Cancel
Save