diff options
| author | midopple <mdoppler@gmx.at> | 2012-02-24 22:57:59 +0100 |
|---|---|---|
| committer | midopple <mdoppler@gmx.at> | 2012-02-24 22:57:59 +0100 |
| commit | eb421e6a653d12221d17d3c515b0ac54010dd253 (patch) | |
| tree | 98031e82be19065afbcc73bf98f0a6a0c17b2252 | |
| parent | c6ebbfdb1289c07f388e021619c73f46fa0edf3f (diff) | |
| parent | 89180de4bfd598298f4d5e77889c57a250e35084 (diff) | |
Merge commit '89180de4bfd598298f4d5e77889c57a250e35084' into experimental
Conflicts:
Sprinter/Makefile
| -rw-r--r-- | Sprinter/Sprinter.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Sprinter/Sprinter.h b/Sprinter/Sprinter.h index 2a1dd93..9873843 100644 --- a/Sprinter/Sprinter.h +++ b/Sprinter/Sprinter.h @@ -114,6 +114,7 @@ void plan_buffer_line(float x, float y, float z, float e, float feed_rate); void plan_set_position(float x, float y, float z, float e); void st_wake_up(); void st_synchronize(); +void st_set_position(const long &x, const long &y, const long &z, const long &e); void check_buffer_while_arc(); |