diff --git a/fixtures/cameo/auro-spot-100.json b/fixtures/cameo/auro-spot-100.json index 494df0000e..8fffacbef4 100644 --- a/fixtures/cameo/auro-spot-100.json +++ b/fixtures/cameo/auro-spot-100.json @@ -198,10 +198,9 @@ { "dmxRange": [103, 127], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "durationStart": "5s", - "durationEnd": "1s", - "comment": "Short burst with break" + "durationEnd": "1s" }, { "dmxRange": [128, 250], diff --git a/fixtures/cameo/auro-spot-200.json b/fixtures/cameo/auro-spot-200.json index 9afe1f4284..34abc153a4 100644 --- a/fixtures/cameo/auro-spot-200.json +++ b/fixtures/cameo/auro-spot-200.json @@ -201,10 +201,9 @@ { "dmxRange": [103, 127], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "durationStart": "5s", - "durationEnd": "1s", - "comment": "Short burst with break" + "durationEnd": "1s" }, { "dmxRange": [128, 250], diff --git a/fixtures/cameo/auro-spot-300.json b/fixtures/cameo/auro-spot-300.json index 6563d1a93d..837975707e 100644 --- a/fixtures/cameo/auro-spot-300.json +++ b/fixtures/cameo/auro-spot-300.json @@ -226,10 +226,9 @@ { "dmxRange": [103, 127], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "durationStart": "5s", - "durationEnd": "1s", - "comment": "Short burst with break" + "durationEnd": "1s" }, { "dmxRange": [128, 250], diff --git a/fixtures/cameo/auro-spot-400.json b/fixtures/cameo/auro-spot-400.json index d46f9e1cc2..c8bba7ffd2 100644 --- a/fixtures/cameo/auro-spot-400.json +++ b/fixtures/cameo/auro-spot-400.json @@ -293,10 +293,9 @@ { "dmxRange": [103, 127], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "durationStart": "5s", - "durationEnd": "1s", - "comment": "Short burst with break" + "durationEnd": "1s" }, { "dmxRange": [128, 250], diff --git a/fixtures/cameo/root-par-6.json b/fixtures/cameo/root-par-6.json index c52d321594..fcd740bb70 100644 --- a/fixtures/cameo/root-par-6.json +++ b/fixtures/cameo/root-par-6.json @@ -275,10 +275,9 @@ { "dmxRange": [103, 127], "type": "ShutterStrobe", - "shutterEffect": "Lightning", + "shutterEffect": "Burst", "durationStart": "5s", - "durationEnd": "1s", - "comment": "Break effect (short burst with break)" + "durationEnd": "1s" }, { "dmxRange": [128, 250], diff --git a/fixtures/cameo/zenit-w600.json b/fixtures/cameo/zenit-w600.json index 0e1d949fca..2a55b776d9 100644 --- a/fixtures/cameo/zenit-w600.json +++ b/fixtures/cameo/zenit-w600.json @@ -88,10 +88,9 @@ { "dmxRange": [103, 127], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "durationStart": "5s", - "durationEnd": "1s", - "comment": "Break effect: Short burst with break" + "durationEnd": "1s" }, { "dmxRange": [128, 250], diff --git a/fixtures/clf/hera.json b/fixtures/clf/hera.json index 2bc63f6525..44f31a7415 100644 --- a/fixtures/clf/hera.json +++ b/fixtures/clf/hera.json @@ -161,7 +161,7 @@ { "dmxRange": [170, 184], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "speedStart": "fast", "speedEnd": "slow", "comment": "Burst pulse" @@ -174,7 +174,7 @@ { "dmxRange": [190, 204], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "speedStart": "fast", "speedEnd": "slow", "randomTiming": true, @@ -201,10 +201,9 @@ { "dmxRange": [230, 244], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "speedStart": "fast", - "speedEnd": "slow", - "comment": "Burst" + "speedEnd": "slow" }, { "dmxRange": [245, 255], diff --git a/fixtures/martin/mac-aura.json b/fixtures/martin/mac-aura.json index a138fceefa..55da1e2bca 100644 --- a/fixtures/martin/mac-aura.json +++ b/fixtures/martin/mac-aura.json @@ -139,10 +139,9 @@ { "dmxRange": [170, 184], "type": "ShutterStrobe", - "shutterEffect": "Pulse", + "shutterEffect": "Burst", "speedStart": "fast", "speedEnd": "slow", - "comment": "Burst", "menuClick": "center" }, { @@ -154,11 +153,10 @@ { "dmxRange": [190, 204], "type": "ShutterStrobe", - "shutterEffect": "Pulse", + "shutterEffect": "Burst", "speedStart": "fast", "speedEnd": "slow", "randomTiming": true, - "comment": "Burst", "menuClick": "center" }, { @@ -185,10 +183,9 @@ { "dmxRange": [230, 244], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "speedStart": "fast", "speedEnd": "slow", - "comment": "Burst", "menuClick": "center" }, { @@ -1477,10 +1474,9 @@ { "dmxRange": [170, 184], "type": "ShutterStrobe", - "shutterEffect": "Pulse", + "shutterEffect": "Burst", "speedStart": "fast", "speedEnd": "slow", - "comment": "Burst", "menuClick": "center" }, { @@ -1492,11 +1488,10 @@ { "dmxRange": [190, 204], "type": "ShutterStrobe", - "shutterEffect": "Pulse", + "shutterEffect": "Burst", "speedStart": "fast", "speedEnd": "slow", "randomTiming": true, - "comment": "Burst", "menuClick": "center" }, { @@ -1523,10 +1518,9 @@ { "dmxRange": [230, 244], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "speedStart": "fast", "speedEnd": "slow", - "comment": "Burst", "menuClick": "center" }, { diff --git a/fixtures/martin/rush-mh-2-wash.json b/fixtures/martin/rush-mh-2-wash.json index 74d4cefdec..02ce066942 100644 --- a/fixtures/martin/rush-mh-2-wash.json +++ b/fixtures/martin/rush-mh-2-wash.json @@ -124,7 +124,7 @@ { "dmxRange": [170, 184], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "speedStart": "fast", "speedEnd": "slow", "comment": "burst pulse" @@ -138,7 +138,7 @@ { "dmxRange": [190, 204], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "speedStart": "fast", "speedEnd": "slow", "randomTiming": true, @@ -167,10 +167,9 @@ { "dmxRange": [230, 244], "type": "ShutterStrobe", - "shutterEffect": "Strobe", + "shutterEffect": "Burst", "speedStart": "fast", - "speedEnd": "slow", - "comment": "burst" + "speedEnd": "slow" }, { "dmxRange": [245, 255], diff --git a/fixtures/tmb/solaris-flare.json b/fixtures/tmb/solaris-flare.json index 1bd850810d..0169c01843 100644 --- a/fixtures/tmb/solaris-flare.json +++ b/fixtures/tmb/solaris-flare.json @@ -192,8 +192,8 @@ }, { "dmxRange": [241, 245], - "type": "Effect", - "effectName": "Burst", + "type": "ShutterStrobe", + "shutterEffect": "Burst", "comment": "use rate at full" }, { diff --git a/lib/model/Capability.js b/lib/model/Capability.js index 016b1f8c45..760b4af1e5 100644 --- a/lib/model/Capability.js +++ b/lib/model/Capability.js @@ -22,6 +22,7 @@ const namePerType = { RampUpDown: `Ramp up and down strobe`, Lightning: `Lightning strobe effect`, Spikes: `Spikes strobe effect`, + Burst: `Burst strobe effect`, }[capability.shutterEffect]; if (capability.randomTiming) { diff --git a/plugins/plugins.json b/plugins/plugins.json index 5cfcab6c28..9479bd5b7a 100644 --- a/plugins/plugins.json +++ b/plugins/plugins.json @@ -59,7 +59,7 @@ }, "ofl": { "name": "Open Fixture Library JSON", - "exportPluginVersion": "12.2.2", + "exportPluginVersion": "12.3.0", "exportTests": [] }, "op-z": { diff --git a/schemas/capability.json b/schemas/capability.json index 95db10fa2b..933895c899 100644 --- a/schemas/capability.json +++ b/schemas/capability.json @@ -67,7 +67,8 @@ "RampDown", "RampUpDown", "Lightning", - "Spikes" + "Spikes", + "Burst" ] }, "soundControlled": { "type": "boolean" }, "speed": { "$ref": "definitions.json#/entities/speed" }, diff --git a/schemas/fixture-redirect.json b/schemas/fixture-redirect.json index c9a5c39340..1dd8873864 100644 --- a/schemas/fixture-redirect.json +++ b/schemas/fixture-redirect.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture-redirect.json", - "version": "12.2.2", + "version": "12.3.0", "type": "object", "properties": { diff --git a/schemas/fixture.json b/schemas/fixture.json index 512e8ccb98..5705485717 100644 --- a/schemas/fixture.json +++ b/schemas/fixture.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json", - "version": "12.2.2", + "version": "12.3.0", "type": "object", "properties": { diff --git a/schemas/gobo.json b/schemas/gobo.json index c7c2e03ed0..8429401d58 100644 --- a/schemas/gobo.json +++ b/schemas/gobo.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/gobo.json", - "version": "12.2.2", + "version": "12.3.0", "type": "object", "properties": { diff --git a/schemas/manufacturers.json b/schemas/manufacturers.json index 922e4b5ea1..8801430f7c 100644 --- a/schemas/manufacturers.json +++ b/schemas/manufacturers.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/manufacturers.json", - "version": "12.2.2", + "version": "12.3.0", "type": "object", "properties": {