mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-23 06:33:15 +02:00
Code Issues Releases Wiki Activity

Fix spindle enable pin logic

Browse Source
This commit is contained in:
bdring
2020-06-27 13:15:33 -05:00
parent 98559bab82
commit 04c75e4e22
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Grbl_Esp32/Spindles/DacSpindle.cpp
View File

@@ -95,10 +95,6 @@ uint32_t DacSpindle::set_rpm(uint32_t rpm) {
pwm_value = map_uint32_t(rpm, _min_rpm, _max_rpm, _pwm_min_value, _pwm_max_value); pwm_value = map_uint32_t(rpm, _min_rpm, _max_rpm, _pwm_min_value, _pwm_max_value);
} }
if (_off_with_zero_speed) {
set_enable_pin(rpm != 0);
}
set_output(pwm_value); set_output(pwm_value);
return rpm; return rpm;

9
Grbl_Esp32/Spindles/PWMSpindle.cpp
View File

@@ -145,9 +145,6 @@ uint32_t PWMSpindle::set_rpm(uint32_t rpm) {
pwm_value = map_uint32_t(rpm, _min_rpm, _max_rpm, _pwm_min_value, _pwm_max_value); pwm_value = map_uint32_t(rpm, _min_rpm, _max_rpm, _pwm_min_value, _pwm_max_value);
} }
if (_off_with_zero_speed)
set_enable_pin(rpm != 0);
set_output(pwm_value); set_output(pwm_value);
return 0; return 0;
@@ -165,7 +162,7 @@ void PWMSpindle::set_state(uint8_t state, uint32_t rpm) {
set_rpm(rpm); set_rpm(rpm);
} }
set_enable_pin(state == SPINDLE_DISABLE); set_enable_pin(state != SPINDLE_DISABLE);
sys.report_ovr_counter = 0; // Set to report change immediately sys.report_ovr_counter = 0; // Set to report change immediately
} }
@@ -227,6 +224,10 @@ void PWMSpindle::set_output(uint32_t duty) {
void PWMSpindle::set_enable_pin(bool enable) { void PWMSpindle::set_enable_pin(bool enable) {
if (_enable_pin == UNDEFINED_PIN) if (_enable_pin == UNDEFINED_PIN)
return; return;
if (_off_with_zero_speed && sys.spindle_speed == 0)
enable = false;
#ifndef INVERT_SPINDLE_ENABLE_PIN #ifndef INVERT_SPINDLE_ENABLE_PIN
digitalWrite(_enable_pin, enable); digitalWrite(_enable_pin, enable);
#else #else

3
Grbl_Esp32/Spindles/RelaySpindle.cpp
View File

@@ -66,9 +66,6 @@ uint32_t RelaySpindle::set_rpm(uint32_t rpm) {
set_output(1); set_output(1);
} }
if (_off_with_zero_speed)
set_enable_pin(rpm != 0);
return rpm; return rpm;
} }