|
@@ -466,9 +466,9 @@ volatile bool Temperature::raw_temps_ready = false;
|
466
|
466
|
|
467
|
467
|
#if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
|
468
|
468
|
celsius_t Temperature::singlenozzle_temp[EXTRUDERS];
|
469
|
|
- #if HAS_FAN
|
470
|
|
- uint8_t Temperature::singlenozzle_fan_speed[EXTRUDERS];
|
471
|
|
- #endif
|
|
469
|
+#endif
|
|
470
|
+#if ENABLED(SINGLENOZZLE_STANDBY_FAN)
|
|
471
|
+ uint8_t Temperature::singlenozzle_fan_speed[EXTRUDERS];
|
472
|
472
|
#endif
|
473
|
473
|
|
474
|
474
|
#if ENABLED(PROBING_HEATERS_OFF)
|
|
@@ -2500,20 +2500,22 @@ void Temperature::disable_all_heaters() {
|
2500
|
2500
|
|
2501
|
2501
|
#endif // PROBING_HEATERS_OFF
|
2502
|
2502
|
|
2503
|
|
-#if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
|
|
2503
|
+#if EITHER(SINGLENOZZLE_STANDBY_TEMP, SINGLENOZZLE_STANDBY_FAN)
|
2504
|
2504
|
|
2505
|
2505
|
void Temperature::singlenozzle_change(const uint8_t old_tool, const uint8_t new_tool) {
|
2506
|
|
- #if HAS_FAN
|
|
2506
|
+ #if ENABLED(SINGLENOZZLE_STANDBY_FAN)
|
2507
|
2507
|
singlenozzle_fan_speed[old_tool] = fan_speed[0];
|
2508
|
2508
|
fan_speed[0] = singlenozzle_fan_speed[new_tool];
|
2509
|
2509
|
#endif
|
2510
|
|
- singlenozzle_temp[old_tool] = temp_hotend[0].target;
|
2511
|
|
- if (singlenozzle_temp[new_tool] && singlenozzle_temp[new_tool] != singlenozzle_temp[old_tool]) {
|
2512
|
|
- setTargetHotend(singlenozzle_temp[new_tool], 0);
|
2513
|
|
- TERN_(AUTOTEMP, planner.autotemp_update());
|
2514
|
|
- TERN_(HAS_STATUS_MESSAGE, set_heating_message(0));
|
2515
|
|
- (void)wait_for_hotend(0, false); // Wait for heating or cooling
|
2516
|
|
- }
|
|
2510
|
+ #if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
|
|
2511
|
+ singlenozzle_temp[old_tool] = temp_hotend[0].target;
|
|
2512
|
+ if (singlenozzle_temp[new_tool] && singlenozzle_temp[new_tool] != singlenozzle_temp[old_tool]) {
|
|
2513
|
+ setTargetHotend(singlenozzle_temp[new_tool], 0);
|
|
2514
|
+ TERN_(AUTOTEMP, planner.autotemp_update());
|
|
2515
|
+ TERN_(HAS_STATUS_MESSAGE, set_heating_message(0));
|
|
2516
|
+ (void)wait_for_hotend(0, false); // Wait for heating or cooling
|
|
2517
|
+ }
|
|
2518
|
+ #endif
|
2517
|
2519
|
}
|
2518
|
2520
|
|
2519
|
2521
|
#endif
|