diff options
| author | kliment <kliment.yanev@gmail.com> | 2012-02-23 14:11:17 -0800 |
|---|---|---|
| committer | kliment <kliment.yanev@gmail.com> | 2012-02-23 14:11:17 -0800 |
| commit | 89180de4bfd598298f4d5e77889c57a250e35084 (patch) | |
| tree | 4a4d5103c83c07542c6205e66a5ed58765ca701f /Sprinter | |
| parent | 6b44b4f9f1f15a0b38fb49370b830418e28dfc42 (diff) | |
| parent | 39bd33a3d149bda07ecc0a89a3cb293468df9c7b (diff) | |
Merge pull request #141 from jschleic/fix-Makefile2
Fix Makefile in experimental
Diffstat (limited to 'Sprinter')
| -rw-r--r-- | Sprinter/Makefile | 2 | ||||
| -rw-r--r-- | Sprinter/Sprinter.h | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Sprinter/Makefile b/Sprinter/Makefile index 639cf1b..4d6326a 100644 --- a/Sprinter/Makefile +++ b/Sprinter/Makefile @@ -55,7 +55,7 @@ $(ARDUINO)/wiring_analog.c $(ARDUINO)/wiring_digital.c \ $(ARDUINO)/wiring_pulse.c \ $(ARDUINO)/wiring_shift.c $(ARDUINO)/WInterrupts.c CXXSRC = $(ARDUINO)/HardwareSerial.cpp $(ARDUINO)/WMath.cpp $(ARDUINO)/WString.cpp\ -$(ARDUINO)/Print.cpp ./SdFile.cpp ./SdVolume.cpp ./Sd2Card.cpp +$(ARDUINO)/Print.cpp ./SdFile.cpp ./SdVolume.cpp ./Sd2Card.cpp ./heater.cpp ./arc_func.cpp FORMAT = ihex diff --git a/Sprinter/Sprinter.h b/Sprinter/Sprinter.h index b70d1fd..9873843 100644 --- a/Sprinter/Sprinter.h +++ b/Sprinter/Sprinter.h @@ -95,10 +95,14 @@ void showString (PGM_P s); void manage_inactivity(byte debug); - +void get_command(); void get_coordinates(); void prepare_move(); void prepare_arc_move(char isclockwise); +FORCE_INLINE void process_commands(); +#ifdef USE_ARC_FUNCTION + FORCE_INLINE void get_arc_coordinates(); +#endif void kill(byte debug); @@ -110,9 +114,13 @@ 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(); +#ifdef SDSUPPORT +void print_disk_info(void); +#endif //SDSUPPORT #ifdef DEBUG void log_message(char* message); |