mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-03 03:13:25 +02:00
Code Issues Releases Wiki Activity

Moved coolant delay into the class set_state() method

Browse Source
This commit is contained in:
Mitch Bradley
2021-05-24 11:20:15 -10:00
parent e98ee547e6
commit 75bd333087
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Grbl_Esp32/src/CoolantControl.cpp
View File

@@ -97,6 +97,7 @@ void CoolantControl::set_state(CoolantState state) {
} }
write(state); write(state);
sys.report_ovr_counter = 0; // Set to report change immediately sys.report_ovr_counter = 0; // Set to report change immediately
delay_msec(int32_t(1000.0 * _delay), DwellMode::SysSuspend);
} }
void CoolantControl::off() { void CoolantControl::off() {

3
Grbl_Esp32/src/Protocol.cpp
View File

@@ -682,10 +682,7 @@ static void protocol_exec_rt_suspend() {
if (gc_state.modal.coolant.Flood || gc_state.modal.coolant.Mist) { if (gc_state.modal.coolant.Flood || gc_state.modal.coolant.Mist) {
// Block if safety door re-opened during prior restore actions. // Block if safety door re-opened during prior restore actions.
if (!sys.suspend.bit.restartRetract) { if (!sys.suspend.bit.restartRetract) {
// NOTE: Laser mode will honor this delay. An exhaust system is often controlled by this pin.
config->_coolant->set_state(restore_coolant); config->_coolant->set_state(restore_coolant);
// TODO: Should this be buried in _coolant->set_state() ?
delay_msec(int32_t(1000.0 * config->_coolant->_delay), DwellMode::SysSuspend);
} }
} }
#ifdef PARKING_ENABLE #ifdef PARKING_ENABLE