From 56e22cf351247337d0ba3f84504f8b796c48d605 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 14 Oct 2024 22:00:40 +0100 Subject: [PATCH 1/6] Check if an interface is listed multiple times in LIST_INTERFACES --- tools/rdm/TestDefinitions.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/rdm/TestDefinitions.py b/tools/rdm/TestDefinitions.py index 68069ea35..fd8240ffd 100644 --- a/tools/rdm/TestDefinitions.py +++ b/tools/rdm/TestDefinitions.py @@ -7225,9 +7225,11 @@ def VerifyResult(self, response, fields): return interfaces = [] + count_by_interface = {} for interface in fields['interfaces']: interface_id = interface['interface_identifier'] + count_by_interface[interface_id] = count_by_interface.get(interface_id, 0) + 1 if (interface_id < RDM_INTERFACE_INDEX_MIN or interface_id > RDM_INTERFACE_INDEX_MAX): self.AddWarning('Interface index %d is outside allowed range (%d to ' @@ -7242,6 +7244,12 @@ def VerifyResult(self, response, fields): 'interface %d' % (interface['interface_hardware_type'], interface_id)) + # Check for duplicate interfaces + for interface, count in count_by_interface.items(): + if count > 1: + self.AddAdvisory('Interface %s listed %d times in list interfaces' % + (interface, count)) + self.SetProperty(self.PROVIDES[0], interfaces) From 12b62974d585969c8957de5cea2e79ea3b9f70e3 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 16 Nov 2024 23:18:17 +0000 Subject: [PATCH 2/6] Update an OSC link --- plugins/osc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/osc/README.md b/plugins/osc/README.md index 6a16251da..656edd4fc 100644 --- a/plugins/osc/README.md +++ b/plugins/osc/README.md @@ -2,7 +2,7 @@ OSC (Open Sound Control) Plugin =============================== This plugin allows OLA to send and receive -[OSC](http://www.opensoundcontrol.org/) messages. +[OSC](https://opensoundcontrol.stanford.edu/) messages. OLA uses the blob type for transporting DMX data. From 9ea2dbc9b034d2a94f979f6e4100c8c59981ff84 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 16 Nov 2024 23:20:09 +0000 Subject: [PATCH 3/6] Update more OSC links --- plugins/osc/README.developer.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/osc/README.developer.md b/plugins/osc/README.developer.md index 0960bc8f6..714a4b26a 100644 --- a/plugins/osc/README.developer.md +++ b/plugins/osc/README.developer.md @@ -18,9 +18,10 @@ Before we begin you should do the following: * Have an understanding of the map & vector classes from the STL (http://www.sgi.com/tech/stl/ or http://www.cplusplus.com/reference/stl/). * Know something about the - [OSC specification](http://opensoundcontrol.org/spec-1_0). You don't need - to know the wire format for the OSC messages. but you should at least - recognize OSC addresses and know the different data types in a message. + [OSC specification](https://opensoundcontrol.stanford.edu/spec-1_0.html). + You don't need to know the wire format for the OSC messages. but you + should at least recognize OSC addresses and know the different data types + in a message. * Look at the [liblo site](http://liblo.sourceforge.net/) and read the examples. * Get familiar with the From 383d2988bf3fe2145d08f1e04fd6d65860bd521e Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 20 Nov 2024 23:09:34 +0000 Subject: [PATCH 4/6] Custom Capitalise URL too --- common/utils/StringUtils.cpp | 1 + include/ola/StringUtils.h | 1 + 2 files changed, 2 insertions(+) diff --git a/common/utils/StringUtils.cpp b/common/utils/StringUtils.cpp index 9068743bf..79d8ad14c 100644 --- a/common/utils/StringUtils.cpp +++ b/common/utils/StringUtils.cpp @@ -500,6 +500,7 @@ void CustomCapitalizeLabel(string *s) { "pid", "rdm", "uid", + "url", NULL }; const size_t size = s->size(); diff --git a/include/ola/StringUtils.h b/include/ola/StringUtils.h index c1bd47ca0..2fc85c73a 100644 --- a/include/ola/StringUtils.h +++ b/include/ola/StringUtils.h @@ -500,6 +500,7 @@ void CapitalizeLabel(std::string *s); * - mdmx * - rdm * - uid + * - url */ void CustomCapitalizeLabel(std::string *s); From 37c175d6dac0d35238d68647377c6b6b7cf7b233 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 25 Nov 2024 00:22:20 +0000 Subject: [PATCH 5/6] Custom Capitalise JSON too --- common/utils/StringUtils.cpp | 1 + include/ola/StringUtils.h | 1 + 2 files changed, 2 insertions(+) diff --git a/common/utils/StringUtils.cpp b/common/utils/StringUtils.cpp index 79d8ad14c..ff2fd0c6d 100644 --- a/common/utils/StringUtils.cpp +++ b/common/utils/StringUtils.cpp @@ -494,6 +494,7 @@ void CustomCapitalizeLabel(string *s) { "ip", "ipv4", // Should really be IPv4 probably, but better than nothing "ipv6", // Should really be IPv6 probably, but better than nothing + "json", "led", "mdmx", // City Theatrical, should really be mDMX, but better than nothing "pdl", diff --git a/include/ola/StringUtils.h b/include/ola/StringUtils.h index 2fc85c73a..557ecd71b 100644 --- a/include/ola/StringUtils.h +++ b/include/ola/StringUtils.h @@ -496,6 +496,7 @@ void CapitalizeLabel(std::string *s); * - ip * - ipv4 * - ipv6 + * - json * - led * - mdmx * - rdm From a59c2539dbd642f6950a03403f924e4ad2612f7a Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 25 Nov 2024 00:25:43 +0000 Subject: [PATCH 6/6] Custom Capitalise ASC and NSC too --- common/utils/StringUtils.cpp | 2 ++ include/ola/StringUtils.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/common/utils/StringUtils.cpp b/common/utils/StringUtils.cpp index ff2fd0c6d..749ad7967 100644 --- a/common/utils/StringUtils.cpp +++ b/common/utils/StringUtils.cpp @@ -488,6 +488,7 @@ void CapitalizeLabel(string *s) { void CustomCapitalizeLabel(string *s) { // Remember to update the Doxygen in include/ola/StringUtils.h too static const char* const transforms[] = { + "asc", "dhcp", "dmx", "dns", @@ -497,6 +498,7 @@ void CustomCapitalizeLabel(string *s) { "json", "led", "mdmx", // City Theatrical, should really be mDMX, but better than nothing + "nsc", "pdl", "pid", "rdm", diff --git a/include/ola/StringUtils.h b/include/ola/StringUtils.h index 557ecd71b..0f7675d39 100644 --- a/include/ola/StringUtils.h +++ b/include/ola/StringUtils.h @@ -490,6 +490,7 @@ void CapitalizeLabel(std::string *s); * * @param s a string to transform. * The following are capitalized: + * - asc * - dhcp * - dmx * - dns @@ -499,6 +500,7 @@ void CapitalizeLabel(std::string *s); * - json * - led * - mdmx + * - nsc * - rdm * - uid * - url