From d1e9f6a2b98e0bd3c1db6f6064d47ea97ec49c47 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 8 Mar 2023 16:14:38 +0000 Subject: [PATCH 1/5] Add a missing file to the Python install list --- python/ola/Makefile.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/python/ola/Makefile.mk b/python/ola/Makefile.mk index 19d7e395da..b2c283cbb7 100644 --- a/python/ola/Makefile.mk +++ b/python/ola/Makefile.mk @@ -33,6 +33,7 @@ pkgpython_PYTHON = \ python/ola/RDMAPI.py \ python/ola/RDMConstants.py \ python/ola/PidStore.py \ + python/ola/StringUtils.py \ python/ola/UID.py \ python/ola/__init__.py endif From 4cc2a6150b11b0e7110743e34fde5b1cbc633e8e Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 21 Mar 2023 22:39:58 +0000 Subject: [PATCH 2/5] Fix a comment typo (cherry picked from commit 8790bdf4536739ee66816fe7fbd9f48cbf1b4deb) --- include/ola/client/Module.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ola/client/Module.h b/include/ola/client/Module.h index 0c81d2fd8a..7b72d5bce4 100644 --- a/include/ola/client/Module.h +++ b/include/ola/client/Module.h @@ -24,7 +24,7 @@ * Sometimes it's useful for client applications to avoid linking against * libola, say for instance if they install separately from OLA. By deferring * the linking and using libola as a plugin, clients can use OLA if it's - * installed on the system or if not, take some other action like displaing a + * installed on the system or if not, take some other action like displaying a * message or using another output mechanism. * * This file provides plugin interfaces so that a client code can load From 21177c4951a8c865b2381034afd3708b4eb39e00 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 24 Mar 2023 17:11:19 +0000 Subject: [PATCH 3/5] Correct the PID used for SetDmxStartupMode, closes #1843, since 5369e339be9cb19315f4f5400b0da5371d1c851a --- tools/rdm/TestDefinitions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/rdm/TestDefinitions.py b/tools/rdm/TestDefinitions.py index 08b3688fab..8188ee3cdc 100644 --- a/tools/rdm/TestDefinitions.py +++ b/tools/rdm/TestDefinitions.py @@ -4740,7 +4740,7 @@ class GetStartUpModeWithData(TestMixins.GetWithDataMixin, class SetDmxStartupMode(OptionalParameterTestFixture): """Set DMX_STARTUP_MODE without changing the settings.""" CATEGORY = TestCategory.DMX_SETUP - PID = 'DMX_FAIL_MODE' + PID = 'DMX_STARTUP_MODE' PROVIDES = ['set_dmx_startup_mode_supported'] REQUIRES = ['dmx_startup_settings'] From a643fd5556faf97fd5c9bb478da0587a0680825c Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 24 Mar 2023 17:15:49 +0000 Subject: [PATCH 4/5] Correct and standardise some DMX_FAIL_MODE and DMX_STARTUP_MODE test names --- tools/rdm/TestDefinitions.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/rdm/TestDefinitions.py b/tools/rdm/TestDefinitions.py index 8188ee3cdc..4884957ee6 100644 --- a/tools/rdm/TestDefinitions.py +++ b/tools/rdm/TestDefinitions.py @@ -4458,8 +4458,8 @@ def VerifyResult(self, response, fields): self.SetProperty('dmx_fail_settings', fields) -class GetFailUpModeWithData(TestMixins.GetWithDataMixin, - OptionalParameterTestFixture): +class GetDmxFailModeWithExtraData(TestMixins.GetWithDataMixin, + OptionalParameterTestFixture): """GET DMX_FAIL_MODE with extra data.""" CATEGORY = TestCategory.ERROR_CONDITIONS PID = 'DMX_FAIL_MODE' @@ -4698,8 +4698,8 @@ def GetFailMode(self): self.SendGet(ROOT_DEVICE, self.pid) -class SetFailModeWithNoData(TestMixins.SetWithNoDataMixin, - OptionalParameterTestFixture): +class SetDmxFailModeWithNoData(TestMixins.SetWithNoDataMixin, + OptionalParameterTestFixture): """Set DMX_FAIL_MODE with no data.""" CATEGORY = TestCategory.ERROR_CONDITIONS PID = 'DMX_FAIL_MODE' @@ -4730,8 +4730,8 @@ def VerifyResult(self, response, fields): self.SetProperty('dmx_startup_settings', fields) -class GetStartUpModeWithData(TestMixins.GetWithDataMixin, - OptionalParameterTestFixture): +class GetStartupModeWithExtraData(TestMixins.GetWithDataMixin, + OptionalParameterTestFixture): """Get DMX_STARTUP_MODE with extra data.""" CATEGORY = TestCategory.ERROR_CONDITIONS PID = 'DMX_STARTUP_MODE' @@ -4971,8 +4971,8 @@ def GetStartupMode(self): self.SendGet(ROOT_DEVICE, self.pid) -class SetStartupModeWithNoData(TestMixins.SetWithNoDataMixin, - OptionalParameterTestFixture): +class SetDmxStartupModeWithNoData(TestMixins.SetWithNoDataMixin, + OptionalParameterTestFixture): """Set DMX_STARTUP_MODE with no data.""" CATEGORY = TestCategory.ERROR_CONDITIONS PID = 'DMX_STARTUP_MODE' From a0c1ad7da972544f5abf0a8f088e31ab27e151dc Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 24 Mar 2023 18:04:24 +0000 Subject: [PATCH 5/5] Fix the order of hold time and delay times for DMX_STARTUP_MODE and DMX_FAIL_MODE, since 5369e339be9cb19315f4f5400b0da5371d1c851a and 959450ab208515ce96fcb26bd39a13b6382c277f closes #1842 --- tools/rdm/TestDefinitions.py | 4 ++-- tools/rdm/TestMixins.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/rdm/TestDefinitions.py b/tools/rdm/TestDefinitions.py index 4884957ee6..4e724d4e1a 100644 --- a/tools/rdm/TestDefinitions.py +++ b/tools/rdm/TestDefinitions.py @@ -4482,8 +4482,8 @@ def Test(self): self.SendSet( ROOT_DEVICE, self.pid, [settings.get('scene_number', 0), - settings.get('hold_time', 0), settings.get('loss_of_signal_delay', 0), + settings.get('hold_time', 0), settings.get('level', 0)] ) @@ -4754,8 +4754,8 @@ def Test(self): self.SendSet( ROOT_DEVICE, self.pid, [settings.get('scene_number', 0), - settings.get('hold_time', 0), settings.get('startup_delay', 0), + settings.get('hold_time', 0), settings.get('level', 0)] ) diff --git a/tools/rdm/TestMixins.py b/tools/rdm/TestMixins.py index 1762713935..80d7eb4ae9 100644 --- a/tools/rdm/TestMixins.py +++ b/tools/rdm/TestMixins.py @@ -754,7 +754,7 @@ def ResetState(self): self.SetBroken('Failed to restore DMX_FAIL_MODE settings') return - for key in ('scene_number', 'hold_time', 'loss_of_signal_delay', 'level'): + for key in ('scene_number', 'loss_of_signal_delay', 'hold_time', 'level'): if key not in settings: self.SetBroken( 'Failed to restore DMX_FAIL_MODE settings, missing %s' % key) @@ -784,7 +784,7 @@ def ResetState(self): self.SetBroken('Failed to restore DMX_STARTUP_MODE settings') return - for key in ('scene_number', 'hold_time', 'startup_delay', 'level'): + for key in ('scene_number', 'startup_delay', 'hold_time', 'level'): if key not in settings: self.SetBroken( 'Failed to restore DMX_STARTUP_MODE settings, missing %s' % key)