ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request #318 from EliteEng/dev

Browse Source 
PWM Spindle Control and Invert Spindle & Coolant Pins
This commit is contained in:
Sonny Jeon
2014-01-02 16:56:02 -08:00
parent f8dd8fa54d ce5f94d675
commit e7cd94e2bc
6 changed files with 198 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gcode.c
View File

@ -238,8 +238,7 @@ uint8_t gc_execute_line(char *line)
case 'R': gc.arc_radius = to_millimeters(value); break;
case 'S':
if (value < 0) { FAIL(STATUS_INVALID_STATEMENT); } // Cannot be negative
// TBD: Spindle speed not supported due to PWM issues, but may come back once resolved.
// gc.spindle_speed = value;
gc.spindle_speed = value;
break;
case 'T':
if (value < 0) { FAIL(STATUS_INVALID_STATEMENT); } // Cannot be negative
@ -266,7 +265,7 @@ uint8_t gc_execute_line(char *line)
// ([M6]: Tool change should be executed here.)
// [M3,M4,M5]: Update spindle state
spindle_run(gc.spindle_direction);
spindle_run(gc.spindle_direction, gc.spindle_speed);
// [*M7,M8,M9]: Update coolant state
coolant_run(gc.coolant_mode);