Leddevices source tree refactoring (#461)

* rework structure of leddevice source tree

* fix data type vor v4l sig detection value in webui

* automate leddevicefactory.cpp

libsrc/leddevice/dev_other/LedDeviceFile.cpp

@@ -0,0 +1,44 @@
+#include "LedDeviceFile.h"
+
+LedDeviceFile::LedDeviceFile(const QJsonObject &deviceConfig)
+	: LedDevice()
+{
+	init(deviceConfig);
+}
+
+LedDeviceFile::~LedDeviceFile()
+{
+}
+
+LedDevice* LedDeviceFile::construct(const QJsonObject &deviceConfig)
+{
+	return new LedDeviceFile(deviceConfig);
+}
+
+bool LedDeviceFile::init(const QJsonObject &deviceConfig)
+{
+	if ( _ofs.is_open() )
+	{
+		_ofs.close();
+	}
+
+	_refresh_timer_interval = 0;
+	LedDevice::init(deviceConfig);
+
+	QString fileName = deviceConfig["output"].toString("/dev/null");
+	_ofs.open( QSTRING_CSTR(fileName) );
+
+	return true;
+}
+
+int LedDeviceFile::write(const std::vector<ColorRgb> & ledValues)
+{
+	_ofs << "[";
+	for (const ColorRgb& color : ledValues)
+	{
+		_ofs << color;
+	}
+	_ofs << "]" << std::endl;
+
+	return 0;
+}

libsrc/leddevice/dev_other/LedDeviceFile.h

@@ -0,0 +1,50 @@
+#pragma once
+
+// STL includes
+#include <fstream>
+
+// Leddevice includes
+#include <leddevice/LedDevice.h>
+
+///
+/// Implementation of the LedDevice that write the led-colors to an
+/// ASCII-textfile('/home/pi/LedDevice.out')
+///
+class LedDeviceFile : public LedDevice
+{
+public:
+	///
+	/// Constructs specific LedDevice
+	///
+	/// @param deviceConfig json device config
+	///
+	LedDeviceFile(const QJsonObject &deviceConfig);
+
+	///
+	/// Destructor of this test-device
+	///
+	virtual ~LedDeviceFile();
+
+	/// constructs leddevice
+	static LedDevice* construct(const QJsonObject &deviceConfig);
+
+	///
+	/// Sets configuration
+	///
+	/// @param deviceConfig the json device config
+	/// @return true if success
+	virtual bool init(const QJsonObject &deviceConfig);
+	
+protected:
+	///
+	/// Writes the given led-color values to the output stream
+	///
+	/// @param ledValues The color-value per led
+	///
+	/// @return Zero on success else negative
+	///
+	virtual int write(const std::vector<ColorRgb> & ledValues);
+
+	/// The outputstream
+	std::ofstream _ofs;
+};

libsrc/leddevice/dev_other/LedDevicePiBlaster.cpp

@@ -0,0 +1,158 @@
+
+// STL includes
+#include <cstring>
+#include <csignal>
+
+// QT includes
+#include <QFile>
+
+// Local LedDevice includes
+#include "LedDevicePiBlaster.h"
+
+LedDevicePiBlaster::LedDevicePiBlaster(const QJsonObject &deviceConfig)
+	: _fid(nullptr)
+{
+	signal(SIGPIPE,  SIG_IGN);
+
+// initialise the mapping tables
+// -1 is invalid
+// z is also meaningless
+// { "gpio" : 4, "ledindex" : 0, "ledcolor" : "r" },
+	#define TABLE_SZ sizeof(_gpio_to_led)/sizeof(_gpio_to_led[0])
+
+	for (unsigned i=0; i <  TABLE_SZ; i++ )
+	{
+		_gpio_to_led[i] = -1;
+		_gpio_to_color[i] = 'z';
+	}
+
+	_deviceReady = init(deviceConfig);
+}
+
+LedDevicePiBlaster::~LedDevicePiBlaster()
+{
+	// Close the device (if it is opened)
+	if (_fid != nullptr)
+	{
+		fclose(_fid);
+		_fid = nullptr;
+	}
+}
+
+
+bool LedDevicePiBlaster::init(const QJsonObject &deviceConfig)
+{
+	LedDevice::init(deviceConfig);
+
+	_deviceName    = deviceConfig["output"].toString("/dev/pi-blaster");
+	QJsonArray gpioMapping = deviceConfig["gpiomap"].toArray();
+
+	if (gpioMapping.isEmpty())
+	{
+		throw std::runtime_error("Piblaster: no gpiomap defined.");
+	}
+
+	// walk through the json config and populate the mapping tables
+	for(QJsonArray::const_iterator gpioArray = gpioMapping.begin(); gpioArray != gpioMapping.end(); ++gpioArray)
+	{
+		const QJsonObject value = (*gpioArray).toObject();
+		const int gpio = value["gpio"].toInt(-1);
+		const int ledindex = value["ledindex"].toInt(-1);
+		const std::string ledcolor = value["ledcolor"].toString("z").toStdString();
+
+		// ignore missing/invalid settings
+		if ( (gpio >= 0) && (gpio < signed(TABLE_SZ)) && (ledindex >= 0) ){
+			_gpio_to_led[gpio] = ledindex;
+			_gpio_to_color[gpio] = ledcolor[0]; // 1st char of string
+		} else {
+			Warning( _log, "IGNORING gpio %d ledindex %d color %c", gpio,ledindex, ledcolor[0]);
+		}
+	}
+
+	return true;
+}
+
+LedDevice* LedDevicePiBlaster::construct(const QJsonObject &deviceConfig)
+{
+	return new LedDevicePiBlaster(deviceConfig);
+}
+
+int LedDevicePiBlaster::open()
+{
+	if (_fid != nullptr)
+	{
+		// The file pointer is already open
+		Error( _log, "Device (%s) is already open.", QSTRING_CSTR(_deviceName) );
+		return -1;
+	}
+
+	if (!QFile::exists(_deviceName))
+	{
+		Error( _log, "The device (%s) does not yet exist.",QSTRING_CSTR(_deviceName) );
+		return -1;
+	}
+
+	_fid = fopen(QSTRING_CSTR(_deviceName), "w");
+	if (_fid == nullptr)
+	{
+		Error( _log, "Failed to open device (%s). Error message: %s", QSTRING_CSTR(_deviceName),  strerror(errno) );
+		return -1;
+	}
+
+	Info( _log, "Connected to device(%s)", QSTRING_CSTR(_deviceName));
+
+	return 0;
+}
+
+int LedDevicePiBlaster::write(const std::vector<ColorRgb> & ledValues)
+{
+	// Attempt to open if not yet opened
+	if (_fid == nullptr && open() < 0)
+	{
+		return -1;
+	}
+
+	int valueIdx = -1;
+	for (unsigned int i=0; i < TABLE_SZ; i++ )
+	{
+		valueIdx = _gpio_to_led[ i ];
+		if ( (valueIdx >= 0) && (valueIdx < _ledCount) ) 
+		{
+			double pwmDutyCycle = 0.0;
+			switch (_gpio_to_color[ i ]) 
+			{
+			case 'r':
+				pwmDutyCycle = ledValues[valueIdx].red / 255.0;
+				break;
+			case 'g':
+				pwmDutyCycle = ledValues[valueIdx].green / 255.0;
+				break;
+			case 'b':
+				pwmDutyCycle = ledValues[valueIdx].blue / 255.0;
+				break;
+			case 'w':
+				pwmDutyCycle = ledValues[valueIdx].red;
+				pwmDutyCycle += ledValues[valueIdx].green;
+				pwmDutyCycle += ledValues[valueIdx].blue;
+				pwmDutyCycle /= (3.0*255.0);
+				break;
+			default:
+				continue;
+			}
+
+//			fprintf(_fid, "%i=%f\n", iPins[iPin], pwmDutyCycle);
+
+			if ( (fprintf(_fid, "%i=%f\n", i, pwmDutyCycle) < 0) 
+			  || (fflush(_fid) < 0)) {
+				if (_fid != nullptr)
+				{
+					fclose(_fid);
+					_fid = nullptr;
+					return -1;
+				}
+			}
+		}
+	}
+
+	return 0;
+}

libsrc/leddevice/dev_other/LedDevicePiBlaster.h

@@ -0,0 +1,59 @@
+#pragma once
+
+// Hyperion-Leddevice includes
+#include <leddevice/LedDevice.h>
+
+///
+/// Implementation of the LedDevice interface for writing to pi-blaster based PWM LEDs
+///
+
+class LedDevicePiBlaster : public LedDevice
+{
+public:
+	///
+	/// Constructs specific LedDevice
+	///
+	/// @param deviceConfig json device config
+	///
+	LedDevicePiBlaster(const QJsonObject &deviceConfig);
+
+	virtual ~LedDevicePiBlaster();
+
+	///
+	/// 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 the piblaster-device. This will only succeed if the device is not yet open
+	/// and the device is available.
+	///
+	/// @return Zero on succes else negative
+	///
+	int open();
+
+private:
+	///
+	/// Writes the colors to the PiBlaster device
+	///
+	/// @param ledValues The color value for each led
+	///
+	/// @return Zero on success else negative
+	///
+	int write(const std::vector<ColorRgb> &ledValues);
+
+	/// The name of the output device (very likely '/dev/pi-blaster')
+	QString _deviceName;
+
+	int _gpio_to_led[64];
+	char _gpio_to_color[64];
+
+	/// File-Pointer to the PiBlaster device
+	FILE * _fid;
+
+};