Skip to content

Commit d606b7c

Browse files
authored
Merge pull request #2041 from peternewman/e1.20-2025
Add more TSP slot ID definitions
2 parents ec76778 + 26550cb commit d606b7c

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

common/rdm/RDMHelper.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,12 @@ string SlotInfoToString(uint8_t slot_type, uint16_t slot_label) {
883883
return "Primary, saturation";
884884
case SD_COLOR_ADD_UV:
885885
return "Primary, additive UV";
886+
case SD_CIE_X:
887+
return "Primary, CIE X color coordinate";
888+
case SD_CIE_Y:
889+
return "Primary, CIE Y color coordinate";
890+
case SD_MAGENTA_GREEN_CORRECTION:
891+
return "Primary, CCT magenta-green adjustment";
886892
case SD_STATIC_GOBO_WHEEL:
887893
return "Primary, static gobo wheel";
888894
case SD_ROTO_GOBO_WHEEL:

include/ola/rdm/RDMEnums.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ typedef enum {
177177
PID_INTERFACE_RELEASE_DHCP = 0x0708,
178178
PID_INTERFACE_APPLY_CONFIGURATION = 0x0709,
179179
PID_IPV4_DEFAULT_ROUTE = 0x070A,
180+
// TODO(Peter): AKA DNS_IPV4_NAME_SERVER
180181
PID_DNS_NAME_SERVER = 0x070B,
181182
PID_DNS_HOSTNAME = 0x070C,
182183
PID_DNS_DOMAIN_NAME = 0x070D,
@@ -648,6 +649,9 @@ typedef enum {
648649
SD_COLOR_HUE = 0x0216,
649650
SD_COLOR_SATURATION = 0x0217,
650651
SD_COLOR_ADD_UV = 0x0218,
652+
SD_CIE_X = 0x0219,
653+
SD_CIE_Y = 0x021A,
654+
SD_MAGENTA_GREEN_CORRECTION = 0x021B,
651655
SD_STATIC_GOBO_WHEEL = 0x0301,
652656
SD_ROTO_GOBO_WHEEL = 0x0302,
653657
SD_PRISM_WHEEL = 0x0303,

0 commit comments

Comments
 (0)