mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-01 18:32:37 +02:00
Code Issues Releases Wiki Activity

WIP PWM Spindle

Browse Source
This commit is contained in:
bdring
2021-06-14 09:46:51 -05:00
parent db0ee2726a
commit d0370c4fa9
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Grbl_Esp32/data/config.yaml
View File

@@ -84,10 +84,16 @@ probe:
pin: gpio.32:low:pu pin: gpio.32:low:pu
PWM: PWM:
min_rpm: 200
max_rpm: 1000
pwm_freq: 5000
pwm_off: 0.000
pwm_min: 20.000
pwm_max: 100.000
invert_pwm: true
output_pin: gpio.2 output_pin: gpio.2
enable_pin: gpio.22 enable_pin: gpio.22
pwm_off: 0.0 direction_pin: gpio.21
pwm_min: 0.0 enable_off_with_zero_speed: true
pwm_max: 100.0 spinup_delay_ms: 2000
min_rpm: 0 spindown_delay_ms: 1000
max_rpm: 1000

14
Grbl_Esp32/src/Spindles/PWMSpindle.cpp
View File

@@ -100,19 +100,21 @@ namespace Spindles {
return; // Block during abort. return; // Block during abort.
} }
int32_t delayMillis;
if (state == SpindleState::Disable) { // Halt or set spindle direction and rpm. if (state == SpindleState::Disable) { // Halt or set spindle direction and rpm.
sys.spindle_speed = 0; sys.spindle_speed = 0;
stop(); stop();
if (use_delays && (_current_state != state)) { delayMillis = _spindown_delay;
delay(_spindown_delay);
}
} else { } else {
set_direction(state == SpindleState::Cw); set_direction(state == SpindleState::Cw);
set_rpm(rpm); set_rpm(rpm);
set_enable(state != SpindleState::Disable); // must be done after setting rpm for enable features to work set_enable(state != SpindleState::Disable); // must be done after setting rpm for enable features to work
if (use_delays && (_current_state != state)) { delayMillis = _spinup_delay;
delay(_spinup_delay); }
}
if (_current_state != state && use_delays) {
delay(delayMillis);
} }
_current_state = state; _current_state = state;