Merge branch 'master' into patch-1

Author: peternewman

data/manufacturer_data.py

@@ -185,6 +185,7 @@
 (0x05D3, "D-LED Illumination Technologies Ltd."),
 (0x05EF, "Guangzhou Chai Yi Light Co., Ltd."),
 (0x05F7, "Immersive Design Studios Inc. "),
+(0x0606, "Guangzhou YiGuang Stage Lighting Co., Ltd."),
 (0x0609, "Diginet Control Systems Pty Ltd"),
 (0x060A, "Kindwin Opto Electronic (ShenZhen) Co. Ltd"),
 (0x060B, "Lighting Science Group (formerly LED Effects, Inc.)"),

data/pid_data.py

@@ -4394,7 +4394,52 @@
                            (0x06, 'Secondary rotation speed'),
                            (0x07, 'Secondary rotation index'),
                            (0xff, 'Secondary undefined')]},
-               {'name': 'slot_label_id', 'type': 'uint16'}],
+               {'name': 'slot_label_id',
+                'type': 'uint16',
+                'range': [(0, 0xffdf), (0xffff, 0xffff)],
+                'labels': [(0x0001, 'Intensity'),
+                           (0x0002, 'Intensity Master'),
+                           (0x0101, 'Pan'),
+                           (0x0102, 'Tilt'),
+                           (0x0201, 'Color Wheel'),
+                           (0x0202, 'Subtractive Color Mixer - Cyan/Blue'),
+                           (0x0203, 'Subtractive Color Mixer - Yellow/Amber'),
+                           (0x0204, 'Subtractive Color Mixer - Magenta'),
+                           (0x0205, 'Additive Color Mixer - Red'),
+                           (0x0206, 'Additive Color Mixer - Green'),
+                           (0x0207, 'Additive Color Mixer - Blue'),
+                           (0x0208, 'Color Temperature Correction'),
+                           (0x0209, 'Color Scroll'),
+                           (0x0210, 'Color Semaphore'),
+                           (0x0211, 'Additive Color Mixer - Amber'),
+                           (0x0212, 'Additive Color Mixer - White'),
+                           (0x0213, 'Additive Color Mixer - Warm White'),
+                           (0x0214, 'Additive Color Mixer - Cool White'),
+                           (0x0215, 'Subtractive Color Mixer - UV'),
+                           (0x0216, 'Hue'),
+                           (0x0217, 'Saturation'),
+                           (0x0301, 'Static gobo wheel'),
+                           (0x0302, 'Rotating gobo wheel'),
+                           (0x0303, 'Prism wheel'),
+                           (0x0304, 'Effects wheel'),
+                           (0x0401, 'Beam size iris'),
+                           (0x0402, 'Edge/Lens focus'),
+                           (0x0403, 'Frost/Diffusion'),
+                           (0x0404, 'Strobe/Shutter'),
+                           (0x0405, 'Zoom lens'),
+                           (0x0406, 'Framing shutter'),
+                           (0x0407, 'Framing shutter rotation'),
+                           (0x0408, 'Douser'),
+                           (0x0409, 'Barn Door'),
+                           (0x0501, 'Lamp control functions'),
+                           (0x0502, 'Fixture control channel'),
+                           (0x0503, 'Overall speed setting applied to multiple or all parameters'),
+                           (0x0504, 'Macro control'),
+                           (0x0505, 'Relay or power control'),
+                           (0x0506, 'Fan control'),
+                           (0x0507, 'Heater control'),
+                           (0x0508, 'Fountain water pump control'),
+                           (0xFFFF, 'No definition')]}],
     }]},
   'get_sub_device_range': 2,
   'name': 'SLOT_INFO',