From 785a27b82185719aceee7a2800ef34c06c744fa9 Mon Sep 17 00:00:00 2001 From: bdring Date: Sun, 19 Apr 2020 14:23:26 -0500 Subject: [PATCH 1/2] fixing PWM channel issue There are 8 high speed channel that share 4 timers. Each 01 23 45 67 pair must share the same settings. --- Grbl_Esp32/spindle_control.cpp | 2 +- Grbl_Esp32/system.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Grbl_Esp32/spindle_control.cpp b/Grbl_Esp32/spindle_control.cpp index a7f0f7b2..52d26bad 100644 --- a/Grbl_Esp32/spindle_control.cpp +++ b/Grbl_Esp32/spindle_control.cpp @@ -56,7 +56,7 @@ void spindle_init() { pinMode(SPINDLE_DIR_PIN, OUTPUT); #endif // use the LED control feature to setup PWM https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/peripherals/ledc.html - spindle_pwm_chan_num = sys_get_next_PWM_chan_num(); + spindle_pwm_chan_num = 0; // spindle always uses channel 0 ledcSetup(spindle_pwm_chan_num, (double)settings.spindle_pwm_freq, SPINDLE_PWM_BIT_PRECISION); // setup the channel ledcAttachPin(SPINDLE_PWM_PIN, spindle_pwm_chan_num); // attach the PWM to the pin // Start with spindle off off diff --git a/Grbl_Esp32/system.cpp b/Grbl_Esp32/system.cpp index 635e6bee..46d78710 100644 --- a/Grbl_Esp32/system.cpp +++ b/Grbl_Esp32/system.cpp @@ -589,12 +589,20 @@ int8_t sys_get_next_RMT_chan_num() { } } +/* + This returns an unused pwm channel. + The 8 channels share 4 timers, so pairs 0,1 & 2,3 , etc + have to be the same frequency. The spindle always uses channel 0 + so we start counting from 2. + There are still possible issues if requested channels use different frequencies + TODO: Make this more robust. +*/ int8_t sys_get_next_PWM_chan_num() { - static uint8_t next_PWM_chan_num = 0; // channels 0-7 are valid + static uint8_t next_PWM_chan_num = 2; // start at 2 to avoid spindle if (next_PWM_chan_num < 8) // 7 is the max PWM channel number return next_PWM_chan_num++; else { grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_ERROR, "Error: out of PWM channels"); return -1; } -} \ No newline at end of file +} From 774f6322d1231e0087ca6954682726abe3475983 Mon Sep 17 00:00:00 2001 From: bdring Date: Sun, 19 Apr 2020 14:24:54 -0500 Subject: [PATCH 2/2] update build date --- Grbl_Esp32/grbl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Grbl_Esp32/grbl.h b/Grbl_Esp32/grbl.h index 31d760ca..18efe9b6 100644 --- a/Grbl_Esp32/grbl.h +++ b/Grbl_Esp32/grbl.h @@ -20,7 +20,7 @@ // Grbl versioning system #define GRBL_VERSION "1.1f" -#define GRBL_VERSION_BUILD "20200417" +#define GRBL_VERSION_BUILD "20200419" //#include #include