pingu_98/Sprinter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge experimental

Browse source
This commit is contained in:
kliment 2011-07-07 10:37:53 +02:00
parent 4b40c04551
commit c5305fe923
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Sprinter/Makefile
View file

@ -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

1
Sprinter/Sprinter.h
View file

@ -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);