Variable spindle output. Resolved conflicts in last push.

Resolve conflicts.
This commit is contained in:
Sonny Jeon 2014-01-04 12:13:49 -07:00
commit 1baff785f5

View File

@ -92,4 +92,5 @@ void spindle_run(int8_t direction, uint16_t rpm)
current_rpm = rpm; current_rpm = rpm;
} }
} }
#endif #endif