bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Followup to hotend_offset[Z] patch

Browse Source
This commit is contained in:
Scott Lahteine
2018-08-24 21:26:29 -05:00
parent e2b8fc4f17
commit d1c9517903
9 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/inc/Conditionals_LCD.h
View File

@ -458,6 +458,8 @@
#define DO_SWITCH_EXTRUDER (ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR))
#define HAS_HOTEND_OFFSET (HOTENDS > 1)
/**
* DISTINCT_E_FACTORS affects how some E factors are accessed
*/

5
Marlin/src/inc/Conditionals_post.h
View File

@ -413,7 +413,6 @@
/**
* Default hotend offsets, if not defined
*/
#define HAS_HOTEND_OFFSET_Z (HOTENDS > 1 && (ENABLED(DUAL_X_CARRIAGE) || ENABLED(SWITCHING_NOZZLE) || ENABLED(PARKING_EXTRUDER)))
#if HOTENDS > 1
#ifndef HOTEND_OFFSET_X
#define HOTEND_OFFSET_X { 0 } // X offsets for each extruder
@ -421,8 +420,8 @@
#ifndef HOTEND_OFFSET_Y
#define HOTEND_OFFSET_Y { 0 } // Y offsets for each extruder
#endif
#if HAS_HOTEND_OFFSET_Z && !defined(HOTEND_OFFSET_Z)
#define HOTEND_OFFSET_Z { 0 }
#ifndef HOTEND_OFFSET_Z
#define HOTEND_OFFSET_Z { 0 } // Z offsets for each extruder
#endif
#endif