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

Apply HAS_MULTI_HOTEND

Browse Source
This commit is contained in:
Scott Lahteine 2020-04-27 04:49:31 -05:00
parent 33217b0dd0
commit c4d57462dc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -475,7 +475,7 @@
#ifndef HOTEND_OVERSHOOT #ifndef HOTEND_OVERSHOOT
#define HOTEND_OVERSHOOT 15 #define HOTEND_OVERSHOOT 15
#endif #endif
#if HOTENDS_ > 1 #if HOTENDS > 1
#define HAS_MULTI_HOTEND 1 #define HAS_MULTI_HOTEND 1
#define HAS_HOTEND_OFFSET 1 #define HAS_HOTEND_OFFSET 1
#endif #endif

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

@ -1753,7 +1753,7 @@
#if HAS_HOTEND && PIN_EXISTS(E0_AUTO_FAN) #if HAS_HOTEND && PIN_EXISTS(E0_AUTO_FAN)
#define HAS_AUTO_FAN_0 1 #define HAS_AUTO_FAN_0 1
#endif #endif
#if HOTENDS > 1 && PIN_EXISTS(E1_AUTO_FAN) #if HAS_MULTI_HOTEND && PIN_EXISTS(E1_AUTO_FAN)
#define HAS_AUTO_FAN_1 1 #define HAS_AUTO_FAN_1 1
#endif #endif
#if HOTENDS > 2 && PIN_EXISTS(E2_AUTO_FAN) #if HOTENDS > 2 && PIN_EXISTS(E2_AUTO_FAN)
@ -1997,7 +1997,7 @@
*/ */
#define WRITE_HEATER_0P(v) WRITE(HEATER_0_PIN, (v) ^ HEATER_0_INVERTING) #define WRITE_HEATER_0P(v) WRITE(HEATER_0_PIN, (v) ^ HEATER_0_INVERTING)
#if HOTENDS > 1 || ENABLED(HEATERS_PARALLEL) #if EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL)
#define WRITE_HEATER_1(v) WRITE(HEATER_1_PIN, (v) ^ HEATER_1_INVERTING) #define WRITE_HEATER_1(v) WRITE(HEATER_1_PIN, (v) ^ HEATER_1_INVERTING)
#if HOTENDS > 2 #if HOTENDS > 2
#define WRITE_HEATER_2(v) WRITE(HEATER_2_PIN, (v) ^ HEATER_2_INVERTING) #define WRITE_HEATER_2(v) WRITE(HEATER_2_PIN, (v) ^ HEATER_2_INVERTING)
@ -2017,7 +2017,7 @@
#endif // HOTENDS > 4 #endif // HOTENDS > 4
#endif // HOTENDS > 3 #endif // HOTENDS > 3
#endif // HOTENDS > 2 #endif // HOTENDS > 2
#endif // HOTENDS > 1 #endif // HAS_MULTI_HOTEND || HEATERS_PARALLEL
#if ENABLED(HEATERS_PARALLEL) #if ENABLED(HEATERS_PARALLEL)
#define WRITE_HEATER_0(v) { WRITE_HEATER_0P(v); WRITE_HEATER_1(v); } #define WRITE_HEATER_0(v) { WRITE_HEATER_0P(v); WRITE_HEATER_1(v); }
#else #else

2
Marlin/src/module/tool_change.cpp
View File

@ -1244,7 +1244,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
#endif #endif
// Migrate the temperature to the new hotend // Migrate the temperature to the new hotend
#if HOTENDS > 1 #if HAS_MULTI_HOTEND
thermalManager.setTargetHotend(thermalManager.degTargetHotend(active_extruder), migration_extruder); thermalManager.setTargetHotend(thermalManager.degTargetHotend(active_extruder), migration_extruder);
#if HAS_DISPLAY #if HAS_DISPLAY
thermalManager.set_heating_message(0); thermalManager.set_heating_message(0);