Skip to content

Commit c9b1131

Browse files
basilhussainbasilhussain
committed
Merge remote-tracking branch 'upstream/master' into dmx-timing
2 parents 66e5c29 + bfd497a commit c9b1131

24 files changed

+1787
-44
lines changed

‎debian/changelog

+12-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ qlcplus (4.14.0) stable; urgency=low
77
* UI: adjust audio volume on video intensity change
88
* UI/Fixture Manager: limit the number of RGB panel columns for RGBW to avoid crash
99
* UI/Function Wizard: improved with more VC widget creation (thanks to 8-Lambda-8)
10+
* UI/Fixture Group Editor: allow to add fixtures top to bottom and left to right (thanks to Yestalgia)
1011
* UI/Show Manager: show step notes on the timeline (thanks to anarchid)
1112
* UI/Show Manager: handle CTRL+mouse wheel to zoom in/out
1213
* Virtual Console/Slider: send feedback on override button press
@@ -17,7 +18,9 @@ qlcplus (4.14.0) stable; urgency=low
1718
* Web Access: reworked websocket implementation
1819
* Web Access: fix grand master stopping running functions
1920
* Web Access: fix simple desk not resetting the current universe
21+
* Web Access: improve value synchornization with simple desk
2022
* Web Access: add widget ID to getWidgetType and getWidgetStatus response
23+
* Web Access: show multipage frame names (thanks to jpue)
2124
* RGB scripts: added 'Sine Wave' script
2225
* RGB scripts: fix Vertical Fall not allowing changing color when cloned
2326
* New fixtures: GLP Impression X5, Ayrton Rivale Profile, Ayrton Kyalami (thanks to Masatoshi Fujino)
@@ -36,8 +39,15 @@ qlcplus (4.14.0) stable; urgency=low
3639
* New fixture: Shehds LED 200W RGB FLASH, GalaxyJet LED Beam 300W Beam&Spot&Wash, Constellaser 12W Waterproof Scan Laser (thanks to Tóth János)
3740
* New fixture: Chauvet Ovation H-605FC (thanks to Ken Coughlin)
3841
* New fixture: Martin smartMAC (thanks to Mads Vejrup)
39-
40-
-- Massimo Callegari <[email protected]> Sun, 12 Jan 2025 18:19:20 +0200
42+
* New fixtures: UKing ZQ01513 100WCOB Cast Aluminum Park Light, ZQ01495 200W Three-in-one Four-eye COB Lamp, ZQ06122 9-Eye COB Matrix (thanks to Mario Rempfer)
43+
* New fixture: lightmaXX Platinum CLS-3 Quad-LED (thanks to Martin Bender)
44+
* New fixture: Varytec Giga Bar Pix 8 UV (thanks to susnux)
45+
* New fixture: beamZ Cobra 720 (thanks to Paul Wilton)
46+
* New fixtures: Cameo TS 100 WW, TS 200 WW (thanks to Sven Koch)
47+
* New fixtures: Varytec ARC One, Cameo LED Gobo Scanner 80, Stairville DJ Lase 40-G MK-III, Stairville HL-x9-18 DCL CW-WWFlood 9-18x6W (thanks to Jan Fries)
48+
* New fixtures: beamZ Panther 60 LED Beam RGBW, MHL-74 Wash 7x10W 4in1 RGBW, BBP96 Uplight PAR (thanks to Jan Fries)
49+
50+
-- Massimo Callegari <[email protected]> Tue, 14 Jan 2025 18:19:20 +0200
4151

4252
qlcplus (4.13.1) stable; urgency=low
4353

‎resources/fixtures/Cameo/Cameo-LED-Gobo-Scanner-80.qxf

+119
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE FixtureDefinition>
3+
<FixtureDefinition xmlns="http://www.qlcplus.org/FixtureDefinition">
4+
<Creator>
5+
<Name>Q Light Controller Plus</Name>
6+
<Version>4.14.0 GIT</Version>
7+
<Author>Jan Fries</Author>
8+
</Creator>
9+
<Manufacturer>Cameo</Manufacturer>
10+
<Model>LED Gobo Scanner 80</Model>
11+
<Type>Scanner</Type>
12+
<Channel Name="Pan" Preset="PositionPan"/>
13+
<Channel Name="Pan fine" Preset="PositionPanFine"/>
14+
<Channel Name="Tilt" Preset="PositionTilt"/>
15+
<Channel Name="Tilt fine" Preset="PositionTiltFine"/>
16+
<Channel Name="Master dimmer" Preset="IntensityMasterDimmer"/>
17+
<Channel Name="Strobe">
18+
<Group Byte="0">Shutter</Group>
19+
<Capability Min="0" Max="5" Preset="ShutterOpen">Strobe open</Capability>
20+
<Capability Min="6" Max="255" Preset="StrobeFreqRange" Res1="0.5" Res2="20">Strobe (Slow to Fast)</Capability>
21+
</Channel>
22+
<Channel Name="Flash Duration">
23+
<Group Byte="0">Speed</Group>
24+
<Capability Min="0" Max="255" Preset="SmallToBig">Flash duration (0ms - 510ms)</Capability>
25+
</Channel>
26+
<Channel Name="Colour Wheel">
27+
<Group Byte="0">Colour</Group>
28+
<Capability Min="0" Max="5" Preset="ColorMacro" Res1="#ffffff">Open</Capability>
29+
<Capability Min="6" Max="18" Preset="ColorMacro" Res1="#ffe100">Warm Yellow</Capability>
30+
<Capability Min="19" Max="31" Preset="ColorMacro" Res1="#e6e6fa">Lavender</Capability>
31+
<Capability Min="32" Max="44" Preset="ColorMacro" Res1="#aaff00">Lime</Capability>
32+
<Capability Min="45" Max="57" Preset="ColorMacro" Res1="#00ffff">Cyan</Capability>
33+
<Capability Min="58" Max="70" Preset="ColorMacro" Res1="#ffb218">Amber</Capability>
34+
<Capability Min="71" Max="83" Preset="ColorMacro" Res1="#ffff00">Yellow</Capability>
35+
<Capability Min="84" Max="96" Preset="ColorMacro" Res1="#0000ff">Blue</Capability>
36+
<Capability Min="97" Max="109" Preset="ColorMacro" Res1="#00ff00">Green</Capability>
37+
<Capability Min="110" Max="122" Preset="ColorMacro" Res1="#ff0000">Red</Capability>
38+
<Capability Min="123" Max="128" Preset="ColorWheelIndex">Colour Run Stop</Capability>
39+
<Capability Min="129" Max="255" Preset="SlowToFast">Colour Run (Slow to Fast)</Capability>
40+
</Channel>
41+
<Channel Name="Gobo Wheel">
42+
<Group Byte="0">Gobo</Group>
43+
<Capability Min="0" Max="5" Preset="GoboMacro" Res1="">Open</Capability>
44+
<Capability Min="6" Max="17" Preset="GoboMacro" Res1="">Gobo 1</Capability>
45+
<Capability Min="18" Max="29" Preset="GoboMacro" Res1="">Gobo 2</Capability>
46+
<Capability Min="30" Max="41" Preset="GoboMacro" Res1="">Gobo 3</Capability>
47+
<Capability Min="42" Max="53" Preset="GoboMacro" Res1="">Gobo 4</Capability>
48+
<Capability Min="54" Max="65" Preset="GoboMacro" Res1="">Gobo 5</Capability>
49+
<Capability Min="66" Max="77" Preset="GoboMacro" Res1="">Gobo 6</Capability>
50+
<Capability Min="78" Max="89" Preset="GoboMacro" Res1="">Gobo 7</Capability>
51+
<Capability Min="90" Max="101" Preset="GoboMacro" Res1="">Gobo 8</Capability>
52+
<Capability Min="102" Max="113" Preset="GoboMacro" Res1="">Gobo 9</Capability>
53+
<Capability Min="114" Max="125" Preset="GoboShakeMacro" Res1="">Gobo Shake 1 (Slow to Fast)</Capability>
54+
<Capability Min="126" Max="137" Preset="GoboShakeMacro" Res1="">Gobo Shake 2 (Slow to Fast)</Capability>
55+
<Capability Min="138" Max="149" Preset="GoboShakeMacro" Res1="">Gobo Shake 3 (Slow to Fast)</Capability>
56+
<Capability Min="150" Max="161" Preset="GoboShakeMacro" Res1="">Gobo Shake 4 (Slow to Fast)</Capability>
57+
<Capability Min="162" Max="173" Preset="GoboShakeMacro" Res1="">Gobo Shake 5 (Slow to Fast)</Capability>
58+
<Capability Min="174" Max="185" Preset="GoboShakeMacro" Res1="">Gobo Shake 6 (Slow to Fast)</Capability>
59+
<Capability Min="186" Max="197" Preset="GoboShakeMacro" Res1="">Gobo Shake 7 (Slow to Fast)</Capability>
60+
<Capability Min="198" Max="209" Preset="GoboShakeMacro" Res1="">Gobo Shake 8 (Slow to Fast)</Capability>
61+
<Capability Min="210" Max="221" Preset="GoboShakeMacro" Res1="">Gobo Shake 9 (Slow to Fast)</Capability>
62+
<Capability Min="222" Max="231" Preset="RotationStop">Gobo Wheel rotation Stop</Capability>
63+
<Capability Min="232" Max="243" Preset="RotationClockwiseSlowToFast">Gobo Wheel Rotation CW (Slow to Fast)</Capability>
64+
<Capability Min="244" Max="255" Preset="RotationCounterClockwiseFastToSlow">Gobo Wheel Rotation CCW (Fast to Slow)</Capability>
65+
</Channel>
66+
<Channel Name="Auto Movement">
67+
<Group Byte="0">Effect</Group>
68+
<Capability Min="0" Max="5">No function</Capability>
69+
<Capability Min="6" Max="40" Preset="SmallToBig">Pan (Small to Big)</Capability>
70+
<Capability Min="41" Max="75" Preset="SmallToBig">Tilt (Small to Big)</Capability>
71+
<Capability Min="76" Max="110" Preset="SmallToBig">Pan / Tilt (Small to Big)</Capability>
72+
<Capability Min="111" Max="145" Preset="SmallToBig">Pan / Tilt Invers (Small to Big)</Capability>
73+
<Capability Min="146" Max="180" Preset="SmallToBig">Circle (Small to Big)</Capability>
74+
<Capability Min="181" Max="215" Preset="SmallToBig">Circle Invers (Small to Big)</Capability>
75+
<Capability Min="216" Max="255" Preset="SmallToBig">Random (Small to Big)</Capability>
76+
</Channel>
77+
<Channel Name="Pan/Tilt speed" Preset="SpeedPanTiltFastSlow"/>
78+
<Channel Name="Device Settings">
79+
<Group Byte="0">Maintenance</Group>
80+
<Capability Min="0" Max="5">No function</Capability>
81+
<Capability Min="6" Max="55">Invert Pan on (Hold 3s)</Capability>
82+
<Capability Min="56" Max="105">Invert Pan off (Hold 5s)</Capability>
83+
<Capability Min="106" Max="155">Invert Tilt on (Hold 3s)</Capability>
84+
<Capability Min="156" Max="205">Invert Tilt off (Hold 5s)</Capability>
85+
<Capability Min="206" Max="255" Preset="ResetAll">Reset All Functions (Hold 3s)</Capability>
86+
</Channel>
87+
<Mode Name="12 Channel">
88+
<Channel Number="0">Pan</Channel>
89+
<Channel Number="1">Pan fine</Channel>
90+
<Channel Number="2">Tilt</Channel>
91+
<Channel Number="3">Tilt fine</Channel>
92+
<Channel Number="4">Master dimmer</Channel>
93+
<Channel Number="5">Strobe</Channel>
94+
<Channel Number="6">Flash Duration</Channel>
95+
<Channel Number="7">Colour Wheel</Channel>
96+
<Channel Number="8">Gobo Wheel</Channel>
97+
<Channel Number="9">Auto Movement</Channel>
98+
<Channel Number="10">Pan/Tilt speed</Channel>
99+
<Channel Number="11">Device Settings</Channel>
100+
</Mode>
101+
<Mode Name="9 Channel">
102+
<Channel Number="0">Pan</Channel>
103+
<Channel Number="1">Tilt</Channel>
104+
<Channel Number="2">Master dimmer</Channel>
105+
<Channel Number="3">Strobe</Channel>
106+
<Channel Number="4">Flash Duration</Channel>
107+
<Channel Number="5">Colour Wheel</Channel>
108+
<Channel Number="6">Gobo Wheel</Channel>
109+
<Channel Number="7">Auto Movement</Channel>
110+
<Channel Number="8">Device Settings</Channel>
111+
</Mode>
112+
<Physical>
113+
<Bulb Type="LED" Lumens="1354" ColourTemperature="0"/>
114+
<Dimensions Weight="4.9" Width="190" Height="450" Depth="150"/>
115+
<Lens Name="Other" DegreesMin="12" DegreesMax="12"/>
116+
<Focus Type="Mirror" PanMax="180" TiltMax="90"/>
117+
<Technical PowerConsumption="130" DmxConnector="3-pin"/>
118+
</Physical>
119+
</FixtureDefinition>

‎resources/fixtures/Cameo/Cameo-TS-100-WW.qxf

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE FixtureDefinition>
3+
<FixtureDefinition xmlns="http://www.qlcplus.org/FixtureDefinition">
4+
<Creator>
5+
<Name>Q Light Controller Plus</Name>
6+
<Version>4.14.0 GIT</Version>
7+
<Author>Sven Koch</Author>
8+
</Creator>
9+
<Manufacturer>Cameo</Manufacturer>
10+
<Model>TS 100 WW</Model>
11+
<Type>Color Changer</Type>
12+
<Channel Name="Dimmer" Preset="IntensityMasterDimmer"/>
13+
<Channel Name="Dimmer fine" Preset="IntensityMasterDimmerFine"/>
14+
<Channel Name="Strobe">
15+
<Group Byte="0">Shutter</Group>
16+
<Capability Min="0" Max="5" Preset="ShutterOpen">Strobe open</Capability>
17+
<Capability Min="6" Max="255" Preset="StrobeFreqRange" Res1="1" Res2="20">Strobe slow -&gt; fast &lt; 1 Hz - 20 Hz</Capability>
18+
</Channel>
19+
<Channel Name="Set Dimmer Curve">
20+
<Group Byte="0">Effect</Group>
21+
<Capability Min="0" Max="5">No function</Capability>
22+
<Capability Min="6" Max="63">Linear dimmer curve</Capability>
23+
<Capability Min="64" Max="127">Exponential dimmer curve</Capability>
24+
<Capability Min="128" Max="191">Logarithmic dimmer curve</Capability>
25+
<Capability Min="192" Max="255">S-curve dimmer curve</Capability>
26+
</Channel>
27+
<Channel Name="Device Settings">
28+
<Group Byte="0">Maintenance</Group>
29+
<Capability Min="0" Max="5">No function</Capability>
30+
<Capability Min="6" Max="63">Dimmer response LED (hold 3s)</Capability>
31+
<Capability Min="64" Max="127">Dimmer response halogen (hold 3s)</Capability>
32+
<Capability Min="128" Max="154">PWM frequency 650 Hz (hold 3s)</Capability>
33+
<Capability Min="155" Max="181">PWM frequency 1530 Hz (hold 3s)</Capability>
34+
<Capability Min="182" Max="208">PWM frequency 3600 Hz (hold 3s)</Capability>
35+
<Capability Min="209" Max="235">PWM frequency 25 kHz (hold 3s)</Capability>
36+
<Capability Min="236" Max="255">No function</Capability>
37+
</Channel>
38+
<Mode Name="5 Channel">
39+
<Channel Number="0">Dimmer</Channel>
40+
<Channel Number="1">Dimmer fine</Channel>
41+
<Channel Number="2">Strobe</Channel>
42+
<Channel Number="3">Set Dimmer Curve</Channel>
43+
<Channel Number="4">Device Settings</Channel>
44+
</Mode>
45+
<Mode Name="3 Channel">
46+
<Channel Number="0">Dimmer</Channel>
47+
<Channel Number="1">Dimmer fine</Channel>
48+
<Channel Number="2">Strobe</Channel>
49+
</Mode>
50+
<Mode Name="1 Channel">
51+
<Channel Number="0">Dimmer</Channel>
52+
</Mode>
53+
<Physical>
54+
<Bulb Type="LED" Lumens="4100" ColourTemperature="0"/>
55+
<Dimensions Weight="7.4" Width="320" Height="370" Depth="310"/>
56+
<Lens Name="Fresnel" DegreesMin="14" DegreesMax="38"/>
57+
<Focus Type="Fixed" PanMax="0" TiltMax="0"/>
58+
<Technical PowerConsumption="120" DmxConnector="3-pin and 5-pin"/>
59+
</Physical>
60+
</FixtureDefinition>

‎resources/fixtures/Cameo/Cameo-TS-200-WW.qxf

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE FixtureDefinition>
3+
<FixtureDefinition xmlns="http://www.qlcplus.org/FixtureDefinition">
4+
<Creator>
5+
<Name>Q Light Controller Plus</Name>
6+
<Version>4.14.0 GIT</Version>
7+
<Author>Sven Koch</Author>
8+
</Creator>
9+
<Manufacturer>Cameo</Manufacturer>
10+
<Model>TS 200 WW</Model>
11+
<Type>Color Changer</Type>
12+
<Channel Name="Dimmer" Preset="IntensityMasterDimmer"/>
13+
<Channel Name="Dimmer fine" Preset="IntensityMasterDimmerFine"/>
14+
<Channel Name="Strobe">
15+
<Group Byte="0">Shutter</Group>
16+
<Capability Min="0" Max="5" Preset="ShutterOpen">Strobe open</Capability>
17+
<Capability Min="6" Max="255" Preset="StrobeFreqRange" Res1="1" Res2="20">Strobe slow -&gt; fast &lt; 1 Hz - 20 Hz</Capability>
18+
</Channel>
19+
<Channel Name="Set Dimmer Curve">
20+
<Group Byte="0">Effect</Group>
21+
<Capability Min="0" Max="5">No function</Capability>
22+
<Capability Min="6" Max="63">Linear dimmer curve</Capability>
23+
<Capability Min="64" Max="127">Exponential dimmer curve</Capability>
24+
<Capability Min="128" Max="191">Logarithmic dimmer curve</Capability>
25+
<Capability Min="192" Max="255">S-curve dimmer curve</Capability>
26+
</Channel>
27+
<Channel Name="Device Settings">
28+
<Group Byte="0">Maintenance</Group>
29+
<Capability Min="0" Max="5">No function</Capability>
30+
<Capability Min="6" Max="63">Dimmer response LED (hold 3s)</Capability>
31+
<Capability Min="64" Max="127">Dimmer response halogen (hold 3s)</Capability>
32+
<Capability Min="128" Max="154">PWM frequency 650 Hz (hold 3s)</Capability>
33+
<Capability Min="155" Max="181">PWM frequency 1530 Hz (hold 3s)</Capability>
34+
<Capability Min="182" Max="208">PWM frequency 3600 Hz (hold 3s)</Capability>
35+
<Capability Min="209" Max="235">PWM frequency 25 kHz (hold 3s)</Capability>
36+
<Capability Min="236" Max="255">No function</Capability>
37+
</Channel>
38+
<Mode Name="5 Channel">
39+
<Channel Number="0">Dimmer</Channel>
40+
<Channel Number="1">Dimmer fine</Channel>
41+
<Channel Number="2">Strobe</Channel>
42+
<Channel Number="3">Set Dimmer Curve</Channel>
43+
<Channel Number="4">Device Settings</Channel>
44+
</Mode>
45+
<Mode Name="3 Channel">
46+
<Channel Number="0">Dimmer</Channel>
47+
<Channel Number="1">Dimmer fine</Channel>
48+
<Channel Number="2">Strobe</Channel>
49+
</Mode>
50+
<Mode Name="1 Channel">
51+
<Channel Number="0">Dimmer</Channel>
52+
</Mode>
53+
<Physical>
54+
<Bulb Type="LED" Lumens="6600" ColourTemperature="0"/>
55+
<Dimensions Weight="7.5" Width="320" Height="370" Depth="310"/>
56+
<Lens Name="Fresnel" DegreesMin="14" DegreesMax="38"/>
57+
<Focus Type="Fixed" PanMax="0" TiltMax="0"/>
58+
<Technical PowerConsumption="200" DmxConnector="3-pin and 5-pin"/>
59+
</Physical>
60+
</FixtureDefinition>

0 commit comments

Comments
 (0)