Merge branch 'dev' of https://github.com/grbl/grbl into dev

Conflicts: limits.c
2013-12-29 20:34:51 -07:00
parent 3054b2df77
commit 903b462b2e
14 changed files with 412 additions and 314 deletions
--- a/motion_control.h
+++ b/motion_control.h
@ -41,7 +41,7 @@ void mc_arc(float *position, float *target, float *offset, uint8_t axis_0, uint8
 void mc_dwell(float seconds);

 // Perform homing cycle to locate machine zero. Requires limit switches.
-void mc_go_home();
+void mc_homing_cycle();

 // Performs system reset. If in motion state, kills all motion and sets system alarm.
 void mc_reset();