From e9393c3634c5bba7b84112a7a08988548b57c6da Mon Sep 17 00:00:00 2001 From: esenapaj Date: Thu, 8 Dec 2016 17:42:23 +0900 Subject: [PATCH] Suppress warnings, etc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ・Suppress warnings ・Remove unused variable "did_update" --- Marlin/Marlin_main.cpp | 1 - Marlin/planner.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index baa8c2f06..070749276 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1349,7 +1349,6 @@ void update_software_endstops(AxisEnum axis) { float offs = LOGICAL_POSITION(0, axis); #if ENABLED(DUAL_X_CARRIAGE) - bool did_update = false; if (axis == X_AXIS) { // In Dual X mode hotend_offset[X] is T1's home position diff --git a/Marlin/planner.h b/Marlin/planner.h index 40bcf9dae..2f6538bfe 100644 --- a/Marlin/planner.h +++ b/Marlin/planner.h @@ -348,11 +348,11 @@ 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((AxisEnum)E_AXIS + set_position_mm(AxisEnum(E_AXIS #if ENABLED(DISTINCT_E_FACTORS) + active_extruder #endif - , e); + ), e); } /**