node-red-contrib-dmx-for-ha 0.6.24 → 0.6.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -313,7 +313,7 @@
|
|
|
313
313
|
</div>
|
|
314
314
|
|
|
315
315
|
<div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
|
|
316
|
-
node-red-contrib-dmx-for-ha v0.6.
|
|
316
|
+
node-red-contrib-dmx-for-ha v0.6.26
|
|
317
317
|
</div>
|
|
318
318
|
|
|
319
319
|
</script>
|
|
@@ -317,7 +317,7 @@
|
|
|
317
317
|
</div>
|
|
318
318
|
|
|
319
319
|
<div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
|
|
320
|
-
node-red-contrib-dmx-for-ha v0.6.
|
|
320
|
+
node-red-contrib-dmx-for-ha v0.6.26
|
|
321
321
|
</div>
|
|
322
322
|
|
|
323
323
|
</script>
|
package/nodes/ha-mqtt-dmx.html
CHANGED
|
@@ -584,7 +584,7 @@
|
|
|
584
584
|
</div>
|
|
585
585
|
|
|
586
586
|
<div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
|
|
587
|
-
node-red-contrib-dmx-for-ha v0.6.
|
|
587
|
+
node-red-contrib-dmx-for-ha v0.6.26
|
|
588
588
|
</div>
|
|
589
589
|
|
|
590
590
|
</script>
|
package/nodes/ha-mqtt-dmx.js
CHANGED
|
@@ -351,11 +351,18 @@ module.exports = function (RED) {
|
|
|
351
351
|
p.warmWhite !== undefined ? p.warmWhite : 0
|
|
352
352
|
);
|
|
353
353
|
sendDmxChannels(channels);
|
|
354
|
+
const br = p.brightness !== undefined ? p.brightness : 255;
|
|
354
355
|
pubState({
|
|
355
356
|
state: p.state || 'OFF',
|
|
356
357
|
color_mode: S.colorMode,
|
|
357
358
|
brightness: p.brightness,
|
|
358
|
-
color:
|
|
359
|
+
color: {
|
|
360
|
+
r: scaleToDmx(p.red !== undefined ? p.red : 255, br),
|
|
361
|
+
g: scaleToDmx(p.green !== undefined ? p.green : 255, br),
|
|
362
|
+
b: scaleToDmx(p.blue !== undefined ? p.blue : 255, br),
|
|
363
|
+
w: scaleToDmx(p.white !== undefined ? p.white : 255, br),
|
|
364
|
+
ww: p.warmWhite
|
|
365
|
+
}
|
|
359
366
|
});
|
|
360
367
|
if (p.state === 'ON') {
|
|
361
368
|
setStatus('green', 'dot', `${fixtureId} ON bright:${p.brightness}`);
|
|
@@ -491,7 +498,12 @@ module.exports = function (RED) {
|
|
|
491
498
|
}
|
|
492
499
|
|
|
493
500
|
saveState('ON', brightness, r, g, b, w, ww);
|
|
494
|
-
|
|
501
|
+
// Report floored DMX values back to HA so sub-floor bleed is never stored in state
|
|
502
|
+
const rPub = scaleToDmx(r, brightness);
|
|
503
|
+
const gPub = scaleToDmx(g, brightness);
|
|
504
|
+
const bPub = scaleToDmx(b, brightness);
|
|
505
|
+
const wPub = scaleToDmx(w, brightness);
|
|
506
|
+
pubState({ state: 'ON', color_mode: S.colorMode, brightness, color: { r: rPub, g: gPub, b: bPub, w: wPub, ww } });
|
|
495
507
|
setStatus('green', 'dot', `${fixtureId} ON bright:${brightness}`);
|
|
496
508
|
}
|
|
497
509
|
|
|
@@ -798,7 +810,12 @@ module.exports = function (RED) {
|
|
|
798
810
|
} else {
|
|
799
811
|
sendDmxChannels(buildColorChannels(0, r, g, b, w, ww));
|
|
800
812
|
}
|
|
801
|
-
|
|
813
|
+
// Report floored values so HA never stores sub-floor values in state
|
|
814
|
+
const rPub = state === 'ON' ? scaleToDmx(r, brightness) : r;
|
|
815
|
+
const gPub = state === 'ON' ? scaleToDmx(g, brightness) : g;
|
|
816
|
+
const bPub = state === 'ON' ? scaleToDmx(b, brightness) : b;
|
|
817
|
+
const wPub = state === 'ON' ? scaleToDmx(w, brightness) : w;
|
|
818
|
+
pubState({ state, color_mode: S.colorMode, brightness, color: { r: rPub, g: gPub, b: bPub, w: wPub, ww } });
|
|
802
819
|
if (state === 'ON') {
|
|
803
820
|
setStatus('green', 'dot', `${fixtureId} ON bright:${brightness}`);
|
|
804
821
|
} else {
|
package/nodes/ha-mqtt-pir.html
CHANGED
|
@@ -318,7 +318,7 @@
|
|
|
318
318
|
</div>
|
|
319
319
|
|
|
320
320
|
<div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
|
|
321
|
-
node-red-contrib-dmx-for-ha v0.6.
|
|
321
|
+
node-red-contrib-dmx-for-ha v0.6.26
|
|
322
322
|
</div>
|
|
323
323
|
|
|
324
324
|
</script>
|
package/nodes/ha-mqtt-relay.html
CHANGED
|
@@ -301,7 +301,7 @@
|
|
|
301
301
|
</div>
|
|
302
302
|
|
|
303
303
|
<div style="margin-top:16px; padding-top:8px; border-top:1px solid #444; color:#666; font-size:0.8em; text-align:right;">
|
|
304
|
-
node-red-contrib-dmx-for-ha v0.6.
|
|
304
|
+
node-red-contrib-dmx-for-ha v0.6.26
|
|
305
305
|
</div>
|
|
306
306
|
|
|
307
307
|
</script>
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-red-contrib-dmx-for-ha",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.26",
|
|
4
4
|
"description": "DMX lighting control for Home Assistant via Node-RED and MQTT. Place a node, fill in the settings, deploy. Full HA device registry integration with RGBW/RGBWW/CCT/brightness colour modes, transitions, effects, and group control.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"node-red",
|