light9 Changeset - f974078a82df

Changeset - f974078a82df

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Drew Perttula - 6 years ago 2019-06-01 10:57:53
drewp@bigasterisk.com

support for more dmx device types
Ignore-this: 2281024bb469ffeee13e92151b41a55

2 files changed with 16 insertions and 2 deletions:

light9/collector/device.py

show/dance2019/deviceClass.n3

0 comments (0 inline, 0 general)

light9/collector/device.py

➞

Show inline comments

@@ @@ -122,16 +122,26 @@ def untype_toOutputAttrs(deviceType, dev @@
         if deviceAttrSettings.get(attr) == L9['g2']:
             return 10
         return 0
     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']:
         out = {
             L9['rotationSpeed']: 0,  # seems to have no effect
             L9['dimmer']: 255,

show/dance2019/deviceClass.n3

➞

Show inline comments

@@ @@ -2,12 +2,13 @@ @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 :color              a :DeviceAttr; rdfs:label "color"; :dataType :color .
 :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";
   :deviceAttr :brightness;
   :attr
     [ :outputAttr :level; :dmxOffset 0 ] .
@@ @@ -33,13 +34,16 @@ @@
   :deviceAttr :color;
   :attr
     [ :outputAttr :master;   :dmxOffset 0 ],
     [ :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;
   :attr
     [ :outputAttr :master;   :dmxOffset 0 ],
     [ :outputAttr :red;      :dmxOffset 1 ],

0 comments (0 inline, 0 general)