From 5b88b66b4f832495fecd0c3ba4a1185dd9c2d53a Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 15 Jul 2015 21:45:35 +0200 Subject: add target for teensy loader in contrib --- .gitignore | 2 ++ README | 8 ++++---- contrib/Makefile | 9 ++++++++- defines.mk | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0b85dfe..125bb4f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,6 @@ contrib/LUFA-* contrib/lufa-LUFA-* contrib/.fastled.prepared contrib/FastLED +contrib/.teesy-loader.prepared +contrib/teensy_loader_cli tuer-rfid/update-keys diff --git a/README b/README index a5d6915..53a2f27 100644 --- a/README +++ b/README @@ -7,7 +7,7 @@ binutils-avr gcc-avr avrdude dfu-programmer -teensy_loader +libusb-dev (for teensy_loader_cli) udev example rules @@ -43,9 +43,9 @@ Build Getting the source via GIT: --------------------------- -git clone git://git.spreadspace.org/avr.git -cd avr - +git clone git://git.spreadspace.org/avr-utils.git +cd avr-utils +make -C contrib build and flash blink example ----------------------------- diff --git a/contrib/Makefile b/contrib/Makefile index 5ced434..722114b 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -23,7 +23,7 @@ LUFA_VERSION := 140928 -all: download-lufa update-fastled +all: download-lufa update-fastled update-teensy-loader download-lufa: LUFA-${LUFA_VERSION}.zip @@ -37,3 +37,10 @@ LUFA-${LUFA_VERSION}.zip: update-fastled: .fastled.prepared cd FastLED/; git pull + +.teesy-loader.prepared: + git clone https://github.com/PaulStoffregen/teensy_loader_cli.git + touch $@ + +update-teensy-loader: .teesy-loader.prepared + cd teensy_loader_cli; git pull; make diff --git a/defines.mk b/defines.mk index 81b4c00..954a3f1 100644 --- a/defines.mk +++ b/defines.mk @@ -201,7 +201,7 @@ SIZE = avr-size LIB_DIR = $(SPREADAVR_PATH)/lib DFU = dfu-programmer -teensy = teensy_loader_cli +teensy = $(SPREADAVR_PATH)/contrib/teensy_loader_cli/teensy_loader_cli avrdude = avrdude ## Options common to C and C++ compiler -- cgit v1.2.3