diff options
| author | kliment <kliment.yanev@gmail.com> | 2011-07-07 10:37:53 +0200 |
|---|---|---|
| committer | kliment <kliment.yanev@gmail.com> | 2011-07-07 10:37:53 +0200 |
| commit | c5305fe923bfbe315af501550db580a0c4a5ba50 (patch) | |
| tree | 3b3266f8bff6482d79392b3075639a4e4f753ee0 | |
| parent | 4b40c04551ebc4dfe64b1154864ef55ea81ca4d7 (diff) | |
Merge experimental
| -rw-r--r-- | Sprinter/Makefile | 6 | ||||
| -rw-r--r-- | Sprinter/Sprinter.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Sprinter/Makefile b/Sprinter/Makefile index 618b384..0f9b5b7 100644 --- a/Sprinter/Makefile +++ b/Sprinter/Makefile @@ -33,7 +33,7 @@ # $Id$ TARGET = $(notdir $(CURDIR)) -INSTALL_DIR = /home/chris/arduino-0022 +INSTALL_DIR = ../../arduino22/arduino-0022/ UPLOAD_RATE = 38400 AVRDUDE_PROGRAMMER = stk500v1 PORT = /dev/ttyUSB0 @@ -52,7 +52,7 @@ ARDUINO = $(INSTALL_DIR)/hardware/arduino/cores/arduino AVR_TOOLS_PATH = /usr/bin SRC = $(ARDUINO)/pins_arduino.c $(ARDUINO)/wiring.c \ $(ARDUINO)/wiring_analog.c $(ARDUINO)/wiring_digital.c \ -$(ARDUINO)/wiring_pulse.c $(ARDUINO)/wiring_serial.c \ +$(ARDUINO)/wiring_pulse.c \ $(ARDUINO)/wiring_shift.c $(ARDUINO)/WInterrupts.c CXXSRC = $(ARDUINO)/HardwareSerial.cpp $(ARDUINO)/WMath.cpp \ $(ARDUINO)/Print.cpp ./SdFile.cpp ./SdVolume.cpp ./Sd2Card.cpp @@ -142,7 +142,7 @@ applet_files: $(TARGET).pde test -d applet || mkdir applet echo '#include "WProgram.h"' > applet/$(TARGET).cpp cat $(TARGET).pde >> applet/$(TARGET).cpp - cat $(ARDUINO)/main.cxx >> applet/$(TARGET).cpp + cat $(ARDUINO)/main.cpp >> applet/$(TARGET).cpp elf: applet/$(TARGET).elf hex: applet/$(TARGET).hex diff --git a/Sprinter/Sprinter.h b/Sprinter/Sprinter.h index ad39c00..408bff9 100644 --- a/Sprinter/Sprinter.h +++ b/Sprinter/Sprinter.h @@ -70,5 +70,6 @@ void prepare_move(); void linear_move(unsigned long steps_remaining[]); void do_step_update_micros(int axis); void do_step(int axis); +void do_step_update_micros(int axis); void kill(byte debug); |