diff --git a/light9/collector/device.py b/light9/collector/device.py --- a/light9/collector/device.py +++ b/light9/collector/device.py @@ -122,6 +122,14 @@ def toOutputAttrs(deviceType, deviceAttr out[L9['white']] = min(r, g, b) out[L9['uv']] = _8bit(floatAttr(L9['uv'])) return out + elif deviceType == L9['Source4LedSeries2']: + out = {} + out[L9['red']], out[L9['green']], out[L9['blue']] = rgbAttr(L9['color']) + out[L9['strobe']] = 0 + out[L9['fixed255']] = 255 + for num in range(7): + out[L9['fixed128_%s' % num]] = 128 + return out elif deviceType == L9['MacAura']: out = { L9['shutter']: 22, diff --git a/show/dance2016/deviceClass.n3 b/show/dance2016/deviceClass.n3 --- a/show/dance2016/deviceClass.n3 +++ b/show/dance2016/deviceClass.n3 @@ -42,6 +42,24 @@ [ :outputAttr :goboShake; :dmxOffset 11 ], [ :outputAttr :goboChoose; :dmxOffset 12 ] . +:Source4LedSeries2 a :DeviceClass; + :docs ; + :deviceAttr :color; + :attr + [ :dmxOffset 0; :outputAttr :red ], + [ :dmxOffset 1; :outputAttr :green ], + [ :dmxOffset 2; :outputAttr :blue ], + [ :dmxOffset 4; :outputAttr :strobe ], + [ :dmxOffset 7; :outputAttr :fixed255 ], + [ :dmxOffset 8; :outputAttr :fixed128_0 ], + [ :dmxOffset 9; :outputAttr :fixed128_1 ], + [ :dmxOffset 10; :outputAttr :fixed128_2 ], + [ :dmxOffset 11; :outputAttr :fixed128_3 ], + [ :dmxOffset 12; :outputAttr :fixed128_4 ], + [ :dmxOffset 13; :outputAttr :fixed128_5 ], + [ :dmxOffset 14; :outputAttr :fixed128_6 ] . + + :ChauvetHex12 a :DeviceClass; :deviceAttr :color, :uv; :docs ; diff --git a/show/dance2016/theaterLightConfig.n3 b/show/dance2016/theaterLightConfig.n3 --- a/show/dance2016/theaterLightConfig.n3 +++ b/show/dance2016/theaterLightConfig.n3 @@ -65,7 +65,14 @@ dev:hexVeryLow4 a :ChauvetHex12; :dmxUni dev:hexVeryLow5 a :ChauvetHex12; :dmxUniverse udmxB:; :dmxBase 205 . - +dev:lowPattern301 a :Source4LedSeries2; :dmxUniverse udmxB:; :dmxBase 1 . +dev:lowPattern302 a :Source4LedSeries2; :dmxUniverse udmxB:; :dmxBase 16 . +dev:lowPattern303 a :Source4LedSeries2; :dmxUniverse udmxB:; :dmxBase 31 . +dev:lowPattern304 a :Source4LedSeries2; :dmxUniverse udmxB:; :dmxBase 46 . +dev:lowPattern305 a :Source4LedSeries2; :dmxUniverse udmxB:; :dmxBase 61 . +dev:lowPattern306 a :Source4LedSeries2; :dmxUniverse udmxB:; :dmxBase 76 . +dev:lowPattern307 a :Source4LedSeries2; :dmxUniverse udmxB:; :dmxBase 91 . +dev:lowPattern308 a :Source4LedSeries2; :dmxUniverse udmxB:; :dmxBase 106 . # [ :name "oran1"; :output dmx:c21 ] . # [ :name "oran2"; :output dmx:c25 ] .