Dmx512 Rs232 support (#256)

* Started work on DMX512 rs232 device
cloned from sedu - no actual changes yet

* Implemented DMX protocol
Added baudrate debugging to ProviderRs232

* Added support for multiple DMX fixture types
This commit is contained in:
penfold42 2016-09-27 01:50:11 +10:00 committed by redPanther
parent d1e165a753
commit d095b355b1
8 changed files with 160 additions and 3 deletions

View File

@ -33,9 +33,10 @@ SET(Leddevice_HEADERS
${CURRENT_SOURCE_DIR}/LedDevicePaintpack.h
${CURRENT_SOURCE_DIR}/LedDevicePiBlaster.h
${CURRENT_SOURCE_DIR}/LedDeviceSedu.h
${CURRENT_SOURCE_DIR}/LedDeviceDMX.h
${CURRENT_SOURCE_DIR}/LedDeviceFile.h
${CURRENT_SOURCE_DIR}/LedDeviceUdpRaw.h
${CURRENT_SOURCE_DIR}/LedDeviceUdpH801.h
${CURRENT_SOURCE_DIR}/LedDeviceUdpH801.h
${CURRENT_SOURCE_DIR}/LedDeviceUdpE131.h
${CURRENT_SOURCE_DIR}/ProviderUdp.h
${CURRENT_SOURCE_DIR}/LedDeviceHyperionUsbasp.h
@ -60,10 +61,11 @@ SET(Leddevice_SOURCES
${CURRENT_SOURCE_DIR}/LedDevicePaintpack.cpp
${CURRENT_SOURCE_DIR}/LedDevicePiBlaster.cpp
${CURRENT_SOURCE_DIR}/LedDeviceSedu.cpp
${CURRENT_SOURCE_DIR}/LedDeviceDMX.cpp
${CURRENT_SOURCE_DIR}/LedDeviceFile.cpp
${CURRENT_SOURCE_DIR}/LedDeviceFadeCandy.cpp
${CURRENT_SOURCE_DIR}/LedDeviceUdpRaw.cpp
${CURRENT_SOURCE_DIR}/LedDeviceUdpH801.cpp
${CURRENT_SOURCE_DIR}/LedDeviceUdpH801.cpp
${CURRENT_SOURCE_DIR}/LedDeviceUdpE131.cpp
${CURRENT_SOURCE_DIR}/ProviderUdp.cpp
${CURRENT_SOURCE_DIR}/LedDeviceHyperionUsbasp.cpp

View File

@ -0,0 +1,84 @@
#include "LedDeviceDMX.h"
#include <QSerialPort>
#include <time.h>
LedDeviceDMX::LedDeviceDMX(const Json::Value &deviceConfig)
: ProviderRs232(deviceConfig)
{
std::string _dmxString = deviceConfig.get("dmxdevice", "invalid").asString();
if (_dmxString == "raw")
{
_dmxDeviceType = 0;
_dmxStart = 1;
_dmxSlotsPerLed = 3;
}
else if (_dmxString == "McCrypt")
{
_dmxDeviceType = 1;
_dmxStart = 1;
_dmxSlotsPerLed = 4;
}
else
{
Error(_log, "unknown dmx device type %s", _dmxString.c_str());
}
Debug(_log, "_dmxString \"%s\", _dmxDeviceType %d", _dmxString.c_str(), _dmxDeviceType );
_rs232Port.setStopBits(QSerialPort::TwoStop);
}
LedDevice* LedDeviceDMX::construct(const Json::Value &deviceConfig)
{
return new LedDeviceDMX(deviceConfig);
}
int LedDeviceDMX::write(const std::vector<ColorRgb> &ledValues)
{
if ( (_ledBuffer.size() != _dmxChannelCount) || (_ledBuffer.size() == 0) )
{
_dmxLedCount = std::min(_ledCount, 512/_dmxSlotsPerLed);
_dmxChannelCount = 1 + _dmxSlotsPerLed * _dmxLedCount;
Debug(_log, "_dmxStart %d, _dmxSlotsPerLed %d", _dmxStart, _dmxSlotsPerLed);
Debug(_log, "_ledCount %d, _dmxLedCount %d, _dmxChannelCount %d", _ledCount, _dmxLedCount, _dmxChannelCount);
_ledBuffer.resize(_dmxChannelCount, 0);
_ledBuffer[0] = 0x00; // NULL START code
}
switch (_dmxDeviceType) {
case 0:
memcpy(_ledBuffer.data()+1, ledValues.data(), _dmxChannelCount-1);
break;
case 1:
int l =_dmxStart;
for (int d=0; d<_dmxLedCount; d++)
{
_ledBuffer[l++] = ledValues[d].red;
_ledBuffer[l++] = ledValues[d].green;
_ledBuffer[l++] = ledValues[d].blue;
_ledBuffer[l++] = 0xff;
}
break;
}
_rs232Port.setBreakEnabled(true);
nanosleep((const struct timespec[]){{0, 176000L}}, NULL); // 176 uSec break time
_rs232Port.setBreakEnabled(false);
nanosleep((const struct timespec[]){{0, 12000L}}, NULL); // 176 uSec make after break time
#undef uberdebug
#ifdef uberdebug
printf ("Writing %d bytes", _dmxChannelCount);
for (unsigned int i=0; i < _dmxChannelCount; i++)
{
if (i%32 == 0) {
printf ("\n%04x: ", i);
}
printf ("%02x ", _ledBuffer[i]);
}
printf ("\n");
#endif
return writeBytes(_dmxChannelCount, _ledBuffer.data());
}

View File

@ -0,0 +1,35 @@
#pragma once
// hyperion incluse
#include "ProviderRs232.h"
///
/// Implementation of the LedDevice interface for writing to DMX512 rs232 led device.
///
class LedDeviceDMX : public ProviderRs232
{
public:
///
/// Constructs specific LedDevice
///
/// @param deviceConfig json device config
///
LedDeviceDMX(const Json::Value &deviceConfig);
/// constructs leddevice
static LedDevice* construct(const Json::Value &deviceConfig);
private:
///
/// Writes the led color values to the led-device
///
/// @param ledValues The color-value per led
/// @return Zero on succes else negative
///
virtual int write(const std::vector<ColorRgb> &ledValues);
int _dmxDeviceType = 0;
int _dmxStart = 1;
int _dmxSlotsPerLed = 3;
int _dmxLedCount = 0;;
unsigned int _dmxChannelCount = 0;
};

View File

@ -35,6 +35,7 @@
#include "LedDevicePaintpack.h"
#include "LedDevicePiBlaster.h"
#include "LedDeviceSedu.h"
#include "LedDeviceDMX.h"
#include "LedDeviceFile.h"
#include "LedDeviceFadeCandy.h"
#include "LedDeviceTpm2net.h"
@ -70,6 +71,7 @@ LedDevice * LedDeviceFactory::construct(const Json::Value & deviceConfig)
LedDevice::addToDeviceMap("adalight" , LedDeviceAdalight::construct);
LedDevice::addToDeviceMap("adalightapa102", LedDeviceAdalightApa102::construct);
LedDevice::addToDeviceMap("sedu" , LedDeviceSedu::construct);
LedDevice::addToDeviceMap("dmx" , LedDeviceDMX::construct);
LedDevice::addToDeviceMap("tpm2" , LedDeviceTpm2::construct);
LedDevice::addToDeviceMap("atmo" , LedDeviceAtmo::construct);
LedDevice::addToDeviceMap("fadecandy" , LedDeviceFadeCandy::construct);

View File

@ -19,6 +19,7 @@
<file alias="schema-piblaster">schemas/schema-piblaster.json</file>
<file alias="schema-rawhid">schemas/schema-rawhid.json</file>
<file alias="schema-sedu">schemas/schema-sedu.json</file>
<file alias="schema-dmx">schemas/schema-dmx.json</file>
<file alias="schema-sk6812rgbw-spi">schemas/schema-sk6812rgbw-spi.json</file>
<file alias="schema-tinkerforge">schemas/schema-tinkerforge.json</file>
<file alias="schema-tpm2net">schemas/schema-tpm2net.json</file>

View File

@ -130,6 +130,7 @@ bool ProviderRs232::tryOpen(const int delayAfterConnect_ms)
}
return false;
}
Debug(_log, "Setting baud rate to %d", _baudRate_Hz);
_rs232Port.setBaudRate(_baudRate_Hz);
_stateChanged = true;
}

View File

@ -53,6 +53,9 @@ protected:
void closeDevice();
/// The RS232 serial-device
QSerialPort _rs232Port;
private slots:
/// Unblock the device after a connection delay
void unblockAfterDelay();
@ -74,7 +77,7 @@ private:
int _delayAfterConnect_ms;
/// The RS232 serial-device
QSerialPort _rs232Port;
// QSerialPort _rs232Port;
bool _blockedForDelay;

View File

@ -0,0 +1,29 @@
{
"type":"object",
"required":true,
"properties":{
"output": {
"type": "string",
"title":"Output path",
"propertyOrder" : 1
},
"output": {
"type": "string",
"title":"DMX Device Type",
"propertyOrder" : 1
},
"rate": {
"type": "integer",
"title":"Baudrate",
"default": 250000,
"propertyOrder" : 2
},
"delayAfterConnect": {
"type": "integer",
"title":"Delay after connect",
"default": 250,
"propertyOrder" : 3
}
},
"additionalProperties": true
}