felix/Marlin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Scale feedrate (mm/s to deg/s) for SCARA

Browse Source
This commit is contained in:
Scott Lahteine
2018-04-03 20:59:29 -05:00
parent bc2fc86993
commit c46d47f45f
5 changed files with 145 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/planner.h
View File

@@ -126,6 +126,8 @@ typedef struct {
} block_t;
#define HAS_POSITION_FLOAT (ENABLED(LIN_ADVANCE) || ENABLED(SCARA_FEEDRATE_SCALING))
#define BLOCK_MOD(n) ((n)&(BLOCK_BUFFER_SIZE-1))
class Planner {
@@ -190,8 +192,11 @@ class Planner {
#endif
#if ENABLED(LIN_ADVANCE)
static float extruder_advance_K,
position_float[XYZE];
static float extruder_advance_K;
#endif
#if HAS_POSITION_FLOAT
static float position_float[XYZE];
#endif
#if ENABLED(SKEW_CORRECTION)
@@ -413,7 +418,7 @@ class Planner {
* millimeters - the length of the movement, if known
*/
static void _buffer_steps(const int32_t (&target)[XYZE]
#if ENABLED(LIN_ADVANCE)
#if HAS_POSITION_FLOAT
, const float (&target_float)[XYZE]
#endif
, float fr_mm_s, const uint8_t extruder, const float &millimeters=0.0