summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile9
-rw-r--r--contrib/fastled4minimus32.patch25
2 files changed, 30 insertions, 4 deletions
diff --git a/contrib/Makefile b/contrib/Makefile
index be93ef2..6e87923 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -23,7 +23,7 @@
##
LUFA_VERSION := 151115
-FASTLED_VERSION := v3.1.0
+FASTLED_VERSION := 3.1.0
BMP180_VERSION := V_1.1.2
all: download-lufa download-fastled update-pjon update-teensy-loader download-bmp180
@@ -34,11 +34,12 @@ LUFA-${LUFA_VERSION}.zip:
wget "http://www.github.com/abcminiuser/lufa/archive/$@" -O "$@"
unzip $@
-download-fastled: FastLED-${FASTLED_VERSION}.zip
+download-fastled: FastLED-v${FASTLED_VERSION}.zip
-FastLED-${FASTLED_VERSION}.zip:
- wget "https://github.com/FastLED/FastLED/archive/${FASTLED_VERSION}.zip" -O "$@"
+FastLED-v${FASTLED_VERSION}.zip:
+ wget "https://github.com/FastLED/FastLED/archive/v${FASTLED_VERSION}.zip" -O "$@"
unzip $@
+ cd FastLED-${FASTLED_VERSION}; patch -p1 < ../fastled4minimus32.patch
download-bmp180: BMP180-${BMP180_VERSION}.zip
diff --git a/contrib/fastled4minimus32.patch b/contrib/fastled4minimus32.patch
new file mode 100644
index 0000000..beb5e47
--- /dev/null
+++ b/contrib/fastled4minimus32.patch
@@ -0,0 +1,25 @@
+diff -Nur FastLED-3.1.0.orig/platforms/avr/fastpin_avr.h FastLED-3.1.0/platforms/avr/fastpin_avr.h
+--- FastLED-3.1.0.orig/platforms/avr/fastpin_avr.h 2015-09-23 18:22:19.000000000 +0200
++++ FastLED-3.1.0/platforms/avr/fastpin_avr.h 2016-06-03 02:03:19.167138941 +0200
+@@ -105,7 +105,7 @@
+ #define AVR_HARDWARE_SPI 1
+
+ #define HAS_HARDWARE_PIN_SUPPORT 1
+-#elif defined(ARDUINO_HOODLOADER2) && (defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__)) || defined(__AVR_AT90USB82__) || defined(__AVR_AT90USB162__)
++#elif (defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__)) || defined(__AVR_AT90USB82__) || defined(__AVR_AT90USB162__)
+
+ _IO(D); _IO(B); _IO(C);
+
+@@ -120,9 +120,9 @@
+ _DEFPIN_AVR( 20, 0x80, D);
+
+ #define HAS_HARDWARE_PIN_SUPPORT 1
+-// #define SPI_DATA 2
+-// #define SPI_CLOCK 1
+-// #define AVR_HARDWARE_SPI 1
++#define SPI_DATA 2
++#define SPI_CLOCK 1
++#define AVR_HARDWARE_SPI 1
+
+ #elif defined(__AVR_ATmega328P__) || defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega8__)
+ // Accelerated port definitions for arduino avrs