summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2015-09-19 16:21:38 +0200
committerChristian Pointner <equinox@spreadspace.org>2015-09-19 16:26:13 +0200
commit73cdbd983c447481375f52900231457035d1249a (patch)
tree87cf415d812f2df5086ea5779256f8691b5bba00
parentimproved linking step (diff)
add rainbow
-rw-r--r--usb-fastled/Makefile2
-rw-r--r--usb-fastled/usb-fastled.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/usb-fastled/Makefile b/usb-fastled/Makefile
index 1905b35..1a67072 100644
--- a/usb-fastled/Makefile
+++ b/usb-fastled/Makefile
@@ -27,7 +27,7 @@ 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_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc_nowait
RESET_PARAM := '!'
FASTLED_PATH := $(SPREADAVR_PATH)/contrib/FastLED
diff --git a/usb-fastled/usb-fastled.cpp b/usb-fastled/usb-fastled.cpp
index 4e5e2cf..17f31c9 100644
--- a/usb-fastled/usb-fastled.cpp
+++ b/usb-fastled/usb-fastled.cpp
@@ -90,6 +90,7 @@ void handle_cmd(uint8_t cmd)
case 'r': fill_solid(leds, NUM_LEDS, CRGB::Red); FastLED.show(); led_on(); break;
case 'g': fill_solid(leds, NUM_LEDS, CRGB::Green); FastLED.show(); led_on(); break;
case 'b': fill_solid(leds, NUM_LEDS, CRGB::Blue); FastLED.show(); led_on(); break;
+ case 'w': fill_rainbow(leds, NUM_LEDS, 0, 256/NUM_LEDS); FastLED.show(); led_on(); break;
case '!': reset2bootloader(); break;
default: printf("error\r\n"); return;
}
@@ -107,6 +108,8 @@ int main(void)
fastled_init();
sei();
+ fill_solid(leds, NUM_LEDS, CRGB::Black);
+ FastLED.show();
for(;;) {
int16_t BytesReceived = usbio_bytes_received();
while(BytesReceived > 0) {