From 01e5d46ea7d4f955864f68fff5025beac50be3d9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 7 Dec 2016 02:26:24 -0600 Subject: [PATCH] Patch some planner compile errors --- Marlin/planner.h | 2 +- Marlin/ultralcd.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/planner.h b/Marlin/planner.h index 9ba2e69f3..b209aa58d 100644 --- a/Marlin/planner.h +++ b/Marlin/planner.h @@ -348,7 +348,7 @@ class Planner { 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_e_position_mm(const float &e) { - set_position_mm(E_AXIS + set_position_mm((AxisEnum)E_AXIS #if ENABLED(DISTINCT_E_FACTORS) + active_extruder #endif diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index dda4418f0..9d6dd3e45 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1874,7 +1874,7 @@ void kill_screen(const char* lcd_msg) { if (e == active_extruder) _planner_refresh_positioning(); 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_e1_positioning() { _reset_e_acceleration_rate(1); }