Diff: WS2811.cpp

Revision:

17:b4e9d8f4baa9

Parent:

16:5f75ea93f15d

Child:

20:b9d76e567637

--- a/WS2811.cpp	Thu Oct 10 21:52:59 2013 +0000
+++ b/WS2811.cpp	Thu Dec 05 15:25:16 2013 +0000
@@ -2,97 +2,73 @@
 //
 // Parameterized and modified to use soft SPI.
 // Jas Strong <jasmine@electronpusher.org>
+// Modified to use hard SPI by Ned Konz <ned@bike-nomad.com>
 /*****************************************************************************/
 
 #include "LedStrip.h"
 #include "WS2811.h"
-#include "bitband.h"
 
-extern int onewire_speed_multiplier;   // speed setting for ws2811 et al.
-
-
-WS2811::WS2811(PinName dataPin, PinName clockPin, int n) :
-    dat(dataPin),
-    clk(clockPin) {
-    // Allocate 3 bytes per pixel:
-    numLEDs = n;
-    pixels = (uint8_t *)malloc(numLEDs * 3);
-    if (pixels) {
-        memset(pixels, 0x00, numLEDs * 3); // Init to RGB 'off' state
-    }
-    // calibrate delay loops for NRZ 
-    int i;
-    guardtime.start();
-    for (i=0; i<1000; i++)
-        /* do nothing */;
-    i=guardtime.read_us();
-    printf("ws2811:  1000 iters took %d usec.\n", i);
-    bogocal = (1000 / (onewire_speed_multiplier * i * 4.2)); // iterations per bitcell (417 nsec)
-    printf("ws2811:  calibrating to %d bogojiffies.\n", bogocal);
-    
-    data_mask = dat.get_mask();
-    clock_mask = clk.get_mask();
-    data_set = dat.get_set();
-    data_clr = dat.get_clr();
-    clock_set = clk.get_set();
-    clock_clr = clk.get_clr();
-    
-    printf("ws2811:          data mask 0x%x, data set reg 0x%x, data clear reg 0x%x\r\n", data_mask, data_set, data_clr);
-    printf("ws2811: (unused) clock mask 0x%x, clock set reg 0x%x, clock clear reg 0x%x\r\n", clock_mask, clock_set, clock_clr);
-    
+WS2811::WS2811(int n, PinName mosi, PinName sclk) :
+    LedStrip(n),
+    spi(mosi, NC, sclk)
+{
+#ifdef TARGET_KL25Z
+    spi.format(8, 3);
+#else
+    spi.format(16, 3);
+#endif
+    spi.frequency(800e3 * 16);  // 12.8 MHz => 800KHz bit rate
 }
 
 /*
  *  These chips use a one-wire protocol based on a sort of NRZ signalling- jas.
  */
- 
-void WS2811::write(uint8_t byte) {
-    
-    for (int i=0; i<8; i++) {
-        if (byte & 0x80)
-            writebit(1);
-        else
-            writebit(0);
-        byte <<= 1;
+
+inline void WS2811::writebit(bool bit)
+{
+    if (bit) {
+#ifdef TARGET_KL25Z
+        spi.write(0xff);    // 8 high
+        spi.write(0x00);    // 8 low
+#else
+        spi.write(0xff00);
+#endif
+    } else {
+#ifdef TARGET_KL25Z
+        spi.write(0xe0);    // 3 high, 5 low
+        spi.write(0x00);    // +8 low
+#else
+        spi.write(0xe000);
+#endif
     }
 }
 
-inline void WS2811::celldelay(void) {
-    for (volatile int i = 0; i<bogocal; i++)
-        /* do nothing */ ;
+void WS2811::write(uint8_t byte)
+{
+    writebit(byte & 0x80);
+    writebit(byte & 0x40);
+    writebit(byte & 0x20);
+    writebit(byte & 0x10);
+    writebit(byte & 0x08);
+    writebit(byte & 0x04);
+    writebit(byte & 0x02);
+    writebit(byte & 0x01);
 }
 
-inline void WS2811::writebit(bool bit) {
-    // first cell is always 1
-    (*data_set) = data_mask;
-    celldelay();
-    if (bit) {
-        (*clock_set) = data_mask; // dummy, we don't care but must take constant time
-        celldelay();
-    } else {
-        (*data_clr) = data_mask;
-        celldelay();
-    }
-    // last cell is always 0
-    (*data_clr) = data_mask;
-    celldelay();
-}
-
-void WS2811::begin(void) {
+void WS2811::begin(void)
+{
     blank();
     show();
 }
 
-uint16_t WS2811::numPixels(void) {
-    return numLEDs;
+void WS2811::blank(void)
+{
+    memset(pixels, 0x00, numPixelBytes());
 }
 
-void WS2811::blank(void) {
-    memset(pixels, 0x00, numLEDs * 3);
-}
-
-void WS2811::show(void) {
-    uint16_t i, nl3 = numLEDs * 3; // 3 bytes per LED
+void WS2811::show(void)
+{
+    uint16_t i, nl3 = numPixelBytes(); // 3 bytes per LED
     while (guardtime.read_us() < 50)
         /* spin */;
     __disable_irq();
@@ -104,58 +80,3 @@
 }
 
 
-uint32_t WS2811::total_luminance(void) {
-    uint32_t running_total;
-    running_total = 0;
-    for (int i=0; i<numLEDs*3; i++)
-        running_total += pixels[i];
-    return running_total;
-}
-
-// Convert R,G,B to combined 32-bit color
-uint32_t WS2811::Color(uint8_t r, uint8_t g, uint8_t b) {
-    // Take the lowest 7 bits of each value and append them end to end
-    // We have the top bit set high (its a 'parity-like' bit in the protocol
-    // and must be set!)
-    return ((uint32_t)g << 16) | ((uint32_t)r << 8) | (uint32_t)b;
-}
-
-// store the rgb component in our array
-void WS2811::setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b) {
-    if (n >= numLEDs) return; // '>=' because arrays are 0-indexed
-
-    pixels[n*3  ] = g;
-    pixels[n*3+1] = r;
-    pixels[n*3+2] = b;
-}
-
-void WS2811::setPixelR(uint16_t n, uint8_t r) {
-    if (n >= numLEDs) return; // '>=' because arrays are 0-indexed
-
-    pixels[n*3+1] = r;
-}
-
-void WS2811::setPixelG(uint16_t n, uint8_t g) {
-    if (n >= numLEDs) return; // '>=' because arrays are 0-indexed
-
-    pixels[n*3] = g;
-}
-
-void WS2811::setPixelB(uint16_t n, uint8_t b) {
-    if (n >= numLEDs) return; // '>=' because arrays are 0-indexed
-
-    pixels[n*3+2] = b;
-}
-
-void WS2811::setPackedPixels(uint8_t * buffer, uint32_t n) {
-    if (n >= numLEDs) return;
-    memcpy(pixels, buffer, (size_t) (n*3));
-}
-
-void WS2811::setPixelColor(uint16_t n, uint32_t c) {
-    if (n >= numLEDs) return; // '>=' because arrays are 0-indexed
-
-    pixels[n*3  ] = (c >> 16);
-    pixels[n*3+1] = (c >>  8);
-    pixels[n*3+2] =  c;
-}