From 8d0916af1360115d0a86090d1b24a28a1ffef5bd Mon Sep 17 00:00:00 2001 From: Michael Moon Date: Tue, 24 Jan 2012 13:18:54 +1100 Subject: [PATCH] allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications --- Marlin/Makefile | 410 ++++++++-------------- Marlin/Marlin.h | 4 +- Marlin/Marlin.pde | 6 +- Marlin/{cardreader.pde => cardreader.cpp} | 0 Marlin/temperature.cpp | 10 +- 5 files changed, 164 insertions(+), 266 deletions(-) rename Marlin/{cardreader.pde => cardreader.cpp} (100%) diff --git a/Marlin/Makefile b/Marlin/Makefile index 84e540568..1e847a37b 100644 --- a/Marlin/Makefile +++ b/Marlin/Makefile @@ -1,76 +1,65 @@ +# Sprinter Arduino Project Makefile +# +# Makefile Based on: +# Arduino 0011 Makefile +# Arduino adaptation by mellis, eighthave, oli.keller +# +# This has been tested with Arduino 0022. +# +# This makefile allows you to build sketches from the command line +# without the Arduino environment (or Java). +# +# Detailed instructions for using the makefile: +# +# 1. Modify the line containg "INSTALL_DIR" to point to the directory that +# contains the Arduino installation (for example, under Mac OS X, this +# might be /Applications/arduino-0012). +# +# 2. Modify the line containing "PORT" to refer to the filename +# representing the USB or serial connection to your Arduino board +# (e.g. PORT = /dev/tty.USB0). If the exact name of this file +# changes, you can use * as a wildcard (e.g. PORT = /dev/tty.usb*). +# +# 3. Set the line containing "MCU" to match your board's processor. +# Older one's are atmega8 based, newer ones like Arduino Mini, Bluetooth +# or Diecimila have the atmega168. If you're using a LilyPad Arduino, +# change F_CPU to 8000000. +# +# 4. Type "make" and press enter to compile/verify your program. +# +# 5. Type "make upload", reset your Arduino board, and press enter to +# upload your program to the Arduino board. +# +# $Id$ + TARGET = $(notdir $(CURDIR)) -# CHANGE BELOW: -#~ INSTALL_DIR = /Applications/Arduino.app/Contents/Resources/Java -INSTALL_DIR = /home/bkubicek/software/arduino-0023 -#~ PORT = /dev/cu.usbserial* -PORT = /dev/ttyACM0 - -# Get these values from: -# $(INSTALL_DIR)/hardware/boards.txt -# (arduino-0022/hardware/arduino/boards.txt) -# The values below are for the "Arduino Duemilanove or Nano w/ ATmega328" -# now for "Arduino Mega 2560" -UPLOAD_SPEED = 115200 -UPLOAD_PROTOCOL = stk500v2 -BUILD_MCU = atmega2560 -BUILD_F_CPU = 16000000L -TERM=bash - -# getting undefined reference to `__cxa_pure_virtual' -#~ [http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1254180518 Arduino Forum - Makefile] -#~ http://www.arduino.cc/playground/OpenBSD/CLI -#~ [http://arduino.cc/forum/index.php?topic=52041.0 A "simple" makefile for Arduino] -#~ [http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1275488191 Arduino Forum - Configuring avr-gcc options in arduino IDE] -# found in /usr/lib/gcc/avr/4.3.5/cc1plus; fixed with -Wl,--gc-section +INSTALL_DIR = ../../arduino-0022/ +UPLOAD_RATE = 115200 +AVRDUDE_PROGRAMMER = arduino +# PORT = /dev/arduino_A900G2I3 +PORT = /dev/arduino +MCU = atmega1280 +#For "old" Arduino Mega +#MCU = atmega1280 +#For Sanguinololu +#MCU = atmega644p +F_CPU = 16000000 + ############################################################################ # Below here nothing should be changed... -LINKORDER=\ -applet/Marlin.cpp.o \ -applet/EEPROM.o \ -applet/main.o \ -applet/MarlinSerial.o \ -applet/motion_control.o\ -applet/pins_arduino.o\ -applet/planner.o\ -applet/Print.o\ -applet/Sd2Card.o\ -applet/SdBaseFile.o\ -applet/SdFatUtil.o\ -applet/SdFile.o\ -applet/SdVolume.o\ -applet/stepper.o\ -applet/temperature.o\ -applet/WInterrupts.o\ -applet/wiring_analog.o\ -applet/wiring_digital.o\ -applet/wiring.o\ -applet/wiring_pulse.o\ -applet/wiring_shift.o\ -applet/WMath.o - -PDES=Marlin.pde ultralcd.pde watchdog.pde cardreader.pde ARDUINO = $(INSTALL_DIR)/hardware/arduino/cores/arduino -# -#~ AVR_TOOLS_PATH = $(INSTALL_DIR)/hardware/tools/avr/bin -# in Ubuntu, avr-gcc is installed separate; -# only avrdude comes with the IDE -AVR_TOOLS_PATH = /usr/bin -AVR_DUDE_PATH = $(INSTALL_DIR)/hardware/tools -# -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 -# added applet/$(TARGET).cpp as in IDE 0022 -CXXSRC = $(ARDUINO)/HardwareSerial.cpp $(ARDUINO)/WMath.cpp \ - $(ARDUINO)/Print.cpp \ - $(ARDUINO)/main.cpp -# applet/$(TARGET).cpp # no need, having a rule now for applet/$(TARGET).cpp.o -# added main.cpp, as in 0022 +AVR_TOOLS_PATH = +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)/WMath.cpp $(ARDUINO)/WString.cpp\ +$(ARDUINO)/Print.cpp Marlin.cpp MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp stepper.cpp temperature.cpp cardreader.cpp FORMAT = ihex + # Name of this Makefile (used for "make depend"). MAKEFILE = Makefile @@ -79,192 +68,128 @@ MAKEFILE = Makefile # AVR (extended) COFF requires stabs, plus an avr-objcopy run. DEBUG = stabs -OPT = 2 +OPT = s # Place -D or -U options here -#~ CDEFS = -DBUILD_F_CPU=$(BUILD_F_CPU) -#~ CXXDEFS = -DBUILD_F_CPU=$(BUILD_F_CPU) -# now called DF_CPU -CDEFS = -DF_CPU=$(BUILD_F_CPU) -DARDUINO=23 -CXXDEFS = -DF_CPU=$(BUILD_F_CPU) -DARDUINO=23 +CDEFS = -DF_CPU=$(F_CPU) +CXXDEFS = -DF_CPU=$(F_CPU) # Place -I options here -CINCS = -I$(ARDUINO) -I$(INSTALL_DIR)/libraries/LiquidCrystal/ -I$(INSTALL_DIR)/libraries/EEPROM/ +CINCS = -I$(ARDUINO) CXXINCS = -I$(ARDUINO) # Compiler flag to set the C Standard level. -# c89 - "ANSI" C +# c89 - "ANSI" C # gnu89 - c89 plus GCC extensions -# c99 - ISO C99 standard (not yet fully implemented) +# c99 - ISO C99 standard (not yet fully implemented) # gnu99 - c99 plus GCC extensions -CSTANDARD = -std=gnu99 +#CSTANDARD = -std=gnu99 CDEBUG = -g$(DEBUG) -# note that typically, IDE 0022 uses -w to suppress warnings (both in cpp and c)! -CWARN = -Wall -#~ CWARN = -w -# "-Wstrict-prototypes" is valid for Ada/C/ObjC but not for C++: -CCWARN = -Wstrict-prototypes -CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums +CWARN = -Wall -Wstrict-prototypes +CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -w -ffunction-sections -fdata-sections -DARDUINO=22 #CEXTRA = -Wa,-adhlns=$(<:.c=.lst) -# to eliminate pins_ardiuno warnings: -# http://arduino.cc/pipermail/developers_arduino.cc/2010-December/004005.html - -# [http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1254180518 Arduino Forum - Makefile] -#~ For building the objects files "-ffunction-sections -fdata-sections" was missing -#~ and the final avr-gcc call needs "-Wl,--gc-section". -CXSECTF = -fno-exceptions -ffunction-sections -fdata-sections -CFINALF = -Wl,--gc-section - -CFLAGS = $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CCWARN) $(CSTANDARD) $(CEXTRA) -# added CWARN also to .cpp -CXXFLAGS = $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CXSECTF) -#ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs +CFLAGS = $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CEXTRA) $(CTUNING) +CXXFLAGS = $(CDEFS) $(CINCS) -O$(OPT) -Wall $(CEXTRA) $(CTUNING) +#ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs LDFLAGS = -lm + # Programming support using avrdude. Settings and variables. AVRDUDE_PORT = $(PORT) -AVRDUDE_WRITE_FLASH = -U flash:w:applet/$(TARGET).hex -AVRDUDE_FLAGS = -V -F \ - -p $(BUILD_MCU) -P $(AVRDUDE_PORT) -c $(UPLOAD_PROTOCOL) \ - -b $(UPLOAD_SPEED) -C $(INSTALL_DIR)/hardware/tools/avrdude.conf -# -b $(UPLOAD_SPEED) -C $(INSTALL_DIR)/hardware/tools/avr/etc/avrdude.conf +AVRDUDE_WRITE_FLASH = -U flash:w:applet/$(TARGET).hex:i +AVRDUDE_FLAGS = -D -C $(INSTALL_DIR)/hardware/tools/avrdude.conf \ +-p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \ +-b $(UPLOAD_RATE) # Program settings -CC = $(AVR_TOOLS_PATH)/avr-gcc -CXX = $(AVR_TOOLS_PATH)/avr-g++ -OBJCOPY = $(AVR_TOOLS_PATH)/avr-objcopy -OBJDUMP = $(AVR_TOOLS_PATH)/avr-objdump -AR = $(AVR_TOOLS_PATH)/avr-ar -SIZE = $(AVR_TOOLS_PATH)/avr-size -NM = $(AVR_TOOLS_PATH)/avr-nm -#~ AVRDUDE = $(AVR_TOOLS_PATH)/avrdude -AVRDUDE = $(AVR_DUDE_PATH)/avrdude +CC = $(AVR_TOOLS_PATH)avr-gcc +CXX = $(AVR_TOOLS_PATH)avr-g++ +OBJCOPY = $(AVR_TOOLS_PATH)avr-objcopy +OBJDUMP = $(AVR_TOOLS_PATH)avr-objdump +AR = $(AVR_TOOLS_PATH)avr-ar +SIZE = $(AVR_TOOLS_PATH)avr-size +NM = $(AVR_TOOLS_PATH)avr-nm +AVRDUDE = avrdude REMOVE = rm -f MV = mv -f # Define all object files. -# NOTE: obj files will be created in respective src directories (libraries or $(INSTALL_DIR)); -# make clean deletes them fine -# note that srcs are in libraries or other directories; -# $(CXXSRC:.cpp=.o) will cause obj files to be in same loc as src files -#~ OBJ = $(SRC:.c=.o) $(CXXSRC:.cpp=.o) $(ASRC:.S=.o) -# to change the output directory for object files; -# must change the obj list here! -# and then, match to corresponding rule somehow? -# or leave this - and parse in rule (auth automatic variable $(@F))? -# "Suffix Replacement" -CXXSRC+=MarlinSerial.cpp SdBaseFile.cpp stepper.cpp motion_control.cpp SdFatUtil.cpp temperature.cpp planner.cpp SdFile.cpp Sd2Card.cpp SdVolume.cpp -OBJ = $(SRC:.c=.o) $(CXXSRC:.cpp=.o) $(ASRC:.S=.o) - -# added - OBJ list, transformed into applet/ -OBJT = $(addprefix applet/,$(notdir $(OBJ))) -ALLSRC = $(SRC) $(CXXSRC) $(ASRC) +OBJ = $(SRC:.c=.o) $(CXXSRC:.cpp=.o) $(ASRC:.S=.o) # Define all listing files. LST = $(ASRC:.S=.lst) $(CXXSRC:.cpp=.lst) $(SRC:.c=.lst) # Combine all necessary flags and optional flags. # Add target processor to flags. -ALL_CFLAGS = -mmcu=$(BUILD_MCU) -I. $(CFLAGS) -ALL_CXXFLAGS = -mmcu=$(BUILD_MCU) -I. $(CXXFLAGS) -ALL_ASFLAGS = -mmcu=$(BUILD_MCU) -I. -x assembler-with-cpp $(ASFLAGS) - -# depended libraries of .pde need to be added from -# $(INSTALL_DIR)/libraries (TODO: and/or ~/sketchbook/libraries) -# grep for 'include', test if exists, add... -# note: prefix "a real tab character" http://www.delorie.com/djgpp/doc/ug/larger/makefiles.html -# $$ to escape $ for shell; -# note: must NOT put comments # inside bash execution; -# those would get removed by make; making shell see "EOF in backquote substitution" -# echo $$ix ; \ -# 'shell' twice - for each subprocess! Backtick doesn't get expanded? -GREPRES:=$(shell for ix in $(shell grep include $(TARGET).pde | sed 's/.*[<"]\(.*\).h[>"].*/\1/'); do \ - if [ -d $(INSTALL_DIR)/libraries/$$ix ] ; then \ - LINCS="$$LINCS -I$(INSTALL_DIR)/libraries/$$ix" ;\ - fi; \ - done; \ - echo $$LINCS) -# append includes: -CINCS += $(GREPRES) -CXXINCS += $(GREPRES) -# append library source .cpp files too (CXXSRC) -GREPRESB:=$(shell for ix in $(shell grep include $(TARGET).pde | sed 's/.*[<"]\(.*\).h[>"].*/\1/'); do \ - if [ -d $(INSTALL_DIR)/libraries/$$ix ] ; then \ - CPPSRCS="$$CPPSRCS $(INSTALL_DIR)/libraries/$$ix/*.cpp" ;\ - fi; \ - done; \ - echo $$CPPSRCS) -CXXSRC += $(GREPRESB) -# added - only CXX obj from libraries: -CXXLIBOBJ = $(GREPRESB:.cpp=.o) +ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) +ALL_CXXFLAGS = -mmcu=$(MCU) -I. $(CXXFLAGS) +ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS) + # Default target. all: applet_files build sizeafter -build: elf hex +build: elf hex applet_files: $(TARGET).pde - # Here is the "preprocessing". - # It creates a .cpp file based with the same name as the .pde file. - # On top of the new .cpp file comes the WProgram.h header. - # At the end there is a generic main() function attached. - # Then the .cpp file will be compiled. Errors during compile will - # refer to this new, automatically generated, file. - # Not the original .pde file you actually edit... + # Here is the "preprocessing". + # It creates a .cpp file based with the same name as the .pde file. + # On top of the new .cpp file comes the WProgram.h header. + # At the end there is a generic main() function attached. + # Then the .cpp file will be compiled. Errors during compile will + # refer to this new, automatically generated, file. + # Not the original .pde file you actually edit... test -d applet || mkdir applet - # @ supresses printout of the cmdline itself; so only the out of echo is printed - @echo ALL OBJT: $(OBJT) - @echo ALL CXXLIBOBJ: $(CXXLIBOBJ) -# echo '#include "WProgram.h"' > applet/$(TARGET).cpp - @echo "#include \"WProgram.h\"\nvoid setup();\nvoid loop();\n" > applet/$(TARGET).cpp - ##cat $(TARGET).pde >> applet/$(TARGET).cpp - cat ${PDES}>> applet/$(TARGET).cpp - cp *.cpp applet/ - # no more need to cat main.cpp (v0022) - now it is compiled in -# cat $(ARDUINO)/main.cpp >> applet/$(TARGET).cpp - + echo '#include "WProgram.h"' > applet/$(TARGET).cpp + cat $(TARGET).pde >> applet/$(TARGET).cpp + cat $(ARDUINO)/main.cpp >> applet/$(TARGET).cpp elf: applet/$(TARGET).elf hex: applet/$(TARGET).hex eep: applet/$(TARGET).eep -lss: applet/$(TARGET).lss +lss: applet/$(TARGET).lss sym: applet/$(TARGET).sym -# Program the device. +# Program the device. upload: applet/$(TARGET).hex $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) -# Display size of file. + + # Display size of file. HEXSIZE = $(SIZE) --target=$(FORMAT) applet/$(TARGET).hex -ELFSIZE = $(SIZE) applet/$(TARGET).elf +ELFSIZE = $(SIZE) applet/$(TARGET).elf sizebefore: @if [ -f applet/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi sizeafter: @if [ -f applet/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(HEXSIZE); echo; fi + # Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB. COFFCONVERT=$(OBJCOPY) --debugging \ - --change-section-address .data-0x800000 \ - --change-section-address .bss-0x800000 \ - --change-section-address .noinit-0x800000 \ - --change-section-address .eeprom-0x810000 +--change-section-address .data-0x800000 \ +--change-section-address .bss-0x800000 \ +--change-section-address .noinit-0x800000 \ +--change-section-address .eeprom-0x810000 + coff: applet/$(TARGET).elf $(COFFCONVERT) -O coff-avr applet/$(TARGET).elf $(TARGET).cof + extcoff: $(TARGET).elf $(COFFCONVERT) -O coff-ext-avr applet/$(TARGET).elf $(TARGET).cof + .SUFFIXES: .elf .hex .eep .lss .sym .elf.hex: $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@ .elf.eep: - -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ - --change-section-lma .eeprom=0 -O $(FORMAT) $< $@ + -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ + --change-section-lma .eeprom=0 -O $(FORMAT) $< $@ # Create extended listing file from ELF output file. .elf.lss: @@ -274,79 +199,50 @@ extcoff: $(TARGET).elf .elf.sym: $(NM) -n $< > $@ -# Link: create ELF output file from library. -# NOTE: applet/$(TARGET).cpp.o MUST BE BEFORE applet/core.a -# in the dependency list, so its rule runs first! -applet/$(TARGET).elf: $(TARGET).pde applet/$(TARGET).cpp.o applet/core.a -# $(CC) $(ALL_CFLAGS) -o $@ applet/$(TARGET).cpp -L. applet/core.a $(LDFLAGS) -# changed as in IDE v0022: link cpp obj files - @echo $$(tput bold)$$(tput setaf 2) $(CC) $$(tput sgr0) $(ALL_CFLAGS) $(CFINALF) -o $@ applet/$(TARGET).cpp.o $(CXXOBJ) -L. applet/core.a $(LDFLAGS) - echo ${OBJT} - #$(CC) $(ALL_CFLAGS) $(CFINALF) -o $@ applet/$(TARGET).cpp.o -L. applet/core.a $(LDFLAGS) - $(CC) $(ALL_CFLAGS) $(CFINALF) -o $@ ${LINKORDER} $(LDFLAGS) - #@$(CC) $(ALL_CFLAGS) $(CFINALF) -o $@ applet/*.o applet/$(TARGET).cpp.o $(CXXOBJ) -L. applet/core.a $(LDFLAGS) - -# added: cpp.o depends on cpp (and .pde which generates it) -# $< "first item in the dependencies list"; $@ "left side of the :"; $^ "right side of the :" -# http://www.cs.colby.edu/maxwell/courses/tutorials/maketutor/ -applet/$(TARGET).cpp.o: applet/$(TARGET).cpp - @echo $$(tput bold) $(CXX) $$(tput sgr0) -c $(ALL_CXXFLAGS) $< -o $@ - @$(CXX) -c $(ALL_CXXFLAGS) $< -o $@ - -#~ applet/core.a: $(OBJ) -#~ @for i in $(OBJ); do echo $(AR) rcs applet/core.a $$i; $(AR) rcs applet/core.a $$i; done - -applet/core.a: $(OBJT) - @for i in $(OBJT); do echo $(AR) rcs applet/core.a $$i; $(AR) rcs applet/core.a $$i; done - -# iterate through OBJ to find the original location; then build depending on source extension -# TODO: add handling of assembler files -applet/%.o: - @for iob in $(OBJ); do \ - if [ "`basename $$iob`" = "`basename $@`" ]; then \ - for ios in $(ALLSRC); do \ - if [ "$${iob%%.*}" = "$${ios%%.*}" ]; then \ - case $${ios##*.} in \ - "cpp") \ - echo "$$(tput bold)$$(tput setaf 1) $(CXX) $$(tput sgr0) -c $(ALL_CXXFLAGS) $$ios -o $@"; \ - $(CXX) -c $(ALL_CXXFLAGS) $$ios -o $@;; \ - "c") \ - echo "$$(tput bold)$$(tput setaf 1) $(CC) $$(tput sgr0) -c $(ALL_CFLAGS) $$ios -o $@"; \ - $(CC) -c $(ALL_CFLAGS) $$ios -o $@;; \ - esac; \ - fi; \ - done; \ - fi; \ - done; - -#~ # Compile: create object files from C++ source files. -#~ .cpp.o: -#~ $(CXX) -c $(ALL_CXXFLAGS) $< -o $@ - -#~ # Compile: create object files from C source files. -#~ .c.o: -#~ $(CC) -c $(ALL_CFLAGS) $< -o $@ - -#~ # Compile: create assembler files from C source files. -#~ .c.s: -#~ $(CC) -S $(ALL_CFLAGS) $< -o $@ - -#~ # Assemble: create object files from assembler source files. -#~ .S.o: -#~ $(CC) -c $(ALL_ASFLAGS) $< -o $@ - -#~ # Automatic dependencies -#~ %.d: %.c -#~ $(CC) -M $(ALL_CFLAGS) $< | sed "s;$(notdir $*).o:;$*.o $*.d:;" > $@ - -#~ %.d: %.cpp -#~ $(CXX) -M $(ALL_CXXFLAGS) $< | sed "s;$(notdir $*).o:;$*.o $*.d:;" > $@ + # Link: create ELF output file from library. +applet/$(TARGET).elf: $(TARGET).pde applet/core.a + $(CC) $(ALL_CFLAGS) -Wl,--gc-sections -o $@ applet/$(TARGET).cpp -L. applet/core.a $(LDFLAGS) + +applet/core.a: $(OBJ) + @for i in $(OBJ); do echo $(AR) rcs applet/core.a $$i; $(AR) rcs applet/core.a $$i; done + + + +# Compile: create object files from C++ source files. +.cpp.o: + $(CXX) -c $(ALL_CXXFLAGS) $< -o $@ + +# Compile: create object files from C source files. +.c.o: + $(CC) -c $(ALL_CFLAGS) $< -o $@ + + +# Compile: create assembler files from C source files. +.c.s: + $(CC) -S $(ALL_CFLAGS) $< -o $@ + + +# Assemble: create object files from assembler source files. +.S.o: + $(CC) -c $(ALL_ASFLAGS) $< -o $@ + + # Target: clean project. clean: $(REMOVE) applet/$(TARGET).hex applet/$(TARGET).eep applet/$(TARGET).cof applet/$(TARGET).elf \ - applet/$(TARGET).map applet/$(TARGET).sym applet/$(TARGET).lss applet/core.a \ - $(OBJT) applet/$(TARGET).cpp.o \ - $(OBJ) $(LST) $(SRC:.c=.s) $(SRC:.c=.d) $(CXXSRC:.cpp=.s) $(CXXSRC:.cpp=.d) - -.PHONY: all build elf hex eep lss sym program coff extcoff clean applet_files sizebefore sizeafter + applet/$(TARGET).map applet/$(TARGET).sym applet/$(TARGET).lss applet/core.a \ + $(OBJ) $(LST) $(SRC:.c=.s) $(SRC:.c=.d) $(CXXSRC:.cpp=.s) $(CXXSRC:.cpp=.d) + +depend: + if grep '^# DO NOT DELETE' $(MAKEFILE) >/dev/null; \ + then \ + sed -e '/^# DO NOT DELETE/,$$d' $(MAKEFILE) > \ + $(MAKEFILE).$$$$ && \ + $(MV) $(MAKEFILE).$$$$ $(MAKEFILE); \ + fi + echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' \ + >> $(MAKEFILE); \ + $(CC) -M -mmcu=$(MCU) $(CDEFS) $(CINCS) $(SRC) $(ASRC) >> $(MAKEFILE) + +.PHONY: all build elf hex eep lss sym program coff extcoff clean depend applet_files sizebefore sizeafter diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index 78739af24..560046a2b 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include @@ -55,7 +55,7 @@ // //# define MYPGM(s) (__extension__({static prog_char __c[] = (s); &__c[0];})) // //#define MYPGM(s) ((const prog_char *g PROGMEM=s)) // //#define MYPGM(s) PSTR(s) -#define MYPGM(s) (__extension__({static char __c[] __attribute__((__progmem__)) = (s); &__c[0];})) //This is the normal behaviour +#define MYPGM(s) (__extension__({static const char __c[] __attribute__((__progmem__)) = (s); &__c[0];})) //This is the normal behaviour //#define MYPGM(s) (__extension__({static prog_char __c[] = (s); &__c[0];})) //this does not work but hides the warnings diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde index 824a57d78..54c0ad3f3 100644 --- a/Marlin/Marlin.pde +++ b/Marlin/Marlin.pde @@ -1301,8 +1301,10 @@ void manage_inactivity(byte debug) last_stepperdisabled_time=previous_millis_cmd; else { - if( (X_ENABLE_ON && (READ(X_ENABLE_PIN)!=0)) || (!X_ENABLE_ON && READ(X_ENABLE_PIN)==0) ) - enquecommand(DEFAULT_STEPPER_DEACTIVE_COMMAND); + #if X_ENABLE_PIN >= 0 + if( (X_ENABLE_ON && (READ(X_ENABLE_PIN)!=0)) || (!X_ENABLE_ON && READ(X_ENABLE_PIN)==0) ) + enquecommand(DEFAULT_STEPPER_DEACTIVE_COMMAND); + #endif last_stepperdisabled_time=millis(); } } diff --git a/Marlin/cardreader.pde b/Marlin/cardreader.cpp similarity index 100% rename from Marlin/cardreader.pde rename to Marlin/cardreader.cpp diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index 371c6e589..e8ec15e95 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -85,9 +85,9 @@ static unsigned long previous_millis_bed_heater; static unsigned char soft_pwm[EXTRUDERS]; #ifdef WATCHPERIOD - static int watch_raw[EXTRUDERS] = { -1000 }; // the first value used for all - static int watch_oldtemp[3] = {0,0,0}; - static unsigned long watchmillis = 0; + int watch_raw[EXTRUDERS] = { -1000 }; // the first value used for all + int watch_oldtemp[3] = {0,0,0}; + unsigned long watchmillis = 0; #endif //WATCHPERIOD // Init min and max temp with extreme values to prevent false errors during startup @@ -218,7 +218,7 @@ void manage_heater() #ifdef WATCHPERIOD if(watchmillis && millis() - watchmillis > WATCHPERIOD){ - if(watch_oldtemp[TEMPSENSOR_HOTEND_0] >= degHotend(active_extruder)){ + if(watch_oldtemp[0] >= degHotend(active_extruder)){ setTargetHotend(0,active_extruder); LCD_MESSAGEPGM("Heating failed"); SERIAL_ECHO_START; @@ -527,7 +527,7 @@ void setWatch() for (int e = 0; e < EXTRUDERS; e++) { if(isHeatingHotend(e)) - watch_oldtemp[TEMPSENSOR_HOTEND_0] = degHotend(0); + watch_oldtemp[0] = degHotend(0); { t = max(t,millis()); watch_raw[e] = current_raw[e];