Diff: wsDrive.cpp

Revision:

3:3c48065d20ff

Parent:

0:b3665f91bedc

Child:

4:c965e448d96b

--- a/wsDrive.cpp	Fri Nov 07 09:25:52 2014 +0000
+++ b/wsDrive.cpp	Wed Nov 12 16:43:33 2014 +0000
@@ -5,6 +5,7 @@
     frequency(2400000);
     format(12);
     pixArray = NULL;
+    pixArray16 = NULL;
     pixelLen = 0;
 }
 
@@ -12,6 +13,14 @@
 {
     pixArray = dataStart;
     pixelLen = dataLen;
+    pixArray16 = NULL;
+}
+
+void wsDrive::setData(pixelInfo16 *dataStart, uint16_t dataLen)
+{
+    pixArray16 = dataStart;
+    pixelLen = dataLen;
+    pixArray = NULL;
 }
 
 void wsDrive::sendData()
@@ -22,23 +31,29 @@
 
 
     uint16_t pixIndex = 0;
-    while (pixIndex < pixelLen) {
-        sendPixel(pixArray + pixIndex++);
-    }  
+    if (pixArray) {
+        while (pixIndex < pixelLen) {
+            sendPixel(pixArray + pixIndex++);
+        }
+    } else if (pixArray16) {
+        while (pixIndex < pixelLen) {
+            sendPixel(pixArray16 + pixIndex++);
+        }
+    }
 }
 
 // each bytes sent as two 12 bit messages (3 bits of data per LED bit).
 void wsDrive::sendByte(unsigned char value)
 {
-    
+
     uint16_t dataToSend = 0;
-    
+
     uint8_t mask = 0x80;
     while (mask) {
         dataToSend += (value & mask)?0x06:0x4; // 100 for a 0 or  110 for a 1
         if (mask & 0x11) {                     // trans
-          fastWrite(dataToSend); 
-          dataToSend = 0;
+            fastWrite(dataToSend);
+            dataToSend = 0;
         }
         dataToSend = dataToSend << 3;
         mask = mask >> 1;
@@ -52,3 +67,27 @@
     sendByte(pixToSend->B);
 }
 
+void wsDrive::sendPixel(pixelInfo16 *pixToSend)
+{
+    if (pixToSend->G > 0xff)
+        sendByte(0xff);
+    else if (pixToSend->G < 0)
+        sendByte(0xff);
+    else
+        sendByte((unsigned char)pixToSend->G);
+
+    if (pixToSend->R > 0xff)
+        sendByte(0xff);
+    else if (pixToSend->R < 0)
+        sendByte(0xff);
+    else
+        sendByte((unsigned char)pixToSend->R);
+
+    if (pixToSend->B > 0xff)
+        sendByte(0xff);
+    else if (pixToSend->B < 0)
+        sendByte(0xff);
+    else
+        sendByte((unsigned char)pixToSend->B);
+
+}