Mercurial > code > home > repos > light9

changeset 1910:f974078a82df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
support for more dmx device types Ignore-this: 2281024bb469ffeee13e92151b41a55
author Drew Perttula <drewp@bigasterisk.com>
date Sat, 01 Jun 2019 10:57:53 +0000
parents 5a9952820f9d
children 11bc3d32f453
files light9/collector/device.py show/dance2019/deviceClass.n3
diffstat 2 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/light9/collector/device.py	Sat Jun 01 10:56:55 2019 +0000
+++ b/light9/collector/device.py	Sat Jun 01 10:57:53 2019 +0000
@@ -125,10 +125,20 @@
 
     if deviceType == L9['ChauvetColorStrip']:
         r, g, b = rgbAttr(L9['color'])
-        return {L9['mode']: 215, L9['red']: r, L9['green']: g, L9['blue']: b}
+        return {L9['mode']: 215,
+                L9['red']: r, L9['green']: g, L9['blue']: b}
     elif deviceType == L9['Bar612601']:
         r, g, b = rgbAttr(L9['color'])
         return {L9['red']: r, L9['green']: g, L9['blue']: b}
+    elif deviceType == L9['LedPar90']:
+        r, g, b = rgbAttr(L9['color'])
+        return {L9['master']: 255,
+                L9['red']: r, L9['green']: g, L9['blue']: b, L9['white']: 0}
+    elif deviceType == L9['LedPar54']:
+        r, g, b = rgbAttr(L9['color'])
+        return {L9['master']: 255,
+                L9['red']: r, L9['green']: g, L9['blue']: b, L9['white']: 0,
+                L9['strobe']: 0}
     elif deviceType == L9['SimpleDimmer']:
         return {L9['level']: _8bit(floatAttr(L9['brightness']))}
     elif deviceType == L9['Mini15']:
--- a/show/dance2019/deviceClass.n3	Sat Jun 01 10:56:55 2019 +0000
+++ b/show/dance2019/deviceClass.n3	Sat Jun 01 10:57:53 2019 +0000
@@ -5,6 +5,7 @@
 :brightness         a :DeviceAttr; rdfs:label "brightness"; :dataType :scalar .
 :strobe             a :DeviceAttr; rdfs:label "strobe"; :dataType :scalar;
   rdfs:comment "0=none, 1=fastest" .
+:doNotUse             a :DeviceAttr; rdfs:label "-"; :dataType :scalar .
 
 
 :SimpleDimmer a :DeviceClass; rdfs:label "SimpleDimmer";
@@ -36,7 +37,10 @@
     [ :outputAttr :red;      :dmxOffset 1 ],
     [ :outputAttr :green;    :dmxOffset 2 ],
     [ :outputAttr :blue;     :dmxOffset 3 ],
-    [ :outputAttr :white;    :dmxOffset 4 ] .
+    [ :outputAttr :white;    :dmxOffset 4 ],
+    [ :outputAttr :strobe;   :dmxOffset 5 ],
+    [ :outputAttr :doNotUse; :dmxOffset 6 ],
+    [ :outputAttr :doNotUse; :dmxOffset 7 ] .
 
 :LedPar54  a :DeviceClass; rdfs:label "LED Par 54 RGBW";
   :deviceAttr :color;