Skip to content

Commit f144ba4

Browse files
peternewmanpeternewman
authored
Merge branch 'master' into 0.11-plugfest-fixes
2 parents ff4f5f1 + c6196f7 commit f144ba4

7 files changed

Lines changed: 44 additions & 34 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:

‎common/rdm/ResponderHelper.cpp‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ bool ResponderHelper::ExtractUInt32(const RDMRequest *request,
8181
}
8282

8383
bool ResponderHelper::ExtractString(const RDMRequest *request,
84-
std::string *output,
84+
string *output,
8585
uint8_t max_length) {
8686
if (request->ParamDataSize() > max_length) {
8787
return false;
@@ -965,7 +965,7 @@ RDMResponse *ResponderHelper::GetParamDescription(
965965
uint32_t min_value,
966966
uint32_t default_value,
967967
uint32_t max_value,
968-
const string description,
968+
const string &description,
969969
uint8_t queued_message_count) {
970970
PACK(
971971
struct parameter_description_s {
@@ -1016,11 +1016,11 @@ RDMResponse *ResponderHelper::GetParamDescription(
10161016
}
10171017

10181018
RDMResponse *ResponderHelper::GetASCIIParamDescription(
1019-
const RDMRequest *request,
1020-
uint16_t pid,
1021-
rdm_command_class command_class,
1022-
const string description,
1023-
uint8_t queued_message_count) {
1019+
const RDMRequest *request,
1020+
uint16_t pid,
1021+
rdm_command_class command_class,
1022+
const string &description,
1023+
uint8_t queued_message_count) {
10241024
return GetParamDescription(
10251025
request,
10261026
pid,
@@ -1037,12 +1037,12 @@ RDMResponse *ResponderHelper::GetASCIIParamDescription(
10371037
}
10381038

10391039
RDMResponse *ResponderHelper::GetBitFieldParamDescription(
1040-
const RDMRequest *request,
1041-
uint16_t pid,
1042-
uint8_t pdl_size,
1043-
rdm_command_class command_class,
1044-
const string description,
1045-
uint8_t queued_message_count) {
1040+
const RDMRequest *request,
1041+
uint16_t pid,
1042+
uint8_t pdl_size,
1043+
rdm_command_class command_class,
1044+
const string &description,
1045+
uint8_t queued_message_count) {
10461046
return GetParamDescription(
10471047
request,
10481048
pid,
@@ -1273,7 +1273,7 @@ RDMResponse *ResponderHelper::GetMetadataParameterVersion(
12731273
RDMResponse *ResponderHelper::GetMetadataJSON(
12741274
const RDMRequest *request,
12751275
uint16_t pid,
1276-
const string json,
1276+
const string &json,
12771277
uint8_t queued_message_count) {
12781278
PACK(
12791279
struct metadata_json_s {
@@ -1302,7 +1302,6 @@ RDMResponse *ResponderHelper::GetMetadataJSON(
13021302
queued_message_count);
13031303
}
13041304

1305-
13061305
/**
13071306
* @brief Handle a request that returns a string
13081307
* @note this truncates the string to max_length
@@ -1361,8 +1360,8 @@ RDMResponse *ResponderHelper::SetString(
13611360
}
13621361

13631362
RDMResponse *ResponderHelper::GetBoolValue(const RDMRequest *request,
1364-
bool value,
1365-
uint8_t queued_message_count) {
1363+
bool value,
1364+
uint8_t queued_message_count) {
13661365
if (request->ParamDataSize()) {
13671366
return NackWithReason(request, NR_FORMAT_ERROR, queued_message_count);
13681367
}
@@ -1373,8 +1372,8 @@ RDMResponse *ResponderHelper::GetBoolValue(const RDMRequest *request,
13731372
}
13741373

13751374
RDMResponse *ResponderHelper::SetBoolValue(const RDMRequest *request,
1376-
bool *value,
1377-
uint8_t queued_message_count) {
1375+
bool *value,
1376+
uint8_t queued_message_count) {
13781377
uint8_t arg;
13791378
if (!ResponderHelper::ExtractUInt8(request, &arg)) {
13801379
return NackWithReason(request, NR_FORMAT_ERROR, queued_message_count);
@@ -1390,8 +1389,8 @@ RDMResponse *ResponderHelper::SetBoolValue(const RDMRequest *request,
13901389

13911390
template<typename T>
13921391
static RDMResponse *GenericGetIntValue(const RDMRequest *request,
1393-
T value,
1394-
uint8_t queued_message_count = 0) {
1392+
T value,
1393+
uint8_t queued_message_count = 0) {
13951394
if (request->ParamDataSize()) {
13961395
return NackWithReason(request, NR_FORMAT_ERROR, queued_message_count);
13971396
}
@@ -1427,8 +1426,8 @@ RDMResponse *ResponderHelper::GetUInt32Value(
14271426

14281427
template<typename T>
14291428
static RDMResponse *GenericSetIntValue(const RDMRequest *request,
1430-
T *value,
1431-
uint8_t queued_message_count = 0) {
1429+
T *value,
1430+
uint8_t queued_message_count = 0) {
14321431
if (!GenericExtractValue(request, value)) {
14331432
return NackWithReason(request, NR_FORMAT_ERROR, queued_message_count);
14341433
}

‎debian/ola-rdm-tests.rdm_test_server.service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Unit]
22
Description=Open Lighting Architecture RDM Test Server
3-
Documentation=man:olad(1)
3+
Documentation=man:rdm_test_server.py(1)
44
After=network.target remote-fs.target olad.service
55
Wants=olad.service
66

‎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,

‎include/ola/rdm/ResponderHelper.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,20 +152,20 @@ class ResponderHelper {
152152
uint32_t min_value,
153153
uint32_t default_value,
154154
uint32_t max_value,
155-
const std::string description,
155+
const std::string &description,
156156
uint8_t queued_message_count = 0);
157157
static RDMResponse *GetASCIIParamDescription(
158158
const RDMRequest *request,
159159
uint16_t pid,
160160
rdm_command_class command_class,
161-
const std::string description,
161+
const std::string &description,
162162
uint8_t queued_message_count = 0);
163163
static RDMResponse *GetBitFieldParamDescription(
164164
const RDMRequest *request,
165165
uint16_t pid,
166166
uint8_t pdl_size,
167167
rdm_command_class command_class,
168-
const std::string description,
168+
const std::string &description,
169169
uint8_t queued_message_count = 0);
170170

171171
static RDMResponse *GetRealTimeClock(
@@ -271,7 +271,7 @@ class ResponderHelper {
271271
static RDMResponse *GetMetadataJSON(
272272
const RDMRequest *request,
273273
uint16_t pid,
274-
const std::string json,
274+
const std::string &json,
275275
uint8_t queued_message_count = 0);
276276

277277
// Generic Helpers.

‎plugins/ftdidmx/FtdiWidget.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ void FtdiWidget::Widgets(vector<FtdiWidgetInfo> *widgets) {
193193
std::string::npos != v.find("JMS") ||
194194
std::string::npos != v.find("KMTRONIC") ||
195195
std::string::npos != v.find("KWMATIK") ||
196+
std::string::npos != v.find("NORTLE") ||
196197
std::string::npos != v.find("WWW.SOH.CZ")) {
197198
widgets->push_back(FtdiWidgetInfo(sname,
198199
sserial,

‎tools/rdm/TestDefinitions.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@
3737
RDM_MIN_HOSTNAME_LENGTH,
3838
RDM_NSC_STATUS_ADDITIVE_CHECKSUM_SUPPORTED_VALUE,
3939
RDM_NSC_STATUS_ADDITIVE_CHECKSUM_UNSUPPORTED,
40-
RDM_NSC_STATUS_PACKET_COUNT_SUPPORTED_VALUE,
41-
RDM_NSC_STATUS_PACKET_COUNT_UNSUPPORTED,
42-
RDM_NSC_STATUS_MOST_RECENT_SLOT_COUNT_SUPPORTED_VALUE,
43-
RDM_NSC_STATUS_MOST_RECENT_SLOT_COUNT_UNSUPPORTED,
44-
RDM_NSC_STATUS_MIN_SLOT_COUNT_SUPPORTED_VALUE,
45-
RDM_NSC_STATUS_MIN_SLOT_COUNT_UNSUPPORTED,
4640
RDM_NSC_STATUS_MAX_SLOT_COUNT_SUPPORTED_VALUE,
4741
RDM_NSC_STATUS_MAX_SLOT_COUNT_UNSUPPORTED,
42+
RDM_NSC_STATUS_MIN_SLOT_COUNT_SUPPORTED_VALUE,
43+
RDM_NSC_STATUS_MIN_SLOT_COUNT_UNSUPPORTED,
44+
RDM_NSC_STATUS_MOST_RECENT_SLOT_COUNT_SUPPORTED_VALUE,
45+
RDM_NSC_STATUS_MOST_RECENT_SLOT_COUNT_UNSUPPORTED,
46+
RDM_NSC_STATUS_PACKET_COUNT_SUPPORTED_VALUE,
47+
RDM_NSC_STATUS_PACKET_COUNT_UNSUPPORTED,
4848
RDM_NSC_STATUS_PACKET_ERROR_COUNT_SUPPORTED_VALUE,
4949
RDM_NSC_STATUS_PACKET_ERROR_COUNT_UNSUPPORTED,
5050
RDM_ZERO_FOOTPRINT_DMX_ADDRESS)

0 commit comments

Comments
 (0)