Leddevices source tree refactoring (#461)

* rework structure of leddevice source tree

* fix data type vor v4l sig detection value in webui

* automate leddevicefactory.cpp
This commit is contained in:
redPanther
2017-08-07 10:05:46 +02:00
committed by GitHub
parent f3bbe158bf
commit 317a903b14
76 changed files with 98 additions and 222 deletions

View File

@@ -0,0 +1,145 @@
// STL includes
#include <cerrno>
#include <cstring>
// Local LedDevice includes
#include "LedDeviceTinkerforge.h"
static const unsigned MAX_NUM_LEDS = 320;
static const unsigned MAX_NUM_LEDS_SETTABLE = 16;
LedDeviceTinkerforge::LedDeviceTinkerforge(const QJsonObject &deviceConfig)
: LedDevice()
, _ipConnection(nullptr)
, _ledStrip(nullptr)
, _colorChannelSize(0)
{
init(deviceConfig);
}
LedDeviceTinkerforge::~LedDeviceTinkerforge()
{
// Close the device (if it is opened)
if (_ipConnection != nullptr && _ledStrip != nullptr)
{
switchOff();
}
// Clean up claimed resources
delete _ipConnection;
delete _ledStrip;
}
bool LedDeviceTinkerforge::init(const QJsonObject &deviceConfig)
{
LedDevice::init(deviceConfig);
_host = deviceConfig["output"].toString("127.0.0.1");
_port = deviceConfig["port"].toInt(4223);
_uid = deviceConfig["uid"].toString();
_interval = deviceConfig["rate"].toInt();
if ((unsigned)_ledCount > MAX_NUM_LEDS)
{
Error(_log,"Invalid attempt to write led values. Not more than %d leds are allowed.", MAX_NUM_LEDS);
return -1;
}
if (_colorChannelSize < (unsigned)_ledCount)
{
_redChannel.resize(_ledCount, uint8_t(0));
_greenChannel.resize(_ledCount, uint8_t(0));
_blueChannel.resize(_ledCount, uint8_t(0));
}
_colorChannelSize = _ledCount;
return true;
}
LedDevice* LedDeviceTinkerforge::construct(const QJsonObject &deviceConfig)
{
return new LedDeviceTinkerforge(deviceConfig);
}
int LedDeviceTinkerforge::open()
{
// Check if connection is already createds
if (_ipConnection != nullptr)
{
Error(_log, "Attempt to open existing connection; close before opening");
return -1;
}
// Initialise a new connection
_ipConnection = new IPConnection;
ipcon_create(_ipConnection);
int connectionStatus = ipcon_connect(_ipConnection, QSTRING_CSTR(_host), _port);
if (connectionStatus < 0)
{
Warning(_log, "Attempt to connect to master brick (%s:%d) failed with status %d", QSTRING_CSTR(_host), _port, connectionStatus);
return -1;
}
// Create the 'LedStrip'
_ledStrip = new LEDStrip;
led_strip_create(_ledStrip, QSTRING_CSTR(_uid), _ipConnection);
int frameStatus = led_strip_set_frame_duration(_ledStrip, _interval);
if (frameStatus < 0)
{
Error(_log,"Attempt to connect to led strip bricklet (led_strip_set_frame_duration()) failed with status %d", frameStatus);
return -1;
}
return 0;
}
int LedDeviceTinkerforge::write(const std::vector<ColorRgb> &ledValues)
{
auto redIt = _redChannel.begin();
auto greenIt = _greenChannel.begin();
auto blueIt = _blueChannel.begin();
for (const ColorRgb &ledValue : ledValues)
{
*redIt = ledValue.red;
++redIt;
*greenIt = ledValue.green;
++greenIt;
*blueIt = ledValue.blue;
++blueIt;
}
return transferLedData(_ledStrip, 0, _colorChannelSize, _redChannel.data(), _greenChannel.data(), _blueChannel.data());
}
int LedDeviceTinkerforge::transferLedData(LEDStrip *ledStrip, unsigned index, unsigned length, uint8_t *redChannel, uint8_t *greenChannel, uint8_t *blueChannel)
{
if (length == 0 || index >= length || length > MAX_NUM_LEDS)
{
return E_INVALID_PARAMETER;
}
uint8_t reds[MAX_NUM_LEDS_SETTABLE];
uint8_t greens[MAX_NUM_LEDS_SETTABLE];
uint8_t blues[MAX_NUM_LEDS_SETTABLE];
for (unsigned i=index; i<length; i+=MAX_NUM_LEDS_SETTABLE)
{
const unsigned copyLength = (i + MAX_NUM_LEDS_SETTABLE > length) ? length - i : MAX_NUM_LEDS_SETTABLE;
memcpy(reds, redChannel + i, copyLength);
memcpy(greens, greenChannel + i, copyLength);
memcpy(blues, blueChannel + i, copyLength);
const int status = led_strip_set_rgb_values(ledStrip, i, copyLength, reds, greens, blues);
if (status != E_OK)
{
Warning(_log, "Setting led values failed with status %d", status);
return status;
}
}
return E_OK;
}

View File

@@ -0,0 +1,90 @@
#pragma once
// STL includes
#include <cstdio>
#include <QString>
// Hyperion-Leddevice includes
#include <leddevice/LedDevice.h>
extern "C" {
#include <tinkerforge/ip_connection.h>
#include <tinkerforge/bricklet_led_strip.h>
}
class LedDeviceTinkerforge : public LedDevice
{
public:
///
/// Constructs specific LedDevice
///
/// @param deviceConfig json device config
///
LedDeviceTinkerforge(const QJsonObject &deviceConfig);
virtual ~LedDeviceTinkerforge();
///
/// Sets configuration
///
/// @param deviceConfig the json device config
/// @return true if success
bool init(const QJsonObject &deviceConfig);
/// constructs leddevice
static LedDevice* construct(const QJsonObject &deviceConfig);
///
/// Attempts to open a connection to the master bricklet and the led strip bricklet.
///
/// @return Zero on succes else negative
///
int open();
private:
///
/// Writes the colors to the led strip bricklet
///
/// @param ledValues The color value for each led
///
/// @return Zero on success else negative
///
virtual int write(const std::vector<ColorRgb> &ledValues);
///
/// Writes the data to the led strip blicklet
int transferLedData(LEDStrip *ledstrip, unsigned int index, unsigned int length, uint8_t *redChannel, uint8_t *greenChannel, uint8_t *blueChannel);
/// The host of the master brick
QString _host;
/// The port of the master brick
uint16_t _port;
/// The uid of the led strip bricklet
QString _uid;
/// The interval/rate
unsigned _interval;
/// ip connection handle
IPConnection *_ipConnection;
/// led strip handle
LEDStrip *_ledStrip;
/// buffer for red channel led data
std::vector<uint8_t> _redChannel;
/// buffer for red channel led data
std::vector<uint8_t> _greenChannel;
/// buffer for red channel led data
std::vector<uint8_t> _blueChannel;
/// buffer size of the color channels
unsigned int _colorChannelSize;
};