Skip to content

Commit

Permalink
New fixture categories "Pixel Bar" and "Stand" (#587)
Browse files Browse the repository at this point in the history
* Allow "Pixel Bar" and "Stand" fixture categories in schema
* Bump schema version to 9.2.0
* Add category icons
* Downgrade new categories in QLC+ and Millumin plugins
* Add "Pixel Bar" and "Matrix" fixture category tests / suggestions
* Add new categories to fixtures
* Change lastModifyDate for all changed fixtures
* Make register
  • Loading branch information
FloEdelmann authored Aug 25, 2018
1 parent 843fafd commit d8f6401
Show file tree
Hide file tree
Showing 27 changed files with 161 additions and 77 deletions.
4 changes: 2 additions & 2 deletions fixtures/adb/alc4.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
"name": "ALC4",
"shortName": "ADBALC4",
"categories": ["Blinder", "Color Changer"],
"categories": ["Blinder", "Pixel Bar", "Color Changer"],
"meta": {
"authors": ["ameisso"],
"createDate": "2018-02-19",
"lastModifyDate": "2018-07-21"
"lastModifyDate": "2018-08-24"
},
"links": {
"manual": ["http://www.lsclighting.com/help-centre/downloads/func-startdown/512/"]
Expand Down
4 changes: 2 additions & 2 deletions fixtures/american-dj/revo-sweep.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
"name": "Revo Sweep",
"shortName": "ADJRevoSweep",
"categories": ["Flower"],
"categories": ["Flower", "Color Changer"],
"meta": {
"authors": ["Felix Edelmann"],
"createDate": "2018-02-06",
"lastModifyDate": "2018-08-09"
"lastModifyDate": "2018-08-24"
},
"links": {
"manual": ["http://adjmedia.s3-website-eu-west-1.amazonaws.com/manuals/revo_sweep.pdf"],
Expand Down
4 changes: 2 additions & 2 deletions fixtures/ayrton/magicblade-fx.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
"name": "MagicBlade FX",
"shortName": "AyrtonMBFX",
"categories": ["Color Changer", "Moving Head"],
"categories": ["Pixel Bar", "Color Changer", "Moving Head"],
"meta": {
"authors": ["Felix Edelmann"],
"createDate": "2018-07-21",
"lastModifyDate": "2018-08-09"
"lastModifyDate": "2018-08-24"
},
"links": {
"manual": ["https://www.ayrton.eu/wp-content/uploads/2015/10/MAGICBLADE-FX-Preliminary-Manual.pdf"],
Expand Down
4 changes: 2 additions & 2 deletions fixtures/chauvet-dj/gigbar-2.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
"name": "GigBAR 2",
"categories": ["Color Changer", "Laser"],
"categories": ["Stand", "Color Changer", "Laser"],
"meta": {
"authors": ["Flo Edelmann", "Felix Edelmann"],
"createDate": "2017-10-16",
"lastModifyDate": "2018-08-10"
"lastModifyDate": "2018-08-24"
},
"comment": "Par 1 and 2 can only mix 3 colors together at the same time.",
"links": {
Expand Down
4 changes: 2 additions & 2 deletions fixtures/chroma-q/color-force-ii-12.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
"name": "Color Force II 12",
"shortName": "CHCF212RGBA",
"categories": ["Color Changer"],
"categories": ["Pixel Bar", "Color Changer"],
"meta": {
"authors": ["Felix Edelmann"],
"createDate": "2018-02-13",
"lastModifyDate": "2018-08-09"
"lastModifyDate": "2018-08-24"
},
"comment": "Look Select capabilities may be inaccurate",
"links": {
Expand Down
4 changes: 2 additions & 2 deletions fixtures/chroma-q/color-force-ii-48.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
"name": "Color Force II 48",
"shortName": "CHCF248RGBA",
"categories": ["Color Changer"],
"categories": ["Pixel Bar", "Color Changer"],
"meta": {
"authors": ["Felix Edelmann"],
"createDate": "2018-02-13",
"lastModifyDate": "2018-08-09"
"lastModifyDate": "2018-08-24"
},
"comment": "Look Select capabilities may be inaccurate",
"links": {
Expand Down
4 changes: 2 additions & 2 deletions fixtures/chroma-q/color-force-ii-72.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
"name": "Color Force II 72",
"shortName": "CHCF272RGBA",
"categories": ["Color Changer"],
"categories": ["Pixel Bar", "Color Changer"],
"meta": {
"authors": ["Felix Edelmann"],
"createDate": "2018-02-13",
"lastModifyDate": "2018-08-09"
"lastModifyDate": "2018-08-24"
},
"comment": "Look Select capabilities may be inaccurate",
"links": {
Expand Down
4 changes: 2 additions & 2 deletions fixtures/equinox/gigabar.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
"name": "Gigabar",
"categories": ["Color Changer"],
"categories": ["Stand", "Color Changer"],
"meta": {
"authors": ["Justin Hornsby", "Felix Edelmann"],
"createDate": "2017-11-16",
"lastModifyDate": "2018-08-09"
"lastModifyDate": "2018-08-24"
},
"links": {
"manual": ["http://www.prolight.co.uk/ftp-in/EQLED65_Manual.pdf"],
Expand Down
4 changes: 2 additions & 2 deletions fixtures/eurolite/led-kls-801.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
"name": "LED KLS-801",
"shortName": "KLS801",
"categories": ["Color Changer"],
"categories": ["Stand", "Color Changer"],
"meta": {
"authors": ["Flo Edelmann", "Felix Edelmann"],
"createDate": "2017-01-20",
"lastModifyDate": "2018-08-09"
"lastModifyDate": "2018-08-24"
},
"links": {
"manual": ["http://s141963554.online.de/anleitung/Steinigke/81012467.pdf"],
Expand Down
4 changes: 2 additions & 2 deletions fixtures/glp/impression-x4-bar-10.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
"name": "Impression X4 Bar 10",
"categories": ["Moving Head", "Color Changer", "Effect", "Strobe"],
"categories": ["Pixel Bar", "Moving Head", "Color Changer", "Strobe"],
"meta": {
"authors": ["Rummels Bucht Berlin"],
"createDate": "2018-05-26",
"lastModifyDate": "2018-08-09"
"lastModifyDate": "2018-08-24"
},
"comment": "impression X4 BAR 10 DMX chart (v1.6) from software version: v0.60",
"links": {
Expand Down
5 changes: 3 additions & 2 deletions fixtures/glp/jdc1.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
"name": "JDC1",
"categories": ["Strobe", "Blinder", "Color Changer"],
"categories": ["Strobe", "Blinder", "Matrix", "Color Changer", "Moving Head"],
"meta": {
"authors": ["Flo Edelmann"],
"createDate": "2018-06-14",
"lastModifyDate": "2018-08-09"
"lastModifyDate": "2018-08-24"
},
"links": {
"manual": ["https://www.glp.de/de/produkte?format=raw&task=download&fid=151"],
Expand All @@ -23,6 +23,7 @@
"degreesMinMax": [86, 148]
},
"focus": {
"type": "Head",
"tiltMax": 185
}
},
Expand Down
4 changes: 2 additions & 2 deletions fixtures/nicols/led-bar-123-fc-ip.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
"name": "LED BAR 123 FC IP",
"categories": ["Color Changer"],
"categories": ["Pixel Bar", "Color Changer"],
"meta": {
"authors": ["Nils Van Zuijlen"],
"createDate": "2018-04-22",
"lastModifyDate": "2018-08-09"
"lastModifyDate": "2018-08-24"
},
"links": {
"manual": ["http://sunlight-online.de/pdf/LEDBAR123FC.pdf"],
Expand Down
4 changes: 2 additions & 2 deletions fixtures/orion/orcan2.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
},
"availableChannels": {
"Master Dimmr": {
"Master Dimmer": {
"defaultValue": 0,
"capability": {
"type": "Intensity"
Expand Down Expand Up @@ -94,7 +94,7 @@
"name": "7-channel",
"shortName": "7ch",
"channels": [
"Master Dimmr",
"Master Dimmer",
"Strobe",
"Effects",
"Effect Speed",
Expand Down
Loading

0 comments on commit d8f6401

Please sign in to comment.