From a50436613834b183e5fccbf8f653af269d5d87dc Mon Sep 17 00:00:00 2001
From: Ludy <Ludy87@users.noreply.github.com>
Date: Tue, 7 May 2019 21:14:12 +0200
Subject: [PATCH] Fix probe fan compiling error (#13930)
---
Marlin/src/gcode/control/M80_M81.cpp | 2 +-
Marlin/src/module/temperature.cpp | 4 ++--
Marlin/src/module/temperature.h | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index d2d90b6518..c2c705f65d 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -97,7 +97,7 @@ void GcodeSuite::M81() {
thermalManager.zero_fan_speeds();
#if ENABLED(PROBING_FANS_OFF)
thermalManager.fans_paused = false;
- ZERO(thermalManager.paused_fan_speed);
+ ZERO(thermalManager.saved_fan_speed);
#endif
#endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index a134465c9f..e7b39e16fc 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -138,8 +138,9 @@ hotend_info_t Temperature::temp_hotend[HOTENDS]; // = { 0 }
#endif
- #if ENABLED(PROBING_FANS_OFF)
+ #if EITHER(PROBING_FANS_OFF, ADVANCED_PAUSE_FANS_PAUSE)
bool Temperature::fans_paused; // = false;
+ uint8_t Temperature::saved_fan_speed[FAN_COUNT]; // = { 0 }
#endif
#if ENABLED(ADAPTIVE_FAN_SLOWING)
@@ -181,7 +182,6 @@ hotend_info_t Temperature::temp_hotend[HOTENDS]; // = { 0 }
#if EITHER(PROBING_FANS_OFF, ADVANCED_PAUSE_FANS_PAUSE)
void Temperature::set_fans_paused(const bool p) {
- static uint8_t saved_fan_speed[FAN_COUNT]; // = { 0 }
if (p != fans_paused) {
fans_paused = p;
if (p)
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 117286131d..fa5013bc56 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -459,8 +459,9 @@ class Temperature {
static void set_fan_speed(const uint8_t target, const uint16_t speed);
- #if ENABLED(PROBING_FANS_OFF)
+ #if EITHER(PROBING_FANS_OFF, ADVANCED_PAUSE_FANS_PAUSE)
static bool fans_paused;
+ static uint8_t saved_fan_speed[FAN_COUNT];
#endif
static constexpr inline uint8_t fanPercent(const uint8_t speed) { return ui8_to_percent(speed); }
--
GitLab