Skip to content

Commit 3d40571

Browse files
FloEdelmannFloEdelmann
authored
Add cameo fixture, outdoor XLR connector (#360)
* Add fixture 'cameo/flat-pro-flood-ip65-tri' via editor * Update register.json via editor * Small fixes * Added '3-pin XLR IP65' to schema * Also adjust cameo Outdoor PAR Tri 12 to use the new connector
1 parent 3e66a7c commit 3d40571

File tree

4 files changed

+211
-7
lines changed

4 files changed

+211
-7
lines changed

‎fixtures/cameo/flat-pro-flood-ip65-tri.json

+194
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
{
2+
"name": "Flat Pro Flood IP65 Tri",
3+
"shortName": "CLFLOODIP65TRI",
4+
"categories": ["Blinder", "Color Changer"],
5+
"meta": {
6+
"authors": ["Felix Edelmann"],
7+
"createDate": "2017-12-25",
8+
"lastModifyDate": "2017-12-25"
9+
},
10+
"manualURL": "https://adamhall.s3.amazonaws.com/media/MARKEN/CAMEO/CLFLOODIP65TRI/CLFLOODIP65TRI_CAMEO_Bedienungsanleitung_EN_DE_FR_ES_PL_IT.pdf",
11+
"physical": {
12+
"dimensions": [180, 180, 120],
13+
"weight": 3.6,
14+
"power": 75,
15+
"DMXconnector": "3-pin XLR IP65",
16+
"bulb": {
17+
"type": "60 W COB LED"
18+
},
19+
"lens": {
20+
"degreesMinMax": [120, 120]
21+
}
22+
},
23+
"availableChannels": {
24+
"Dimmer": {
25+
"type": "Intensity",
26+
"defaultValue": 0
27+
},
28+
"Color Macros Simple": {
29+
"name": "Color Macros",
30+
"type": "Multi-Color",
31+
"capabilities": [
32+
{
33+
"range": [0, 36],
34+
"name": "Red",
35+
"color": "#ff0000"
36+
},
37+
{
38+
"range": [37, 73],
39+
"name": "Green",
40+
"color": "#00ff00"
41+
},
42+
{
43+
"range": [74, 110],
44+
"name": "Blue",
45+
"color": "#0000ff"
46+
},
47+
{
48+
"range": [111, 147],
49+
"name": "Yellow",
50+
"color": "#ffff00"
51+
},
52+
{
53+
"range": [148, 184],
54+
"name": "Magenta",
55+
"color": "#ff00ff"
56+
},
57+
{
58+
"range": [185, 221],
59+
"name": "Cyan",
60+
"color": "#00ffff"
61+
},
62+
{
63+
"range": [222, 255],
64+
"name": "White",
65+
"color": "#ffffff"
66+
}
67+
]
68+
},
69+
"Strobe": {
70+
"type": "Strobe",
71+
"defaultValue": 0,
72+
"capabilities": [
73+
{
74+
"range": [0, 0],
75+
"name": "No function"
76+
},
77+
{
78+
"range": [1, 255],
79+
"name": "Strobe 1-20Hz"
80+
}
81+
]
82+
},
83+
"Color Macros Extended": {
84+
"name": "Color Macros",
85+
"type": "Multi-Color",
86+
"defaultValue": 0,
87+
"capabilities": [
88+
{
89+
"range": [0, 4],
90+
"name": "Blackout",
91+
"color": "#000000"
92+
},
93+
{
94+
"range": [5, 15],
95+
"name": "Red",
96+
"color": "#ff0000"
97+
},
98+
{
99+
"range": [16, 26],
100+
"name": "Green",
101+
"color": "#00ff00"
102+
},
103+
{
104+
"range": [27, 37],
105+
"name": "Blue",
106+
"color": "#0000ff"
107+
},
108+
{
109+
"range": [38, 48],
110+
"name": "Yellow",
111+
"color": "#ffff00"
112+
},
113+
{
114+
"range": [49, 59],
115+
"name": "Magenta",
116+
"color": "#ff00ff"
117+
},
118+
{
119+
"range": [60, 70],
120+
"name": "Cyan",
121+
"color": "#00ffff"
122+
},
123+
{
124+
"range": [71, 80],
125+
"name": "White",
126+
"color": "#ffffff"
127+
},
128+
{
129+
"range": [81, 150],
130+
"name": "Color jump slow-fast"
131+
},
132+
{
133+
"range": [151, 255],
134+
"name": "Color fade slow-fast"
135+
}
136+
]
137+
},
138+
"Red": {
139+
"type": "Single Color",
140+
"color": "Red",
141+
"defaultValue": 0
142+
},
143+
"Green": {
144+
"type": "Single Color",
145+
"color": "Green",
146+
"defaultValue": 0
147+
},
148+
"Blue": {
149+
"type": "Single Color",
150+
"color": "Blue",
151+
"defaultValue": 0
152+
}
153+
},
154+
"modes": [
155+
{
156+
"name": "2-channel",
157+
"shortName": "2ch",
158+
"channels": [
159+
"Dimmer",
160+
"Color Macros Simple"
161+
]
162+
},
163+
{
164+
"name": "3-channel 1",
165+
"shortName": "3ch1",
166+
"channels": [
167+
"Dimmer",
168+
"Strobe",
169+
"Color Macros Extended"
170+
]
171+
},
172+
{
173+
"name": "3-channel 2",
174+
"shortName": "3ch2",
175+
"channels": [
176+
"Red",
177+
"Green",
178+
"Blue"
179+
]
180+
},
181+
{
182+
"name": "6-channel",
183+
"shortName": "6ch",
184+
"channels": [
185+
"Dimmer",
186+
"Strobe",
187+
"Red",
188+
"Green",
189+
"Blue",
190+
"Color Macros Extended"
191+
]
192+
}
193+
]
194+
}

‎fixtures/cameo/outdoor-par-tri-12.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"name": "Outdoor PAR Tri 12",
3-
"shortName": "OutTri12",
3+
"shortName": "CLPSTTRI12IP",
44
"categories": ["Color Changer"],
55
"manualURL": "http://adamhall.invaliddomain.de/out/media/downloads/MARKEN/CAMEO/CLPSTTRI12IP/CLPSTTRI12IP_CAMEO_Bedienungsanleitung_EN_DE_FR_ES_PL_IT.pdf",
66
"meta": {
77
"authors": ["Flo Edelmann", "Felix Edelmann"],
88
"createDate": "2017-02-24",
9-
"lastModifyDate": "2017-03-09"
9+
"lastModifyDate": "2017-12-26"
1010
},
1111
"physical": {
1212
"dimensions": [203, 203, 193],
1313
"weight": 4.25,
1414
"power": 50,
15-
"DMXconnector": "3-pin",
15+
"DMXconnector": "3-pin XLR IP65",
1616
"bulb": {
1717
"type": "LED",
1818
"lumens": 911

‎fixtures/register.json

+12-2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@
5050
"lastModifyDate": "2017-07-14",
5151
"lastAction": "created"
5252
},
53+
"cameo/flat-pro-flood-ip65-tri": {
54+
"name": "Flat Pro Flood IP65 Tri",
55+
"lastModifyDate": "2017-12-25",
56+
"lastAction": "created"
57+
},
5358
"cameo/gobo-scanner-80": {
5459
"name": "Gobo Scanner 80",
5560
"lastModifyDate": "2017-11-30",
@@ -72,7 +77,7 @@
7277
},
7378
"cameo/outdoor-par-tri-12": {
7479
"name": "Outdoor PAR Tri 12",
75-
"lastModifyDate": "2017-03-09",
80+
"lastModifyDate": "2017-12-26",
7681
"lastAction": "modified"
7782
},
7883
"cameo/thunder-wash-100-rgb": {
@@ -416,6 +421,7 @@
416421
],
417422
"cameo": [
418423
"flat-pro-18",
424+
"flat-pro-flood-ip65-tri",
419425
"gobo-scanner-80",
420426
"hydrabeam-100",
421427
"hydrabeam-300-rgbw",
@@ -531,6 +537,7 @@
531537
},
532538
"categories": {
533539
"Blinder": [
540+
"cameo/flat-pro-flood-ip65-tri",
534541
"cameo/thunder-wash-100-rgb",
535542
"cameo/thunder-wash-100-w",
536543
"cameo/thunder-wash-600-rgb",
@@ -547,6 +554,7 @@
547554
"american-dj/xs-400",
548555
"ayra/tdc-triple-burst",
549556
"cameo/flat-pro-18",
557+
"cameo/flat-pro-flood-ip65-tri",
550558
"cameo/gobo-scanner-80",
551559
"cameo/hydrabeam-100",
552560
"cameo/hydrabeam-300-rgbw",
@@ -747,6 +755,7 @@
747755
"american-dj/fog-fury-jett-pro",
748756
"american-dj/galaxian-3d",
749757
"cameo/flat-pro-18",
758+
"cameo/flat-pro-flood-ip65-tri",
750759
"cameo/gobo-scanner-80",
751760
"cameo/hydrabeam-100",
752761
"cameo/nanospot-120",
@@ -861,6 +870,8 @@
861870
}
862871
},
863872
"lastUpdated": [
873+
"cameo/outdoor-par-tri-12",
874+
"cameo/flat-pro-flood-ip65-tri",
864875
"futurelight/sc-250-scanner",
865876
"ayra/tdc-triple-burst",
866877
"futurelight/dmh-75-i-led-moving-head",
@@ -934,7 +945,6 @@
934945
"eurolite/led-par-56-tcl",
935946
"eurolite/led-ps-4-hcl",
936947
"futurelight/pro-slim-par-7-hcl",
937-
"cameo/outdoor-par-tri-12",
938948
"cameo/thunder-wash-100-rgb",
939949
"cameo/thunder-wash-100-w",
940950
"cameo/thunder-wash-600-rgb",

‎fixtures/schema.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const schema = require('js-schema');
1212
*
1313
* @type {string}
1414
*/
15-
module.exports.VERSION = '2.1.1';
15+
module.exports.VERSION = '2.2.0';
1616

1717
/**
1818
* see https://github.com/molnarg/js-schema
@@ -46,7 +46,7 @@ const Physical = schema({
4646
'?dimensions': Array.of(3, Number.above(0)), // width, height, depth (in mm)
4747
'?weight': Number.above(0), // in kg
4848
'?power': Number.above(0), // in W
49-
'?DMXconnector': ['3-pin', '5-pin', '3-pin (swapped +/-)', '3-pin and 5-pin', '3.5mm stereo jack'], // additions are welcome
49+
'?DMXconnector': ['3-pin', '5-pin', '3-pin (swapped +/-)', '3-pin and 5-pin', '3-pin XLR IP65', '3.5mm stereo jack'], // additions are welcome
5050
'?bulb': schema({
5151
'?type': NonEmptyString, // e.g. 'LED'
5252
'?colorTemperature': Number.above(0), // in K

0 commit comments

Comments
 (0)