MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adjust formatting in Planner

Browse Source
This commit is contained in:
Scott Lahteine 2016-12-03 22:03:46 -06:00
parent 200cf3e9f9
commit 0dfe95eaba
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/planner.cpp
View File

@ -78,8 +78,8 @@ Planner planner;
* A ring buffer of moves described in steps * A ring buffer of moves described in steps
*/ */
block_t Planner::block_buffer[BLOCK_BUFFER_SIZE]; block_t Planner::block_buffer[BLOCK_BUFFER_SIZE];
volatile uint8_t Planner::block_buffer_head = 0; // Index of the next block to be pushed volatile uint8_t Planner::block_buffer_head = 0, // Index of the next block to be pushed
volatile uint8_t Planner::block_buffer_tail = 0; Planner::block_buffer_tail = 0;
float Planner::max_feedrate_mm_s[NUM_AXIS], // Max speeds in mm per second float Planner::max_feedrate_mm_s[NUM_AXIS], // Max speeds in mm per second
Planner::axis_steps_per_mm[NUM_AXIS], Planner::axis_steps_per_mm[NUM_AXIS],
@ -1375,7 +1375,6 @@ void Planner::set_position_mm_kinematic(const float position[NUM_AXIS]) {
#endif #endif
} }
/** /**
* Sync from the stepper positions. (e.g., after an interrupted move) * Sync from the stepper positions. (e.g., after an interrupted move)
*/ */

16
Marlin/planner.h
View File

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