Drop physical.focus (#885)

* Add Barrel Scanner category * Update schema * Add icon * Downgrade in plugins if needed * Use in fixtures * Remove physical.focus property * Remove in schema, model, UI, docs and fixtures * Regenerate properties in plugins where needed * Simplify category suggestions * Remove Moving Head category from tilting bars * Bump schema version to 12.0.0
OpenLightingProject · May 22, 2019 · e343f33 · e343f33
1 parent 48bab26
commit e343f33
Show file tree

Hide file tree

Showing 194 changed files with 597 additions and 1,535 deletions.
diff --git a/docs/fixture-format.md b/docs/fixture-format.md
@@ -67,7 +67,7 @@ The `physical` section describes properties not directly used in the DMX protoco
 
 A fixture can have multiple *modes* (also sometimes called *personalities*) like "Basic 3-channel mode" or "Extended 5-channel mode". Our modes are not allowed to have the word "mode" in them, as it is automatically appended at the end.
 
-A mode can contain the `physical` property to override specific physical data of the fixture. E.g. one mode could set the `panMax` value different than the fixture default.
+A mode can contain the `physical` property to override specific physical data of the fixture. E.g. one mode could set the `power` value different than the fixture default.
 
 A mode's `shortName` must be unique amongst all modes of the respective fixture.
 

diff --git a/docs/model-api.md b/docs/model-api.md
@@ -2046,10 +2046,6 @@ A fixture's technical data, belonging to the hardware and not the DMX protocol.
     * [.lensName](#Physical+lensName) ⇒ <code>string</code> \| <code>null</code>
     * [.lensDegreesMin](#Physical+lensDegreesMin) ⇒ <code>number</code> \| <code>null</code>
     * [.lensDegreesMax](#Physical+lensDegreesMax) ⇒ <code>number</code> \| <code>null</code>
-    * [.hasFocus](#Physical+hasFocus) ⇒ <code>boolean</code> \| <code>null</code>
-    * [.focusType](#Physical+focusType) ⇒ <code>&#x27;Fixed&#x27;</code> \| <code>&#x27;Head&#x27;</code> \| <code>&#x27;Mirror&#x27;</code> \| <code>&#x27;Barrel&#x27;</code> \| <code>null</code>
-    * [.focusPanMax](#Physical+focusPanMax) ⇒ <code>number</code> \| <code>null</code>
-    * [.focusTiltMax](#Physical+focusTiltMax) ⇒ <code>number</code> \| <code>null</code>
     * [.hasMatrixPixels](#Physical+hasMatrixPixels) ⇒ <code>boolean</code>
     * [.matrixPixelsDimensions](#Physical+matrixPixelsDimensions) ⇒ <code>array.&lt;number&gt;</code> \| <code>null</code>
     * [.matrixPixelsSpacing](#Physical+matrixPixelsSpacing) ⇒ <code>array.&lt;number&gt;</code> \| <code>null</code>
@@ -2144,26 +2140,6 @@ Creates a new Physical instance.
 ### physical.lensDegreesMax ⇒ <code>number</code> \| <code>null</code>
 **Kind**: instance property of [<code>Physical</code>](#Physical)  
 **Returns**: <code>number</code> \| <code>null</code> - The maximum possible beam angle in degrees. Defaults to null.  
-<a name="Physical+hasFocus"></a>
-
-### physical.hasFocus ⇒ <code>boolean</code> \| <code>null</code>
-**Kind**: instance property of [<code>Physical</code>](#Physical)  
-**Returns**: <code>boolean</code> \| <code>null</code> - Whether physical data about the focus is available.  
-<a name="Physical+focusType"></a>
-
-### physical.focusType ⇒ <code>&#x27;Fixed&#x27;</code> \| <code>&#x27;Head&#x27;</code> \| <code>&#x27;Mirror&#x27;</code> \| <code>&#x27;Barrel&#x27;</code> \| <code>null</code>
-**Kind**: instance property of [<code>Physical</code>](#Physical)  
-**Returns**: <code>&#x27;Fixed&#x27;</code> \| <code>&#x27;Head&#x27;</code> \| <code>&#x27;Mirror&#x27;</code> \| <code>&#x27;Barrel&#x27;</code> \| <code>null</code> - Whether and how this fixture can change its focus point. Defaults to null.  
-<a name="Physical+focusPanMax"></a>
-
-### physical.focusPanMax ⇒ <code>number</code> \| <code>null</code>
-**Kind**: instance property of [<code>Physical</code>](#Physical)  
-**Returns**: <code>number</code> \| <code>null</code> - The maximum angle in degrees that this fixture can rotate in horizontal direction (Pan). `Number.POSITIVE_INFINITY` if continuous pan is possible. Defaults to null.  
-<a name="Physical+focusTiltMax"></a>
-
-### physical.focusTiltMax ⇒ <code>number</code> \| <code>null</code>
-**Kind**: instance property of [<code>Physical</code>](#Physical)  
-**Returns**: <code>number</code> \| <code>null</code> - The maximum angle in degrees that this fixture can rotate in vertical direction (Tilt). `Number.POSITIVE_INFINITY` if continuous pan is possible. Defaults to null.  
 <a name="Physical+hasMatrixPixels"></a>
 
 ### physical.hasMatrixPixels ⇒ <code>boolean</code>

diff --git a/fixtures/5star-systems/spica-250m.json b/fixtures/5star-systems/spica-250m.json
@@ -29,11 +29,6 @@
     },
     "lens": {
       "degreesMinMax": [18, 18]
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 530,
-      "tiltMax": 280
     }
   },
   "wheels": {

diff --git a/fixtures/abstract/twister-4.json b/fixtures/abstract/twister-4.json
@@ -26,9 +26,6 @@
     "DMXconnector": "3-pin",
     "bulb": {
       "type": "A1/259"
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "wheels": {

diff --git a/fixtures/adb/alc4.json b/fixtures/adb/alc4.json
@@ -19,9 +19,6 @@
     "bulb": {
       "type": "LED",
       "lumens": 4000
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "matrix": {

diff --git a/fixtures/adb/warp-m.json b/fixtures/adb/warp-m.json
@@ -20,11 +20,6 @@
     "bulb": {
       "type": "halogen",
       "colorTemperature": 3200
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 400,
-      "tiltMax": 275
     }
   },
   "availableChannels": {

diff --git a/fixtures/afx/lmh460z.json b/fixtures/afx/lmh460z.json
@@ -35,11 +35,6 @@
     },
     "lens": {
       "degreesMinMax": [15, 60]
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 540,
-      "tiltMax": 280
     }
   },
   "availableChannels": {

diff --git a/fixtures/american-dj/auto-spot-150.json b/fixtures/american-dj/auto-spot-150.json
@@ -21,11 +21,6 @@
     },
     "lens": {
       "degreesMinMax": [13, 13]
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 540,
-      "tiltMax": 270
     }
   },
   "wheels": {

diff --git a/fixtures/american-dj/crazy-pocket-8.json b/fixtures/american-dj/crazy-pocket-8.json
@@ -30,11 +30,6 @@
     },
     "lens": {
       "degreesMinMax": [4, 4]
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 540,
-      "tiltMax": 205
     }
   },
   "matrix": {

diff --git a/fixtures/american-dj/dotz-par.json b/fixtures/american-dj/dotz-par.json
@@ -22,9 +22,6 @@
     },
     "lens": {
       "degreesMinMax": [25, 60]
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "availableChannels": {

diff --git a/fixtures/american-dj/flat-par-qa12xs.json b/fixtures/american-dj/flat-par-qa12xs.json
@@ -22,9 +22,6 @@
     },
     "lens": {
       "degreesMinMax": [25, 25]
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "availableChannels": {

diff --git a/fixtures/american-dj/galaxian-3d.json b/fixtures/american-dj/galaxian-3d.json
@@ -29,9 +29,6 @@
     },
     "lens": {
       "degreesMinMax": [82, 82]
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "matrix": {

diff --git a/fixtures/american-dj/inno-pocket-beam-q4.json b/fixtures/american-dj/inno-pocket-beam-q4.json
@@ -29,11 +29,6 @@
     },
     "lens": {
       "degreesMinMax": [4, 4]
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 540,
-      "tiltMax": 230
     }
   },
   "availableChannels": {

diff --git a/fixtures/american-dj/inno-pocket-fusion.json b/fixtures/american-dj/inno-pocket-fusion.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
   "name": "Inno Pocket Fusion",
   "shortName": "ADJInnoPocketFusion",
-  "categories": ["Effect", "Laser", "Color Changer"],
+  "categories": ["Barrel Scanner", "Laser", "Color Changer"],
   "meta": {
     "authors": ["Flo Edelmann", "EXELBONSAI"],
     "createDate": "2018-07-26",
@@ -28,11 +28,6 @@
     },
     "lens": {
       "degreesMinMax": [2, 5]
-    },
-    "focus": {
-      "type": "Barrel",
-      "panMax": 180,
-      "tiltMax": "infinite"
     }
   },
   "wheels": {

diff --git a/fixtures/american-dj/pocket-pro.json b/fixtures/american-dj/pocket-pro.json
@@ -28,11 +28,6 @@
     },
     "lens": {
       "degreesMinMax": [15, 15]
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 540,
-      "tiltMax": 230
     }
   },
   "wheels": {

diff --git a/fixtures/american-dj/quad-phase-hp.json b/fixtures/american-dj/quad-phase-hp.json
@@ -25,9 +25,6 @@
     },
     "lens": {
       "degreesMinMax": [65, 65]
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "availableChannels": {

diff --git a/fixtures/american-dj/revo-burst.json b/fixtures/american-dj/revo-burst.json
@@ -23,9 +23,6 @@
     "DMXconnector": "3-pin",
     "bulb": {
       "type": "RGBW LEDs"
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "matrix": {

diff --git a/fixtures/american-dj/saber-spot-rgbw.json b/fixtures/american-dj/saber-spot-rgbw.json
@@ -31,9 +31,6 @@
     },
     "lens": {
       "degreesMinMax": [4, 45]
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "availableChannels": {

diff --git a/fixtures/american-dj/stinger-spot.json b/fixtures/american-dj/stinger-spot.json
@@ -29,11 +29,6 @@
     },
     "lens": {
       "degreesMinMax": [13, 13]
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 540,
-      "tiltMax": 210
     }
   },
   "wheels": {

diff --git a/fixtures/american-dj/vizi-spot-led-pro.json b/fixtures/american-dj/vizi-spot-led-pro.json
@@ -25,11 +25,6 @@
     },
     "lens": {
       "degreesMinMax": [13, 13]
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 630,
-      "tiltMax": 270
     }
   },
   "wheels": {

diff --git a/fixtures/american-dj/xs-400.json b/fixtures/american-dj/xs-400.json
@@ -32,11 +32,6 @@
     },
     "lens": {
       "degreesMinMax": [5, 5]
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 540,
-      "tiltMax": "infinite"
     }
   },
   "availableChannels": {

diff --git a/fixtures/ayra/tdc-triple-burst.json b/fixtures/ayra/tdc-triple-burst.json
@@ -19,9 +19,6 @@
     "DMXconnector": "3-pin",
     "bulb": {
       "type": "15x 3W LED (R/G/B/W/A)"
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "matrix": {

diff --git a/fixtures/ayrton/magicblade-fx.json b/fixtures/ayrton/magicblade-fx.json
@@ -27,11 +27,6 @@
     "lens": {
       "degreesMinMax": [3.6, 53]
     },
-    "focus": {
-      "type": "Head",
-      "panMax": "infinite",
-      "tiltMax": "infinite"
-    },
     "matrixPixels": {
       "dimensions": [64, 64, 0],
       "spacing": [2.8, 0, 0]

diff --git a/fixtures/big-dipper/ls90.json b/fixtures/big-dipper/ls90.json
@@ -28,11 +28,6 @@
       "type": "90W LED",
       "colorTemperature": 8000,
       "lumens": 4500
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 540,
-      "tiltMax": 270
     }
   },
   "wheels": {

diff --git a/fixtures/blizzard/rokbox-rgbw.json b/fixtures/blizzard/rokbox-rgbw.json
@@ -33,9 +33,6 @@
     },
     "lens": {
       "degreesMinMax": [25, 30]
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "availableChannels": {

diff --git a/fixtures/boomtonedj/crazy-spot-30.json b/fixtures/boomtonedj/crazy-spot-30.json
@@ -25,11 +25,6 @@
     },
     "lens": {
       "degreesMinMax": [15, 15]
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 540,
-      "tiltMax": 270
     }
   },
   "wheels": {

diff --git a/fixtures/briteq/bt-coloray-120r.json b/fixtures/briteq/bt-coloray-120r.json
@@ -25,9 +25,6 @@
     },
     "lens": {
       "degreesMinMax": [15, 15]
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "availableChannels": {

diff --git a/fixtures/briteq/bt-coloray-18fcr.json b/fixtures/briteq/bt-coloray-18fcr.json
@@ -25,9 +25,6 @@
     },
     "lens": {
       "degreesMinMax": [20, 20]
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "availableChannels": {

diff --git a/fixtures/briteq/bt-coloray-60r.json b/fixtures/briteq/bt-coloray-60r.json
@@ -25,9 +25,6 @@
     },
     "lens": {
       "degreesMinMax": [15, 15]
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "availableChannels": {

diff --git a/fixtures/briteq/bt-ledrotor.json b/fixtures/briteq/bt-ledrotor.json
@@ -27,9 +27,6 @@
     "DMXconnector": "3-pin and 5-pin",
     "bulb": {
       "type": "32× 3W UV LEDs, 720× 0.2W RGB LEDs"
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "matrix": {

diff --git a/fixtures/briteq/cob-slim-100-rgb.json b/fixtures/briteq/cob-slim-100-rgb.json
@@ -35,9 +35,6 @@
     "lens": {
       "name": "Other",
       "degreesMinMax": [15, 70]
-    },
-    "focus": {
-      "type": "Fixed"
     }
   },
   "availableChannels": {

diff --git a/fixtures/cameo/auro-spot-100.json b/fixtures/cameo/auro-spot-100.json
@@ -31,11 +31,6 @@
     },
     "lens": {
       "degreesMinMax": [12, 12]
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 630,
-      "tiltMax": 235
     }
   },
   "wheels": {

diff --git a/fixtures/cameo/auro-spot-200.json b/fixtures/cameo/auro-spot-200.json
@@ -34,11 +34,6 @@
     },
     "lens": {
       "degreesMinMax": [12, 12]
-    },
-    "focus": {
-      "type": "Head",
-      "panMax": 630,
-      "tiltMax": 235
     }
   },
   "wheels": {