Skip to content

Commit

Permalink
Add Burst as new shutter effect (#2094)
Browse files Browse the repository at this point in the history 
Co-authored-by: Flo Edelmann <florian-edelmann@online.de>
  • Loading branch information
@JonahKr @FloEdelmann
JonahKr and FloEdelmann committed Aug 20, 2021
1 parent 71ecb76 commit 62fb8e7
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 48 deletions.
5 changes: 2 additions & 3 deletions fixtures/cameo/auro-spot-100.json
View file
Expand Up @@ -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],
Expand Down
5 changes: 2 additions & 3 deletions fixtures/cameo/auro-spot-200.json
View file
Expand Up @@ -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],
Expand Down
5 changes: 2 additions & 3 deletions fixtures/cameo/auro-spot-300.json
View file
Expand Up @@ -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],
Expand Down
5 changes: 2 additions & 3 deletions fixtures/cameo/auro-spot-400.json
View file
Expand Up @@ -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],
Expand Down
5 changes: 2 additions & 3 deletions fixtures/cameo/root-par-6.json
View file
Expand Up @@ -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],
Expand Down
5 changes: 2 additions & 3 deletions fixtures/cameo/zenit-w600.json
View file
Expand Up @@ -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],
Expand Down
9 changes: 4 additions & 5 deletions fixtures/clf/hera.json
View file
Expand Up @@ -161,7 +161,7 @@
{
"dmxRange": [170, 184],
"type": "ShutterStrobe",
"shutterEffect": "Strobe",
"shutterEffect": "Burst",
"speedStart": "fast",
"speedEnd": "slow",
"comment": "Burst pulse"
Expand All @@ -174,7 +174,7 @@
{
"dmxRange": [190, 204],
"type": "ShutterStrobe",
"shutterEffect": "Strobe",
"shutterEffect": "Burst",
"speedStart": "fast",
"speedEnd": "slow",
"randomTiming": true,
Expand All @@ -201,10 +201,9 @@
{
"dmxRange": [230, 244],
"type": "ShutterStrobe",
"shutterEffect": "Strobe",
"shutterEffect": "Burst",
"speedStart": "fast",
"speedEnd": "slow",
"comment": "Burst"
"speedEnd": "slow"
},
{
"dmxRange": [245, 255],
Expand Down
18 changes: 6 additions & 12 deletions fixtures/martin/mac-aura.json
View file
Expand Up @@ -139,10 +139,9 @@
{
"dmxRange": [170, 184],
"type": "ShutterStrobe",
"shutterEffect": "Pulse",
"shutterEffect": "Burst",
"speedStart": "fast",
"speedEnd": "slow",
"comment": "Burst",
"menuClick": "center"
},
{
Expand All @@ -154,11 +153,10 @@
{
"dmxRange": [190, 204],
"type": "ShutterStrobe",
"shutterEffect": "Pulse",
"shutterEffect": "Burst",
"speedStart": "fast",
"speedEnd": "slow",
"randomTiming": true,
"comment": "Burst",
"menuClick": "center"
},
{
Expand All @@ -185,10 +183,9 @@
{
"dmxRange": [230, 244],
"type": "ShutterStrobe",
"shutterEffect": "Strobe",
"shutterEffect": "Burst",
"speedStart": "fast",
"speedEnd": "slow",
"comment": "Burst",
"menuClick": "center"
},
{
Expand Down Expand Up @@ -1477,10 +1474,9 @@
{
"dmxRange": [170, 184],
"type": "ShutterStrobe",
"shutterEffect": "Pulse",
"shutterEffect": "Burst",
"speedStart": "fast",
"speedEnd": "slow",
"comment": "Burst",
"menuClick": "center"
},
{
Expand All @@ -1492,11 +1488,10 @@
{
"dmxRange": [190, 204],
"type": "ShutterStrobe",
"shutterEffect": "Pulse",
"shutterEffect": "Burst",
"speedStart": "fast",
"speedEnd": "slow",
"randomTiming": true,
"comment": "Burst",
"menuClick": "center"
},
{
Expand All @@ -1523,10 +1518,9 @@
{
"dmxRange": [230, 244],
"type": "ShutterStrobe",
"shutterEffect": "Strobe",
"shutterEffect": "Burst",
"speedStart": "fast",
"speedEnd": "slow",
"comment": "Burst",
"menuClick": "center"
},
{
Expand Down
9 changes: 4 additions & 5 deletions fixtures/martin/rush-mh-2-wash.json
View file
Expand Up @@ -124,7 +124,7 @@
{
"dmxRange": [170, 184],
"type": "ShutterStrobe",
"shutterEffect": "Strobe",
"shutterEffect": "Burst",
"speedStart": "fast",
"speedEnd": "slow",
"comment": "burst pulse"
Expand All @@ -138,7 +138,7 @@
{
"dmxRange": [190, 204],
"type": "ShutterStrobe",
"shutterEffect": "Strobe",
"shutterEffect": "Burst",
"speedStart": "fast",
"speedEnd": "slow",
"randomTiming": true,
Expand Down Expand Up @@ -167,10 +167,9 @@
{
"dmxRange": [230, 244],
"type": "ShutterStrobe",
"shutterEffect": "Strobe",
"shutterEffect": "Burst",
"speedStart": "fast",
"speedEnd": "slow",
"comment": "burst"
"speedEnd": "slow"
},
{
"dmxRange": [245, 255],
Expand Down
4 changes: 2 additions & 2 deletions fixtures/tmb/solaris-flare.json
View file
Expand Up @@ -192,8 +192,8 @@
},
{
"dmxRange": [241, 245],
"type": "Effect",
"effectName": "Burst",
"type": "ShutterStrobe",
"shutterEffect": "Burst",
"comment": "use rate at full"
},
{
Expand Down
1 change: 1 addition & 0 deletions lib/model/Capability.js
View file
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion plugins/plugins.json
View file
Expand Up @@ -59,7 +59,7 @@
},
"ofl": {
"name": "Open Fixture Library JSON",
"exportPluginVersion": "12.2.2",
"exportPluginVersion": "12.3.0",
"exportTests": []
},
"op-z": {
Expand Down
3 changes: 2 additions & 1 deletion schemas/capability.json
View file
Expand Up @@ -67,7 +67,8 @@
"RampDown",
"RampUpDown",
"Lightning",
"Spikes"
"Spikes",
"Burst"
] },
"soundControlled": { "type": "boolean" },
"speed": { "$ref": "definitions.json#/entities/speed" },
Expand Down
2 changes: 1 addition & 1 deletion schemas/fixture-redirect.json
View file
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion schemas/fixture.json
View file
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion schemas/gobo.json
View file
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion schemas/manufacturers.json
View file
Expand Up @@ -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": {
Expand Down

0 comments on commit 62fb8e7

Please sign in to comment.