Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix GDTF fine channel parsing #3574

Merged
merged 2 commits into from Oct 24, 2023
Merged

Fix GDTF fine channel parsing #3574

merged 2 commits into from Oct 24, 2023

Conversation

FloEdelmann
Copy link
Member

Fixes #3545.

@FloEdelmann FloEdelmann added bug Something doesn't work as intended. component-plugin Affects one or more import or export plugins. labels Oct 24, 2023
@FloEdelmann FloEdelmann enabled auto-merge (squash) October 24, 2023 21:36
@github-actions
Copy link

Plugin export diff

(Output of test script tests/github/export-diff.js.)

You can view your uncommitted changes in plugin exports manually by executing:
$ node cli/diff-plugin-outputs.js -p <plugin-key> [-c <compare-plugin-key>] <fixtures>

🆚 cameo/hydrabeam-400-rgbw: aglight
Changed outputted file aglight_fixture_library.json 
--- removed
+++ added
@@ -3,9 +3,9 @@
   "fixtures": [
     {
       "$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/master/schemas/fixture.json",
       "name": "Hydrabeam 400 RGBW",
-      "shortName": "CLHB400W RGBW",
+      "shortName": "CLHB400RGBW",
       "categories": ["Moving Head", "Color Changer"],
       "meta": {
         "authors": ["ashmotif200", "Luke Nelson"],
         "createDate": "2023-10-24",
💤 cameo/hydrabeam-400-rgbw: color-chief Outputted files not changed.
💤 cameo/hydrabeam-400-rgbw: colorsource Outputted files not changed.
💤 cameo/hydrabeam-400-rgbw: d-light Outputted files not changed.
💤 cameo/hydrabeam-400-rgbw: dmxcontrol3 Outputted files not changed.
🆚 cameo/hydrabeam-400-rgbw: dragonframe
Changed outputted file cameo/hydrabeam-400-rgbw.json 
--- removed
+++ added
@@ -1,8 +1,8 @@
 {
   "$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/schema-12.2.1/schemas/fixture.json",
   "name": "Hydrabeam 400 RGBW",
-  "shortName": "CLHB400W RGBW",
+  "shortName": "CLHB400RGBW",
   "categories": ["Moving Head", "Color Changer"],
   "meta": {
     "authors": ["ashmotif200", "Luke Nelson"],
     "createDate": "2023-10-24",
🆚 cameo/hydrabeam-400-rgbw: ecue
Changed outputted file UserLibrary.xml 
--- removed
+++ added
@@ -2,9 +2,9 @@
 <Document Owner="user" TypeVersion="2" SaveTimeStamp="2023-10-24#21:37:32">
     <Library>
         <Fixtures>
             <Manufacturer _CreationDate="2023-10-24#21:37:32" _ModifiedDate="2023-10-24#21:37:32" Name="cameo" Comment="" Web="https://www.cameolight.com/">
-                <Fixture _CreationDate="2023-10-24#00:00:00" _ModifiedDate="2023-10-24#00:00:00" Name="Hydrabeam 400 RGBW (6ch mode)" NameShort="CLHB400W RGBW-6ch" Comment="generated by the Open Fixture Library – https://open-fixture-library.org/cameo/hydrabeam-400-rgbw" AllocateDmxChannels="6" Weight="7.5" Power="100" DimWidth="810" DimHeight="250" DimDepth="130">
+                <Fixture _CreationDate="2023-10-24#00:00:00" _ModifiedDate="2023-10-24#00:00:00" Name="Hydrabeam 400 RGBW (6ch mode)" NameShort="CLHB400RGBW-6ch" Comment="generated by the Open Fixture Library – https://open-fixture-library.org/cameo/hydrabeam-400-rgbw" AllocateDmxChannels="6" Weight="7.5" Power="100" DimWidth="810" DimHeight="250" DimDepth="130">
                     <ChannelIntensity Name="Dimmer All" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1">
                         <Range Name="Intensity off…bright" Start="0" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelIntensity>
                     <ChannelBeam Name="Strobe All" DefaultValue="0" Highlight="200" Deflection="0" DmxByte0="2" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="2">
@@ -55,9 +55,9 @@
                     <ChannelBeam Name="Auto color change speed" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="6" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="6">
                         <Range Name="Effect speed slow…fast" Start="0" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelBeam>
                 </Fixture>
-                <Fixture _CreationDate="2023-10-24#00:00:00" _ModifiedDate="2023-10-24#00:00:00" Name="Hydrabeam 400 RGBW (10ch mode)" NameShort="CLHB400W RGBW-10ch" Comment="generated by the Open Fixture Library – https://open-fixture-library.org/cameo/hydrabeam-400-rgbw" AllocateDmxChannels="10" Weight="7.5" Power="100" DimWidth="810" DimHeight="250" DimDepth="130">
+                <Fixture _CreationDate="2023-10-24#00:00:00" _ModifiedDate="2023-10-24#00:00:00" Name="Hydrabeam 400 RGBW (10ch mode)" NameShort="CLHB400RGBW-10ch" Comment="generated by the Open Fixture Library – https://open-fixture-library.org/cameo/hydrabeam-400-rgbw" AllocateDmxChannels="10" Weight="7.5" Power="100" DimWidth="810" DimHeight="250" DimDepth="130">
                     <ChannelFocus Name="Pan All" DefaultValue="32767" Highlight="65535" Deflection="0" DmxByte0="1" DmxByte1="9" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1">
                         <Range Name="Pan 0…540°" Start="0" End="65535" AutoMenu="1" Centre="0"/>
                     </ChannelFocus>
                     <ChannelFocus Name="Tilt All" DefaultValue="32767" Highlight="65535" Deflection="0" DmxByte0="2" DmxByte1="10" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="2">
@@ -114,9 +114,9 @@
                     <ChannelBeam Name="Auto color change speed" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="8" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="8">
                         <Range Name="Effect speed slow…fast" Start="0" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelBeam>
                 </Fixture>
-                <Fixture _CreationDate="2023-10-24#00:00:00" _ModifiedDate="2023-10-24#00:00:00" Name="Hydrabeam 400 RGBW (19ch mode)" NameShort="CLHB400W RGBW-19ch" Comment="generated by the Open Fixture Library – https://open-fixture-library.org/cameo/hydrabeam-400-rgbw" AllocateDmxChannels="19" Weight="7.5" Power="100" DimWidth="810" DimHeight="250" DimDepth="130">
+                <Fixture _CreationDate="2023-10-24#00:00:00" _ModifiedDate="2023-10-24#00:00:00" Name="Hydrabeam 400 RGBW (19ch mode)" NameShort="CLHB400RGBW-19ch" Comment="generated by the Open Fixture Library – https://open-fixture-library.org/cameo/hydrabeam-400-rgbw" AllocateDmxChannels="19" Weight="7.5" Power="100" DimWidth="810" DimHeight="250" DimDepth="130">
                     <ChannelIntensity Name="Dimmer All" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1">
                         <Range Name="Intensity off…bright" Start="0" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelIntensity>
                     <ChannelBeam Name="Strobe All" DefaultValue="0" Highlight="200" Deflection="0" DmxByte0="2" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="2">
@@ -174,9 +174,9 @@
                     <ChannelBeam Name="Head Speed" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="19" DmxByte1="0" Constant="0" Crossfade="1" Invert="1" Precedence="LTP" ClassicPos="19">
                         <Range Name="Pan/tilt movement fast…slow" Start="0" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelBeam>
                 </Fixture>
-                <Fixture _CreationDate="2023-10-24#00:00:00" _ModifiedDate="2023-10-24#00:00:00" Name="Hydrabeam 400 RGBW (32ch mode)" NameShort="CLHB400W RGBW-32ch" Comment="generated by the Open Fixture Library – https://open-fixture-library.org/cameo/hydrabeam-400-rgbw" AllocateDmxChannels="32" Weight="7.5" Power="100" DimWidth="810" DimHeight="250" DimDepth="130">
+                <Fixture _CreationDate="2023-10-24#00:00:00" _ModifiedDate="2023-10-24#00:00:00" Name="Hydrabeam 400 RGBW (32ch mode)" NameShort="CLHB400RGBW-32ch" Comment="generated by the Open Fixture Library – https://open-fixture-library.org/cameo/hydrabeam-400-rgbw" AllocateDmxChannels="32" Weight="7.5" Power="100" DimWidth="810" DimHeight="250" DimDepth="130">
                     <ChannelIntensity Name="Dimmer All" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1">
                         <Range Name="Intensity off…bright" Start="0" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelIntensity>
                     <ChannelBeam Name="Strobe All" DefaultValue="0" Highlight="200" Deflection="0" DmxByte0="2" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="2">
@@ -316,9 +316,9 @@
                     <ChannelColor Name="White All" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="32" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="24">
                         <Range Name="White off…bright" Start="0" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelColor>
                 </Fixture>
-                <Fixture _CreationDate="2023-10-24#00:00:00" _ModifiedDate="2023-10-24#00:00:00" Name="Hydrabeam 400 RGBW (56ch mode)" NameShort="CLHB400W RGBW-56ch" Comment="generated by the Open Fixture Library – https://open-fixture-library.org/cameo/hydrabeam-400-rgbw" AllocateDmxChannels="56" Weight="7.5" Power="100" DimWidth="810" DimHeight="250" DimDepth="130">
+                <Fixture _CreationDate="2023-10-24#00:00:00" _ModifiedDate="2023-10-24#00:00:00" Name="Hydrabeam 400 RGBW (56ch mode)" NameShort="CLHB400RGBW-56ch" Comment="generated by the Open Fixture Library – https://open-fixture-library.org/cameo/hydrabeam-400-rgbw" AllocateDmxChannels="56" Weight="7.5" Power="100" DimWidth="810" DimHeight="250" DimDepth="130">
                     <ChannelFocus Name="Pan 1" DefaultValue="32767" Highlight="65535" Deflection="0" DmxByte0="1" DmxByte1="2" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1">
                         <Range Name="Pan 0…540°" Start="0" End="65535" AutoMenu="1" Centre="0"/>
                     </ChannelFocus>
                     <ChannelFocus Name="Tilt 1" DefaultValue="32767" Highlight="65535" Deflection="0" DmxByte0="3" DmxByte1="4" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="2">
🆚 cameo/hydrabeam-400-rgbw: millumin
Changed outputted file cameo/hydrabeam-400-rgbw.json 
--- removed
+++ added
@@ -1,8 +1,8 @@
 {
   "$schema": "https://raw.githubusercontent.com/OpenLightingProject/open-fixture-library/schema-7.3.0/schemas/fixture.json",
   "name": "Hydrabeam 400 RGBW",
-  "shortName": "CLHB400W RGBW",
+  "shortName": "CLHB400RGBW",
   "categories": ["Moving Head", "Color Changer"],
   "meta": {
     "authors": ["ashmotif200", "Luke Nelson"],
     "createDate": "2023-10-24",
💤 cameo/hydrabeam-400-rgbw: op-z Outputted files not changed.
💤 cameo/hydrabeam-400-rgbw: qlcplus_4.12.2 Outputted files not changed.

@github-actions
Copy link

Export files validity

(Output of test script tests/github/exports-valid.js.)

Test the exported files of selected fixtures against the plugins' export tests.
You can run a plugin's export tests by executing:
$ node cli/run-export-test.js -p <plugin name> <fixtures>

❌ cameo / hydrabeam-400-rgbw: d-light / attributes-correctness
  • ✔️ cameo/hydrabeam-400-rgbw-6ch.xml
  • ✔️ cameo/hydrabeam-400-rgbw-10ch.xml
  • ❌ cameo/hydrabeam-400-rgbw-19ch.xmlError parsing XML: Duplicate parameter name: FOCUS/PAN,Duplicate parameter name: FOCUS/TILT,Duplicate parameter name: FOCUS/PAN,Duplicate parameter name: FOCUS/TILT,Duplicate parameter name: FOCUS/PAN,Duplicate parameter name: FOCUS/TILT
  • ❌ cameo/hydrabeam-400-rgbw-32ch.xmlError parsing XML: Duplicate parameter name: FOCUS/PAN,Duplicate parameter name: FOCUS/TILT,Duplicate parameter name: FOCUS/PAN,Duplicate parameter name: FOCUS/TILT,Duplicate parameter name: FOCUS/PAN,Duplicate parameter name: FOCUS/TILT
  • ❌ cameo/hydrabeam-400-rgbw-56ch.xmlError parsing XML: Duplicate parameter name: FOCUS/PAN,Duplicate parameter name: FOCUS/TILT,Duplicate parameter name: FOCUS/PAN,Duplicate parameter name: FOCUS/TILT,Duplicate parameter name: FOCUS/PAN,Duplicate parameter name: FOCUS/TILT
✔️ cameo / hydrabeam-400-rgbw: dmxcontrol3 / channel-numbers
  • ✔️ cameo-hydrabeam-400-rgbw-6ch.xml
  • ✔️ cameo-hydrabeam-400-rgbw-10ch.xml
  • ✔️ cameo-hydrabeam-400-rgbw-19ch.xml
  • ✔️ cameo-hydrabeam-400-rgbw-32ch.xml
  • ✔️ cameo-hydrabeam-400-rgbw-56ch.xml
✔️ cameo / hydrabeam-400-rgbw: dragonframe / json-schema-conformity
  • ✔️ cameo/hydrabeam-400-rgbw.json
  • ✔️ manufacturers.json
✔️ cameo / hydrabeam-400-rgbw: millumin / json-schema-conformity
  • ✔️ cameo/hydrabeam-400-rgbw.json
✔️ cameo / hydrabeam-400-rgbw: qlcplus_4.12.2 / fixture-tool-validation
  • ✔️ fixtures/cameo-Hydrabeam-400-RGBW.qxf
✔️ cameo / hydrabeam-400-rgbw: qlcplus_4.12.2 / xsd-schema-conformity
  • ✔️ fixtures/cameo-Hydrabeam-400-RGBW.qxf

@FloEdelmann FloEdelmann merged commit 0301ca1 into master Oct 24, 2023
4 checks passed
@FloEdelmann FloEdelmann deleted the fix-gdtf-parser branch October 24, 2023 21:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bug Something doesn't work as intended. component-plugin Affects one or more import or export plugins.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

GDTF parsing error
1 participant
@FloEdelmann