mirror
/
GRBL-Advanced
kopia lustrzana https://github.com/Schildkroet/GRBL-Advanced
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fixed spindle not disabled bug #35

pull/89/head
Patrick Felixberger 2020-04-22 22:24:21 +02:00
rodzic 5800f99bad
commit de67181ff4
1 zmienionych plików z 9 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
grbl/SpindleControl.c
Wyświetl plik

@ -87,10 +87,12 @@ void Spindle_SetSpeed(uint8_t pwm_value)
{ {
TIM1->CCR1 = 100 - pwm_value; // Set PWM output level. TIM1->CCR1 = 100 - pwm_value; // Set PWM output level.
#ifdef SPINDLE_ENABLE_OFF_WITH_ZERO_SPEED #ifdef SPINDLE_ENABLE_OFF_WITH_ZERO_SPEED
if (pwm_value == SPINDLE_PWM_OFF_VALUE) { if (pwm_value == SPINDLE_PWM_OFF_VALUE)
{
Spindle_Stop(); Spindle_Stop();
} }
else { else
{
TIM_Cmd(TIM1, ENABLE); // Ensure PWM output is enabled. TIM_Cmd(TIM1, ENABLE); // Ensure PWM output is enabled.
#ifdef INVERT_SPINDLE_ENABLE_PIN #ifdef INVERT_SPINDLE_ENABLE_PIN
GPIO_ResetBits(GPIO_SPINDLE_ENA_PORT, GPIO_SPINDLE_ENA_PIN); GPIO_ResetBits(GPIO_SPINDLE_ENA_PORT, GPIO_SPINDLE_ENA_PIN);
@ -100,11 +102,14 @@ void Spindle_SetSpeed(uint8_t pwm_value)
spindle_enabled = 1; spindle_enabled = 1;
} }
#else #else
if(pwm_value == SPINDLE_PWM_OFF_VALUE) { if(pwm_value == SPINDLE_PWM_OFF_VALUE)
{
TIM1->CCR1 = 100; // Disable PWM. Output voltage is zero.
TIM_Cmd(TIM1, DISABLE); // Disable PWM. Output voltage is zero. TIM_Cmd(TIM1, DISABLE); // Disable PWM. Output voltage is zero.
spindle_enabled = 0; spindle_enabled = 0;
} }
else { else
{
TIM_Cmd(TIM1, ENABLE); // Ensure PWM output is enabled. TIM_Cmd(TIM1, ENABLE); // Ensure PWM output is enabled.
spindle_enabled = 1; spindle_enabled = 1;
} }