Fix makefile and header to compile from command line
This commit is contained in:
parent
57f82b5a5b
commit
d98555ffb0
2 changed files with 6 additions and 8 deletions
|
|
@ -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,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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue