From e1210e2d886b5432340e7fef5c92282cc5515684 Mon Sep 17 00:00:00 2001 From: Parita Date: Sun, 23 Jun 2013 01:11:11 +0530 Subject: [PATCH 1/3] Added changes in the makefile to link SoftwareSerial library --- Makefile | 60 +++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 4db57e7337d..676c1691455 100644 --- a/Makefile +++ b/Makefile @@ -1,70 +1,67 @@ CC=avr-gcc CXX=avr-g++ -#MCU=-mmcu=atmega328p -#CPU_SPEED=-DF_CPU=16000000UL -#VARIANTS=standard +MCU=-mmcu=atmega328p +CPU_SPEED=-DF_CPU=16000000UL +VARIANTS=standard SPI_PATH=libraries/SPI -SD_PATH=libraries/SD PINS_PATH=hardware/arduino/variants/$(VARIANTS) WIRING_PATH=hardware/arduino/cores/arduino ETHERNET_PATH=libraries/Ethernet +SOFTWARE_SERIAL_PATH=libraries/SoftwareSerial -STATIC_LIBRARIES=libarduino.a libspi.a libethernet.a libsd.a librawsd.a +STATIC_LIBRARIES=libarduino.a libspi.a libethernet.a libsoftwareserial.a libstring.a HEADER_PATHS=-I$(SPI_PATH) -I$(PINS_PATH) -I$(WIRING_PATH) -I$(ETHERNET_PATH) \ - -I$(ETHERNET_PATH)/utility -I$(SD_PATH) -I$(SD_PATH)/utility + -I$(ETHERNET_PATH)/utility -I$(SOFTWARE_SERIAL_PATH) ENABLE_FLAGS=-DARDUINO_WIRING_DIGITAL -DARDUINO_LITE -CFLAGS=-mmcu=$(MCU) -DF_CPU=$(CPU_SPEED) $(ENABLE_FLAGS) -Os -w -funsigned-char \ - -funsigned-bitfields -fpack-struct -fshort-enums -fno-exceptions +STRING_CFLAGS=$(MCU) $(CPU_SPEED) -DARDUINO_WIRING_DIGITAL -DARDUINO_STRING -Os -w -funsigned-char \ + -funsigned-bitfields -fpack-struct -fshort-enums + +CFLAGS=$(MCU) $(CPU_SPEED) $(ENABLE_FLAGS) -Os -w -funsigned-char \ + -funsigned-bitfields -fpack-struct -fshort-enums ARDUINO_FILES=wiring.c wiring_digital.c HardwareSerial.cpp \ - WInterrupts.c Print.cpp IPAddress.cpp new.cpp + WInterrupts.c IPAddress.cpp Print.cpp new.cpp ETHERNET_FILES=Ethernet.cpp EthernetUdp.cpp utility/socket.cpp \ utility/w5100.cpp ETHERNET_SOURCES=$(addprefix $(ETHERNET_PATH)/, $(ETHERNET_FILES)) ETHERNET_OBJECTS=$(ETHERNET_SOURCES:.cpp=.o) +SOFTWARE_SERIAL_FILES=SoftwareSerial.cpp +SOFTWARE_SERIAL_SOURCES=$(addprefix $(SOFTWARE_SERIAL_PATH)/,$(SOFTWARE_SERIAL_FILES)) +SOFTWARE_SERIAL_OBJECTS=$(SOFTWARE_SERIAL_SOURCES;.cpp=.o) + ARDUINO_SOURCES=$(addprefix $(WIRING_PATH)/, $(ARDUINO_FILES)) ARDUINO_OBJECTS1=$(filter %.cpp, $(ARDUINO_SOURCES)) ARDUINO_OBJECTS2=$(filter %.c, $(ARDUINO_SOURCES)) ARDUINO_OBJECTS=$(ARDUINO_OBJECTS1:.cpp=.o) $(ARDUINO_OBJECTS2:.c=.o) -.phony: clean default - default: $(STATIC_LIBRARIES) - -clean: - echo ------------- CLEAN - rm -f libarduino.a libspi.a libethernet.a libsd.a librawsd.a -libarduino.a: $(ARDUINO_OBJECTS) - echo ------------- LIBARDUINO - avr-ar rcs $@ $^ +libarduino.a: $(ARDUINO_OBJECTS) + avr-ar rcs $@ $(ARDUINO_OBJECTS) rm $(ARDUINO_OBJECTS) libspi.a: $(SPI_PATH)/SPI.cpp $(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $(SPI_PATH)/SPI.o avr-ar rcs $@ $(SPI_PATH)/SPI.o - rm $(SPI_PATH)/SPI.o + rm $(SPI_PATH)/SPI.o -libsd.a: $(SD_PATH)/SD.cpp librawsd.a - @echo --------------------- LIB SD - $(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $(SD_PATH)/SD.o - avr-ar rcs $@ $(SD_PATH)/SD.o - rm $(SD_PATH)/SD.o +libstring.a: $(WIRING_PATH)/WString.cpp + $(CXX) $(HEADER_PATHS) $< $(STRING_CFLAGS) -c -o $(WIRING_PATH)/WString.o + avr-ar rcs $@ $(WIRING_PATH)/WString.o + rm $(WIRING_PATH)/WString.o -librawsd.a: $(SD_PATH)/utility/Sd2Card.cpp - @echo --------------------- LIBRAWSD - $(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $(SD_PATH)/utility/SD2Card.o - avr-ar rcs $@ $(SD_PATH)/utility/SD2Card.o - rm $(SD_PATH)/utility/SD2Card.o - libethernet.a: $(ETHERNET_OBJECTS) avr-ar rcs $@ $^ - rm $(ETHERNET_OBJECTS) + rm $(ETHERNET_OBJECTS) + +libsoftwareserial.a: $(SOFTWARE_SERIAL_PATH)/SoftwareSerial.cpp + $(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $(SOFTWARE_SERIAL_PATH)/SoftwareSerial.o + avr-ar rcs $@ $(SOFTWARE_SERIAL_PATH)/SoftwareSerial.o $(ETHERNET_PATH)/%.o : $(ETHERNET_PATH)/%.cpp $(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $@ @@ -74,3 +71,4 @@ $(WIRING_PATH)/%.o : $(WIRING_PATH)/%.c $(WIRING_PATH)/%.o : $(WIRING_PATH)/%.cpp $(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $@ + From 9c8d5b1d28faae411632fb5552057872b9a06457 Mon Sep 17 00:00:00 2001 From: Parita Date: Sun, 23 Jun 2013 01:36:04 +0530 Subject: [PATCH 2/3] reflected previous sd card fixes --- Makefile | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 676c1691455..c3dfef5ef6e 100644 --- a/Makefile +++ b/Makefile @@ -5,25 +5,26 @@ CPU_SPEED=-DF_CPU=16000000UL VARIANTS=standard SPI_PATH=libraries/SPI +SD_PATH=libraries/SD PINS_PATH=hardware/arduino/variants/$(VARIANTS) WIRING_PATH=hardware/arduino/cores/arduino ETHERNET_PATH=libraries/Ethernet SOFTWARE_SERIAL_PATH=libraries/SoftwareSerial -STATIC_LIBRARIES=libarduino.a libspi.a libethernet.a libsoftwareserial.a libstring.a +STATIC_LIBRARIES=libarduino.a libspi.a libethernet.a libsd.a librawsd.a libsoftwareserial.a libstring.a HEADER_PATHS=-I$(SPI_PATH) -I$(PINS_PATH) -I$(WIRING_PATH) -I$(ETHERNET_PATH) \ - -I$(ETHERNET_PATH)/utility -I$(SOFTWARE_SERIAL_PATH) + -I$(ETHERNET_PATH)/utility -I$(SD_PATH) -I$(SD_PATH)/utility -I$(SOFTWARE_SERIAL_PATH) ENABLE_FLAGS=-DARDUINO_WIRING_DIGITAL -DARDUINO_LITE -STRING_CFLAGS=$(MCU) $(CPU_SPEED) -DARDUINO_WIRING_DIGITAL -DARDUINO_STRING -Os -w -funsigned-char \ +CFLAGS=$(MCU) $(CPU_SPEED) $(ENABLE_FLAGS) -Os -w -funsigned-char \ -funsigned-bitfields -fpack-struct -fshort-enums -CFLAGS=$(MCU) $(CPU_SPEED) $(ENABLE_FLAGS) -Os -w -funsigned-char \ +STRING_CFLAGS=$(MCU) $(CPU_SPEED) -DARDUINO_WIRING_DIGITAL -DARDUINO_STRING -Os -w -funsigned-char \ -funsigned-bitfields -fpack-struct -fshort-enums ARDUINO_FILES=wiring.c wiring_digital.c HardwareSerial.cpp \ - WInterrupts.c IPAddress.cpp Print.cpp new.cpp + WInterrupts.c Print.cpp IPAddress.cpp new.cpp ETHERNET_FILES=Ethernet.cpp EthernetUdp.cpp utility/socket.cpp \ utility/w5100.cpp @@ -39,9 +40,16 @@ ARDUINO_OBJECTS1=$(filter %.cpp, $(ARDUINO_SOURCES)) ARDUINO_OBJECTS2=$(filter %.c, $(ARDUINO_SOURCES)) ARDUINO_OBJECTS=$(ARDUINO_OBJECTS1:.cpp=.o) $(ARDUINO_OBJECTS2:.c=.o) +.phony: clean default + default: $(STATIC_LIBRARIES) +clean: + echo ------------- CLEAN + rm -f libarduino.a libspi.a libethernet.a libsd.a librawsd.a libsoftwareserial.a libstring.a + libarduino.a: $(ARDUINO_OBJECTS) + echo ------------- LIBARDUINO avr-ar rcs $@ $(ARDUINO_OBJECTS) rm $(ARDUINO_OBJECTS) @@ -50,6 +58,18 @@ libspi.a: $(SPI_PATH)/SPI.cpp avr-ar rcs $@ $(SPI_PATH)/SPI.o rm $(SPI_PATH)/SPI.o +libsd.a: $(SD_PATH)/SD.cpp librawsd.a + @echo --------------------- LIB SD + $(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $(SD_PATH)/SD.o + avr-ar rcs $@ $(SD_PATH)/SD.o + rm $(SD_PATH)/SD.o + +librawsd.a: $(SD_PATH)/utility/Sd2Card.cpp + @echo --------------------- LIBRAWSD + $(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $(SD_PATH)/utility/SD2Card.o + avr-ar rcs $@ $(SD_PATH)/utility/SD2Card.o + rm $(SD_PATH)/utility/SD2Card.o + libstring.a: $(WIRING_PATH)/WString.cpp $(CXX) $(HEADER_PATHS) $< $(STRING_CFLAGS) -c -o $(WIRING_PATH)/WString.o avr-ar rcs $@ $(WIRING_PATH)/WString.o From 65eacdf1182ef50941a10155a13de6961f634df5 Mon Sep 17 00:00:00 2001 From: Parita Date: Sun, 23 Jun 2013 01:39:12 +0530 Subject: [PATCH 3/3] minor changes --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c3dfef5ef6e..4e7e55aa33b 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ HEADER_PATHS=-I$(SPI_PATH) -I$(PINS_PATH) -I$(WIRING_PATH) -I$(ETHERNET_PATH) \ ENABLE_FLAGS=-DARDUINO_WIRING_DIGITAL -DARDUINO_LITE CFLAGS=$(MCU) $(CPU_SPEED) $(ENABLE_FLAGS) -Os -w -funsigned-char \ - -funsigned-bitfields -fpack-struct -fshort-enums + -funsigned-bitfields -fpack-struct -fshort-enums -fno-exceptions STRING_CFLAGS=$(MCU) $(CPU_SPEED) -DARDUINO_WIRING_DIGITAL -DARDUINO_STRING -Os -w -funsigned-char \ -funsigned-bitfields -fpack-struct -fshort-enums @@ -50,7 +50,7 @@ clean: libarduino.a: $(ARDUINO_OBJECTS) echo ------------- LIBARDUINO - avr-ar rcs $@ $(ARDUINO_OBJECTS) + avr-ar rcs $@ $^ rm $(ARDUINO_OBJECTS) libspi.a: $(SPI_PATH)/SPI.cpp