Skip to content

Melzi Makefile Fix, not working on Debian Squeeze. Added link to the EEPROM library. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Madefree wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Melzi Makefile Fix, not working on Debian Squeeze. Added link to the EEPROM library. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions Sprinter_Melzi/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Arduino 0011 Makefile
# Arduino adaptation by mellis, eighthave, oli.keller
#
# This has been tested with Arduino 0022.
# This has been tested with Arduino 23
#
# This makefile allows you to build sketches from the command line
# without the Arduino environment (or Java).
Expand Down Expand Up @@ -34,7 +34,7 @@

TARGET = $(notdir $(CURDIR))
#INSTALL_DIR = ../../arduino22/arduino-0022/
INSTALL_DIR = /home/jeanmarc/arduino-0021
INSTALL_DIR = /home/marco/arduino-0023
UPLOAD_RATE = 38400
AVRDUDE_PROGRAMMER = stk500v1
PORT = /dev/ttyUSB*
Expand All @@ -50,13 +50,24 @@ F_CPU = 16000000
# Below here nothing should be changed...

ARDUINO = $(INSTALL_DIR)/hardware/arduino/cores/arduino
ARDUINO_LIB_SRC = $(INSTALL_DIR)/libraries
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_shift.c $(ARDUINO)/WInterrupts.c
CXXSRC = $(ARDUINO)/HardwareSerial.cpp $(ARDUINO)/WMath.cpp $(ARDUINO)/WString.cpp\
$(ARDUINO)/Print.cpp ./SdFile.cpp ./SdVolume.cpp ./Sd2Card.cpp
SRC = $(ARDUINO)/pins_arduino.c \
$(ARDUINO)/wiring.c \
$(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 \
$(ARDUINO_LIB_SRC)/EEPROM/EEPROM.cpp \
./SdFile.cpp \
./SdVolume.cpp \
./Sd2Card.cpp \
./SerialManager.cpp
FORMAT = ihex


Expand All @@ -75,7 +86,7 @@ CDEFS = -DF_CPU=$(F_CPU)
CXXDEFS = -DF_CPU=$(F_CPU)

# Place -I options here
CINCS = -I$(ARDUINO)
CINCS = -I$(ARDUINO) -I$(ARDUINO_LIB_SRC)/EEPROM
CXXINCS = -I$(ARDUINO)

# Compiler flag to set the C Standard level.
Expand Down
2 changes: 2 additions & 0 deletions Sprinter_Melzi/Sprinter_Melzi.pde
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ unsigned long previous_millis_cmd = 0;
unsigned long max_inactive_time = 0;
unsigned long stepper_inactive_time = 0;

int byteToint(byte value);

#ifdef SDSUPPORT
Sd2Card card;
SdVolume volume;
Expand Down