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

Don't define unused move_extruder_servo

Browse Source 
For parity with #10772
This commit is contained in:
Scott Lahteine 2018-05-19 16:31:55 -05:00
parent b360bb9ff9
commit a847ea625e
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Conditionals_LCD.h
View File

@ -427,6 +427,8 @@
#define E_MANUAL EXTRUDERS #define E_MANUAL EXTRUDERS
#endif #endif
#define DO_SWITCH_EXTRUDER (ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR))
/** /**
* DISTINCT_E_FACTORS affects how some E factors are accessed * DISTINCT_E_FACTORS affects how some E factors are accessed
*/ */

8
Marlin/Marlin_main.cpp
View File

@ -537,10 +537,6 @@ static millis_t stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL
#define BUZZ(d,f) NOOP #define BUZZ(d,f) NOOP
#endif #endif
#if ENABLED(SWITCHING_NOZZLE)
#define DO_SWITCH_EXTRUDER (SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR)
#endif
uint8_t target_extruder; uint8_t target_extruder;
#if HAS_BED_PROBE #if HAS_BED_PROBE
@ -11512,7 +11508,7 @@ inline void gcode_M999() {
flush_and_request_resend(); flush_and_request_resend();
} }
#if ENABLED(SWITCHING_EXTRUDER) #if DO_SWITCH_EXTRUDER
#if EXTRUDERS > 3 #if EXTRUDERS > 3
#define REQ_ANGLES 4 #define REQ_ANGLES 4
#define _SERVO_NR (e < 2 ? SWITCHING_EXTRUDER_SERVO_NR : SWITCHING_EXTRUDER_E23_SERVO_NR) #define _SERVO_NR (e < 2 ? SWITCHING_EXTRUDER_SERVO_NR : SWITCHING_EXTRUDER_E23_SERVO_NR)
@ -11532,7 +11528,7 @@ inline void gcode_M999() {
safe_delay(500); safe_delay(500);
} }
} }
#endif // SWITCHING_EXTRUDER #endif // DO_SWITCH_EXTRUDER
#if ENABLED(SWITCHING_NOZZLE) #if ENABLED(SWITCHING_NOZZLE)
inline void move_nozzle_servo(const uint8_t e) { inline void move_nozzle_servo(const uint8_t e) {

2
Marlin/ultralcd.cpp
View File

@ -3258,7 +3258,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
else else
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28")); MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
#if ENABLED(SWITCHING_EXTRUDER) #if ENABLED(SWITCHING_EXTRUDER) || ENABLED(SWITCHING_NOZZLE)
#if EXTRUDERS == 4 #if EXTRUDERS == 4
switch (active_extruder) { switch (active_extruder) {