Change to use TeensyDMX library

Author: ssilverman

Deevstock/DSGrid/control_tdmx.h

@@ -1,5 +1,5 @@
 #pragma message Teensy 3.2 + MSGEQ7
-#include <TeensyDmx.h>
+#include <TeensyDMX.h>
 //#define MSGEQ7_10BIT
 // MSGEQ7
 #include "MSGEQ7.h"
@@ -14,15 +14,16 @@
 
 CMSGEQ7<true, MSGEQ7_RESET_PIN, MSGEQ7_STROBE_PIN, AUDIO_LEFT_PIN, AUDIO_RIGHT_PIN> MSGEQ7;
 
-TeensyDmx Dmx(Serial1);
+qindesign::teensydmx::Receiver dmxRx{Serial1};
+uint8_t dmxRxBuf[512];  // Buffer up to 512 channels
 
 void InitMSGEQ7() { 
   MSGEQ7.begin();
 }
 
 void controlSetup() {
   pinMode(LED_BUILTIN, OUTPUT);
-  Dmx.setMode(TeensyDmx::DMX_IN);
+  dmxRx.begin();
   pgm = 0;
 
   InitMSGEQ7();
@@ -32,7 +33,7 @@ void controlSetup() {
 }
 
 int getValue(int chan, int minV, int maxV) {
-  return map(Dmx.getBuffer()[(chan - 1)], 0, 255, minV, maxV);
+  return map(dmxRxBuf[(chan - 1)], 0, 255, minV, maxV);
 }
 
 
@@ -56,8 +57,11 @@ int right[7];
 
 void controlLoop() {
   int gPatternCount = 32; // FIXME
-  Dmx.loop();
-  if (Dmx.newFrame()) {
+
+  // Read up to 4 bytes (3rd param) starting from channel 1 (2nd param)
+  // Channel 0 is the start code
+  int read = dmxRx.read(dmxRxBuf, 1, 4);
+  if (read == 4) {
     EVERY_N_SECONDS( 2 ) {
       Serial.printf("Brighness: %u\n", getValue(1, 0, 255)); // Dimmer data for Channel 1
     }

Deevstock/DeevstockDMX/DeevstockDMX.ino

@@ -30,13 +30,14 @@ const bool    kMatrixSerpentineLayout = true;
 #define USE_OCTOWS2811
 #include<OctoWS2811.h>
 
-#include <TeensyDmx.h>
+#include <TeensyDMX.h>
 #include <FastLED.h>
 #include <Audio.h>
 
 // **********************************************************************************************************
 
-TeensyDmx Dmx(Serial1);
+qindesign::teensydmx::Receiver dmxRx{Serial1};
+uint8_t dmxRxBuf[6];  // Buffer up to 512 channels
 
 CRGB leds[NUM_LEDS];
 CRGB ledsAudio[NUM_AUDIO_LEDS];
@@ -204,7 +205,7 @@ void setup() {
   /* USB serial */
   Serial.begin(115200);
 
-  Dmx.setMode(TeensyDmx::DMX_IN);
+  dmxRx.begin();
 
   pinMode(LED_BUILTIN, OUTPUT);
 
@@ -238,29 +239,30 @@ elapsedMillis elapsed;
 int pattern = 0;
 void loop()
 {
-    Dmx.loop();
-  if (Dmx.newFrame()) {
-
+  // Read up to 6 bytes (3rd param) starting from channel 1 (2nd param)
+  // Channel 0 is the start code
+  int read = dmxRx.readPacket(dmxRxBuf, 1, 6);
+  if (read == 6) {
     led = !led;
     digitalWrite(LED_BUILTIN, led);
-    int b = Dmx.getBuffer()[0]; // brightness = 1
+    int b = dmxRxBuf[0]; // brightness = 1
     if (b != BRIGHTNESS) {
       BRIGHTNESS = b;
       FastLED.setBrightness(BRIGHTNESS);
       Serial.printf("Brightness: %u\n", BRIGHTNESS);
     }
-    STEPS = Dmx.getBuffer()[1]; // steps = 2
-    SPEEDO = Dmx.getBuffer()[2]; //speed = 3
-    FADE = Dmx.getBuffer()[3]; // fade = 4
-    int p = Dmx.getBuffer()[4]; // pattern = 5
+    STEPS = dmxRxBuf[1]; // steps = 2
+    SPEEDO = dmxRxBuf[2]; //speed = 3
+    FADE = dmxRxBuf[3]; // fade = 4
+    int p = dmxRxBuf[4]; // pattern = 5
     pattern = map(p, 0, 255, 0, (gPatternCount - 1));
     if(p > (gPatternCount - 1)) { 
       p = 0;
     }
     else {
       pattern = p;
     }
-    currentPalette = palettes[map(Dmx.getBuffer()[5], 0, 255, 0, (paletteCount - 1))]; // channel 6
+    currentPalette = palettes[map(dmxRxBuf[5], 0, 255, 0, (paletteCount - 1))]; // channel 6
 //    EVERY_N_SECONDS( 2 ) {
 //      Serial.println(p);
 //      Serial.print("b=");