Cleanups following recent commits
This commit is contained in:
parent
dca48f0e63
commit
71396f77d3
@ -649,7 +649,7 @@
|
|||||||
/**
|
/**
|
||||||
* Heater & Fan Pausing
|
* Heater & Fan Pausing
|
||||||
*/
|
*/
|
||||||
#if ENABLED(PROBING_FANS_OFF) && FAN_COUNT == 0
|
#if FAN_COUNT == 0
|
||||||
#undef PROBING_FANS_OFF
|
#undef PROBING_FANS_OFF
|
||||||
#endif
|
#endif
|
||||||
#define QUIET_PROBING (ENABLED(PROBING_HEATERS_OFF) || ENABLED(PROBING_FANS_OFF))
|
#define QUIET_PROBING (ENABLED(PROBING_HEATERS_OFF) || ENABLED(PROBING_FANS_OFF))
|
||||||
|
@ -2057,26 +2057,21 @@ static void clean_up_after_endstop_or_probe_move() {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(PROBING_FANS_OFF)
|
#if ENABLED(PROBING_FANS_OFF)
|
||||||
void fans_pause(bool p) {
|
|
||||||
if (p == fans_paused) { // If called out of order something is wrong
|
|
||||||
SERIAL_ERROR_START;
|
|
||||||
SERIAL_ERRORPGM("Fans already ");
|
|
||||||
if (!fans_paused) SERIAL_ERRORPGM("un");
|
|
||||||
SERIAL_ERRORLNPGM("paused!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
void fans_pause(const bool p) {
|
||||||
|
if (p != fans_paused) {
|
||||||
|
fans_paused = p;
|
||||||
if (p)
|
if (p)
|
||||||
for (uint8_t x = 0;x < FAN_COUNT;x++) {
|
for (uint8_t x = 0; x < FAN_COUNT; x++) {
|
||||||
paused_fanSpeeds[x] = fanSpeeds[x];
|
paused_fanSpeeds[x] = fanSpeeds[x];
|
||||||
fanSpeeds[x] = 0;
|
fanSpeeds[x] = 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
for (uint8_t x = 0;x < FAN_COUNT;x++)
|
for (uint8_t x = 0; x < FAN_COUNT; x++)
|
||||||
fanSpeeds[x] = paused_fanSpeeds[x];
|
fanSpeeds[x] = paused_fanSpeeds[x];
|
||||||
|
|
||||||
fans_paused = p;
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#endif // PROBING_FANS_OFF
|
#endif // PROBING_FANS_OFF
|
||||||
|
|
||||||
#if HAS_BED_PROBE
|
#if HAS_BED_PROBE
|
||||||
@ -2091,18 +2086,16 @@ static void clean_up_after_endstop_or_probe_move() {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if QUIET_PROBING
|
#if QUIET_PROBING
|
||||||
void probing_pause(bool pause) {
|
void probing_pause(const bool p) {
|
||||||
#if ENABLED(PROBING_HEATERS_OFF)
|
#if ENABLED(PROBING_HEATERS_OFF)
|
||||||
thermalManager.pause(pause);
|
thermalManager.pause(p);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(PROBING_FANS_OFF)
|
#if ENABLED(PROBING_FANS_OFF)
|
||||||
fans_pause(pause);
|
fans_pause(p);
|
||||||
#endif
|
#endif
|
||||||
|
if (p) safe_delay(25);
|
||||||
if(pause) safe_delay(25);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif // QUIET_PROBING
|
||||||
|
|
||||||
#if ENABLED(BLTOUCH)
|
#if ENABLED(BLTOUCH)
|
||||||
|
|
||||||
|
@ -1353,15 +1353,10 @@ void Temperature::disable_all_heaters() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if ENABLED(PROBING_HEATERS_OFF)
|
#if ENABLED(PROBING_HEATERS_OFF)
|
||||||
void Temperature::pause(bool p) {
|
|
||||||
if (p == paused) { // If called out of order something is wrong
|
|
||||||
SERIAL_ERROR_START;
|
|
||||||
SERIAL_ERRORPGM("Heaters already ");
|
|
||||||
if (!paused) SERIAL_ERRORPGM("un");
|
|
||||||
SERIAL_ERRORLNPGM("paused!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
void Temperature::pause(const bool p) {
|
||||||
|
if (p != paused) {
|
||||||
|
paused = p;
|
||||||
if (p) {
|
if (p) {
|
||||||
HOTEND_LOOP() {
|
HOTEND_LOOP() {
|
||||||
paused_hotend_temp[e] = degTargetHotend(e);
|
paused_hotend_temp[e] = degTargetHotend(e);
|
||||||
@ -1378,13 +1373,9 @@ void Temperature::disable_all_heaters() {
|
|||||||
setTargetBed(paused_bed_temp);
|
setTargetBed(paused_bed_temp);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
}
|
||||||
paused = p;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Temperature::ispaused() {
|
|
||||||
return paused;
|
|
||||||
}
|
|
||||||
#endif // PROBING_HEATERS_OFF
|
#endif // PROBING_HEATERS_OFF
|
||||||
|
|
||||||
#if ENABLED(HEATER_0_USES_MAX6675)
|
#if ENABLED(HEATER_0_USES_MAX6675)
|
||||||
|
@ -458,8 +458,7 @@ class Temperature {
|
|||||||
#endif // BABYSTEPPING
|
#endif // BABYSTEPPING
|
||||||
|
|
||||||
#if ENABLED(PROBING_HEATERS_OFF)
|
#if ENABLED(PROBING_HEATERS_OFF)
|
||||||
static void pause(bool p);
|
static void pause(const bool p);
|
||||||
static bool ispaused();
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Loading…
Reference in New Issue
Block a user