Merge pull request #20 from makermelissa/master

Added pixeldust demo

core.c

@@ -386,7 +386,7 @@ void _PM_stop(Protomatter_core *core) {
     // If _PM_begin failed, this will be a NULL pointer.  Stop early,
     // none of the other "stop" operations make sense
     if (!core->screenData) {
-       return;
+      return;
     }
     while (core->swapBuffers)
       ;                         // Wait for any pending buffer swap

examples/pixeldust/pixeldust.ino

@@ -0,0 +1,131 @@
+#include <Wire.h>               // For I2C communication
+#include <Adafruit_LIS3DH.h>
+#include <Adafruit_PixelDust.h> // For simulation
+#include "Adafruit_Protomatter.h"
+
+uint8_t rgbPins[]  = {7, 8, 9, 10, 11, 12};
+uint8_t addrPins[] = {17, 18, 19, 20};
+uint8_t clockPin   = 14;
+uint8_t latchPin   = 15;
+uint8_t oePin      = 16;
+
+Adafruit_LIS3DH accel = Adafruit_LIS3DH();
+
+Adafruit_Protomatter matrix(
+  64, 4, 1, rgbPins, 4, addrPins, clockPin, latchPin, oePin, true);
+
+
+#define WIDTH        64 // Display width in pixels
+#define HEIGHT       32 // Display height in pixels
+#define MAX_FPS      45 // Maximum redraw rate, frames/second
+
+#define N_COLORS 8
+#define BOX_HEIGHT 8
+#define N_GRAINS (BOX_HEIGHT*N_COLORS*8)
+uint16_t colors[N_COLORS];
+
+// Sand object, last 2 args are accelerometer scaling and grain elasticity
+Adafruit_PixelDust sand(WIDTH, HEIGHT, N_GRAINS, 1, 128, false);
+
+
+uint32_t        prevTime   = 0;      // Used for frames-per-second throttle
+
+// SETUP - RUNS ONCE AT PROGRAM START --------------------------------------
+
+void err(int x) {
+  uint8_t i;
+  pinMode(LED_BUILTIN, OUTPUT);       // Using onboard LED
+  for(i=1;;i++) {                     // Loop forever...
+    digitalWrite(LED_BUILTIN, i & 1); // LED on/off blink to alert user
+    delay(x);
+  }
+}
+
+void setup(void) {
+  uint8_t i, j, bytes;
+  Serial.begin(115200);
+  //while (!Serial) delay(10);
+
+  ProtomatterStatus status = matrix.begin();
+  Serial.printf("Protomatter begin() status: %d\n", status);
+
+  if  (!sand.begin()) {
+    Serial.println("Couldn't start sand");
+    err(1000); // Slow blink = malloc error
+  }
+
+  if  (!accel.begin(0x19)) {
+    Serial.println("Couldn't find accelerometer");
+    err(250);  // Fast bink = I2C error
+  }
+  accel.setRange(LIS3DH_RANGE_4_G);   // 2, 4, 8 or 16 G!
+
+  //sand.randomize(); // Initialize random sand positions
+
+  // Set up initial sand coordinates, in 8x8 blocks
+  int n = 0;
+  for(int i=0; i<N_COLORS; i++) {
+    int xx = i * WIDTH / N_COLORS;
+    int yy =  HEIGHT - BOX_HEIGHT;
+    for(int y=0; y<BOX_HEIGHT; y++) {
+      for(int x=0; x < WIDTH / N_COLORS; x++) {
+        //Serial.printf("#%d -> (%d, %d)\n", n,  xx + x, yy + y);
+        sand.setPosition(n++, xx + x, yy + y);
+      }
+    }
+  }
+  Serial.printf("%d total pixels\n", n);
+
+  colors[0] = color565(64, 64, 64);   // Dark Gray
+  colors[1] = color565(120, 79, 23);   // Brown
+  colors[2] = color565(228,  3,  3);   // Red
+  colors[3] = color565(255,140,  0);   // Orange
+  colors[4] = color565(255,237,  0);   // Yellow
+  colors[5] = color565(  0,128, 38);   // Green
+  colors[6] = color565(  0, 77,255);   // Blue
+  colors[7] = color565(117,  7,135); // Purple  
+}
+
+uint16_t color565(uint8_t red, uint8_t green, uint8_t blue) {
+  return ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | (blue >> 3);
+}
+// MAIN LOOP - RUNS ONCE PER FRAME OF ANIMATION ----------------------------
+
+void loop() {
+  // Limit the animation frame rate to MAX_FPS.  Because the subsequent sand
+  // calculations are non-deterministic (don't always take the same amount
+  // of time, depending on their current states), this helps ensure that
+  // things like gravity appear constant in the simulation.
+  uint32_t t;
+  while(((t = micros()) - prevTime) < (1000000L / MAX_FPS));
+  prevTime = t;
+
+  // Read accelerometer...
+  sensors_event_t event;
+  accel.getEvent(&event);
+  //Serial.printf("(%0.1f, %0.1f, %0.1f)\n", event.acceleration.x, event.acceleration.y, event.acceleration.z);
+
+  double xx, yy, zz;
+  xx = event.acceleration.x * 1000;
+  yy = event.acceleration.y * 1000;
+  zz = event.acceleration.z * 1000;
+
+  // Run one frame of the simulation
+  sand.iterate(xx, yy, zz);
+
+  //sand.iterate(-accel.y, accel.x, accel.z);
+
+  // Update pixel data in LED driver
+  dimension_t x, y;
+  matrix.fillScreen(0x0);
+  for(int i=0; i<N_GRAINS ; i++) {
+    sand.getPosition(i, &x, &y);
+    int n = i / ((WIDTH / N_COLORS) * BOX_HEIGHT); // Color index
+    uint16_t flakeColor = colors[n];
+    matrix.drawPixel(x, y, flakeColor);
+    //Serial.printf("(%d, %d)\n", x, y);
+  }
+  matrix.show(); // Copy data to matrix buffers
+
+
+}

library.properties

@@ -7,4 +7,4 @@ paragraph=RGB LED matrix.
 category=Display
 url=https://github.com/adafruit/Adafruit_protomatter
 architectures=samd,nrf52,stm32,esp32
-depends=Adafruit GFX Library
+depends=Adafruit GFX Library, Adafruit LIS3DH, Adafruit PixelDust