Skip to content

Commit dd256f4

Browse files
CGBassPlayerFloEdelmann
CGBassPlayer
and
FloEdelmann
authored
Add powerConnectors object to schema (#3350)
* update some fixtures to use it * show it in the UI Co-authored-by: Flo Edelmann <git@flo-edelmann.de>
1 parent ae6f56d commit dd256f4

35 files changed

+246
-58
lines changed

‎docs/model-api.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,6 +1981,7 @@ A fixture's technical data, belonging to the hardware and not the DMX protocol.
19811981
* [.depth](#Physical+depth) ⇒ <code>number</code> \| <code>null</code>
19821982
* [.weight](#Physical+weight) ⇒ <code>number</code> \| <code>null</code>
19831983
* [.power](#Physical+power) ⇒ <code>number</code> \| <code>null</code>
1984+
* [.powerConnectors](#Physical+powerConnectors) ⇒ <code>Record.&lt;string, string&gt;</code>
19841985
* [.DMXconnector](#Physical+DMXconnector) ⇒ <code>string</code> \| <code>null</code>
19851986
* [.hasBulb](#Physical+hasBulb) ⇒ <code>boolean</code> \| <code>null</code>
19861987
* [.bulbType](#Physical+bulbType) ⇒ <code>string</code> \| <code>null</code>
@@ -2039,6 +2040,11 @@ Creates a new Physical instance.
20392040
### physical.power ⇒ <code>number</code> \| <code>null</code>
20402041
**Kind**: instance property of [<code>Physical</code>](#Physical)
20412042
**Returns**: <code>number</code> \| <code>null</code> - Power consumption of the fixture in watts. Defaults to null.
2043+
<a name="Physical+powerConnectors"></a>
2044+
2045+
### physical.powerConnectors ⇒ <code>Record.&lt;string, string&gt;</code>
2046+
**Kind**: instance property of [<code>Physical</code>](#Physical)
2047+
**Returns**: <code>Record.&lt;string, string&gt;</code> - Power connector information.
20422048
<a name="Physical+DMXconnector"></a>
20432049

20442050
### physical.DMXconnector ⇒ <code>string</code> \| <code>null</code>

‎fixtures/afx/lmh460z.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"shortName": "LMH460Z",
55
"categories": ["Moving Head", "Color Changer"],
66
"meta": {
7-
"authors": ["Folson_dev"],
7+
"authors": ["Folson_dev", "Ryan Goodwin"],
88
"createDate": "2019-03-22",
9-
"lastModifyDate": "2019-03-22"
9+
"lastModifyDate": "2023-07-12"
1010
},
1111
"comment": "Wash Zoom LED",
1212
"links": {
@@ -24,6 +24,9 @@
2424
"dimensions": [350, 400, 260],
2525
"weight": 9,
2626
"power": 400,
27+
"powerConnectors": {
28+
"powerCON": "input only"
29+
},
2730
"DMXconnector": "3-pin",
2831
"bulb": {
2932
"type": "36x 10W RGBW LED",

‎fixtures/american-dj/stinger-spot.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"shortName": "ADJStingerSpot",
55
"categories": ["Moving Head", "Color Changer"],
66
"meta": {
7-
"authors": ["unk", "Felix Edelmann"],
7+
"authors": ["unk", "Felix Edelmann", "Ryan Goodwin"],
88
"createDate": "2019-04-02",
9-
"lastModifyDate": "2019-04-02"
9+
"lastModifyDate": "2023-07-12"
1010
},
1111
"links": {
1212
"manual": [
@@ -23,6 +23,9 @@
2323
"dimensions": [174, 273, 145],
2424
"weight": 3,
2525
"power": 36,
26+
"powerConnectors": {
27+
"IEC C13": "input only"
28+
},
2629
"DMXconnector": "3-pin",
2730
"bulb": {
2831
"type": "10W white LED"

‎fixtures/astera/fp3-hyperion-tube.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"shortName": "AsteraFP3Hyperion",
55
"categories": ["Pixel Bar", "Color Changer", "Blinder", "Strobe"],
66
"meta": {
7-
"authors": ["Jack Crombie", "Felix Edelmann", "Dyami Caliri"],
7+
"authors": ["Jack Crombie", "Felix Edelmann", "Dyami Caliri", "Ryan Goodwin"],
88
"createDate": "2021-01-11",
9-
"lastModifyDate": "2021-01-11"
9+
"lastModifyDate": "2023-07-12"
1010
},
1111
"links": {
1212
"manual": [
@@ -23,6 +23,9 @@
2323
"dimensions": [2031, 42, 42],
2424
"weight": 2.9,
2525
"power": 92,
26+
"powerConnectors": {
27+
"Proprietary": "input only"
28+
},
2629
"DMXconnector": "5-pin",
2730
"bulb": {
2831
"type": "LED",

‎fixtures/cameo/auro-beam-150.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"shortName": "CLABEAM150",
55
"categories": ["Moving Head", "Color Changer"],
66
"meta": {
7-
"authors": ["Ray Tone"],
7+
"authors": ["Ray Tone", "Ryan Goodwin"],
88
"createDate": "2020-03-28",
9-
"lastModifyDate": "2020-03-28"
9+
"lastModifyDate": "2023-07-12"
1010
},
1111
"links": {
1212
"manual": [
@@ -24,7 +24,10 @@
2424
"dimensions": [375, 260, 180],
2525
"weight": 5.5,
2626
"power": 130,
27-
"DMXconnector": "3-pin",
27+
"powerConnectors": {
28+
"powerCON": "input and output"
29+
},
30+
"DMXconnector": "3-pin and 5-pin",
2831
"bulb": {
2932
"type": "LED",
3033
"lumens": 1700

‎fixtures/cameo/auro-spot-400.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"shortName": "CLAS400",
55
"categories": ["Moving Head", "Color Changer"],
66
"meta": {
7-
"authors": ["Felix Edelmann"],
7+
"authors": ["Felix Edelmann", "Ryan Goodwin"],
88
"createDate": "2019-02-08",
9-
"lastModifyDate": "2019-02-08"
9+
"lastModifyDate": "2023-07-12"
1010
},
1111
"links": {
1212
"manual": [
@@ -23,6 +23,9 @@
2323
"dimensions": [405, 565, 285],
2424
"weight": 15.6,
2525
"power": 290,
26+
"powerConnectors": {
27+
"powerCON": "input and output"
28+
},
2629
"DMXconnector": "3-pin and 5-pin",
2730
"bulb": {
2831
"type": "180W white LED",

‎fixtures/cameo/hydrabeam-300-rgbw.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
"shortName": "CLHB300RGBW",
55
"categories": ["Moving Head", "Color Changer"],
66
"meta": {
7-
"authors": ["Flo Edelmann"],
7+
"authors": ["Flo Edelmann", "Ryan Goodwin"],
88
"createDate": "2017-07-24",
9-
"lastModifyDate": "2018-09-04"
9+
"lastModifyDate": "2023-07-12"
1010
},
1111
"links": {
12-
"manual": ["https://adamhall.s3.amazonaws.com/media/MARKEN/CAMEO/CLHB300W/CLHB300_CAMEO_Bedienungsanleitung_EN_DE_FR_ES_PL_IT.PDF"],
12+
"manual": [
13+
"https://adamhall.s3.amazonaws.com/media/MARKEN/CAMEO/CLHB300W/CLHB300_CAMEO_Bedienungsanleitung_EN_DE_FR_ES_PL_IT.PDF"
14+
],
1315
"video": [
1416
"https://www.youtube.com/watch?v=_tO2vB15ieE",
1517
"https://www.youtube.com/watch?v=OY2TEMiPsCY"
@@ -19,6 +21,9 @@
1921
"dimensions": [380, 240, 380],
2022
"weight": 5.5,
2123
"power": 60,
24+
"powerConnectors": {
25+
"IEC C13": "input only"
26+
},
2227
"DMXconnector": "3-pin",
2328
"bulb": {
2429
"type": "LED"

‎fixtures/chauvet-dj/gigbar-2.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"name": "GigBAR 2",
44
"categories": ["Stand", "Color Changer", "Laser"],
55
"meta": {
6-
"authors": ["Flo Edelmann", "Felix Edelmann"],
6+
"authors": ["Flo Edelmann", "Felix Edelmann", "Ryan Goodwin"],
77
"createDate": "2017-10-16",
8-
"lastModifyDate": "2018-08-24"
8+
"lastModifyDate": "2023-07-12"
99
},
1010
"comment": "Par 1 and 2 can only mix 3 colors together at the same time.",
1111
"links": {
@@ -21,6 +21,10 @@
2121
"dimensions": [1185, 387, 110],
2222
"weight": 6.6,
2323
"power": 64,
24+
"powerConnectors": {
25+
"IEC C13": "input only",
26+
"Hardwired": "output only"
27+
},
2428
"DMXconnector": "3-pin"
2529
},
2630
"matrix": {

‎fixtures/chauvet-dj/washfx.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
"name": "WashFX",
44
"categories": ["Color Changer"],
55
"meta": {
6-
"authors": ["Justin Hornsby", "Felix Edelmann"],
6+
"authors": ["Justin Hornsby", "Felix Edelmann", "Ryan Goodwin"],
77
"createDate": "2017-11-21",
8-
"lastModifyDate": "2018-08-10"
8+
"lastModifyDate": "2023-07-12"
99
},
1010
"links": {
11-
"manual": ["https://www.chauvetdj.com/wp-content/uploads/2015/12/Wash_FX_UM_Rev1_WO-1.pdf"],
12-
"productPage": ["https://www.chauvetdj.com/products/wash-fx/"],
11+
"manual": [
12+
"https://www.chauvetdj.com/wp-content/uploads/2015/12/Wash_FX_UM_Rev1_WO-1.pdf"
13+
],
14+
"productPage": [
15+
"https://www.chauvetdj.com/products/wash-fx/"
16+
],
1317
"video": [
1418
"https://www.youtube.com/watch?v=VCuOFK6Vr9k",
1519
"https://www.youtube.com/watch?v=YYqyuCCxH7w"
@@ -19,6 +23,10 @@
1923
"dimensions": [215, 255, 180],
2024
"weight": 2.2,
2125
"power": 75,
26+
"powerConnectors": {
27+
"IEC C13": "input only",
28+
"Hardwired": "output only"
29+
},
2230
"DMXconnector": "3-pin",
2331
"bulb": {
2432
"type": "LED"

‎fixtures/flash-professional/led-moving-head-150w.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"name": "LED Moving Head 150W",
44
"categories": ["Moving Head", "Color Changer"],
55
"meta": {
6-
"authors": ["Flo Edelmann"],
6+
"authors": ["Flo Edelmann", "Ryan Goodwin"],
77
"createDate": "2019-11-21",
8-
"lastModifyDate": "2019-11-21"
8+
"lastModifyDate": "2023-07-12"
99
},
1010
"links": {
1111
"manual": [
@@ -22,7 +22,10 @@
2222
"dimensions": [250, 452, 256],
2323
"weight": 12,
2424
"power": 189,
25-
"DMXconnector": "3-pin and 5-pin",
25+
"powerConnectors": {
26+
"powerCON": "input and output"
27+
},
28+
"DMXconnector": "3-pin",
2629
"bulb": {
2730
"type": "1× 150W white LED"
2831
},

0 commit comments

Comments
 (0)