From 0d8eee79a9eb4701f3100434f5d696d912f7816f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 24 Feb 2015 17:23:53 +0100 Subject: added SPREADAVR_PATH variable to all examples --- any-led/Makefile | 7 ++++--- ats-watch/Makefile | 5 +++-- blink/Makefile | 3 ++- dolmetsch-ctl/Makefile | 5 +++-- pcr-controller/Makefile | 7 ++++--- r3cam-steppermotor/Makefile | 5 +++-- rf433send/Makefile | 7 ++++--- serial-led/Makefile | 5 +++-- tube-rotator/Makefile | 7 ++++--- tuer-rfid/Makefile | 7 ++++--- usb-1wire/Makefile | 7 ++++--- usb-adc-dustsensor/Makefile | 7 ++++--- usb-ajar/Makefile | 7 ++++--- usb-dual-serial/Makefile | 7 ++++--- usb-eth/Makefile | 5 +++-- usb-freq/Makefile | 7 ++++--- usb-keyboardmouse/Makefile | 5 +++-- usb-led/Makefile | 7 ++++--- usb-midi/Makefile | 5 +++-- usb-pwm/Makefile | 7 ++++--- usb-serial/Makefile | 5 +++-- usb-spi/Makefile | 5 +++-- 22 files changed, 77 insertions(+), 55 deletions(-) diff --git a/any-led/Makefile b/any-led/Makefile index 36eab31..ea5bf27 100644 --- a/any-led/Makefile +++ b/any-led/Makefile @@ -25,10 +25,11 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial anyio EXTERNAL_LIBS := lufa -RESET_FUNC := ../tools/reset_lufa_cdc +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'r' -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -43,4 +44,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace any-led example\"" -D USB_PRODUCT_LE LUFA_COMPONENTS := USB USBCLASS SERIAL -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/ats-watch/Makefile b/ats-watch/Makefile index 6047864..d6d29a0 100644 --- a/ats-watch/Makefile +++ b/ats-watch/Makefile @@ -25,8 +25,9 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial anyio EXTERNAL_LIBS := lufa +SPREADAVR_PATH := .. -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -41,4 +42,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"ats-watch\"" -D USB_PRODUCT_LEN=9 LUFA_COMPONENTS := USB USBCLASS SERIAL -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/blink/Makefile b/blink/Makefile index 7814de3..a529954 100644 --- a/blink/Makefile +++ b/blink/Makefile @@ -24,5 +24,6 @@ NAME := blink OBJ := $(NAME).o LIBS := util led BOARD_TYPE := culV3 +SPREADAVR_PATH := .. -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/dolmetsch-ctl/Makefile b/dolmetsch-ctl/Makefile index 331b966..685405a 100644 --- a/dolmetsch-ctl/Makefile +++ b/dolmetsch-ctl/Makefile @@ -25,8 +25,9 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o keypad.o eventqueue.o LIBS := util led lufa-descriptor-midi EXTERNAL_LIBS := lufa +SPREADAVR_PATH := .. -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -41,4 +42,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"dolmetsch controller\"" -D USB_PRODUCT_LEN=20 LUFA_COMPONENTS := USB USBCLASS -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/pcr-controller/Makefile b/pcr-controller/Makefile index 75aa477..821e590 100644 --- a/pcr-controller/Makefile +++ b/pcr-controller/Makefile @@ -25,10 +25,11 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o pwm.o pid_control.o temp_curve.o cmd_queue.o LIBS := util led lufa-descriptor-usbserial anyio onewire ds1820 EXTERNAL_LIBS := lufa -RESET_FUNC := ../tools/reset_lufa_cdc +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'R' -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -43,4 +44,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"OLGA pcr-controller\"" -D USB_PRODUCT_LEN=19 LUFA_COMPONENTS := USB USBCLASS SERIAL -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/r3cam-steppermotor/Makefile b/r3cam-steppermotor/Makefile index 3b7afce..be27b2f 100644 --- a/r3cam-steppermotor/Makefile +++ b/r3cam-steppermotor/Makefile @@ -27,8 +27,9 @@ BOARD_TYPE := minimus32 OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio EXTERNAL_LIBS := lufa +SPREADAVR_PATH := .. -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -43,4 +44,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"realraum cam-steppermotor\"" -D USB_PRODUCT_LEN= LUFA_COMPONENTS := USB USBCLASS -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/rf433send/Makefile b/rf433send/Makefile index d9ec7c6..068bd34 100644 --- a/rf433send/Makefile +++ b/rf433send/Makefile @@ -26,10 +26,11 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio EXTERNAL_LIBS := lufa -RESET_FUNC := ../tools/reset_lufa_cdc +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'r' -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -44,4 +45,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"realraum RF433 controller\"" -D USB_PRODUCT_LEN= LUFA_COMPONENTS := USB USBCLASS -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/serial-led/Makefile b/serial-led/Makefile index cd73ecc..4156d4a 100644 --- a/serial-led/Makefile +++ b/serial-led/Makefile @@ -25,8 +25,9 @@ BOARD_TYPE := slowpandongle1 OBJ := $(NAME).o LIBS := util led serialio EXTERNAL_LIBS := lufa +SPREADAVR_PATH := .. -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_COMPONENTS := SERIAL -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/tube-rotator/Makefile b/tube-rotator/Makefile index c75c022..7f567de 100644 --- a/tube-rotator/Makefile +++ b/tube-rotator/Makefile @@ -25,10 +25,11 @@ BOARD_TYPE := teenstep OBJ := $(NAME).o stepper.o LIBS := util led lufa-descriptor-usbserial anyio EXTERNAL_LIBS := lufa -RESET_FUNC := ../tools/reset_lufa_cdc +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := '!' -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -43,4 +44,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"realraum tube rotator\"" -D USB_PRODUCT_LEN=21 LUFA_COMPONENTS := USB USBCLASS SERIAL -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/tuer-rfid/Makefile b/tuer-rfid/Makefile index ae4bbba..82a3b87 100644 --- a/tuer-rfid/Makefile +++ b/tuer-rfid/Makefile @@ -26,10 +26,11 @@ BOARD_TYPE := teenstep OBJ := $(NAME).o heartbeat.o stepper.o ledmatrix.o sl018.o keystore.o statemachine.o eventqueue.o limits.o manual.o ajar.o LIBS := util led lufa-descriptor-usbserial anyio EXTERNAL_LIBS := lufa -RESET_FUNC := ../tools/reset_lufa_cdc +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'r' -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -46,7 +47,7 @@ LUFA_COMPONENTS := USB USBCLASS TWI SERIAL CLEAN_TARGETS += clean-pdf clean-update-keys -include ../include.mk +include $(SPREADAVR_PATH)/include.mk update-keys: update-keys.c gcc -o $@ $< diff --git a/usb-1wire/Makefile b/usb-1wire/Makefile index 44219b4..70cb4a2 100644 --- a/usb-1wire/Makefile +++ b/usb-1wire/Makefile @@ -25,10 +25,11 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio onewire ds1820 EXTERNAL_LIBS := lufa -RESET_FUNC := ../tools/reset_lufa_cdc +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'r' -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -43,4 +44,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-1wire example\"" -D USB_PRODUCT_ LUFA_COMPONENTS := USB USBCLASS -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-adc-dustsensor/Makefile b/usb-adc-dustsensor/Makefile index 71133e8..64b48b2 100644 --- a/usb-adc-dustsensor/Makefile +++ b/usb-adc-dustsensor/Makefile @@ -25,10 +25,11 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio EXTERNAL_LIBS := lufa -RESET_FUNC := ../tools/reset_lufa_cdc +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'r' -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -43,4 +44,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-adc-dustsensor example\"" -D USB LUFA_COMPONENTS := USB USBCLASS -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-ajar/Makefile b/usb-ajar/Makefile index 9642455..003e25c 100644 --- a/usb-ajar/Makefile +++ b/usb-ajar/Makefile @@ -25,10 +25,11 @@ BOARD_TYPE := minimus32 OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial anyio onewire ds1820 EXTERNAL_LIBS := lufa -RESET_FUNC := ../tools/reset_lufa_cdc +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'r' -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -43,4 +44,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-ajar example\"" -D USB_PRODUCT_L LUFA_COMPONENTS := USB USBCLASS SERIAL -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-dual-serial/Makefile b/usb-dual-serial/Makefile index 4efef9f..c6ca219 100644 --- a/usb-dual-serial/Makefile +++ b/usb-dual-serial/Makefile @@ -25,10 +25,11 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbdualserial EXTERNAL_LIBS := lufa -RESET_FUNC := ../tools/reset_lufa_cdc +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'r' -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 @@ -40,4 +41,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-dual-serial example\"" -D USB_PR LUFA_COMPONENTS := USB USBCLASS SERIAL -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-eth/Makefile b/usb-eth/Makefile index 9630145..2aa6f71 100644 --- a/usb-eth/Makefile +++ b/usb-eth/Makefile @@ -25,8 +25,9 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-rndis EXTERNAL_LIBS := lufa +SPREADAVR_PATH := .. -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 @@ -39,4 +40,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-eth example\"" -D USB_PRODUCT_LE LUFA_COMPONENTS := USB USBCLASS -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-freq/Makefile b/usb-freq/Makefile index 40bcabc..a855ff6 100644 --- a/usb-freq/Makefile +++ b/usb-freq/Makefile @@ -25,10 +25,11 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio EXTERNAL_LIBS := lufa -RESET_FUNC := ../tools/reset_lufa_cdc +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'r' -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -43,4 +44,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-freq example\"" -D USB_PRODUCT_L LUFA_COMPONENTS := USB USBCLASS -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-keyboardmouse/Makefile b/usb-keyboardmouse/Makefile index 659e618..01fee72 100644 --- a/usb-keyboardmouse/Makefile +++ b/usb-keyboardmouse/Makefile @@ -25,8 +25,9 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-keyboardmouse EXTERNAL_LIBS := lufa +SPREADAVR_PATH := .. -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 @@ -38,4 +39,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-keyboardmouse example\"" -D USB_ LUFA_COMPONENTS := USB USBCLASS SERIAL -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-led/Makefile b/usb-led/Makefile index e3b0b57..290a668 100644 --- a/usb-led/Makefile +++ b/usb-led/Makefile @@ -25,10 +25,11 @@ BOARD_TYPE := teenstep OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio EXTERNAL_LIBS := lufa -RESET_FUNC := ../tools/reset_lufa_cdc +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'r' -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -43,4 +44,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-led example\"" -D USB_PRODUCT_LE LUFA_COMPONENTS := USB USBCLASS -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-midi/Makefile b/usb-midi/Makefile index c52a24d..ba3d8f7 100644 --- a/usb-midi/Makefile +++ b/usb-midi/Makefile @@ -25,8 +25,9 @@ BOARD_TYPE := rhmixxx OBJ := $(NAME).o LIBS := util led lufa-descriptor-midi EXTERNAL_LIBS := lufa +SPREADAVR_PATH := .. -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -41,4 +42,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"rhmixxx midi controller\"" -D USB_PRODUCT_LEN=23 LUFA_COMPONENTS := USB USBCLASS SERIAL -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-pwm/Makefile b/usb-pwm/Makefile index 85ba3c8..dcc7a11 100644 --- a/usb-pwm/Makefile +++ b/usb-pwm/Makefile @@ -25,10 +25,11 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio EXTERNAL_LIBS := lufa -RESET_FUNC := ../tools/reset_lufa_cdc +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'r' -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -43,4 +44,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-pwm example\"" -D USB_PRODUCT_LE LUFA_COMPONENTS := USB USBCLASS -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-serial/Makefile b/usb-serial/Makefile index 6cde62d..26bae81 100644 --- a/usb-serial/Makefile +++ b/usb-serial/Makefile @@ -25,8 +25,9 @@ BOARD_TYPE := slowpandongle2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial EXTERNAL_LIBS := lufa +SPREADAVR_PATH := .. -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -41,4 +42,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-serial example\"" -D USB_PRODUCT LUFA_COMPONENTS := USB USBCLASS SERIAL -include ../include.mk +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-spi/Makefile b/usb-spi/Makefile index ea8ebb8..b0516bc 100644 --- a/usb-spi/Makefile +++ b/usb-spi/Makefile @@ -25,8 +25,9 @@ BOARD_TYPE := teensy2 OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial EXTERNAL_LIBS := lufa +SPREADAVR_PATH := .. -LUFA_PATH := ../contrib/LUFA-120219 +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 LUFA_OPTS += -D ORDERED_EP_CONFIG @@ -41,4 +42,4 @@ LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-spi example\"" -D USB_PRODUCT_LE LUFA_COMPONENTS := USB USBCLASS -include ../include.mk +include $(SPREADAVR_PATH)/include.mk -- cgit v1.2.3