From faaf2a549d104f9e91a145d30c8d650da7e1890b Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 30 Mar 2024 11:07:39 +0000 Subject: [PATCH 1/3] 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 8966a2576f0adca992ba7468ab9d1633f124d422 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 21 Apr 2024 14:43:47 +0100 Subject: [PATCH 2/3] 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 { public: From d561605f8be9b487cd181d34111a7b8fe23fef30 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 21 Apr 2024 15:18:40 +0100 Subject: [PATCH 3/3] 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))