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>
OpenLightingProject · Jul 12, 2023 · dd256f4 · dd256f4
1 parent ae6f56d
commit dd256f4
Show file tree

Hide file tree

Showing 35 changed files with 246 additions and 58 deletions.
diff --git a/docs/model-api.md b/docs/model-api.md
@@ -1981,6 +1981,7 @@ A fixture's technical data, belonging to the hardware and not the DMX protocol.
     * [.depth](#Physical+depth) ⇒ <code>number</code> \| <code>null</code>
     * [.weight](#Physical+weight) ⇒ <code>number</code> \| <code>null</code>
     * [.power](#Physical+power) ⇒ <code>number</code> \| <code>null</code>
+    * [.powerConnectors](#Physical+powerConnectors) ⇒ <code>Record.&lt;string, string&gt;</code>
     * [.DMXconnector](#Physical+DMXconnector) ⇒ <code>string</code> \| <code>null</code>
     * [.hasBulb](#Physical+hasBulb) ⇒ <code>boolean</code> \| <code>null</code>
     * [.bulbType](#Physical+bulbType) ⇒ <code>string</code> \| <code>null</code>
@@ -2039,6 +2040,11 @@ Creates a new Physical instance.
 ### physical.power ⇒ <code>number</code> \| <code>null</code>
 **Kind**: instance property of [<code>Physical</code>](#Physical)  
 **Returns**: <code>number</code> \| <code>null</code> - Power consumption of the fixture in watts. Defaults to null.  
+<a name="Physical+powerConnectors"></a>
+
+### physical.powerConnectors ⇒ <code>Record.&lt;string, string&gt;</code>
+**Kind**: instance property of [<code>Physical</code>](#Physical)  
+**Returns**: <code>Record.&lt;string, string&gt;</code> - Power connector information.  
 <a name="Physical+DMXconnector"></a>
 
 ### physical.DMXconnector ⇒ <code>string</code> \| <code>null</code>

diff --git a/fixtures/afx/lmh460z.json b/fixtures/afx/lmh460z.json
@@ -4,9 +4,9 @@
   "shortName": "LMH460Z",
   "categories": ["Moving Head", "Color Changer"],
   "meta": {
-    "authors": ["Folson_dev"],
+    "authors": ["Folson_dev", "Ryan Goodwin"],
     "createDate": "2019-03-22",
-    "lastModifyDate": "2019-03-22"
+    "lastModifyDate": "2023-07-12"
   },
   "comment": "Wash Zoom LED",
   "links": {
@@ -24,6 +24,9 @@
     "dimensions": [350, 400, 260],
     "weight": 9,
     "power": 400,
+    "powerConnectors": {
+      "powerCON": "input only"
+    },
     "DMXconnector": "3-pin",
     "bulb": {
       "type": "36x 10W RGBW LED",

diff --git a/fixtures/american-dj/stinger-spot.json b/fixtures/american-dj/stinger-spot.json
@@ -4,9 +4,9 @@
   "shortName": "ADJStingerSpot",
   "categories": ["Moving Head", "Color Changer"],
   "meta": {
-    "authors": ["unk", "Felix Edelmann"],
+    "authors": ["unk", "Felix Edelmann", "Ryan Goodwin"],
     "createDate": "2019-04-02",
-    "lastModifyDate": "2019-04-02"
+    "lastModifyDate": "2023-07-12"
   },
   "links": {
     "manual": [
@@ -23,6 +23,9 @@
     "dimensions": [174, 273, 145],
     "weight": 3,
     "power": 36,
+    "powerConnectors": {
+      "IEC C13": "input only"
+    },
     "DMXconnector": "3-pin",
     "bulb": {
       "type": "10W white LED"

diff --git a/fixtures/astera/fp3-hyperion-tube.json b/fixtures/astera/fp3-hyperion-tube.json
@@ -4,9 +4,9 @@
   "shortName": "AsteraFP3Hyperion",
   "categories": ["Pixel Bar", "Color Changer", "Blinder", "Strobe"],
   "meta": {
-    "authors": ["Jack Crombie", "Felix Edelmann", "Dyami Caliri"],
+    "authors": ["Jack Crombie", "Felix Edelmann", "Dyami Caliri", "Ryan Goodwin"],
     "createDate": "2021-01-11",
-    "lastModifyDate": "2021-01-11"
+    "lastModifyDate": "2023-07-12"
   },
   "links": {
     "manual": [
@@ -23,6 +23,9 @@
     "dimensions": [2031, 42, 42],
     "weight": 2.9,
     "power": 92,
+    "powerConnectors": {
+      "Proprietary": "input only"
+    },
     "DMXconnector": "5-pin",
     "bulb": {
       "type": "LED",

diff --git a/fixtures/cameo/auro-beam-150.json b/fixtures/cameo/auro-beam-150.json
@@ -4,9 +4,9 @@
   "shortName": "CLABEAM150",
   "categories": ["Moving Head", "Color Changer"],
   "meta": {
-    "authors": ["Ray Tone"],
+    "authors": ["Ray Tone", "Ryan Goodwin"],
     "createDate": "2020-03-28",
-    "lastModifyDate": "2020-03-28"
+    "lastModifyDate": "2023-07-12"
   },
   "links": {
     "manual": [
@@ -24,7 +24,10 @@
     "dimensions": [375, 260, 180],
     "weight": 5.5,
     "power": 130,
-    "DMXconnector": "3-pin",
+    "powerConnectors": {
+      "powerCON": "input and output"
+    },
+    "DMXconnector": "3-pin and 5-pin",
     "bulb": {
       "type": "LED",
       "lumens": 1700

diff --git a/fixtures/cameo/auro-spot-400.json b/fixtures/cameo/auro-spot-400.json
@@ -4,9 +4,9 @@
   "shortName": "CLAS400",
   "categories": ["Moving Head", "Color Changer"],
   "meta": {
-    "authors": ["Felix Edelmann"],
+    "authors": ["Felix Edelmann", "Ryan Goodwin"],
     "createDate": "2019-02-08",
-    "lastModifyDate": "2019-02-08"
+    "lastModifyDate": "2023-07-12"
   },
   "links": {
     "manual": [
@@ -23,6 +23,9 @@
     "dimensions": [405, 565, 285],
     "weight": 15.6,
     "power": 290,
+    "powerConnectors": {
+      "powerCON": "input and output"
+    },
     "DMXconnector": "3-pin and 5-pin",
     "bulb": {
       "type": "180W white LED",

diff --git a/fixtures/cameo/hydrabeam-300-rgbw.json b/fixtures/cameo/hydrabeam-300-rgbw.json
@@ -4,12 +4,14 @@
   "shortName": "CLHB300RGBW",
   "categories": ["Moving Head", "Color Changer"],
   "meta": {
-    "authors": ["Flo Edelmann"],
+    "authors": ["Flo Edelmann", "Ryan Goodwin"],
     "createDate": "2017-07-24",
-    "lastModifyDate": "2018-09-04"
+    "lastModifyDate": "2023-07-12"
   },
   "links": {
-    "manual": ["https://adamhall.s3.amazonaws.com/media/MARKEN/CAMEO/CLHB300W/CLHB300_CAMEO_Bedienungsanleitung_EN_DE_FR_ES_PL_IT.PDF"],
+    "manual": [
+      "https://adamhall.s3.amazonaws.com/media/MARKEN/CAMEO/CLHB300W/CLHB300_CAMEO_Bedienungsanleitung_EN_DE_FR_ES_PL_IT.PDF"
+    ],
     "video": [
       "https://www.youtube.com/watch?v=_tO2vB15ieE",
       "https://www.youtube.com/watch?v=OY2TEMiPsCY"
@@ -19,6 +21,9 @@
     "dimensions": [380, 240, 380],
     "weight": 5.5,
     "power": 60,
+    "powerConnectors": {
+      "IEC C13": "input only"
+    },
     "DMXconnector": "3-pin",
     "bulb": {
       "type": "LED"

diff --git a/fixtures/chauvet-dj/gigbar-2.json b/fixtures/chauvet-dj/gigbar-2.json
@@ -3,9 +3,9 @@
   "name": "GigBAR 2",
   "categories": ["Stand", "Color Changer", "Laser"],
   "meta": {
-    "authors": ["Flo Edelmann", "Felix Edelmann"],
+    "authors": ["Flo Edelmann", "Felix Edelmann", "Ryan Goodwin"],
     "createDate": "2017-10-16",
-    "lastModifyDate": "2018-08-24"
+    "lastModifyDate": "2023-07-12"
   },
   "comment": "Par 1 and 2 can only mix 3 colors together at the same time.",
   "links": {
@@ -21,6 +21,10 @@
     "dimensions": [1185, 387, 110],
     "weight": 6.6,
     "power": 64,
+    "powerConnectors": {
+      "IEC C13": "input only",
+      "Hardwired": "output only"
+    },
     "DMXconnector": "3-pin"
   },
   "matrix": {

diff --git a/fixtures/chauvet-dj/washfx.json b/fixtures/chauvet-dj/washfx.json
@@ -3,13 +3,17 @@
   "name": "WashFX",
   "categories": ["Color Changer"],
   "meta": {
-    "authors": ["Justin Hornsby", "Felix Edelmann"],
+    "authors": ["Justin Hornsby", "Felix Edelmann", "Ryan Goodwin"],
     "createDate": "2017-11-21",
-    "lastModifyDate": "2018-08-10"
+    "lastModifyDate": "2023-07-12"
   },
   "links": {
-    "manual": ["https://www.chauvetdj.com/wp-content/uploads/2015/12/Wash_FX_UM_Rev1_WO-1.pdf"],
-    "productPage": ["https://www.chauvetdj.com/products/wash-fx/"],
+    "manual": [
+      "https://www.chauvetdj.com/wp-content/uploads/2015/12/Wash_FX_UM_Rev1_WO-1.pdf"
+    ],
+    "productPage": [
+      "https://www.chauvetdj.com/products/wash-fx/"
+    ],
     "video": [
       "https://www.youtube.com/watch?v=VCuOFK6Vr9k",
       "https://www.youtube.com/watch?v=YYqyuCCxH7w"
@@ -19,6 +23,10 @@
     "dimensions": [215, 255, 180],
     "weight": 2.2,
     "power": 75,
+    "powerConnectors": {
+      "IEC C13": "input only",
+      "Hardwired": "output only"
+    },
     "DMXconnector": "3-pin",
     "bulb": {
       "type": "LED"

diff --git a/fixtures/flash-professional/led-moving-head-150w.json b/fixtures/flash-professional/led-moving-head-150w.json
@@ -3,9 +3,9 @@
   "name": "LED Moving Head 150W",
   "categories": ["Moving Head", "Color Changer"],
   "meta": {
-    "authors": ["Flo Edelmann"],
+    "authors": ["Flo Edelmann", "Ryan Goodwin"],
     "createDate": "2019-11-21",
-    "lastModifyDate": "2019-11-21"
+    "lastModifyDate": "2023-07-12"
   },
   "links": {
     "manual": [
@@ -22,7 +22,10 @@
     "dimensions": [250, 452, 256],
     "weight": 12,
     "power": 189,
-    "DMXconnector": "3-pin and 5-pin",
+    "powerConnectors": {
+      "powerCON": "input and output"
+    },
+    "DMXconnector": "3-pin",
     "bulb": {
       "type": "1× 150W white LED"
     },

diff --git a/fixtures/glp/impression-laser.json b/fixtures/glp/impression-laser.json
@@ -4,19 +4,26 @@
   "shortName": "GLPLaser",
   "categories": ["Laser", "Moving Head", "Color Changer"],
   "meta": {
-    "authors": ["Felix Edelmann"],
+    "authors": ["Felix Edelmann", "Ryan Goodwin"],
     "createDate": "2018-02-02",
-    "lastModifyDate": "2018-08-09"
+    "lastModifyDate": "2023-07-12"
   },
   "comment": "The manual leaves gaps between capabilities, which are corrected here.",
   "links": {
-    "manual": ["https://www.glp.de/de/produkte?format=raw&task=download&fid=65"],
-    "video": ["https://www.youtube.com/watch?v=xtjhMXGvLiE"]
+    "manual": [
+      "https://www.glp.de/de/produkte?format=raw&task=download&fid=65"
+    ],
+    "video": [
+      "https://www.youtube.com/watch?v=xtjhMXGvLiE"
+    ]
   },
   "physical": {
     "dimensions": [340, 145, 370],
     "weight": 7.5,
     "power": 170,
+    "powerConnectors": {
+      "powerCON": "input only"
+    },
     "DMXconnector": "3-pin",
     "lens": {
       "degreesMinMax": [40, 40]

diff --git a/fixtures/glp/knv-arc.json b/fixtures/glp/knv-arc.json
@@ -3,9 +3,9 @@
   "name": "KNV Arc",
   "categories": ["Effect", "Color Changer", "Strobe"],
   "meta": {
-    "authors": ["Flo Edelmann"],
+    "authors": ["Flo Edelmann", "Ryan Goodwin"],
     "createDate": "2019-04-07",
-    "lastModifyDate": "2019-04-07"
+    "lastModifyDate": "2023-07-12"
   },
   "links": {
     "manual": [
@@ -23,6 +23,9 @@
     "dimensions": [250, 250, 180],
     "weight": 9.7,
     "power": 800,
+    "powerConnectors": {
+      "powerCON TRUE1": "input and output"
+    },
     "bulb": {
       "type": "25× 30W White LEDs, 400× 0.25W RGB LEDs",
       "colorTemperature": 5000,

diff --git a/fixtures/martin/mac-axiom-hybrid.json b/fixtures/martin/mac-axiom-hybrid.json
@@ -4,9 +4,9 @@
   "shortName": "MartinAxiomHybrid",
   "categories": ["Moving Head", "Color Changer"],
   "meta": {
-    "authors": ["novasfronteiras.co"],
+    "authors": ["novasfronteiras.co", "Ryan Goodwin"],
     "createDate": "2017-08-07",
-    "lastModifyDate": "2018-08-09"
+    "lastModifyDate": "2023-07-12"
   },
   "links": {
     "manual": [
@@ -21,6 +21,9 @@
     "dimensions": [414, 630, 399],
     "weight": 24.8,
     "power": 600,
+    "powerConnectors": {
+      "powerCON TRUE1": "input only"
+    },
     "DMXconnector": "5-pin",
     "bulb": {
       "type": "440 W short-arc discharge",

diff --git a/fixtures/martin/mac-encore-performance.json b/fixtures/martin/mac-encore-performance.json
@@ -4,9 +4,9 @@
   "shortName": "MartinEncorePerf",
   "categories": ["Moving Head", "Color Changer"],
   "meta": {
-    "authors": ["Felix Edelmann"],
+    "authors": ["Felix Edelmann", "Ryan Goodwin"],
     "createDate": "2019-01-16",
-    "lastModifyDate": "2019-01-16"
+    "lastModifyDate": "2023-07-12"
   },
   "links": {
     "manual": [
@@ -25,6 +25,9 @@
     "dimensions": [480, 740, 452],
     "weight": 31,
     "power": 585,
+    "powerConnectors": {
+      "powerCON TRUE1": "input only"
+    },
     "DMXconnector": "5-pin",
     "bulb": {
       "type": "White LED"

diff --git a/fixtures/martin/mania-scx500.json b/fixtures/martin/mania-scx500.json
@@ -4,9 +4,9 @@
   "shortName": "SCX500",
   "categories": ["Scanner", "Color Changer"],
   "meta": {
-    "authors": ["Michael Stiller"],
+    "authors": ["Michael Stiller", "Ryan Goodwin"],
     "createDate": "2019-01-14",
-    "lastModifyDate": "2019-01-14"
+    "lastModifyDate": "2023-07-12"
   },
   "links": {
     "manual": [
@@ -24,6 +24,9 @@
     "dimensions": [445, 178, 204],
     "weight": 6.7,
     "power": 164,
+    "powerConnectors": {
+      "IEC C13": "input only"
+    },
     "DMXconnector": "3-pin",
     "bulb": {
       "type": "H5 MR16 halogen",

diff --git a/fixtures/mdg/theone-atmospheric-generator.json b/fixtures/mdg/theone-atmospheric-generator.json
@@ -4,9 +4,9 @@
   "shortName": "MDGtheONE",
   "categories": ["Hazer", "Smoke"],
   "meta": {
-    "authors": ["Flo Edelmann"],
+    "authors": ["Flo Edelmann", "Ryan Goodwin"],
     "createDate": "2017-10-13",
-    "lastModifyDate": "2018-08-09"
+    "lastModifyDate": "2023-07-12"
   },
   "comment": "Fog output: 85m³ per minute in Fog mode, at full pressure",
   "links": {
@@ -27,6 +27,9 @@
     "dimensions": [250, 610, 300],
     "weight": 23,
     "power": 1480,
+    "powerConnectors": {
+      "IEC C19": "input only"
+    },
     "DMXconnector": "5-pin"
   },
   "availableChannels": {