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

Merge pull request #6638 from bgort/silentprobing2

Browse source 
Cleanup previous implementation of new quiet probing
This commit is contained in:
bgort 2017-05-08 10:21:36 -04:00 committed by GitHub
parent 4b7f8ad9c6 6cb0fa4128
commit 83b6bc8e05
2 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Marlin/Marlin_main.cpp
View file

@ -2058,32 +2058,24 @@ static void clean_up_after_endstop_or_probe_move() {
#if ENABLED(PROBING_FANS_OFF) #if ENABLED(PROBING_FANS_OFF)
void fans_pause(bool p) { void fans_pause(bool p) {
if (p && fans_paused) { // If called out of order something is wrong if (p == fans_paused) { // If called out of order something is wrong
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERRORLNPGM("Fans already paused!"); serialprintPGM(fans_paused ? PSTR("Fans already paused!") : PSTR("Fans already unpaused!"));
return; return;
} }
if (!p && !fans_paused) { if (p)
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM("Fans already unpaused!");
return;
}
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; fans_paused = p;
} }
#endif #endif // PROBING_FANS_OFF
#if HAS_BED_PROBE #if HAS_BED_PROBE

12
Marlin/temperature.cpp
View file

@ -1358,15 +1358,9 @@ void Temperature::disable_all_heaters() {
#if ENABLED(PROBING_HEATERS_OFF) #if ENABLED(PROBING_HEATERS_OFF)
void Temperature::pause(bool p) { void Temperature::pause(bool p) {
if (p && paused) { // If called out of order something is wrong if (p == paused) { // If called out of order something is wrong
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERRORLNPGM("Heaters already paused!"); serialprintPGM(paused ? PSTR("Heaters already paused!") : PSTR("Heaters already unpaused!"));
return;
}
if (!p && !paused) {
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM("Heaters already unpaused!");
return; return;
} }
@ -1393,7 +1387,7 @@ void Temperature::disable_all_heaters() {
bool Temperature::ispaused() { bool Temperature::ispaused() {
return paused; return paused;
} }
#endif #endif // PROBING_HEATERS_OFF
#if ENABLED(HEATER_0_USES_MAX6675) #if ENABLED(HEATER_0_USES_MAX6675)