summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkliment <kliment.yanev@gmail.com>2011-07-07 16:34:34 +0200
committerkliment <kliment.yanev@gmail.com>2011-07-07 16:34:34 +0200
commitd98555ffb0e94ece92311dcf2ff3a2ff13d9e3d4 (patch)
tree25da997fee5ae5adb9208cfe095dcdbe6fd45f64
parent57f82b5a5b566025ff0c6da6728dbc4380b937cd (diff)
Fix makefile and header to compile from command line
-rw-r--r--Sprinter/Makefile6
-rw-r--r--Sprinter/Sprinter.h8
2 files changed, 6 insertions, 8 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 31d4b69..7a4b8a9 100644
--- a/Sprinter/Sprinter.h
+++ b/Sprinter/Sprinter.h
@@ -1,7 +1,8 @@
// Tonokip RepRap firmware rewrite based off of Hydra-mmm firmware.
// Licence: GPL
#include <WProgram.h>
-
+extern "C" void __cxa_pure_virtual();
+void __cxa_pure_virtual(){};
void get_command();
void process_commands();
@@ -28,10 +29,7 @@ void enable_x();
void enable_y();
void enable_z();
void enable_e();
-void do_x_step();
-void do_y_step();
-void do_z_step();
-void do_e_step();
+void do_step(int axis);
void kill(byte debug);