Skip to content

Commit 53215b8

Browse files
anselanzaanselanza
committed
Adding beamsplit macro
1 parent 91e6ec7 commit 53215b8

4 files changed

Lines changed: 171 additions & 42 deletions

File tree

‎example.project.json‎

Lines changed: 151 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
"label": "ambience",
3131
"state": {
3232
"Hero Left": {
33+
"beamsplit": {
34+
"ControlValue": 10000
35+
},
3336
"brightness": {
3437
"ControlValue": 46000
3538
},
@@ -52,6 +55,9 @@
5255
}
5356
},
5457
"Hero Right": {
58+
"beamsplit": {
59+
"ControlValue": 8000
60+
},
5561
"brightness": {
5662
"ControlValue": 65535
5763
},
@@ -74,9 +80,6 @@
7480
}
7581
},
7682
"Hex Left": {
77-
"Brightness": {
78-
"ControlValue": 35000
79-
},
8083
"Colour": {
8184
"ColourValue": [
8285
255,
@@ -85,20 +88,20 @@
8588
255
8689
]
8790
},
88-
"Pan": {
91+
"brightness": {
92+
"ControlValue": 35000
93+
},
94+
"pan": {
8995
"ControlValue": 17544
9096
},
91-
"Tilt": {
97+
"tilt": {
9298
"ControlValue": 0
9399
},
94-
"Zoom": {
100+
"zoom": {
95101
"ControlValue": 22189
96102
}
97103
},
98104
"Hex Right": {
99-
"Brightness": {
100-
"ControlValue": 41000
101-
},
102105
"Colour": {
103106
"ColourValue": [
104107
255,
@@ -107,13 +110,16 @@
107110
255
108111
]
109112
},
110-
"Pan": {
113+
"brightness": {
114+
"ControlValue": 41000
115+
},
116+
"pan": {
111117
"ControlValue": 25801
112118
},
113-
"Tilt": {
119+
"tilt": {
114120
"ControlValue": 0
115121
},
116-
"Zoom": {
122+
"zoom": {
117123
"ControlValue": 0
118124
}
119125
}
@@ -123,6 +129,9 @@
123129
"label": "speaker",
124130
"state": {
125131
"Hero Left": {
132+
"beamsplit": {
133+
"ControlValue": 10000
134+
},
126135
"brightness": {
127136
"ControlValue": 65535
128137
},
@@ -145,6 +154,9 @@
145154
}
146155
},
147156
"Hero Right": {
157+
"beamsplit": {
158+
"ControlValue": 5000
159+
},
148160
"brightness": {
149161
"ControlValue": 65535
150162
},
@@ -167,9 +179,6 @@
167179
}
168180
},
169181
"Hex Left": {
170-
"Brightness": {
171-
"ControlValue": 35000
172-
},
173182
"Colour": {
174183
"ColourValue": [
175184
255,
@@ -178,20 +187,20 @@
178187
255
179188
]
180189
},
181-
"Pan": {
190+
"brightness": {
191+
"ControlValue": 35000
192+
},
193+
"pan": {
182194
"ControlValue": 13932
183195
},
184-
"Tilt": {
196+
"tilt": {
185197
"ControlValue": 25801
186198
},
187-
"Zoom": {
199+
"zoom": {
188200
"ControlValue": 65535
189201
}
190202
},
191203
"Hex Right": {
192-
"Brightness": {
193-
"ControlValue": 65535
194-
},
195204
"Colour": {
196205
"ColourValue": [
197206
255,
@@ -200,13 +209,16 @@
200209
255
201210
]
202211
},
203-
"Pan": {
212+
"brightness": {
213+
"ControlValue": 65535
214+
},
215+
"pan": {
204216
"ControlValue": 29413
205217
},
206-
"Tilt": {
218+
"tilt": {
207219
"ControlValue": 26317
208220
},
209-
"Zoom": {
221+
"zoom": {
210222
"ControlValue": 41797
211223
}
212224
}
@@ -216,6 +228,9 @@
216228
"label": "white down",
217229
"state": {
218230
"Hero Left": {
231+
"beamsplit": {
232+
"ControlValue": 0
233+
},
219234
"brightness": {
220235
"ControlValue": 65535
221236
},
@@ -238,6 +253,9 @@
238253
}
239254
},
240255
"Hero Right": {
256+
"beamsplit": {
257+
"ControlValue": 0
258+
},
241259
"brightness": {
242260
"ControlValue": 65535
243261
},
@@ -260,9 +278,6 @@
260278
}
261279
},
262280
"Hex Left": {
263-
"Brightness": {
264-
"ControlValue": 65535
265-
},
266281
"Colour": {
267282
"ColourValue": [
268283
255,
@@ -271,20 +286,97 @@
271286
255
272287
]
273288
},
274-
"Pan": {
289+
"brightness": {
290+
"ControlValue": 65535
291+
},
292+
"pan": {
275293
"ControlValue": 0
276294
},
277-
"Tilt": {
295+
"tilt": {
278296
"ControlValue": 34057
279297
},
280-
"Zoom": {
298+
"zoom": {
281299
"ControlValue": 38701
282300
}
283301
},
284302
"Hex Right": {
285-
"Brightness": {
303+
"Colour": {
304+
"ColourValue": [
305+
255,
306+
255,
307+
224,
308+
255
309+
]
310+
},
311+
"brightness": {
286312
"ControlValue": 65535
287313
},
314+
"pan": {
315+
"ControlValue": 0
316+
},
317+
"tilt": {
318+
"ControlValue": 31993
319+
},
320+
"zoom": {
321+
"ControlValue": 31477
322+
}
323+
}
324+
}
325+
},
326+
{
327+
"label": "Beamsplitting",
328+
"state": {
329+
"Hero Left": {
330+
"beamsplit": {
331+
"ControlValue": 13000
332+
},
333+
"brightness": {
334+
"ControlValue": 65535
335+
},
336+
"colour": {
337+
"ColourValue": [
338+
0,
339+
0,
340+
0,
341+
0
342+
]
343+
},
344+
"pan": {
345+
"ControlValue": 35089
346+
},
347+
"tilt": {
348+
"ControlValue": 38185
349+
},
350+
"zoom": {
351+
"ControlValue": 65535
352+
}
353+
},
354+
"Hero Right": {
355+
"beamsplit": {
356+
"ControlValue": 13000
357+
},
358+
"brightness": {
359+
"ControlValue": 37669
360+
},
361+
"colour": {
362+
"ColourValue": [
363+
0,
364+
0,
365+
0,
366+
0
367+
]
368+
},
369+
"pan": {
370+
"ControlValue": 26317
371+
},
372+
"tilt": {
373+
"ControlValue": 35605
374+
},
375+
"zoom": {
376+
"ControlValue": 65535
377+
}
378+
},
379+
"Hex Left": {
288380
"Colour": {
289381
"ColourValue": [
290382
255,
@@ -293,13 +385,38 @@
293385
255
294386
]
295387
},
296-
"Pan": {
388+
"brightness": {
389+
"ControlValue": 0
390+
},
391+
"pan": {
297392
"ControlValue": 0
298393
},
299-
"Tilt": {
394+
"tilt": {
395+
"ControlValue": 34057
396+
},
397+
"zoom": {
398+
"ControlValue": 38701
399+
}
400+
},
401+
"Hex Right": {
402+
"Colour": {
403+
"ColourValue": [
404+
255,
405+
255,
406+
224,
407+
255
408+
]
409+
},
410+
"brightness": {
411+
"ControlValue": 65535
412+
},
413+
"pan": {
414+
"ControlValue": 0
415+
},
416+
"tilt": {
300417
"ControlValue": 31993
301418
},
302-
"Zoom": {
419+
"zoom": {
303420
"ControlValue": 31477
304421
}
305422
}

‎fixtures/ADJ_Vizi_Hex_Wash7.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,25 +343,25 @@
343343
},
344344
{
345345
"control": {
346-
"label": "Brightness",
346+
"label": "brightness",
347347
"channels": [{ "HiRes": [19, 20] }]
348348
}
349349
},
350350
{
351351
"control": {
352-
"label": "Pan",
352+
"label": "pan",
353353
"channels": [{ "HiRes": [1, 2] }]
354354
}
355355
},
356356
{
357357
"control": {
358-
"label": "Tilt",
358+
"label": "tilt",
359359
"channels": [{ "HiRes": [3, 4] }]
360360
}
361361
},
362362
{
363363
"control": {
364-
"label": "Zoom",
364+
"label": "zoom",
365365
"channels": [{ "LoRes": 21 }]
366366
}
367367
}

‎fixtures/Varytec_HERO_340FX.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,12 @@
203203
"label": "zoom",
204204
"channels": [{ "LoRes": 14 }]
205205
}
206+
},
207+
{
208+
"control": {
209+
"label": "beamsplit",
210+
"channels": [{ "LoRes": 15 }]
211+
}
206212
}
207213
]
208214
}

0 commit comments

Comments
 (0)