CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch some planner compile errors

Browse Source
This commit is contained in:
Scott Lahteine 2016-12-07 02:26:24 -06:00
parent 4783a59249
commit 01e5d46ea7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/planner.h
View File

@ -348,7 +348,7 @@ class Planner {
static void set_position_mm(const AxisEnum axis, const float &v); static void set_position_mm(const AxisEnum axis, const float &v);
static FORCE_INLINE void set_z_position_mm(const float &z) { set_position_mm(Z_AXIS, z); } static FORCE_INLINE void set_z_position_mm(const float &z) { set_position_mm(Z_AXIS, z); }
static FORCE_INLINE void set_e_position_mm(const float &e) { static FORCE_INLINE void set_e_position_mm(const float &e) {
set_position_mm(E_AXIS set_position_mm((AxisEnum)E_AXIS
#if ENABLED(DISTINCT_E_FACTORS) #if ENABLED(DISTINCT_E_FACTORS)
+ active_extruder + active_extruder
#endif #endif

2
Marlin/ultralcd.cpp
View File

@ -1874,7 +1874,7 @@ void kill_screen(const char* lcd_msg) {
if (e == active_extruder) if (e == active_extruder)
_planner_refresh_positioning(); _planner_refresh_positioning();
else else
planner.steps_to_mm[i] = 1.0 / planner.axis_steps_per_mm[i]; planner.steps_to_mm[e] = 1.0 / planner.axis_steps_per_mm[e];
} }
void _planner_refresh_e0_positioning() { _reset_e_acceleration_rate(0); } void _planner_refresh_e0_positioning() { _reset_e_acceleration_rate(0); }
void _planner_refresh_e1_positioning() { _reset_e_acceleration_rate(1); } void _planner_refresh_e1_positioning() { _reset_e_acceleration_rate(1); }