diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2015-12-01 22:10:29 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2015-12-01 22:10:29 +0100 |
| commit | ebf5e854c35985f27c08e30d6da76c4aa1938b1d (patch) | |
| tree | 131f1043985d280117fc67a57e3ac1ff840c73be | |
| parent | upgrade of LUFA (diff) | |
FastLED 3.1 is now released
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | contrib/Makefile | 17 | ||||
| -rw-r--r-- | usb-fastled/Makefile | 2 |
3 files changed, 11 insertions, 13 deletions
@@ -7,8 +7,7 @@ tools/reset_arduino contrib/LUFA-* contrib/lufa-LUFA-* -contrib/.fastled.prepared -contrib/FastLED -contrib/.teesy-loader.prepared +contrib/FastLED-* +contrib/.teensy-loader.prepared contrib/teensy_loader_cli tuer-rfid/update-keys diff --git a/contrib/Makefile b/contrib/Makefile index ff920b2..c76db20 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -22,8 +22,9 @@ ## LUFA_VERSION := 151115 +FASTLED_VERSION := v3.1.0 -all: download-lufa update-fastled update-teensy-loader +all: download-lufa download-fastled update-teensy-loader download-lufa: LUFA-${LUFA_VERSION}.zip @@ -31,17 +32,15 @@ LUFA-${LUFA_VERSION}.zip: wget "http://www.github.com/abcminiuser/lufa/archive/$@" -O "$@" unzip $@ -.fastled.prepared: - git clone --branch 'FastLED3.1' https://github.com/FastLED/FastLED.git - git -C FastLED checkout b3e1d2645f466040d51f32f299e609bec574437e - touch $@ +download-fastled: FastLED-${FASTLED_VERSION}.zip -update-fastled: .fastled.prepared - git -C FastLED fetch +FastLED-${FASTLED_VERSION}.zip: + wget "https://github.com/FastLED/FastLED/archive/${FASTLED_VERSION}.zip" -O "$@" + unzip $@ -.teesy-loader.prepared: +.teensy-loader.prepared: git clone https://github.com/PaulStoffregen/teensy_loader_cli.git touch $@ -update-teensy-loader: .teesy-loader.prepared +update-teensy-loader: .teensy-loader.prepared cd teensy_loader_cli; git pull; make diff --git a/usb-fastled/Makefile b/usb-fastled/Makefile index f0518cb..c4bbe47 100644 --- a/usb-fastled/Makefile +++ b/usb-fastled/Makefile @@ -30,7 +30,7 @@ SPREADAVR_PATH := .. RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc_nowait RESET_PARAM := '!' -FASTLED_PATH := $(SPREADAVR_PATH)/contrib/FastLED +FASTLED_PATH := $(SPREADAVR_PATH)/contrib/FastLED-3.1.0 FASTLED_OPTS := -DCORE_TEENSY LUFA_PATH := $(SPREADAVR_PATH)/contrib/lufa-LUFA-151115 |