Merge branch 'fastled'

9 files changed, 864 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index 5063a30..0b85dfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,6 @@
 tools/reset_arduino
 contrib/LUFA-*
 contrib/lufa-LUFA-*
+contrib/.fastled.prepared
+contrib/FastLED
 tuer-rfid/update-keys
diff --git a/contrib/Makefile b/contrib/Makefile
index c0ad248..5ced434 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -23,10 +23,17 @@
 
 LUFA_VERSION := 140928
 
-all: download-lufa
+all: download-lufa update-fastled
 
 download-lufa: LUFA-${LUFA_VERSION}.zip
 
 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
+	touch $@
+
+update-fastled: .fastled.prepared
+	cd FastLED/; git pull
diff --git a/fastled.mk b/fastled.mk
new file mode 100644
index 0000000..954d7ad
--- /dev/null
+++ b/fastled.mk
@@ -0,0 +1,41 @@
+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+include $(SPREADAVR_PATH)/defines.mk
+
+SRC:=$(wildcard $(FASTLED_PATH)/*.cpp)
+
+CXXFLAGS += -I$(FASTLED_PATH)
+CXXFLAGS += -DARDUINO
+CXXFLAGS += -DNEED_CXX_BITS
+CXXFLAGS += $(FASTLED_OPTS)
+
+OBJ = $(SRC:%.cpp=%.o)
+
+libfastled.a: $(OBJ)
+	$(AR) $@ $(OBJ)
+
+%.o: %.cpp
+	$(CXX) -c $(CXXFLAGS) $< -o $@
+
+clean:
+	rm -f $(SRC:%.cpp=%.o)
diff --git a/include.mk b/include.mk
index 28eeaaa..20d20f4 100644
--- a/include.mk
+++ b/include.mk
@@ -34,8 +34,11 @@ CXX_DEP := $(CXX_SRC:%.cpp=%.d)
 OBJ_LIB := $(LIBS:%=lib-%.o)
 SRC_LIB := $(LIBS:%=$(LIB_DIR)/%.c)
 DEP_LIB := $(LIBS:%=lib-%.d)
+CXX_OBJ_LIB := $(CXX_LIBS:%=lib-%.o)
+CXX_SRC_LIB := $(CXX_LIBS:%=$(LIB_DIR)/%.cpp)
+CXX_DEP_LIB := $(CXX_LIBS:%=lib-%.d)
 
-.PHONY: prepare clean clean-external distclean clean-lufa program erase flash reset run
+.PHONY: prepare clean clean-external distclean clean-lufa clean-fastled program erase flash reset run
 
 ELFFILE := $(NAME).elf
 HEXFILE := $(NAME).hex
@@ -53,21 +56,62 @@ CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD)
 CFLAGS += $(LUFA_OPTS)
 endif
 
+ifdef FASTLED_PATH
+CXXFLAGS += -I$(FASTLED_PATH)
+CXXFLAGS += -DARDUINO
+CXXFLAGS += -DNEED_CXX_BITS
+CXXFLAGS += $(FASTLED_OPTS)
+endif
+
 prepare: $(EXTERNAL_LIBS:%=build-%)
 clean-external: $(EXTERNAL_LIBS:%=clean-%)
 
 export
+
 build-lufa: liblufa.a
 
 liblufa.a: Makefile
-	@echo "building external LUFA lib ($(LUFA_PATH))"
+	@echo ""
+	@echo "****************************************************"
+	@echo "* building external LUFA lib ($(LUFA_PATH))"
+	@echo ""
 	make -f $(SPREADAVR_PATH)/lufa.mk liblufa.a
 	make -f $(SPREADAVR_PATH)/lufa.mk clean
+	@echo ""
+	@echo "****************************************************"
 
 clean-lufa:
+	@echo ""
+	@echo "****************************************************"
 	@echo "cleaning external LUFA lib ($(LUFA_PATH))"
+	@echo ""
 	make -f $(SPREADAVR_PATH)/lufa.mk clean
 	rm -f liblufa.a
+	@echo ""
+	@echo "****************************************************"
+
+
+build-fastled: libfastled.a
+
+libfastled.a: Makefile
+	@echo ""
+	@echo "****************************************************"
+	@echo "building external FastLED lib ($(FASTLED_PATH))"
+	@echo ""
+	make -f $(SPREADAVR_PATH)/fastled.mk libfastled.a
+	make -f $(SPREADAVR_PATH)/fastled.mk clean
+	@echo ""
+	@echo "****************************************************"
+
+clean-fastled:
+	@echo ""
+	@echo "****************************************************"
+	@echo "cleaning external FastLED lib ($(FASTLED_PATH))"
+	@echo ""
+	make -f $(SPREADAVR_PATH)/fastled.mk clean
+	rm -f libfastled.a
+	@echo ""
+	@echo "****************************************************"
 
 
 ## project-specific objects
@@ -89,10 +133,18 @@ lib-%.d: $(LIB_DIR)/%.c Makefile
   sed 's,\($*\)\.o[ :]*,lib-\1.o $@ : ,g' < $@.$$$$ > $@; \
   rm -f $@.$$$$; echo '(re)building $@'
 
+lib-%.d: $(LIB_DIR)/%.cpp Makefile
+	@set -e; rm -f $@; \
+  $(CXX) -MM $(CXXFLAGS) $< > $@.$$$$; \
+  sed 's,\($*\)\.o[ :]*,lib-\1.o $@ : ,g' < $@.$$$$ > $@; \
+  rm -f $@.$$$$; echo '(re)building $@'
+
+
 ifneq ($(MAKECMDGOALS),distclean)
 -include $(DEP)
 -include $(CXX_DEP)
 -include $(DEP_LIB)
+-include $(CXX_DEP_LIB)
 endif
 
 %.o: %.c Makefile
@@ -104,8 +156,11 @@ endif
 lib-%.o: $(LIB_DIR)/%.c Makefile
 	$(CC) $(CFLAGS) -c $< -o $@
 
-$(ELFFILE): $(OBJ) $(CXX_OBJ) $(OBJ_LIB) $(EXTERNAL_LIBS:%=lib%.a)
-	$(CC) $(LDFLAGS) $(OBJ) $(CXX_OBJ) $(OBJ_LIB) $(EXTERNAL_LIBS:%=-l%) -o $@
+lib-%.o: $(LIB_DIR)/%.cpp Makefile
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+$(ELFFILE): $(OBJ_LIB) $(CXX_OBJ_LIB) $(EXTERNAL_LIBS:%=lib%.a) $(OBJ) $(CXX_OBJ)
+	$(CC) $(LDFLAGS) $(OBJ) $(CXX_OBJ) $(OBJ_LIB)  $(CXX_OBJ_LIB) $(EXTERNAL_LIBS:%=-l%) -o $@
 	$(SIZE) $@
 	@echo ""
 
diff --git a/lib/Arduino.h b/lib/Arduino.h
new file mode 100644
index 0000000..4b3026b
--- /dev/null
+++ b/lib/Arduino.h
@@ -0,0 +1,212 @@
+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Arduino Header stub to build FastLED library */
+
+#ifndef Arduino_h
+#define Arduino_h
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include <avr/pgmspace.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#define HIGH 0x1
+#define LOW  0x0
+
+#define INPUT 0x0
+#define OUTPUT 0x1
+#define INPUT_PULLUP 0x2
+
+#define true 0x1
+#define false 0x0
+
+#define PI 3.1415926535897932384626433832795
+#define HALF_PI 1.5707963267948966192313216916398
+#define TWO_PI 6.283185307179586476925286766559
+#define DEG_TO_RAD 0.017453292519943295769236907684886
+#define RAD_TO_DEG 57.295779513082320876798154814105
+
+#define SERIAL  0x0
+#define DISPLAY 0x1
+
+#define LSBFIRST 0
+#define MSBFIRST 1
+
+#define CHANGE 1
+#define FALLING 2
+#define RISING 3
+
+#if defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
+#define DEFAULT 0
+#define EXTERNAL 1
+#define INTERNAL 2
+#else
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__)
+#define INTERNAL1V1 2
+#define INTERNAL2V56 3
+#else
+#define INTERNAL 3
+#endif
+#define DEFAULT 1
+#define EXTERNAL 0
+#endif
+
+// undefine stdlib's abs if encountered
+#ifdef abs
+#undef abs
+#endif
+
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+#define abs(x) ((x)>0?(x):-(x))
+#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
+#define round(x)     ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
+#define radians(deg) ((deg)*DEG_TO_RAD)
+#define degrees(rad) ((rad)*RAD_TO_DEG)
+#define sq(x) ((x)*(x))
+
+#define interrupts() sei()
+#define noInterrupts() cli()
+
+#define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
+#define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
+#define microsecondsToClockCycles(a) ( (a) * clockCyclesPerMicrosecond() )
+
+#define lowByte(w) ((uint8_t) ((w) & 0xff))
+#define highByte(w) ((uint8_t) ((w) >> 8))
+
+#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
+#define bitSet(value, bit) ((value) |= (1UL << (bit)))
+#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
+#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
+
+
+typedef unsigned int word;
+
+#define bit(b) (1UL << (b))
+
+typedef uint8_t boolean;
+typedef uint8_t byte;
+
+void init(void);
+
+void pinMode(uint8_t, uint8_t);
+void digitalWrite(uint8_t, uint8_t);
+//int digitalRead(uint8_t);
+//int analogRead(uint8_t);
+//void analogReference(uint8_t mode);
+//void analogWrite(uint8_t, int);
+
+unsigned long millis(void);
+unsigned long micros(void);
+void delay(unsigned long);
+void delayMicroseconds(unsigned int us);
+// unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
+
+// void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
+// uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
+
+// void attachInterrupt(uint8_t, void (*)(void), int mode);
+// void detachInterrupt(uint8_t);
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+
+#define analogInPinToBit(P) (P)
+
+// On the ATmega1280, the addresses of some of the port registers are
+// greater than 255, so we can't store them in uint8_t's.
+extern const uint16_t PROGMEM port_to_mode_PGM[];
+extern const uint16_t PROGMEM port_to_input_PGM[];
+extern const uint16_t PROGMEM port_to_output_PGM[];
+
+extern const uint8_t PROGMEM digital_pin_to_port_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_bit_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+//
+// These perform slightly better as macros compared to inline functions
+//
+#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
+#define digitalPinToBitMask(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM + (P) ) )
+#define digitalPinToTimer(P) ( pgm_read_byte( digital_pin_to_timer_PGM + (P) ) )
+#define analogInPinToBit(P) (P)
+#define portOutputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_output_PGM + (P))) )
+#define portInputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_input_PGM + (P))) )
+#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_mode_PGM + (P))) )
+
+#define NOT_A_PIN 0
+#define NOT_A_PORT 0
+
+#ifdef ARDUINO_MAIN
+#define PA 1
+#define PB 2
+#define PC 3
+#define PD 4
+#define PE 5
+#define PF 6
+#define PG 7
+#define PH 8
+#define PJ 10
+#define PK 11
+#define PL 12
+#endif
+
+#define NOT_ON_TIMER 0
+#define TIMER0A 1
+#define TIMER0B 2
+#define TIMER1A 3
+#define TIMER1B 4
+#define TIMER2  5
+#define TIMER2A 6
+#define TIMER2B 7
+
+#define TIMER3A 8
+#define TIMER3B 9
+#define TIMER3C 10
+#define TIMER4A 11
+#define TIMER4B 12
+#define TIMER4C 13
+#define TIMER4D 14
+#define TIMER5A 15
+#define TIMER5B 16
+#define TIMER5C 17
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+// #include "pins_arduino.h"
+void arduino_init(void);
+
+#endif
diff --git a/lib/arduino-stub.cpp b/lib/arduino-stub.cpp
new file mode 100644
index 0000000..03efc95
--- /dev/null
+++ b/lib/arduino-stub.cpp
@@ -0,0 +1,361 @@
+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Arduino.h"
+
+
+extern "C" {
+
+#ifndef cbi
+#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
+#endif
+#ifndef sbi
+#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
+#endif
+
+/*
+  wiring.c - Partial implementation of the Wiring API for the ATmega8.
+  Part of Arduino - http://www.arduino.cc/
+
+  Copyright (c) 2005-2006 David A. Mellis
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+
+  $Id$
+*/
+
+//#include "wiring_private.h"
+
+// the prescaler is set so that timer0 ticks every 64 clock cycles, and the
+// the overflow handler is called every 256 ticks.
+#define MICROSECONDS_PER_TIMER0_OVERFLOW (clockCyclesToMicroseconds(64 * 256))
+
+// the whole number of milliseconds per timer0 overflow
+#define MILLIS_INC (MICROSECONDS_PER_TIMER0_OVERFLOW / 1000)
+
+// the fractional number of milliseconds per timer0 overflow. we shift right
+// by three to fit these numbers into a byte. (for the clock speeds we care
+// about - 8 and 16 MHz - this doesn't lose precision.)
+#define FRACT_INC ((MICROSECONDS_PER_TIMER0_OVERFLOW % 1000) >> 3)
+#define FRACT_MAX (1000 >> 3)
+
+volatile unsigned long timer0_overflow_count = 0;
+volatile unsigned long timer0_millis = 0;
+static unsigned char timer0_fract = 0;
+
+#if defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__)
+ISR(TIM0_OVF_vect)
+#else
+ISR(TIMER0_OVF_vect)
+#endif
+{
+  // copy these to local variables so they can be stored in registers
+  // (volatile variables must be read from memory on every access)
+  unsigned long m = timer0_millis;
+  unsigned char f = timer0_fract;
+
+  m += MILLIS_INC;
+  f += FRACT_INC;
+  if (f >= FRACT_MAX) {
+    f -= FRACT_MAX;
+    m += 1;
+  }
+
+  timer0_fract = f;
+  timer0_millis = m;
+  timer0_overflow_count++;
+}
+
+unsigned long millis()
+{
+  unsigned long m;
+  uint8_t oldSREG = SREG;
+
+  // disable interrupts while we read timer0_millis or we might get an
+  // inconsistent value (e.g. in the middle of a write to timer0_millis)
+  cli();
+  m = timer0_millis;
+  SREG = oldSREG;
+
+  return m;
+}
+
+unsigned long micros() {
+  unsigned long m;
+  uint8_t oldSREG = SREG, t;
+
+  cli();
+  m = timer0_overflow_count;
+#if defined(TCNT0)
+  t = TCNT0;
+#elif defined(TCNT0L)
+  t = TCNT0L;
+#else
+  #error TIMER 0 not defined
+#endif
+
+
+#ifdef TIFR0
+  if ((TIFR0 & _BV(TOV0)) && (t < 255))
+    m++;
+#else
+  if ((TIFR & _BV(TOV0)) && (t < 255))
+    m++;
+#endif
+
+  SREG = oldSREG;
+
+  return ((m << 8) + t) * (64 / clockCyclesPerMicrosecond());
+}
+
+void delay(unsigned long ms)
+{
+  uint16_t start = (uint16_t)micros();
+
+  while (ms > 0) {
+    if (((uint16_t)micros() - start) >= 1000) {
+      ms--;
+      start += 1000;
+    }
+  }
+}
+
+/* Delay for the given number of microseconds.  Assumes a 8 or 16 MHz clock. */
+void delayMicroseconds(unsigned int us)
+{
+  // calling avrlib's delay_us() function with low values (e.g. 1 or
+  // 2 microseconds) gives delays longer than desired.
+  //delay_us(us);
+#if F_CPU >= 20000000L
+  // for the 20 MHz clock on rare Arduino boards
+
+  // for a one-microsecond delay, simply wait 2 cycle and return. The overhead
+  // of the function call yields a delay of exactly a one microsecond.
+  __asm__ __volatile__ (
+    "nop" "\n\t"
+    "nop"); //just waiting 2 cycle
+  if (--us == 0)
+    return;
+
+  // the following loop takes a 1/5 of a microsecond (4 cycles)
+  // per iteration, so execute it five times for each microsecond of
+  // delay requested.
+  us = (us<<2) + us; // x5 us
+
+  // account for the time taken in the preceeding commands.
+  us -= 2;
+
+#elif F_CPU >= 16000000L
+  // for the 16 MHz clock on most Arduino boards
+
+  // for a one-microsecond delay, simply return.  the overhead
+  // of the function call yields a delay of approximately 1 1/8 us.
+  if (--us == 0)
+    return;
+
+  // the following loop takes a quarter of a microsecond (4 cycles)
+  // per iteration, so execute it four times for each microsecond of
+  // delay requested.
+  us <<= 2;
+
+  // account for the time taken in the preceeding commands.
+  us -= 2;
+#else
+  // for the 8 MHz internal clock on the ATmega168
+
+  // for a one- or two-microsecond delay, simply return.  the overhead of
+  // the function calls takes more than two microseconds.  can't just
+  // subtract two, since us is unsigned; we'd overflow.
+  if (--us == 0)
+    return;
+  if (--us == 0)
+    return;
+
+  // the following loop takes half of a microsecond (4 cycles)
+  // per iteration, so execute it twice for each microsecond of
+  // delay requested.
+  us <<= 1;
+
+  // partially compensate for the time taken by the preceeding commands.
+  // we can't subtract any more than this or we'd overflow w/ small delays.
+  us--;
+#endif
+
+  // busy wait
+  __asm__ __volatile__ (
+    "1: sbiw %0,1" "\n\t" // 2 cycles
+    "brne 1b" : "=w" (us) : "0" (us) // 2 cycles
+  );
+}
+
+void init()
+{
+  // on the ATmega168, timer 0 is also used for fast hardware pwm
+  // (using phase-correct PWM would mean that timer 0 overflowed half as often
+  // resulting in different millis() behavior on the ATmega8 and ATmega168)
+#if defined(TCCR0A) && defined(WGM01)
+  sbi(TCCR0A, WGM01);
+  sbi(TCCR0A, WGM00);
+#endif
+
+  // set timer 0 prescale factor to 64
+#if defined(__AVR_ATmega128__)
+  // CPU specific: different values for the ATmega128
+  sbi(TCCR0, CS02);
+#elif defined(TCCR0) && defined(CS01) && defined(CS00)
+  // this combination is for the standard atmega8
+  sbi(TCCR0, CS01);
+  sbi(TCCR0, CS00);
+#elif defined(TCCR0B) && defined(CS01) && defined(CS00)
+  // this combination is for the standard 168/328/1280/2560
+  sbi(TCCR0B, CS01);
+  sbi(TCCR0B, CS00);
+#elif defined(TCCR0A) && defined(CS01) && defined(CS00)
+  // this combination is for the __AVR_ATmega645__ series
+  sbi(TCCR0A, CS01);
+  sbi(TCCR0A, CS00);
+#else
+  #error Timer 0 prescale factor 64 not set correctly
+#endif
+
+  // enable timer 0 overflow interrupt
+#if defined(TIMSK) && defined(TOIE0)
+  sbi(TIMSK, TOIE0);
+#elif defined(TIMSK0) && defined(TOIE0)
+  sbi(TIMSK0, TOIE0);
+#else
+  #error	Timer 0 overflow interrupt not set correctly
+#endif
+
+  // timers 1 and 2 are used for phase-correct hardware pwm
+  // this is better for motors as it ensures an even waveform
+  // note, however, that fast pwm mode can achieve a frequency of up
+  // 8 MHz (with a 16 MHz clock) at 50% duty cycle
+
+#if defined(TCCR1B) && defined(CS11) && defined(CS10)
+  TCCR1B = 0;
+
+  // set timer 1 prescale factor to 64
+  sbi(TCCR1B, CS11);
+#if F_CPU >= 8000000L
+  sbi(TCCR1B, CS10);
+#endif
+#elif defined(TCCR1) && defined(CS11) && defined(CS10)
+  sbi(TCCR1, CS11);
+#if F_CPU >= 8000000L
+  sbi(TCCR1, CS10);
+#endif
+#endif
+  // put timer 1 in 8-bit phase correct pwm mode
+#if defined(TCCR1A) && defined(WGM10)
+  sbi(TCCR1A, WGM10);
+#elif defined(TCCR1)
+  #warning this needs to be finished
+#endif
+
+  // set timer 2 prescale factor to 64
+#if defined(TCCR2) && defined(CS22)
+  sbi(TCCR2, CS22);
+#elif defined(TCCR2B) && defined(CS22)
+  sbi(TCCR2B, CS22);
+#else
+  #warning Timer 2 not finished (may not be present on this CPU)
+#endif
+
+  // configure timer 2 for phase correct pwm (8-bit)
+#if defined(TCCR2) && defined(WGM20)
+  sbi(TCCR2, WGM20);
+#elif defined(TCCR2A) && defined(WGM20)
+  sbi(TCCR2A, WGM20);
+#else
+  #warning Timer 2 not finished (may not be present on this CPU)
+#endif
+
+#if defined(TCCR3B) && defined(CS31) && defined(WGM30)
+  sbi(TCCR3B, CS31);		// set timer 3 prescale factor to 64
+  sbi(TCCR3B, CS30);
+  sbi(TCCR3A, WGM30);		// put timer 3 in 8-bit phase correct pwm mode
+#endif
+
+#if defined(TCCR4A) && defined(TCCR4B) && defined(TCCR4D) /* beginning of timer4 block for 32U4 and similar */
+  sbi(TCCR4B, CS42);		// set timer4 prescale factor to 64
+  sbi(TCCR4B, CS41);
+  sbi(TCCR4B, CS40);
+  sbi(TCCR4D, WGM40);		// put timer 4 in phase- and frequency-correct PWM mode
+  sbi(TCCR4A, PWM4A);		// enable PWM mode for comparator OCR4A
+  sbi(TCCR4C, PWM4D);		// enable PWM mode for comparator OCR4D
+#else /* beginning of timer4 block for ATMEGA1280 and ATMEGA2560 */
+#if defined(TCCR4B) && defined(CS41) && defined(WGM40)
+  sbi(TCCR4B, CS41);		// set timer 4 prescale factor to 64
+  sbi(TCCR4B, CS40);
+  sbi(TCCR4A, WGM40);		// put timer 4 in 8-bit phase correct pwm mode
+#endif
+#endif /* end timer4 block for ATMEGA1280/2560 and similar */
+
+#if defined(TCCR5B) && defined(CS51) && defined(WGM50)
+  sbi(TCCR5B, CS51);		// set timer 5 prescale factor to 64
+  sbi(TCCR5B, CS50);
+  sbi(TCCR5A, WGM50);		// put timer 5 in 8-bit phase correct pwm mode
+#endif
+
+#if defined(ADCSRA)
+  // set a2d prescale factor to 128
+  // 16 MHz / 128 = 125 KHz, inside the desired 50-200 KHz range.
+  // XXX: this will not work properly for other clock speeds, and
+  // this code should use F_CPU to determine the prescale factor.
+  sbi(ADCSRA, ADPS2);
+  sbi(ADCSRA, ADPS1);
+  sbi(ADCSRA, ADPS0);
+
+  // enable a2d conversions
+  sbi(ADCSRA, ADEN);
+#endif
+
+  // the bootloader connects pins 0 and 1 to the USART; disconnect them
+  // here so they can be used as normal digital i/o; they will be
+  // reconnected in Serial.begin()
+#if defined(UCSRB)
+  UCSRB = 0;
+#elif defined(UCSR0B)
+  UCSR0B = 0;
+#endif
+}
+
+}
+
+void arduino_init(void)
+{
+  init();
+}
diff --git a/usb-fastled/Makefile b/usb-fastled/Makefile
new file mode 100644
index 0000000..03d2c7e
--- /dev/null
+++ b/usb-fastled/Makefile
@@ -0,0 +1,50 @@
+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := usb-fastled
+BOARD_TYPE := teensy2
+CXX_OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-usbserial usbio
+CXX_LIBS := arduino-stub
+EXTERNAL_LIBS := fastled lufa
+SPREADAVR_PATH := ..
+RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc
+RESET_PARAM := '!'
+
+FASTLED_PATH := $(SPREADAVR_PATH)/contrib/FastLED
+
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/lufa-LUFA-140928
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D ORDERED_EP_CONFIG
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+
+LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\""
+LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-fastled example\""
+
+LUFA_COMPONENTS := USB USBCLASS
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/usb-fastled/usb-fastled.cpp b/usb-fastled/usb-fastled.cpp
new file mode 100644
index 0000000..429e8f5
--- /dev/null
+++ b/usb-fastled/usb-fastled.cpp
@@ -0,0 +1,131 @@
+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <avr/power.h>
+#include <stdio.h>
+
+#include "util.h"
+#include "led.h"
+#include "usbio.h"
+
+#include "Arduino.h"
+#include "FastLED.h"
+
+
+
+
+// How many leds in your strip?
+#define NUM_LEDS 30
+
+// For led chips like Neopixels, which have a data line, ground, and power, you just
+// need to define DATA_PIN.  For led chipsets that are SPI based (four wires - data, clock,
+// ground, and power), like the LPD8806 define both DATA_PIN and CLOCK_PIN
+#define DATA_PIN 3    // PD0 @ Atmega32U4
+#define CLOCK_PIN 2   // PD1 @ Atmega32U4
+
+// Define the array of leds
+CRGB leds[NUM_LEDS];
+
+void fastled_init()
+{
+  arduino_init();
+
+//  Uncomment/edit one of the following lines for your leds arrangement.
+//  FastLED.addLeds<TM1803, DATA_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<TM1804, DATA_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<TM1809, DATA_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<WS2811, DATA_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<WS2812, DATA_PIN, RGB>(leds, NUM_LEDS);
+  FastLED.addLeds<WS2812B, DATA_PIN, GRB>(leds, NUM_LEDS);
+//  FastLED.addLeds<NEOPIXEL, DATA_PIN>(leds, NUM_LEDS);
+//  FastLED.addLeds<APA104, DATA_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<UCS1903, DATA_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<UCS1903B, DATA_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<GW6205, DATA_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<GW6205_400, DATA_PIN, RGB>(leds, NUM_LEDS);
+
+//  FastLED.addLeds<WS2801, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<SM16716, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<LPD8806, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<P9813, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<APA102, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<DOTSTAR, RGB>(leds, NUM_LEDS);
+
+//  FastLED.addLeds<WS2801, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<SM16716, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<LPD8806, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<P9813, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<APA102, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS);
+//  FastLED.addLeds<DOTSTAR, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS);
+}
+
+
+void leds_set(CRGB color)
+{
+  uint8_t i;
+  for(i = 0; i < NUM_LEDS; ++i) {
+    leds[i] = color;
+  }
+  FastLED.show();
+}
+
+void handle_cmd(uint8_t cmd)
+{
+  switch(cmd) {
+  case '0': leds_set(CRGB::Black); led_off(); break;
+  case '1': leds_set(CRGB::White); led_on(); break;
+  case 'r': leds_set(CRGB::Red); led_on(); break;
+  case 'g': leds_set(CRGB::Green); led_on(); break;
+  case 'b': leds_set(CRGB::Blue); led_on(); break;
+  case '!': reset2bootloader(); break;
+  default: printf("error\r\n"); return;
+  }
+  printf("ok\r\n");
+}
+
+int main(void)
+{
+  MCUSR &= ~(1 << WDRF);
+  wdt_disable();
+
+  cpu_init();
+  led_init();
+  usbio_init();
+  fastled_init();
+  sei();
+
+  for(;;) {
+    int16_t BytesReceived = usbio_bytes_received();
+    while(BytesReceived > 0) {
+      int ReceivedByte = fgetc(stdin);
+      if(ReceivedByte != EOF) {
+        handle_cmd(ReceivedByte);
+      }
+      BytesReceived--;
+    }
+
+    usbio_task();
+  }
+}
diff --git a/usb-led++/Makefile b/usb-led++/Makefile
index a77b38c..1fcc20c 100644
--- a/usb-led++/Makefile
+++ b/usb-led++/Makefile
@@ -22,7 +22,6 @@
 
 NAME := usb-led
 BOARD_TYPE := teensy2
-OBJ :=
 CXX_OBJ := $(NAME).o
 LIBS := util led lufa-descriptor-usbserial usbio
 EXTERNAL_LIBS := lufa