Revision 3:a0545942de4f, committed 2017-06-14

Comitter:

mochen

Date:

Wed Jun 14 01:46:42 2017 +0000

Parent:

2:cb82a3dc4031

Commit message:

Simplified colors to make a basic test.

Changed in this revision

diff -r cb82a3dc4031 -r a0545942de4f main.cpp
--- a/main.cpp	Thu Feb 12 21:55:24 2015 +0000
+++ b/main.cpp	Wed Jun 14 01:46:42 2017 +0000
@@ -2,46 +2,27 @@
 #include "WS2812.h"
 #include "PixelArray.h"
 
-#define WS2812_BUF 150
+#define WS2812_BUF 3
 #define NUM_COLORS 6
-#define NUM_LEDS_PER_COLOR 10
+#define NUM_LEDS_PER_COLOR 1
 
 PixelArray px(WS2812_BUF);
 
 // See the program page for information on the timing numbers
 // The given numbers are for the K64F
-WS2812 ws(D9, WS2812_BUF, 0, 5, 5, 0);
+WS2812 ws(D6, WS2812_BUF, 0, 5, 5, 0);
 
 int main()
 {
-
-    ws.useII(WS2812::PER_PIXEL); // use per-pixel intensity scaling
-    
-    // set up the colours we want to draw with
-    int colorbuf[NUM_COLORS] = {0x2f0000,0x2f2f00,0x002f00,0x002f2f,0x00002f,0x2f002f};
-
-    // for each of the colours (j) write out 10 of them
-    // the pixels are written at the colour*10, plus the colour position
-    // all modulus 60 so it wraps around
-    for (int i = 0; i < WS2812_BUF; i++) {
-        px.Set(i, colorbuf[(i / NUM_LEDS_PER_COLOR) % NUM_COLORS]);
-    }
-
-    // now all the colours are computed, add a fade effect using intensity scaling
-    // compute and write the II value for each pixel
-    for (int j=0; j<WS2812_BUF; j++) {
-        // px.SetI(pixel position, II value)
-        px.SetI(j%WS2812_BUF, 0xf+(0xf*(j%NUM_LEDS_PER_COLOR)));
-    }
-
+    px.Set(0, 0);
+    px.Set(1, 0x00ff00);
+    px.Set(2, 0x00ee00);
 
     // Now the buffer is written, rotate it
     // by writing it out with an increasing offset
     while (1) {
-        for (int z=WS2812_BUF; z >= 0 ; z--) {
-            ws.write_offsets(px.getBuf(),z,z,z);
+            ws.write(px.getBuf());
             wait(0.075);
-        }
     }
 
 }