zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix probe fan compiling error (#13930)

Browse source
This commit is contained in:
Ludy 2019-05-07 21:14:12 +02:00 committed by Scott Lahteine
parent 24e956d168
commit a504366138
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/gcode/control/M80_M81.cpp
View file

@ -97,7 +97,7 @@ void GcodeSuite::M81() {
thermalManager.zero_fan_speeds(); thermalManager.zero_fan_speeds();
#if ENABLED(PROBING_FANS_OFF) #if ENABLED(PROBING_FANS_OFF)
thermalManager.fans_paused = false; thermalManager.fans_paused = false;
ZERO(thermalManager.paused_fan_speed); ZERO(thermalManager.saved_fan_speed);
#endif #endif
#endif #endif

4
Marlin/src/module/temperature.cpp
View file

@ -138,8 +138,9 @@ hotend_info_t Temperature::temp_hotend[HOTENDS]; // = { 0 }
#endif #endif
#if ENABLED(PROBING_FANS_OFF) #if EITHER(PROBING_FANS_OFF, ADVANCED_PAUSE_FANS_PAUSE)
bool Temperature::fans_paused; // = false; bool Temperature::fans_paused; // = false;
uint8_t Temperature::saved_fan_speed[FAN_COUNT]; // = { 0 }
#endif #endif
#if ENABLED(ADAPTIVE_FAN_SLOWING) #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) #if EITHER(PROBING_FANS_OFF, ADVANCED_PAUSE_FANS_PAUSE)
void Temperature::set_fans_paused(const bool p) { void Temperature::set_fans_paused(const bool p) {
static uint8_t saved_fan_speed[FAN_COUNT]; // = { 0 }
if (p != fans_paused) { if (p != fans_paused) {
fans_paused = p; fans_paused = p;
if (p) if (p)

3
Marlin/src/module/temperature.h
View file

@ -459,8 +459,9 @@ class Temperature {
static void set_fan_speed(const uint8_t target, const uint16_t speed); 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 bool fans_paused;
static uint8_t saved_fan_speed[FAN_COUNT];
#endif #endif
static constexpr inline uint8_t fanPercent(const uint8_t speed) { return ui8_to_percent(speed); } static constexpr inline uint8_t fanPercent(const uint8_t speed) { return ui8_to_percent(speed); }