From faaf2a549d104f9e91a145d30c8d650da7e1890b Mon Sep 17 00:00:00 2001
From: Peter Newman <peterjnewman@gmail.com>
Date: Sat, 30 Mar 2024 11:07:39 +0000
Subject: [PATCH 1/5] Correct a comment's instructions
---
common/protocol/Ola.proto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/protocol/Ola.proto b/common/protocol/Ola.proto
index 304ee1d589..394f1ae7b1 100644
--- a/common/protocol/Ola.proto
+++ b/common/protocol/Ola.proto
@@ -78,7 +78,7 @@ enum PluginIds {
}
/**
- * If you add more here be sure to update ResponseCodeToString in RDMHelper.cpp
+ * If you add more here be sure to update StatusCodeToString in RDMHelper.cpp
*/
enum RDMResponseCode {
// The request/response completed correctly
From e083653d2d18018fe6ef42f757bc06462de87f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20H=C3=BClsmann?= <fh@cbix.de>
Date: Sat, 30 Mar 2024 12:43:55 +0100
Subject: [PATCH 2/5] Fix liblo 0.32 header compatibility
---
plugins/osc/OSCNode.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/osc/OSCNode.cpp b/plugins/osc/OSCNode.cpp
index d25d0d0201..26636ae531 100644
--- a/plugins/osc/OSCNode.cpp
+++ b/plugins/osc/OSCNode.cpp
@@ -141,7 +141,7 @@ bool ExtractSlotValueFromPair(const string &type, lo_arg **argv,
* @param user_data a pointer to the OSCNode object.
*/
int OSCDataHandler(const char *osc_address, const char *types, lo_arg **argv,
- int argc, void *, void *user_data) {
+ int argc, lo_message, void *user_data) {
OLA_DEBUG << "Got OSC message for " << osc_address << ", types are " << types;
OSCNode *node = reinterpret_cast<OSCNode*>(user_data);
@@ -150,7 +150,7 @@ int OSCDataHandler(const char *osc_address, const char *types, lo_arg **argv,
if (argc == 1) {
if (type == "b") {
- lo_blob blob = argv[0];
+ lo_blob blob = (lo_blob)argv[0];
unsigned int size = min(static_cast<uint32_t>(DMX_UNIVERSE_SIZE),
lo_blob_datasize(blob));
node->SetUniverse(
From 8966a2576f0adca992ba7468ab9d1633f124d422 Mon Sep 17 00:00:00 2001
From: Peter Newman <peterjnewman@gmail.com>
Date: Sun, 21 Apr 2024 14:43:47 +0100
Subject: [PATCH 3/5] Fix a comment typo
(cherry picked from commit 720bb248c281983138b8e8cd5c6f5542854a657b)
---
plugins/spi/SPIOutput.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/spi/SPIOutput.h b/plugins/spi/SPIOutput.h
index 698b052745..fa59d106cf 100644
--- a/plugins/spi/SPIOutput.h
+++ b/plugins/spi/SPIOutput.h
@@ -73,7 +73,7 @@ class SPIOutput: public ola::rdm::DiscoverableRDMControllerInterface {
private:
/**
- * The RDM Operations for the MovingLightResponder.
+ * The RDM Operations for the SPIOutput.
*/
class RDMOps : public ola::rdm::ResponderOps<SPIOutput> {
public:
From d561605f8be9b487cd181d34111a7b8fe23fef30 Mon Sep 17 00:00:00 2001
From: Peter Newman <peterjnewman@gmail.com>
Date: Sun, 21 Apr 2024 15:18:40 +0100
Subject: [PATCH 4/5] Fix the formatting of some PID values in some Python
exceptions
(cherry picked from commit 3d070a6192b06a57b313947ce701da2fd58dcd7d)
---
python/ola/PidStore.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python/ola/PidStore.py b/python/ola/PidStore.py
index 3028af709f..1a73b5b79e 100644
--- a/python/ola/PidStore.py
+++ b/python/ola/PidStore.py
@@ -1031,7 +1031,7 @@ def LoadFile(self, pid_file_name, validate, override=False):
if validate:
if ((pid_pb.value >= RDMConstants.RDM_MANUFACTURER_PID_MIN) and
(pid_pb.value <= RDMConstants.RDM_MANUFACTURER_PID_MAX)):
- raise InvalidPidFormat('%0x04hx between %0x04hx and %0x04hx in %s' %
+ raise InvalidPidFormat('0x%04hx between 0x%04hx and 0x%04hx in %s' %
(pid_pb.value,
RDMConstants.RDM_MANUFACTURER_PID_MIN,
RDMConstants.RDM_MANUFACTURER_PID_MAX,
@@ -1067,7 +1067,7 @@ def LoadFile(self, pid_file_name, validate, override=False):
if ((pid_pb.value < RDMConstants.RDM_MANUFACTURER_PID_MIN) or
(pid_pb.value > RDMConstants.RDM_MANUFACTURER_PID_MAX)):
raise InvalidPidFormat(
- 'Manufacturer pid 0x%04hx not between %0x04hx and %0x04hx' %
+ 'Manufacturer pid 0x%04hx not between 0x%04hx and 0x%04hx' %
(pid_pb.value,
RDMConstants.RDM_MANUFACTURER_PID_MIN,
RDMConstants.RDM_MANUFACTURER_PID_MAX))
From 11226214f0719106f3ef3bce3bd92f5489d02d91 Mon Sep 17 00:00:00 2001
From: Peter Newman <peternewman@users.noreply.github.com>
Date: Sun, 22 Sep 2024 02:36:28 +0100
Subject: [PATCH 5/5] Add another manufacturer name to ignore
---
.codespellignorelines | 1 +
1 file changed, 1 insertion(+)
diff --git a/.codespellignorelines b/.codespellignorelines
index 1949ee6ec0..d920e5e37e 100644
--- a/.codespellignorelines
+++ b/.codespellignorelines
@@ -65,6 +65,7 @@ const uint8_t BaseRobeWidget::SOM;
manufacturer_name: "Guangzhou Litewise Lighting Equipments Co., Ltd. dba \"EK Lights\""
manufacturer_name: "Guangzhou VAS Lighting Co., Ltd."
manufacturer_name: "ARRI -- Arnold & Richter Cine Technik GmbH & Co. Betriebs KG"
+ manufacturer_name: "MEDIAM Ltd. (Modus brand)"
manufacturer_name: "SRM Technik GmbH"
manufacturer_name: "medien technik cords"
manufacturer_name: "TBE Srl"