X-mas: Flashing via Berry

diff --git a/xmas-lights/firmware/Makefile b/xmas-lights/firmware/Makefile
index e7e911a32ba20b6dba04a92f1ff84021f88a742a..9b75b5d90ae6985e1ddeeeef11ec8f9b0995c5ec 100644 (file)
--- a/xmas-lights/firmware/Makefile
+++ b/xmas-lights/firmware/Makefile
@@ -8,3 +8,7 @@ WITH_DFU_FLASH=1
 DFU_ARGS=-d 4242:0015,4242:0014
 
 include $(ROOT)/mk/bluepill.mk
+
+upload: xmas.dfu
+       rsync xmas.dfu root@berry:xmas-lights/
+       ssh root@berry "cd xmas-lights && dfu-util $(DFU_ARGS) -D xmas.dfu"

diff --git a/xmas-lights/firmware/main.c b/xmas-lights/firmware/main.c
index 5597fa0b636f8ef9049d65b87868bbea0d1b4c41..3c6975117ffac48cbeef9c0994acc1508fac9187 100644 (file)
--- a/xmas-lights/firmware/main.c
+++ b/xmas-lights/firmware/main.c
@@ -396,7 +396,7 @@ static void usb_init(void)
 
 /*** Effects ***/
 
-#if 0
+#if 1
 
 static void effect(void)
 {
@@ -411,8 +411,8 @@ static void effect(void)
        for (uint j=0; j < NPIX_NUM_LEDS; j++)
                neopixel_set(j, neopixel_leds[j][0]*DIM, neopixel_leds[j][1]*DIM, neopixel_leds[j][2]*DIM);
        neopixel_set(b, 0, 0, 255);
-       neopixel_set((b + NPIX_NUM_LEDS/3) % NPIX_NUM_LEDS, 0, 255, 0);
-       neopixel_set((b + 2*NPIX_NUM_LEDS/3) % NPIX_NUM_LEDS, 255, 0, 0);
+       neopixel_set((b + NPIX_NUM_LEDS/3) % NPIX_NUM_LEDS, 0, 0, 255);
+       neopixel_set((b + 2*NPIX_NUM_LEDS/3) % NPIX_NUM_LEDS, 0, 0, 255);
        b = (b + 1) % NPIX_NUM_LEDS;
 }