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

Merge pull request #5431 from esenapaj/Suppress-warnings,-etc

Browse Source 
Suppress warnings, etc
This commit is contained in:
Scott Lahteine 2016-12-08 13:10:12 -08:00 committed by GitHub
commit f089279263
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Marlin_main.cpp
View File

@ -1349,7 +1349,6 @@ void update_software_endstops(AxisEnum axis) {
float offs = LOGICAL_POSITION(0, axis); float offs = LOGICAL_POSITION(0, axis);
#if ENABLED(DUAL_X_CARRIAGE) #if ENABLED(DUAL_X_CARRIAGE)
bool did_update = false;
if (axis == X_AXIS) { if (axis == X_AXIS) {
// In Dual X mode hotend_offset[X] is T1's home position // In Dual X mode hotend_offset[X] is T1's home position

4
Marlin/planner.h
View File

@ -348,11 +348,11 @@ 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((AxisEnum)E_AXIS set_position_mm(AxisEnum(E_AXIS
#if ENABLED(DISTINCT_E_FACTORS) #if ENABLED(DISTINCT_E_FACTORS)
+ active_extruder + active_extruder
#endif #endif
, e); ), e);
} }
/** /**