Diff: color_pixels.cpp

Revision:

2:5c805323a2c0

Parent:

0:1e1ce549ad91

Child:

3:91af7b451005

--- a/color_pixels.cpp	Thu Jul 31 12:02:23 2014 +0000
+++ b/color_pixels.cpp	Tue Oct 28 11:03:20 2014 +0800
@@ -1,4 +1,4 @@
-/** Color pixels library using WS2812B and nRF51822 (16Hz)
+/** Color pixels library using WS2812B and nRF51822 (16MHz)
  *  It's for
  *    + http://www.seeedstudio.com/depot/Digital-RGB-LED-FlexiStrip-60-LED-1-Meter-p-1666.html
  *    + http://www.seeedstudio.com/depot/WS2812B-Digital-RGB-LED-Waterproof-FlexiStrip-144-LEDmeter-2-meter-p-1869.html
@@ -30,7 +30,8 @@
 #include "color_pixels.h"
 #include "nrf51822.h"
 
-// Generate a high level pulse (0.81us) of WS2812B's 0 code (0.9us +- 0.15us)
+#if !defined ( __GNUC__ )
+// Generate a high level pulse (0.81us) of WS2812B's 1 code (0.9us +- 0.15us)
 #define COLOR_PIXELS_ONE_HIGH(mask)     \
             NRF_GPIO->OUTSET = (mask);  \
             __ASM ( \
@@ -52,8 +53,52 @@
             __ASM (  \
                     " NOP\n\t"  \
                 );  \
+            NRF_GPIO->OUTCLR = (mask);  \
+            __ASM ( \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                )
+#else
+// Generate a high level pulse (0.94us) of WS2812B's 1 code (0.9us +- 0.15us)
+#define COLOR_PIXELS_ONE_HIGH(mask)     \
+            NRF_GPIO->OUTSET = (mask);  \
+            __ASM ( \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                ); \
             NRF_GPIO->OUTCLR = (mask)
 
+// Generate a high level pulse (0.44us) of WS2812B's 0 code (0.35us +- 0.15us)
+#define COLOR_PIXELS_ZERO_HIGH(mask)    \
+            NRF_GPIO->OUTSET = (mask);  \
+            __ASM (  \
+                    " NOP\n\t"  \
+                );  \
+            NRF_GPIO->OUTCLR = (mask);  \
+            __ASM ( \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                    " NOP\n\t" \
+                )
+#endif            
+
 static void delay_us(uint32_t us)
 {
     do {
@@ -86,7 +131,7 @@
                              | (GPIO_PIN_CNF_DIR_Output << GPIO_PIN_CNF_DIR_Pos);
     NRF_GPIO->OUTCLR = (1UL << pin);
 
-    colors = new color_t[num];
+    colors = new grb_t[num];
     for (int i = 0; i < num; i++) {
         colors[i].grb = 0;
     }
@@ -107,21 +152,29 @@
     }
 }
 
+void ColorPixels::set_color(uint16_t index, uint32_t rgb) {
+    color_t c = *(color_t *)&rgb;
+    set_color(index, c.r, c.g, c.b);
+}
+
 void ColorPixels::update()
 {
     uint32_t mask =  1 << pin;
     NRF_GPIO->OUTCLR = mask;
     delay_us(50);
+    
+    grb_t *pcolor = colors;
     for (int i = 0; i < num; i++) {
-        uint32_t color = colors[i].grb;
+        uint32_t grb = (*pcolor).grb;
         for (int bit = 0; bit < 24; bit++) {
-            if (color & 1) {
+            if (grb & 1) {
                 COLOR_PIXELS_ONE_HIGH(mask);
             } else {
                 COLOR_PIXELS_ZERO_HIGH(mask);
             }
-            color >>= 1;
+            grb >>= 1;
         }
+        pcolor++;
     }
 }
 
@@ -133,3 +186,91 @@
 
     update();
 }
+
+uint32_t toRGB(uint8_t red, uint8_t green, uint8_t blue)
+{
+    color_t c;
+    
+    c.r = red;
+    c.g = green;
+    c.b = blue;
+    
+    return c.rgb;
+};
+
+uint32_t wheel(float position, uint8_t min = 0, uint8_t max = 255) 
+{
+    uint8_t d = max - min;
+    uint32_t c;
+
+    if(position < 0.166) {
+        c = toRGB(max, min + position * 6 * d, min);
+    } else if(position < 0.332) {
+        position -= 0.166;
+        c = toRGB(max - position * 6 * d, max, min);
+    } else if(position < 0.498) {
+        position -= 0.332;
+        c = toRGB(min, max, min + position * 6 * d);
+    } else if(position < 0.664) {
+        position -= 0.498;
+        c = toRGB(min, max - position * 6 * d, max);
+    } else if(position < 0.83) {
+        position -= 0.664;
+        c = toRGB(min + d * position * 6, min, max);
+    } else {
+        position -= 0.83;
+        c = toRGB(max, min, max - position * 6 * d);
+    }
+    
+    return c;
+}
+
+void find_wheel_options(uint32_t rgb, float *position, uint8_t *min, uint8_t *max)
+{
+    color_t c;
+    c.rgb = rgb;
+    
+    if (c.r > c.g) {
+        if (c.g >= c.b) {
+            *max = c.r;
+            *min = c.b;
+            *position = (float)(c.g - c.b) / (c.r - c.b) / 6.0;
+        } else if (c.b >= c.r) {
+            *max = c.b;
+            *min = c.g;
+            *position = (float)(c.r - c.g) / (c.b - c.g) / 6.0 + 0.664;
+        } else {
+            *max = c.r;
+            *min = c.g;
+            *position = (float)(c.b - c.g) / (c.r - c.g) / 6.0 + 0.83;
+        }
+    } else {
+        if (c.r > c.b) {
+            *max = c.g;
+            *min = c.b;
+            *position = (float)(c.r - c.b) / (c.g - c.b) / 6.0 + 0.166;
+        } else if (c.b > c.g) {
+            *max = c.b;
+            *min = c.r;
+            *position = (float)(c.g - c.r) / (c.b - c.r) / 6.0 + 0.498;
+        } else {
+            *max = c.g;
+            *min = c.r;
+            *position = (float)(c.b - c.r) / (c.g - c.r) / 6.0 + 0.332;
+        }
+    }
+}
+
+void ColorPixels::rainbow(uint32_t rgb)
+{
+    float position;
+    uint8_t min, max;
+    
+    find_wheel_options(rgb, &position, &min, &max);
+    for (int i = 0; i < num; i++) {
+        float current = ((int)(i + num * position) % num) / (float)num;
+        set_color(i, wheel(current, min, max));
+    }
+    
+    update();
+}