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

Merge pull request #4045 from thinkyhead/rc_max_feedrate_is_mm_s

Browse Source 
Fix feedrate in gcode_T (max_feedrate is mm/s)
This commit is contained in:
Scott Lahteine 2016-06-16 16:23:22 -07:00 committed by GitHub
commit c42b1364b2
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin_main.cpp
View File

@ -6633,11 +6633,13 @@ inline void gcode_T(uint8_t tmp_extruder) {
if (next_feedrate > 0.0) stored_feedrate = feedrate = next_feedrate; if (next_feedrate > 0.0) stored_feedrate = feedrate = next_feedrate;
} }
else { else {
feedrate =
#ifdef XY_TRAVEL_SPEED #ifdef XY_TRAVEL_SPEED
feedrate = XY_TRAVEL_SPEED; XY_TRAVEL_SPEED
#else #else
feedrate = min(planner.max_feedrate[X_AXIS], planner.max_feedrate[Y_AXIS]); min(planner.max_feedrate[X_AXIS], planner.max_feedrate[Y_AXIS]) * 60
#endif #endif
;
} }
if (tmp_extruder != active_extruder) { if (tmp_extruder != active_extruder) {

2
Marlin/planner.cpp
View File

@ -80,7 +80,7 @@ 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; volatile uint8_t Planner::block_buffer_tail = 0;
float Planner::max_feedrate[NUM_AXIS]; // Max speeds in mm per minute float Planner::max_feedrate[NUM_AXIS]; // Max speeds in mm per second
float Planner::axis_steps_per_mm[NUM_AXIS]; float Planner::axis_steps_per_mm[NUM_AXIS];
unsigned long Planner::max_acceleration_steps_per_s2[NUM_AXIS]; unsigned long Planner::max_acceleration_steps_per_s2[NUM_AXIS];
unsigned long Planner::max_acceleration_mm_per_s2[NUM_AXIS]; // Use M201 to override by software unsigned long Planner::max_acceleration_mm_per_s2[NUM_AXIS]; // Use M201 to override by software

2
Marlin/planner.h
View File

@ -115,7 +115,7 @@ class Planner {
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; static volatile uint8_t block_buffer_tail;
static float max_feedrate[NUM_AXIS]; // Max speeds in mm per minute static float max_feedrate[NUM_AXIS]; // Max speeds in mm per second
static float axis_steps_per_mm[NUM_AXIS]; static float axis_steps_per_mm[NUM_AXIS];
static unsigned long max_acceleration_steps_per_s2[NUM_AXIS]; static unsigned long max_acceleration_steps_per_s2[NUM_AXIS];
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