add limit for write to leddevice (#432)

* add limit for write to leddevice

* add to default config

* add i18n

* extend xmas effect

* fix indention

* add check for minimum brightness

* adapt effects to fading and new minWriteTime

* remove old latchTime
rename minimumWriteTime to latchTime
make it as dev specific option

* set default for rewriteTime to 1s
pause smoothing on color too

* reenable smoothing for color - it looks nicer :-)

* fix timeout timer

config/hyperion.config.json.commented

@@ -27,13 +27,15 @@
 	/// * [device type specific configuration]
 	/// * 'colorOrder' : The order of the color bytes ('rgb', 'rbg', 'bgr', etc.).
 	/// * 'rewriteTime': in ms. Data is resend to leds, if no new data is available in thistime. 0 means no refresh
+	/// * 'latchTime' : minimum time between led writes. 0 means no limit. default 10 means a rate of max 100Hz write time
 	"device" :
 	{
 		"type"       : "file",
 		"output"     : "/dev/null",
 		"rate"     : 1000000,
 		"colorOrder" : "rgb",
-		"rewriteTime": 0
+		"rewriteTime": 0,
+		"latchTime" : 10
 	},
 
 	/// Color manipulation configuration used to tune the output colors to specific surroundings. 

config/hyperion.config.json.default

@@ -16,7 +16,8 @@
 		"output"     : "/dev/null",
 		"rate"       : 1000000,
 		"colorOrder" : "rgb",
-		"rewriteTime": 5000
+		"rewriteTime": 5000,
+		"latchTime" : 10
 	},
 
 	"color" :

effects/breath.json

@@ -5,7 +5,7 @@
 	{
 		"color-end": [ 255, 255, 255 ],
 		"color-start": [ 50, 50, 50 ],
-		"fade-in-time" : 4000,
+		"fade-in-time" : 3000,
 		"fade-out-time" : 1000,
 		"color-start-time" : 50,
 		"color-end-time" : 250,

effects/fade.py

@@ -9,31 +9,32 @@ colorStartTime = float(hyperion.args.get('color-start-time', 1000)) / 1000
 colorEndTime   = float(hyperion.args.get('color-end-time', 1000)) / 1000
 repeat         = hyperion.args.get('repeat-count', 0)
 maintainEndCol = hyperion.args.get('maintain-end-color', True)
-minStepTime    = 0.03
+minStepTime    = float(hyperion.latchTime)/1000.0
 currentR = currentG = currentB = 0
 
 # create color table for fading from start to end color
+steps = float(abs(max((colorEnd[0] - colorStart[0]),max((colorEnd[1] - colorStart[1]),(colorEnd[2] - colorStart[2])))))
 color_step = (
-	(colorEnd[0] - colorStart[0]) / 256.0,
+	(colorEnd[0] - colorStart[0]) / steps,
-	(colorEnd[1] - colorStart[1]) / 256.0,
+	(colorEnd[1] - colorStart[1]) / steps,
-	(colorEnd[2] - colorStart[2]) / 256.0
+	(colorEnd[2] - colorStart[2]) / steps
 )
 
-calcChannel = lambda i: min(max(int(colorStart[i] + color_step[i]*step),0),255)
+calcChannel = lambda i: min(max(int(round(colorStart[i] + color_step[i]*step)),0), colorEnd[i] if colorStart[i] < colorEnd[i] else colorStart[i])
 colors = []
-for step in range(256):
+for step in range(int(steps)+1):
 	colors.append( (calcChannel(0),calcChannel(1),calcChannel(2)) )
 
 # calculate timings
 if fadeInTime>0:
-	incrementIn  = max(1,int(round(256.0 / (fadeInTime / minStepTime) )))
+	incrementIn  = max(1,int(round(steps / (fadeInTime / minStepTime) )))
-	sleepTimeIn  = fadeInTime / (256.0 / incrementIn)
+	sleepTimeIn  = fadeInTime / (steps / incrementIn)
 else:
 	incrementIn  = sleepTimeIn  = 1
 	
 if fadeOutTime>0:
-	incrementOut = max(1,int(round(256.0 / (fadeOutTime / minStepTime) )))
+	incrementOut = max(1,int(round(steps / (fadeOutTime / minStepTime) )))
-	sleepTimeOut = fadeOutTime / (256.0 / incrementOut)
+	sleepTimeOut = fadeOutTime / (steps / incrementOut)
 else:
 	incrementOut  = sleepTimeOut  = 1
 
@@ -50,7 +51,8 @@ repeatCounter = 1
 while not hyperion.abort():
 	# fade in
 	if fadeInTime > 0:
-		for step in range(0,256,incrementIn):
+		setColor( colors[0][0],colors[0][1],colors[0][2] )
+		for step in range(0,int(steps)+1,incrementIn):
 			if hyperion.abort(): break
 			setColor( colors[step][0],colors[step][1],colors[step][2] )
 			time.sleep(sleepTimeIn)
@@ -58,29 +60,31 @@ while not hyperion.abort():
 	# end color
 	t = 0.0
 	while t<colorStartTime and not hyperion.abort():
-		setColor( colors[255][0],colors[255][1],colors[255][2] )
+		setColor( colors[int(steps)][0],colors[int(steps)][1],colors[int(steps)][2] )
-		time.sleep(0.01)
+		time.sleep(minStepTime)
-		t += 0.01
+		t += minStepTime
 
 	# fade out
 	if fadeOutTime > 0:
-		for step in range(255,-1,-incrementOut):
+		setColor( colors[int(steps)][0],colors[int(steps)][1],colors[int(steps)][2] )
+		for step in range(int(steps),-1,-incrementOut):
 			if hyperion.abort(): break
-			hyperion.setColor( colors[step][0],colors[step][1],colors[step][2] )
+			setColor( colors[step][0],colors[step][1],colors[step][2] )
 			time.sleep(sleepTimeOut)
 
 	# start color
 	t = 0.0
 	while t<colorEndTime and not hyperion.abort():
 		setColor( colors[0][0],colors[0][1],colors[0][2] )
-		time.sleep(0.01)
+		time.sleep(minStepTime)
-		t += 0.01
+		t += minStepTime
 
 	# repeat
 	if repeat > 0 and repeatCounter >= repeat : break
 	repeatCounter += 1
 
 time.sleep(0.5)
+
 # maintain end color until effect end
 while not hyperion.abort() and maintainEndCol:
 	hyperion.setColor( currentR, currentG, currentB )

effects/light-clock.py

@@ -51,4 +51,4 @@ while not hyperion.abort():
 		hyperion.imageCanonicalGradient(centerX, centerY, angleS, colorsSecond)
 
 	hyperion.imageShow()
-	time.sleep(0.01 )
+	time.sleep(0.5 )

effects/rainbow-swirl.py

@@ -1,4 +1,4 @@
-import hyperion, time
+import hyperion, time, math
 
 # Get the parameters
 rotationTime = float(hyperion.args.get('rotation-time', 3.0))
@@ -6,12 +6,18 @@ reverse      = bool(hyperion.args.get('reverse', False))
 centerX      = float(hyperion.args.get('center_x', 0.5))
 centerY      = float(hyperion.args.get('center_y', 0.5))
 
+minStepTime  = float(hyperion.latchTime)/1000.0
 sleepTime = max(0.1, rotationTime) / 360
 angle     = 0
 centerX   = int(round(float(hyperion.imageWidth)*centerX))
 centerY   = int(round(float(hyperion.imageHeight)*centerY))
 increment = -1 if reverse else 1
 
+# adapt sleeptime to hardware
+if minStepTime > sleepTime:
+	increment *= int(math.ceil(minStepTime / sleepTime))
+	sleepTime  = minStepTime
+
 # table of stop colors for rainbow gradient, first is the position, next rgb, all values 0-255
 rainbowColors = bytearray([
 	0  ,255,0  ,0, 255,

effects/random.json

@@ -3,7 +3,7 @@
 	"script" : "random.py",
 	"args"   :
 	{
-		"speed"      : 1.0,
+		"speed"      : 750,
 		"saturation" : 1.0
 	}
 }

effects/random.py

@@ -1,21 +1,46 @@
-import hyperion, time, colorsys, random
+import hyperion, time, colorsys, random, math
 
 # get args
-sleepTime  = float(hyperion.args.get('speed', 1.0))
+sleepTime  = float(hyperion.args.get('speed', 1.0))/1000.0
 saturation = float(hyperion.args.get('saturation', 1.0))
 ledData    = bytearray()
+ledDataBuf = bytearray()
+color_step = []
+minStepTime= float(hyperion.latchTime)/1000.0
+fadeSteps  = min(256.0, math.floor(sleepTime/minStepTime))
 
 # Initialize the led data
 for i in range(hyperion.ledCount):
 	ledData += bytearray((0,0,0))
+	ledDataBuf += bytearray((0,0,0))
+	color_step.append((0.0,0.0,0.0))
 
 # Start the write data loop
 while not hyperion.abort():
-	hyperion.setColor(ledData)
+	for i in range(len(ledData)):
+		ledDataBuf[i] = ledData[i]
+
 	for i in range(hyperion.ledCount):
 		if random.randrange(10) == 1:
 			rgb = colorsys.hsv_to_rgb(random.random(), saturation, random.random())
 			ledData[i*3  ] = int(255*rgb[0])
 			ledData[i*3+1] = int(255*rgb[1])
 			ledData[i*3+2] = int(255*rgb[2])
-	time.sleep(sleepTime)
+
+			color_step[i] = (
+				(ledData[i*3  ]-ledDataBuf[i*3  ])/fadeSteps,
+				(ledData[i*3+1]-ledDataBuf[i*3+1])/fadeSteps,
+				(ledData[i*3+2]-ledDataBuf[i*3+2])/fadeSteps)
+		else:
+			color_step[i] = (0.0,0.0,0.0)
+			
+	for step in range(int(fadeSteps)):
+		for i in range(hyperion.ledCount):
+			ledDataBuf[i*3  ] = min(max(int(ledDataBuf[i*3  ] + color_step[i][0]*float(step)),0),ledData[i*3  ])
+			ledDataBuf[i*3+1] = min(max(int(ledDataBuf[i*3+1] + color_step[i][1]*float(step)),0),ledData[i*3+1])
+			ledDataBuf[i*3+2] = min(max(int(ledDataBuf[i*3+2] + color_step[i][2]*float(step)),0),ledData[i*3+2])
+			
+		hyperion.setColor(ledDataBuf)
+		time.sleep(sleepTime/fadeSteps)
+	hyperion.setColor(ledData)
+

effects/schema/random.schema.json

@@ -7,8 +7,9 @@
 		"speed": {
 			"type": "number",
 			"title":"edt_eff_speed_title",
-			"default": 1.0,
+			"default": 1000,
-			"minimum" : 0.0,
+			"minimum" : 10,
+			"append" : "edt_append_ms",
 			"propertyOrder" : 1
 		},
 		"saturation": {

effects/schema/trails.schema.json

@@ -33,10 +33,11 @@
 			"propertyOrder" : 4
 		},
 		"speed": {
-			"type": "number",
+			"type": "integer",
 			"title":"edt_eff_speed_title",
-			"default": 1.0,
+			"default": 100,
-			"minimum" : 0.1,
+			"minimum" : 10,
+			"append" : "edt_append_ms",
 			"propertyOrder" : 5
 		},
 		"random": {

effects/schema/x-mas.schema.json

@@ -5,11 +5,47 @@
 	"required":true,
 	"properties":{
 		"sleepTime": {
-			"type": "number",
+			"type": "integer",
 			"title":"edt_eff_sleeptime_title",
-			"default": 1.0,
+			"default": 1000,
-			"minimum" : 0.1,
+			"minimum" : 100,
+			"append" : "edt_append_ms",
 			"propertyOrder" : 1
+		},
+		"length": {
+			"type": "integer",
+			"title":"edt_eff_length_title",
+			"default": 1,
+			"minimum" : 1,
+			"propertyOrder" : 2
+		},
+		"color1": {
+			"type": "array",
+			"title":"edt_eff_color_title",
+			"format":"colorpicker",
+			"default": [255,255,255],
+			"items" : {
+				"type": "integer",
+				"minimum": 0,
+				"maximum": 255
+			},
+			"minItems": 3,
+			"maxItems": 3,
+			"propertyOrder" : 3
+		},
+		"color2": {
+			"type": "array",
+			"title":"edt_eff_color_title",
+			"format":"colorpicker",
+			"default": [255,0,0],
+			"items" : {
+				"type": "integer",
+				"minimum": 0,
+				"maximum": 255
+			},
+			"minItems": 3,
+			"maxItems": 3,
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": false

effects/traces.py

@@ -1,7 +1,4 @@
-import hyperion
+import hyperion, time, random, math
-import time
-import colorsys
-import random
 
 # Initialize the led data
 ledData = bytearray()
@@ -9,17 +6,20 @@ for i in range(hyperion.ledCount):
 	ledData += bytearray((0,0,0))
 
 sleepTime   = float(hyperion.args.get('speed', 1.0)) * 0.004
+minStepTime = float(hyperion.latchTime)/1000.0
+factor      = 1 if sleepTime > minStepTime else int(math.ceil(minStepTime/sleepTime))
 
 runners = [
-{ "i":0, "pos":0, "c":0, "step":9 , "lvl":255},
+	{ "i":0, "pos":0, "c":0, "step":9, "lvl":255},
-{ "i":1, "pos":0, "c":0, "step":8 , "lvl":255},
+	{ "i":1, "pos":0, "c":0, "step":8, "lvl":255},
-{ "i":2, "pos":0, "c":0, "step":7 , "lvl":255},
+	{ "i":2, "pos":0, "c":0, "step":7, "lvl":255},
-{ "i":0, "pos":0, "c":0, "step":6 , "lvl":100},
+	{ "i":0, "pos":0, "c":0, "step":6, "lvl":100},
-{ "i":1, "pos":0, "c":0, "step":5 , "lvl":100},
+	{ "i":1, "pos":0, "c":0, "step":5, "lvl":100},
-{ "i":2, "pos":0, "c":0, "step":4, "lvl":100},
+	{ "i":2, "pos":0, "c":0, "step":4, "lvl":100},
 ]
 
 # Start the write data loop
+i = 0
 while not hyperion.abort():
 	for r in runners:
 		if r["c"] == 0:
@@ -30,5 +30,9 @@ while not hyperion.abort():
 		else:
 			r["c"] -= 1
 
+	i += 1
+	if i % factor == 0:
 		hyperion.setColor(ledData)
+		i = 0
+	
 	time.sleep(sleepTime)

effects/trails.json

@@ -7,7 +7,7 @@
 		"max_len" : 7,
 		"height" : 8,
 		"trails": 3,
-		"speed" : 1.0,
+		"speed" : 30,
 		"random" : false,
 		"color" : [255, 255, 255]
 	}

effects/trails.py

@@ -7,7 +7,7 @@ min_len = int(hyperion.args.get('min_len', 3))
 max_len = int(hyperion.args.get('max_len', 3))
 height = int(hyperion.args.get('height', 8))
 trails = int(hyperion.args.get('int', 8))
-sleepTime = float(hyperion.args.get('speed', 1.0)) * 0.01
+sleepTime = float(hyperion.args.get('speed', 1)) / 1000.0
 color = list(hyperion.args.get('color', (255,255,255)))
 randomise = bool(hyperion.args.get('random', False))
 whidth = hyperion.ledCount / height
@@ -45,9 +45,7 @@ class trail:
 tr = []
 
 for i in range(trails):
-  r = {
+	r = {'exec': trail()}
-      'exec': trail()
-    }
 
 	if randomise:
 		col = (random.uniform(0.1, 1.0), random.uniform(0.1, 1.0), random.uniform(0.1, 1.0))

effects/trails_color.json

@@ -7,7 +7,7 @@
 		"max_len" : 6,
 		"height" : 8,
 		"trails": 16,
-		"speed" : 8.0,
+		"speed" : 50,
 		"random" : true,
 		"color" : [255, 255, 255]
 	}

effects/x-mas.json

@@ -3,6 +3,9 @@
 	"script" : "x-mas.py",
 	"args" :
 	{
-		"sleepTime" : 0.75
+		"sleepTime" : 750,
+		"color1" : [255,255,255],
+		"color2" : [255,0,0],
+		"length" : 1
 	}
 }

effects/x-mas.py

@@ -1,22 +1,26 @@
 import hyperion, time, colorsys
 
 # Get the parameters
-sleepTime = float(hyperion.args.get('sleepTime', 1.0))
+sleepTime   = float(hyperion.args.get('sleepTime', 1000))/1000.0
+length = hyperion.args.get('length', 1)
+color1 = hyperion.args.get('color1', (255,255,255))
+color2 = hyperion.args.get('color2', (255,0,0))
 
 # Initialize the led data
+i = 0
 ledDataOdd = bytearray()
-for i in range(hyperion.ledCount):
+while i < hyperion.ledCount:
-	if i%2 == 0:
+	for l in range(length):
-		ledDataOdd += bytearray((int(255), int(0), int(0)))
+		if i<hyperion.ledCount:
-	else:
+			ledDataOdd += bytearray((int(color1[0]), int(color1[1]), int(color1[2])))
-		ledDataOdd += bytearray((int(255), int(255), int(255)))
+			i += 1
 
-ledDataEven = bytearray()
+	for l in range(length):
-for i in range(hyperion.ledCount):
+		if i<hyperion.ledCount:
-	if i%2 == 0:
+			ledDataOdd += bytearray((int(color2[0]), int(color2[1]), int(color2[2])))
-		ledDataEven += bytearray((int(255), int(255), int(255)))
+			i += 1
-	else:
+
-		ledDataEven += bytearray((int(255), int(0), int(0)))
+ledDataEven = ledDataOdd[3*length:] + ledDataOdd[0:3*length]
 
 # Start the write data loop
 while not hyperion.abort():

include/hyperion/Hyperion.h

@@ -179,6 +179,8 @@ public:
 	
 	int getConfigVersionId() { return _configVersionId; };
 
+	int getLatchTime() const;
+
 public slots:
 	///
 	/// Writes a single color to all the leds for the given time and priority

include/leddevice/LedDevice.h

@@ -62,6 +62,7 @@ public:
 	
 	void setEnable(bool enable);
 	bool enabled() { return _enabled; };
+	int getLatchTime() { return _latchTime_ms; };
 
 	inline bool componentState() { return enabled(); };
 	
@@ -95,7 +96,8 @@ protected:
 	/// e.g. Adalight device will switch off when it does not receive data at least every 15 seconds
 	QTimer       _refresh_timer;
 	unsigned int _refresh_timer_interval;
-
+	qint64       _last_write_time;
+	unsigned int _latchTime_ms;
 protected slots:
 	/// Write the last data to the leds again
 	int rewriteLeds();

libsrc/effectengine/Effect.cpp

@@ -126,6 +126,9 @@ void Effect::run()
 	// add imageHeight variable to the interpreter
 	PyObject_SetAttrString(module, "imageHeight", Py_BuildValue("i", _imageSize.height()));
 
+	// add minimumWriteTime variable to the interpreter
+	PyObject_SetAttrString(module, "latchTime", Py_BuildValue("i", Hyperion::getInstance()->getLatchTime()));
+
 	// add a args variable to the interpreter
 	PyObject_SetAttrString(module, "args", json2python(_args));
 

libsrc/hyperion/Hyperion.cpp

@@ -436,7 +436,7 @@ Hyperion::Hyperion(const QJsonObject &qjsonConfig, const QString configFile)
 	_timerBonjourResolver.start();
 
 	// create the effect engine
-	_effectEngine = new EffectEngine(this,qjsonConfig["effects"].toObject());
+	_effectEngine = new EffectEngine(this,qjsonConfig["effects"].toObject() );
 	
 	const QJsonObject& device = qjsonConfig["device"].toObject();
 	unsigned int hwLedCount = device["ledCount"].toInt(getLedCount());
@@ -455,6 +455,10 @@ Hyperion::Hyperion(const QJsonObject &qjsonConfig, const QString configFile)
 	update();
 }
 
+int Hyperion::getLatchTime() const
+{
+  return _device->getLatchTime();
+}
 
 void Hyperion::freeObjects(bool emitCloseSignal)
 {
@@ -857,7 +861,7 @@ void Hyperion::update()
 	}
 
 	// Start the timeout-timer
-	if (priorityInfo.timeoutTime_ms == -1)
+	if (priorityInfo.timeoutTime_ms <= 0)
 	{
 		_timer.stop();
 	}

libsrc/hyperion/schemas/hyperion.schema-2.json

@@ -61,7 +61,7 @@
 			"type" : "object",
 			"title" : "edt_dev_general_heading_title",
 			"required" : true,
-			"defaultProperties": ["ledCount","colorOrder","rewriteTime"],
+			"defaultProperties": ["ledCount","colorOrder","rewriteTime","minimumWriteTime"],
 			"properties" :
 			{
 				"type" :
@@ -89,7 +89,7 @@
 				"rewriteTime": {
 					"type": "integer",
 					"title":"edt_dev_general_rewriteTime_title",
-					"default": 5000,
+					"default": 1000,
 					"append" : "edt_append_ms",
 					"minimum": 0,
 					"access" : "expert",

libsrc/leddevice/LedDevice.cpp

@@ -5,6 +5,8 @@
 #include <QResource>
 #include <QStringList>
 #include <QDir>
+#include <QDateTime>
+
 #include "hyperion/Hyperion.h"
 
 LedDeviceRegistry LedDevice::_ledDeviceMap = LedDeviceRegistry();
@@ -20,6 +22,8 @@ LedDevice::LedDevice()
 	, _deviceReady(true)
 	, _refresh_timer()
 	, _refresh_timer_interval(0)
+	, _last_write_time(QDateTime::currentMSecsSinceEpoch())
+	, _latchTime_ms(0)
 	, _componentRegistered(false)
 	, _enabled(true)
 {
@@ -66,7 +70,14 @@ void LedDevice::setActiveDevice(QString dev)
 
 bool LedDevice::init(const QJsonObject &deviceConfig)
 {
-	_refresh_timer.setInterval( deviceConfig["rewriteTime"].toInt(_refresh_timer_interval) );
+	_latchTime_ms = deviceConfig["latchTime"].toInt(_latchTime_ms);
+	_refresh_timer.setInterval( deviceConfig["rewriteTime"].toInt( _refresh_timer_interval) );
+	if (_refresh_timer.interval() <= (signed)_latchTime_ms )
+	{
+		Warning(_log, "latchTime(%d) is bigger/equal rewriteTime(%d)", _refresh_timer.interval(), _latchTime_ms);
+		_refresh_timer.setInterval(_latchTime_ms+10);
+	}
+
 	return true;
 }
 
@@ -127,17 +138,26 @@ QJsonObject LedDevice::getLedDeviceSchemas()
 
 int LedDevice::setLedValues(const std::vector<ColorRgb>& ledValues)
 {
+	int retval = 0;
 	if (!_deviceReady || !_enabled)
 		return -1;
 
-	_ledValues = ledValues;
 
 	// restart the timer
 	if (_refresh_timer.interval() > 0)
 	{
 		_refresh_timer.start();
 	}
-	return write(ledValues);
+
+	if (_latchTime_ms == 0 || QDateTime::currentMSecsSinceEpoch()-_last_write_time >= _latchTime_ms)
+	{
+		_ledValues = ledValues;
+		retval = write(ledValues);
+		_last_write_time = QDateTime::currentMSecsSinceEpoch();
+	} 
+	//else Debug(_log, "latch %d", QDateTime::currentMSecsSinceEpoch()-_last_write_time);
+
+	return retval;
 }
 
 int LedDevice::switchOff()

libsrc/leddevice/LedDeviceAPA102.cpp

@@ -14,7 +14,6 @@ LedDevice* LedDeviceAPA102::construct(const QJsonObject &deviceConfig)
 bool LedDeviceAPA102::init(const QJsonObject &deviceConfig)
 {
 	ProviderSpi::init(deviceConfig);
-	_latchTime_ns = 500000; // fixed latchtime
 
 	const unsigned int startFrameSize = 4;
 	const unsigned int endFrameSize = std::max<unsigned int>(((_ledCount + 15) / 16), 4);

libsrc/leddevice/LedDeviceTpm2net.cpp

@@ -8,7 +8,6 @@ LedDeviceTpm2net::LedDeviceTpm2net(const QJsonObject &deviceConfig)
 
 bool LedDeviceTpm2net::init(const QJsonObject &deviceConfig)
 {
-	_LatchTime_ns = 104000;
 	_port = TPM2_DEFAULT_PORT;
 	ProviderUdp::init(deviceConfig);
 	_tpm2_max  = deviceConfig["max-packet"].toInt(170);

libsrc/leddevice/LedDeviceUdpE131.cpp

@@ -12,7 +12,6 @@ LedDeviceUdpE131::LedDeviceUdpE131(const QJsonObject &deviceConfig)
 
 bool LedDeviceUdpE131::init(const QJsonObject &deviceConfig)
 {
-	_LatchTime_ns = 104000;
 	_port = 5568;
 	ProviderUdp::init(deviceConfig);
 	_e131_universe = deviceConfig["universe"].toInt(1);

libsrc/leddevice/LedDeviceUdpH801.cpp

@@ -9,7 +9,7 @@ LedDeviceUdpH801::LedDeviceUdpH801(const QJsonObject &deviceConfig)
 bool LedDeviceUdpH801::init(const QJsonObject &deviceConfig)
 {
 	/* The H801 port is fixed */
-	_LatchTime_ns = 10000000;
+	_latchTime_ms = 10;
 	_port = 30977;
 	_defaultHost = "255.255.255.255";
 	ProviderUdp::init(deviceConfig);

libsrc/leddevice/LedDeviceUdpRaw.cpp

@@ -3,7 +3,6 @@
 LedDeviceUdpRaw::LedDeviceUdpRaw(const QJsonObject &deviceConfig)
 	: ProviderUdp()
 {
-	_LatchTime_ns = 500000;
 	_port = 5568;
 	init(deviceConfig);
 }

libsrc/leddevice/LedDeviceWs2801.cpp

@@ -3,7 +3,6 @@
 LedDeviceWs2801::LedDeviceWs2801(const QJsonObject &deviceConfig)
 	: ProviderSpi()
 {
-	_latchTime_ns = 500000;
 	_deviceReady = 	ProviderSpi::init(deviceConfig);
 }
 

libsrc/leddevice/ProviderSpi.cpp

@@ -18,12 +18,12 @@ ProviderSpi::ProviderSpi()
 	: LedDevice()
 	, _deviceName("/dev/spidev0.0")
 	, _baudRate_Hz(1000000)
-	, _latchTime_ns(0)
 	, _fid(-1)
 	, _spiMode(SPI_MODE_0)
 	, _spiDataInvert(false)
 {
 	memset(&_spi, 0, sizeof(_spi));
+	_latchTime_ms = 1;
 }
 
 ProviderSpi::~ProviderSpi()
@@ -37,7 +37,6 @@ bool ProviderSpi::init(const QJsonObject &deviceConfig)
 
 	_deviceName    = deviceConfig["output"].toString(_deviceName);
 	_baudRate_Hz   = deviceConfig["rate"].toInt(_baudRate_Hz);
-	_latchTime_ns  = deviceConfig["latchtime"].toInt(_latchTime_ns);
 	_spiMode       = deviceConfig["spimode"].toInt(_spiMode);
 	_spiDataInvert = deviceConfig["invert"].toBool(_spiDataInvert);
 	
@@ -46,7 +45,7 @@ bool ProviderSpi::init(const QJsonObject &deviceConfig)
 
 int ProviderSpi::open()
 {
-	Debug(_log, "_baudRate_Hz %d,  _latchTime_ns %d", _baudRate_Hz, _latchTime_ns);
+	Debug(_log, "_baudRate_Hz %d,  _latchTime_ns %d", _baudRate_Hz, _latchTime_ms);
 	Debug(_log, "_spiDataInvert %d,  _spiMode %d", _spiDataInvert, _spiMode);
 
 	const int bitsPerWord = 8;
@@ -99,16 +98,5 @@ int ProviderSpi::writeBytes(const unsigned size, const uint8_t * data)
 	int retVal = ioctl(_fid, SPI_IOC_MESSAGE(1), &_spi);
 	ErrorIf((retVal < 0), _log, "SPI failed to write. errno: %d, %s", errno,  strerror(errno) );
 
-	if (retVal >= 0 && _latchTime_ns > 0)
-	{
-		// The 'latch' time for latching the shifted-value into the leds
-		timespec latchTime;
-		latchTime.tv_sec  = 0;
-		latchTime.tv_nsec = _latchTime_ns;
-
-		// Sleep to latch the leds (only if write succesfull)
-		nanosleep(&latchTime, NULL);
-	}
-
 	return retVal;
 }

libsrc/leddevice/ProviderSpi.h

@@ -54,9 +54,6 @@ protected:
 	/// The used baudrate of the output device
 	int _baudRate_Hz;
 
-	/// The time which the device should be untouched after a write
-	int _latchTime_ns;
-
 	/// The File Identifier of the opened output device (or -1 if not opened)
 	int _fid;
 

libsrc/leddevice/ProviderUdp.cpp

@@ -17,10 +17,10 @@
 
 ProviderUdp::ProviderUdp()
 	: LedDevice()
-	, _LatchTime_ns(-1)
 	, _port(1)
 	, _defaultHost("127.0.0.1")
 {
+	_latchTime_ms = 1;
 	_udpSocket = new QUdpSocket();
 }
 
@@ -60,8 +60,6 @@ bool ProviderUdp::init(const QJsonObject &deviceConfig)
 	
 	Debug( _log, "UDP using %s:%d", _address.toString().toStdString().c_str() , _port );
 	
-	_LatchTime_ns = deviceConfig["latchtime"].toInt(_LatchTime_ns);
-
 	return true;
 }
 
@@ -79,21 +77,7 @@ int ProviderUdp::writeBytes(const unsigned size, const uint8_t * data)
 {
 
 	qint64 retVal = _udpSocket->writeDatagram((const char *)data,size,_address,_port);
-
+	WarningIf((retVal<0), _log, "Error sending: %s", strerror(errno));
-	if (retVal >= 0 && _LatchTime_ns > 0)
-	{
-		// The 'latch' time for latching the shifted-value into the leds
-		timespec latchTime;
-		latchTime.tv_sec  = 0;
-		latchTime.tv_nsec = _LatchTime_ns;
-
-		// Sleep to latch the leds (only if write succesfull)
-		nanosleep(&latchTime, NULL);
-	}
-	else
-	{
-		Warning( _log, "Error sending: %s", strerror(errno));
-	}
 
 	return retVal;
 }

libsrc/leddevice/ProviderUdp.h

@@ -48,9 +48,6 @@ protected:
 	///
 	int writeBytes(const unsigned size, const uint8_t *data);
 
-	/// The time which the device should be untouched after a write
-	int _LatchTime_ns;
-
 	///
 	QUdpSocket * _udpSocket;
 	QHostAddress _address;

libsrc/leddevice/schemas/schema-adalight.json

@@ -26,6 +26,16 @@
 			"title":"edt_dev_spec_LBap102Mode_title",
 			"default": false,
 			"propertyOrder" : 4
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 15,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 5
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-apa102.json

@@ -20,6 +20,16 @@
 			"title":"edt_dev_spec_invert_title",
 			"default": false,
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-atmo.json

@@ -20,6 +20,16 @@
 			"default": 250,
 			"append" : "ms",
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 10,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-atmoorb.json

@@ -33,6 +33,16 @@
 			"title":"edt_dev_spec_useOrbSmoothing_title",
 			"default": true,
 			"propertyOrder" : 5
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 6
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-dmx.json

@@ -19,6 +19,16 @@
 			"title":"edt_dev_spec_delayAfterConnect_title",
 			"default": 250,
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 10,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-e131.json

@@ -21,11 +21,14 @@
 			"default": 1,
 			"propertyOrder" : 3
 		},
-		"latchtime": {
+		"latchTime": {
 			"type": "integer",
 			"title":"edt_dev_spec_latchtime_title",
-			"default": 104000,
+			"default": 1,
-			"append" : "ns",
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
 			"propertyOrder" : 4
 		},
 		"cid": {

libsrc/leddevice/schemas/schema-fadecandy.json

@@ -14,47 +14,57 @@
 			"default": 7890,
 			"propertyOrder" : 2
 		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 3
+		},
 		"setFcConfig": {
 			"type": "boolean",
 			"title":"edt_dev_spec_FCsetConfig_title",
 			"default": false,
-			"propertyOrder" : 3
+			"propertyOrder" : 4
 		},
 		"manualLed": {
 			"type": "boolean",
 			"title":"edt_dev_spec_FCmanualControl_title",
 			"default": false,
-			"propertyOrder" : 4
+			"propertyOrder" : 5
 		},
 		"ledOn": {
 			"type": "boolean",
 			"title":"edt_dev_spec_FCledToOn_title",
 			"default": false,
-			"propertyOrder" : 5
+			"propertyOrder" : 6
 		},
 		"interpolation": {
 			"type": "boolean",
 			"title":"edt_dev_spec_interpolation_title",
 			"default": false,
-			"propertyOrder" : 6
+			"propertyOrder" : 7
 		},
 		"dither": {
 			"type": "boolean",
 			"title":"edt_dev_spec_dithering_title",
 			"default": false,
-			"propertyOrder" : 7
+			"propertyOrder" : 8
 		},
 		"gamma" : {
 			"type" : "number",
 			"title" : "edt_dev_spec_gamma_title",
-			"minimum" : 0.0,
+			"minimum" : 0.1,
-			"maximum": 100.0,
+			"maximum": 5.0,
-			"propertyOrder" : 8
+			"propertyOrder" : 9
 		},
 		"whitepoint" : {
 			"type" : "array",
 			"title" : "edt_dev_spec_whitepoint_title",
-			"propertyOrder" : 9,
+			"propertyOrder" : 10,
 			"default" : [255,255,255],
 			"maxItems" : 3,
 			"minItems" : 3,

libsrc/leddevice/schemas/schema-file.json

@@ -5,7 +5,18 @@
 		"output": {
 			"type": "string",
 			"title":"edt_dev_spec_outputPath_title",
-			"default" : "/dev/null"
+			"default" : "/dev/null",
+			"propertyOrder" : 1
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 2
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-h801.json

@@ -22,6 +22,16 @@
 				"title" : "edt_dev_spec_lightid_itemtitle"
 			},
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 10,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-hyperionusbasp.json

@@ -2,6 +2,16 @@
 	"type":"object",
 	"required":true,
 	"properties":{
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 10,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 1
+		}
 	},
 	"additionalProperties": true
 }

libsrc/leddevice/schemas/schema-lightpack.json

@@ -4,7 +4,18 @@
 	"properties":{
 		"output": {
 			"type": "string",
-			"title":"edt_dev_spec_serial_title"
+			"title":"edt_dev_spec_serial_title",
+			"propertyOrder" : 1
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 11,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 2
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-lpd6803.json

@@ -19,6 +19,16 @@
 			"title":"edt_dev_spec_invert_title",
 			"default": false,
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-lpd8806.json

@@ -19,6 +19,16 @@
 			"title":"edt_dev_spec_invert_title",
 			"default": false,
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-multilightpack.json

@@ -2,6 +2,16 @@
 	"type":"object",
 	"required":true,
 	"properties":{
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 11,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 1
+		}
 	},
 	"additionalProperties": true
 }

libsrc/leddevice/schemas/schema-p9813.json

@@ -19,6 +19,16 @@
 			"title":"edt_dev_spec_invert_title",
 			"default": false,
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-paintpack.json

@@ -19,6 +19,16 @@
 			"title":"edt_dev_spec_delayAfterConnect_title",
 			"default": 0,
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-philipshue.json

@@ -44,6 +44,16 @@
 				"title" : "edt_dev_spec_lightid_itemtitle"
 			},
 			"propertyOrder" : 6
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 200,
+			"append" : "edt_append_ms",
+			"minimum": 100,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 7
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-piblaster.json

@@ -8,6 +8,16 @@
 			"default" : "/dev/pi-blaster",
 			"propertyOrder" : 1
 		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 5,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 2
+		},
 		"gpiomap": {
 			"type": "array",
 			"title":"edt_dev_spec_gpioMap_title",

libsrc/leddevice/schemas/schema-rawhid.json

@@ -19,6 +19,16 @@
 			"title":"edt_dev_spec_delayAfterConnect_title",
 			"default": 0,
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 10,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-sedu.json

@@ -19,6 +19,16 @@
 			"title":"edt_dev_spec_delayAfterConnect_title",
 			"default": 250,
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 10,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-sk6812spi.json

@@ -29,6 +29,16 @@
 				"enum_titles" : ["edt_dev_enum_subtract_minimum", "edt_dev_enum_sub_min_warm_adjust", "edt_dev_enum_white_off"]
 			},
 			"propertyOrder" : 4
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 5
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-sk6822spi.json

@@ -19,6 +19,16 @@
 			"title":"edt_dev_spec_invert_title",
 			"default": false,
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_general_latchTime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-tinkerforge.json

@@ -26,6 +26,16 @@
 			"title":"edt_dev_spec_intervall_title",
 			"minimum" : 0,
 			"propertyOrder" : 4
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 5
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-tpm2.json

@@ -19,6 +19,16 @@
 			"title":"edt_dev_spec_delayAfterConnect_title",
 			"default": 250,
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 10,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-tpm2net.json

@@ -28,6 +28,16 @@
 			"minimum" : 0,
 			"default" : 170,
 			"propertyOrder" : 4
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 5
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-udpraw.json

@@ -14,6 +14,16 @@
 			"minimum" : 0,
 			"maximum" : 65535,
 			"propertyOrder" : 2
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 3
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-ws2801.json

@@ -26,6 +26,16 @@
 			"title":"edt_dev_spec_invert_title",
 			"default": false,
 			"propertyOrder" : 4
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 5
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-ws2812spi.json

@@ -19,6 +19,16 @@
 			"title":"edt_dev_spec_invert_title",
 			"default": false,
 			"propertyOrder" : 3
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 4
 		}
 	},
 	"additionalProperties": true

libsrc/leddevice/schemas/schema-ws281x.json

@@ -35,6 +35,16 @@
 				"enum_titles" : ["edt_dev_enum_subtract_minimum", "edt_dev_enum_sub_min_warm_adjust", "edt_dev_enum_white_off"]
 			},
 			"propertyOrder" : 4
+		},
+		"latchTime": {
+			"type": "integer",
+			"title":"edt_dev_spec_latchtime_title",
+			"default": 1,
+			"append" : "edt_append_ms",
+			"minimum": 1,
+			"maximum": 1000,
+			"access" : "expert",
+			"propertyOrder" : 5
 		}
 	},
 	"additionalProperties": true