Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions data/pid_data.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
MANUFACTURER_PIDS = [

# Creative Lighting
{'id': 0x00a1,
'name': 'Creative Lighting',
Expand Down Expand Up @@ -125,6 +126,7 @@
'value': 0x8005},
]
},

# ImageCue
{'id': 0x0308,
'name': 'Image Cue',
Expand All @@ -139,6 +141,7 @@
'value': 0x80d0},
]
},

# Ayrton
{'id': 16761,
'name': 'Ayrton',
Expand Down Expand Up @@ -168,6 +171,7 @@
'value': 32771},
],
},

# Clay Paky
{'id': 17232,
'name': 'Clay Paky S.p.A',
Expand Down Expand Up @@ -471,7 +475,7 @@
'get_response': {'items': [{'name': 'anti_blind', 'type': 'bool'}]},
'get_sub_device_range': 2,
'name': 'CP_ANTI_BLIND',
'set_request': {'items': [{'name': 'color_wheel_linear', 'type': 'bool'}]},
'set_request': {'items': [{'name': 'anti_blind', 'type': 'bool'}]},
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great spot! 👍

'set_response': {'items': []},
'set_sub_device_range': 1,
'value': 34327},
Expand Down Expand Up @@ -501,6 +505,7 @@
'value': 34335},
],
},

# City Theatrical
{'id': 0x4354,
'name': 'City Theatrical Inc.',
Expand Down Expand Up @@ -885,7 +890,7 @@
'set_sub_device_range': 0,
'notes': ('Get/Set the factory settings lock. The factory settings '
'lock controls whether factory programmed settings that are '
'not to be changed by the customer can be changed. An '
'not to be changed by the customer can be changed. An '
'example would be RDM UID or MAC addresses.'),
'value': 0x801a},

Expand Down Expand Up @@ -1050,6 +1055,7 @@
'value': 0xc862},
],
},

# JANDS
{'id': 0x4a61,
'name': 'Jands',
Expand Down Expand Up @@ -1217,6 +1223,7 @@
'value': 0x8002},
]
},

# Martin Professional
{'id': 0x4d50,
'name': 'Martin Professional A/S',
Expand Down Expand Up @@ -2514,9 +2521,12 @@
'value': 0x8702},
],
},

# Production Resource Group
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Genuine question, do we think the commented names are worth the effort given it's also in the name field just below, or should we just drop the duplication entirely?

{'id': 20562,
'name': 'Production Resource Group',
'pids': [
# Something is wrong herer, the name Property differs and an Error cant be set via RDM

Check failure on line 2529 in data/pid_data.py

View workflow job for this annotation

GitHub Actions / test (codespell)

cant ==> can't
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Something is wrong herer, the name Property differs and an Error cant be set via RDM
# TODO(Someone): Something is wrong here, the name property differs between get and set

Whilst it would be horrible, there's technically nothing stopping them getting an error state via RDM, just like they'd get the start address. Although sensors/status notifications would probably be better overall.

I fear given the context, it might be the set aspect that's wrong, given the PID name matches too...

{'get_request': {'items': []},
'get_response': {'items': [{'name': 'fan_error_status', 'type': 'uint8',
'labels': [(0, 'No Error'),
Expand Down Expand Up @@ -2651,7 +2661,7 @@
}]},
'get_sub_device_range': 0,
'name': 'ZOOM_TYPE',
'set_request': {'items': [{'name': 'followspot_control', 'type': 'uint8',
'set_request': {'items': [{'name': 'zoom_type', 'type': 'uint8',
Comment on lines -2654 to +2664
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's technically nothing wrong with this, given the PID name, but I agree what you've got is likely clearer...

'labels': [(0, 'Fast'), (1, 'In Focus')],
}]},
'set_response': {'items': []},
Expand Down Expand Up @@ -2680,7 +2690,7 @@
'set_sub_device_range': 0,
'value': 34337},
{'name': 'ZERO_GOBO_WHEELS',
'set_request': {'items': [{'name': 'followspot_control', 'type': 'bool'}]},
'set_request': {'items': [{'name': 'followspot_control_gobo_wheels', 'type': 'bool'}]},
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we change this to gobo_wheels or zero_gobo_wheels too and drop the followspot_control bit again?

'set_response': {'items': []},
'set_sub_device_range': 0,
'value': 34368},
Expand All @@ -2699,6 +2709,7 @@
'value': 36864},
],
},

# SWISSON AG
{'id': 0x5377,
'name': 'SWISSON AG',
Expand All @@ -2715,6 +2726,8 @@
},
],
},

# Wireless Solutions
{'id': 0x5753,
'name': 'Wireless Solutions',
'pids': [{'name': 'WDMX_LOGIN',
Expand Down Expand Up @@ -2916,6 +2929,8 @@
'value': 33792}
]
},

# Open Lighting
{'id': 0x7a70,
'name': 'Open Lighting',
'pids': [
Expand Down Expand Up @@ -2993,6 +3008,8 @@
'value': 0x8006},
],
},

# Stellascapes
{'id': 0x2dc8,
'name': 'Stellascapes',
'pids': [
Expand Down Expand Up @@ -3050,6 +3067,8 @@
'value': 0x8006},
],
},

# Soundlight
{'id': 21324,
'name': 'Soundlight',
'pids': [
Expand Down Expand Up @@ -3252,6 +3271,8 @@
'value': 0xdccd},
]
},

# Lumen Radio
{'id': 0x4c55,
'name': 'Lumen Radio',
'pids': [
Expand Down Expand Up @@ -3330,8 +3351,10 @@
'value': 0x8102},
],
},

# Robe Lighting s.r.o.
{'id': 0x5253,
'name': 'robe',
'name': 'Robe Lighting s.r.o.',
'pids': [
{'get_request': {'items': []},
'get_response': {'items': [{'labels': [(0, 'Wired'),
Expand Down Expand Up @@ -3454,6 +3477,8 @@
'value': 40975},
],
},

# ETC
{'id': 0x6574,
'name': 'ETC',
'pids': [
Expand Down Expand Up @@ -3929,6 +3954,8 @@
'value': 0xf000},
],
},

# GDS
{'id': 0x3434,
'name': 'GDS',
'pids': [
Expand Down
Loading