From d2d622d60504f254c0b4b0a02af90e555e1a1b6a Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Sat, 8 Nov 2025 18:51:57 +0100 Subject: [PATCH 1/2] Update manufacturers.json via editor [skip ci] --- fixtures/manufacturers.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fixtures/manufacturers.json b/fixtures/manufacturers.json index 40c0a272cc..c0bec60ff7 100644 --- a/fixtures/manufacturers.json +++ b/fixtures/manufacturers.json @@ -20,6 +20,9 @@ "name": "AFX", "website": "https://lotronic.net/gb/brand/15-afx" }, + "aladin": { + "name": "ALADIN" + }, "alien-pro": { "name": "Alien Pro", "website": "http://alienpro.com.mx/" From 3251575d0b0372ef112a61ca00a0e3ca4f53ab54 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Sat, 8 Nov 2025 18:51:58 +0100 Subject: [PATCH 2/2] Add fixture `aladin/beam-mari` via editor --- fixtures/aladin/beam-mari.json | 159 +++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 fixtures/aladin/beam-mari.json diff --git a/fixtures/aladin/beam-mari.json b/fixtures/aladin/beam-mari.json new file mode 100644 index 0000000000..c1e047cc25 --- /dev/null +++ b/fixtures/aladin/beam-mari.json @@ -0,0 +1,159 @@ +{ + "$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json", + "name": "BEAM MARI", + "categories": ["Moving Head"], + "meta": { + "authors": ["ALADIN"], + "createDate": "2025-11-08", + "lastModifyDate": "2025-11-08" + }, + "links": { + "video": [ + "https://www.youtube.com/watch?v=kAYCj8_C6_I&list=RDkAYCj8_C6_I&start_radio=1" + ] + }, + "wheels": { + "Color Wheel": { + "slots": [ + { + "type": "Open" + } + ] + } + }, + "availableChannels": { + "Color Wheel": { + "capability": { + "type": "WheelSlot", + "slotNumber": 1 + } + }, + "Strobe": { + "capability": { + "type": "ShutterStrobe", + "shutterEffect": "Open" + } + }, + "Dimmer": { + "precedence": "HTP", + "capability": { + "type": "Intensity" + } + }, + "Reserved": { + "capability": { + "type": "NoFunction" + } + }, + "Prism": { + "capability": { + "type": "Prism" + } + }, + "Prism Rotation": { + "capability": { + "type": "PrismRotation" + } + }, + "Reserved 2": { + "name": "Reserved", + "capability": { + "type": "NoFunction" + } + }, + "No function": { + "capability": { + "type": "NoFunction" + } + }, + "Focus": { + "capability": { + "type": "Focus", + "distanceStart": "near", + "distanceEnd": "far" + } + }, + "Pan": { + "capability": { + "type": "Pan", + "angle": "1deg" + } + }, + "Pan 2": { + "name": "Pan", + "fineChannelAliases": ["Pan 2 fine"], + "capability": { + "type": "PanContinuous" + } + }, + "Tilt": { + "capability": { + "type": "Tilt", + "angle": "250deg" + } + }, + "Pan/Tilt Duration": { + "capability": { + "type": "PanTiltSpeed", + "speedStart": "fast", + "speedEnd": "slow" + } + }, + "Tilt 2": { + "name": "Tilt", + "capability": { + "type": "Tilt", + "angle": "250deg" + } + }, + "Pan/Tilt Duration 2": { + "name": "Pan/Tilt Duration", + "fineChannelAliases": ["Pan/Tilt Duration 2 fine"], + "capability": { + "type": "Pan", + "angle": "250deg" + } + }, + "Pan/Tilt Speed": { + "capability": { + "type": "PanTiltSpeed", + "speed": "fast" + } + }, + "Reserved 3": { + "name": "Reserved", + "capability": { + "type": "Generic" + } + }, + "Reserved 4": { + "name": "Reserved", + "capability": { + "type": "Generic" + } + } + }, + "modes": [ + { + "name": "BEAM MARI", + "channels": [ + "Color Wheel", + "Strobe", + "Dimmer", + "Reserved", + "Prism", + "Prism Rotation", + "Reserved 2", + "No function", + "Focus", + "Pan", + "Pan/Tilt Duration", + "Tilt 2", + "Pan/Tilt Duration 2", + "Pan/Tilt Speed", + "Reserved 3", + "Reserved 4" + ] + } + ] +}