Add Burst as new shutter effect (#2094)

JonahKr · FloEdelmann · web-flow · commit 62fb8e774035 · 2021-08-20T13:52:31.000+02:00
Co-authored-by: Flo Edelmann &lt;florian-edelmann@online.de&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": {

Original file line number	Diff line number	Diff line change
`@@ -198,10 +198,9 @@`
`198`	`198`	`{`
`199`	`199`	`"dmxRange": [103, 127],`
`200`	`200`	`"type": "ShutterStrobe",`
`201`		`- "shutterEffect": "Strobe",`
	`201`	`+ "shutterEffect": "Burst",`
`202`	`202`	`"durationStart": "5s",`
`203`		`- "durationEnd": "1s",`
`204`		`- "comment": "Short burst with break"`
	`203`	`+ "durationEnd": "1s"`
`205`	`204`	`},`
`206`	`205`	`{`
`207`	`206`	`"dmxRange": [128, 250],`
Original file line number	Diff line number	Diff line change
`@@ -201,10 +201,9 @@`
`201`	`201`	`{`
`202`	`202`	`"dmxRange": [103, 127],`
`203`	`203`	`"type": "ShutterStrobe",`
`204`		`- "shutterEffect": "Strobe",`
	`204`	`+ "shutterEffect": "Burst",`
`205`	`205`	`"durationStart": "5s",`
`206`		`- "durationEnd": "1s",`
`207`		`- "comment": "Short burst with break"`
	`206`	`+ "durationEnd": "1s"`
`208`	`207`	`},`
`209`	`208`	`{`
`210`	`209`	`"dmxRange": [128, 250],`
Original file line number	Diff line number	Diff line change
`@@ -226,10 +226,9 @@`
`226`	`226`	`{`
`227`	`227`	`"dmxRange": [103, 127],`
`228`	`228`	`"type": "ShutterStrobe",`
`229`		`- "shutterEffect": "Strobe",`
	`229`	`+ "shutterEffect": "Burst",`
`230`	`230`	`"durationStart": "5s",`
`231`		`- "durationEnd": "1s",`
`232`		`- "comment": "Short burst with break"`
	`231`	`+ "durationEnd": "1s"`
`233`	`232`	`},`
`234`	`233`	`{`
`235`	`234`	`"dmxRange": [128, 250],`
Original file line number	Diff line number	Diff line change
`@@ -293,10 +293,9 @@`
`293`	`293`	`{`
`294`	`294`	`"dmxRange": [103, 127],`
`295`	`295`	`"type": "ShutterStrobe",`
`296`		`- "shutterEffect": "Strobe",`
	`296`	`+ "shutterEffect": "Burst",`
`297`	`297`	`"durationStart": "5s",`
`298`		`- "durationEnd": "1s",`
`299`		`- "comment": "Short burst with break"`
	`298`	`+ "durationEnd": "1s"`
`300`	`299`	`},`
`301`	`300`	`{`
`302`	`301`	`"dmxRange": [128, 250],`
Original file line number	Diff line number	Diff line change
`@@ -275,10 +275,9 @@`
`275`	`275`	`{`
`276`	`276`	`"dmxRange": [103, 127],`
`277`	`277`	`"type": "ShutterStrobe",`
`278`		`- "shutterEffect": "Lightning",`
	`278`	`+ "shutterEffect": "Burst",`
`279`	`279`	`"durationStart": "5s",`
`280`		`- "durationEnd": "1s",`
`281`		`- "comment": "Break effect (short burst with break)"`
	`280`	`+ "durationEnd": "1s"`
`282`	`281`	`},`
`283`	`282`	`{`
`284`	`283`	`"dmxRange": [128, 250],`
Original file line number	Diff line number	Diff line change
`@@ -88,10 +88,9 @@`
`88`	`88`	`{`
`89`	`89`	`"dmxRange": [103, 127],`
`90`	`90`	`"type": "ShutterStrobe",`
`91`		`- "shutterEffect": "Strobe",`
	`91`	`+ "shutterEffect": "Burst",`
`92`	`92`	`"durationStart": "5s",`
`93`		`- "durationEnd": "1s",`
`94`		`- "comment": "Break effect: Short burst with break"`
	`93`	`+ "durationEnd": "1s"`
`95`	`94`	`},`
`96`	`95`	`{`
`97`	`96`	`"dmxRange": [128, 250],`
Original file line number	Diff line number	Diff line change
`@@ -192,8 +192,8 @@`
`192`	`192`	`},`
`193`	`193`	`{`
`194`	`194`	`"dmxRange": [241, 245],`
`195`		`- "type": "Effect",`
`196`		`- "effectName": "Burst",`
	`195`	`+ "type": "ShutterStrobe",`
	`196`	`+ "shutterEffect": "Burst",`
`197`	`197`	`"comment": "use rate at full"`
`198`	`198`	`},`
`199`	`199`	`{`