ESPDmx replaced with SparkFunDMX

wled00/dmx.cpp

@@ -60,7 +60,7 @@ void handleDMX()
 }
 
 void initDMX() {
-  dmx.init(512);        // initialize with bus length
+  dmx.initWrite(512);       // initialize with bus length
 }
 
 #else

wled00/src/dependencies/dmx/LICENSE.md

@@ -0,0 +1,55 @@
+SparkFun License Information
+============================
+
+SparkFun uses two different licenses for our files — one for hardware and one for code.
+
+Hardware
+---------
+
+**SparkFun hardware is released under [Creative Commons Share-alike 4.0 International](http://creativecommons.org/licenses/by-sa/4.0/).**
+
+Note: This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/legalcode).
+
+You are free to:
+
+Share — copy and redistribute the material in any medium or format
+Adapt — remix, transform, and build upon the material
+for any purpose, even commercially.
+The licensor cannot revoke these freedoms as long as you follow the license terms.
+Under the following terms:
+
+Attribution — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
+ShareAlike — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
+No additional restrictions — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
+Notices:
+
+You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
+No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
+
+
+Code
+--------
+
+**SparkFun code, firmware, and software is released under the MIT License(http://opensource.org/licenses/MIT).**
+
+The MIT License (MIT)
+
+Copyright (c) 2016 SparkFun Electronics
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

wled00/src/dependencies/dmx/SparkFunDMX.cpp

@@ -0,0 +1,155 @@
+/******************************************************************************
+SparkFunDMX.h
+Arduino Library for the SparkFun ESP32 LED to DMX Shield
+Andy England @ SparkFun Electronics
+7/22/2019
+
+Development environment specifics:
+Arduino IDE 1.6.4
+
+This code is released under the [MIT License](http://opensource.org/licenses/MIT).
+Please review the LICENSE.md file included with this example. If you have any questions 
+or concerns with licensing, please contact techsupport@sparkfun.com.
+Distributed as-is; no warranty is given.
+******************************************************************************/
+
+/* ----- LIBRARIES ----- */
+#include <Arduino.h>
+
+#include "SparkFunDMX.h"
+#include <HardwareSerial.h>
+
+#define dmxMaxChannel  513
+#define defaultMax 32
+
+#define DMXSPEED       250000
+#define DMXFORMAT      SERIAL_8N2
+
+int enablePin = 26;		// "LightBrain" rt
+int rxPin = 25;       // "LightBrain" rx
+int txPin = 2;        // "LightBrain" tx
+
+//DMX value array and size. Entry 0 will hold startbyte
+uint8_t dmxData[dmxMaxChannel] = {};
+int chanSize;
+int currentChannel = 0;
+
+HardwareSerial DMXSerial(2);
+
+/* Interrupt Timer for DMX Receive */
+hw_timer_t * timer = NULL;
+portMUX_TYPE timerMux = portMUX_INITIALIZER_UNLOCKED;
+
+volatile int _interruptCounter;
+volatile bool _startCodeDetected = false;
+
+volatile bool ledPin = false;
+
+/* Start Code is detected by 21 low interrupts */
+void IRAM_ATTR onTimer() {
+	if (digitalRead(rxPin) == 1)
+	{
+		_interruptCounter = 0; //If the RX Pin is high, we are not in an interrupt
+	}
+	else
+	{
+		_interruptCounter++;
+	}
+	if (_interruptCounter > 9)
+	{	
+		portENTER_CRITICAL_ISR(&timerMux);
+		_startCodeDetected = true;
+		DMXSerial.begin(DMXSPEED, DMXFORMAT, rxPin, txPin);
+		portEXIT_CRITICAL_ISR(&timerMux);
+		_interruptCounter = 0;
+	}
+}
+
+void SparkFunDMX::initRead(int chanQuant) {
+
+  timer = timerBegin(0, 1, true);
+  timerAttachInterrupt(timer, &onTimer, true);
+  timerAlarmWrite(timer, 320, true);
+  timerAlarmEnable(timer);
+  _READWRITE = _READ;
+  if (chanQuant > dmxMaxChannel || chanQuant <= 0) 
+  {
+    chanQuant = defaultMax;
+  }
+  chanSize = chanQuant;
+  pinMode(13, OUTPUT);
+  pinMode(enablePin, OUTPUT);
+  digitalWrite(enablePin, LOW);
+  pinMode(rxPin, INPUT);
+}
+
+// Set up the DMX-Protocol
+void SparkFunDMX::initWrite (int chanQuant) {
+
+  _READWRITE = _WRITE;
+  if (chanQuant > dmxMaxChannel || chanQuant <= 0) {
+    chanQuant = defaultMax;
+  }
+
+  chanSize = chanQuant + 1; //Add 1 for start code
+
+  DMXSerial.begin(DMXSPEED, DMXFORMAT, rxPin, txPin);
+  pinMode(enablePin, OUTPUT);
+  digitalWrite(enablePin, HIGH);
+}
+
+// Function to read DMX data
+uint8_t SparkFunDMX::read(int Channel) {
+  if (Channel > chanSize) Channel = chanSize;
+  return(dmxData[Channel - 1]); //subtract one to account for start byte
+}
+
+// Function to send DMX data
+void SparkFunDMX::write(int Channel, uint8_t value) {
+  if (Channel < 0) Channel = 0;
+  if (Channel > chanSize) chanSize = Channel;
+  dmxData[0] = 0;
+  dmxData[Channel] = value; //add one to account for start byte
+}
+
+
+
+void SparkFunDMX::update() {
+  if (_READWRITE == _WRITE)
+  {
+	DMXSerial.begin(DMXSPEED, DMXFORMAT, rxPin, txPin);//Begin the Serial port
+    pinMatrixOutDetach(txPin, false, false); //Detach our
+    pinMode(txPin, OUTPUT); 
+    digitalWrite(txPin, LOW); //88 uS break
+    delayMicroseconds(88);  
+    digitalWrite(txPin, HIGH); //4 Us Mark After Break
+    delayMicroseconds(1);
+    pinMatrixOutAttach(txPin, U2TXD_OUT_IDX, false, false);
+
+    DMXSerial.write(dmxData, chanSize);
+    DMXSerial.flush();
+    DMXSerial.end();//clear our DMX array, end the Hardware Serial port
+  }
+  else if (_READWRITE == _READ)//In a perfect world, this function ends serial communication upon packet completion and attaches RX to a CHANGE interrupt so the start code can be read again
+  { 
+	if (_startCodeDetected == true)
+	{
+		while (DMXSerial.available())
+		{
+			dmxData[currentChannel++] = DMXSerial.read();
+		}
+	if (currentChannel > chanSize) //Set the channel counter back to 0 if we reach the known end size of our packet
+	{
+
+      portENTER_CRITICAL(&timerMux);
+	  _startCodeDetected = false;
+	  DMXSerial.flush();
+	  DMXSerial.end();
+      portEXIT_CRITICAL(&timerMux);
+	  currentChannel = 0;
+	}
+	}
+  }
+}
+
+// Function to update the DMX bus

wled00/src/dependencies/dmx/SparkFunDMX.h

@@ -0,0 +1,38 @@
+/******************************************************************************
+SparkFunDMX.h
+Arduino Library for the SparkFun ESP32 LED to DMX Shield
+Andy England @ SparkFun Electronics
+7/22/2019
+
+Development environment specifics:
+Arduino IDE 1.6.4
+
+This code is released under the [MIT License](http://opensource.org/licenses/MIT).
+Please review the LICENSE.md file included with this example. If you have any questions 
+or concerns with licensing, please contact techsupport@sparkfun.com.
+Distributed as-is; no warranty is given.
+******************************************************************************/
+
+#include <inttypes.h>
+
+
+#ifndef SparkFunDMX_h
+#define SparkFunDMX_h
+
+// ---- Methods ----
+
+class SparkFunDMX {
+public:
+  void initRead(int maxChan);
+  void initWrite(int maxChan);
+  uint8_t read(int Channel);
+  void write(int channel, uint8_t value);
+  void update();
+private:
+  uint8_t _startCodeValue = 0xFF;
+  bool _READ = true;
+  bool _WRITE = false;
+  bool _READWRITE;
+};
+
+#endif