From 783354ffc1f8be858bda697951e8f05b2ef108f3 Mon Sep 17 00:00:00 2001 From: Harrison Carter Date: Tue, 16 Dec 2025 13:06:17 -0600 Subject: [PATCH 01/10] add statelessStep capability support --- .../statelessColorTemperatureStep.yml | 14 ++++++++++ .../capabilities/statelessSwitchLevelStep.yml | 14 ++++++++++ .../light-color-level-1800K-6500K.yml | 4 +++ .../light-color-level-2000K-7000K.yml | 4 +++ .../light-color-level-2200K-6500K.yml | 4 +++ .../light-color-level-2700K-6500K.yml | 4 +++ .../profiles/light-color-level-fan.yml | 4 +++ ...-level-illuminance-motion-1000K-15000K.yml | 4 +++ .../light-color-level-illuminance-motion.yml | 4 +++ .../profiles/light-color-level.yml | 4 +++ .../profiles/light-level-2-button.yml | 2 ++ .../profiles/light-level-3-button.yml | 2 ++ .../profiles/light-level-4-button.yml | 2 ++ .../profiles/light-level-5-button.yml | 2 ++ .../profiles/light-level-6-button.yml | 2 ++ .../profiles/light-level-7-button.yml | 2 ++ .../profiles/light-level-8-button.yml | 2 ++ ...ight-level-ColorTemperature-1500-9000k.yml | 4 +++ .../profiles/light-level-button.yml | 2 ++ ...ght-level-colorTemperature-2200K-6500K.yml | 4 +++ ...ght-level-colorTemperature-2700K-6500K.yml | 4 +++ ...ght-level-colorTemperature-2710k-6500k.yml | 4 +++ .../profiles/light-level-colorTemperature.yml | 4 +++ .../light-level-energy-powerConsumption.yml | 2 ++ .../profiles/light-level-motion.yml | 2 ++ ...ht-level-power-energy-powerConsumption.yml | 2 ++ .../profiles/light-level-power.yml | 2 ++ .../matter-switch/profiles/light-level.yml | 2 ++ .../plug-level-energy-powerConsumption.yml | 2 ++ ...ug-level-power-energy-powerConsumption.yml | 2 ++ .../profiles/plug-level-power.yml | 2 ++ .../matter-switch/profiles/plug-level.yml | 2 ++ .../profiles/switch-color-level.yml | 4 +++ .../switch-level-colorTemperature.yml | 4 +++ .../matter-switch/profiles/switch-level.yml | 2 ++ .../SmartThings/matter-switch/src/init.lua | 6 +++++ .../switch_handlers/capability_handlers.lua | 26 +++++++++++++++++++ 37 files changed, 156 insertions(+) create mode 100644 drivers/SmartThings/matter-switch/capabilities/statelessColorTemperatureStep.yml create mode 100644 drivers/SmartThings/matter-switch/capabilities/statelessSwitchLevelStep.yml diff --git a/drivers/SmartThings/matter-switch/capabilities/statelessColorTemperatureStep.yml b/drivers/SmartThings/matter-switch/capabilities/statelessColorTemperatureStep.yml new file mode 100644 index 0000000000..978293198a --- /dev/null +++ b/drivers/SmartThings/matter-switch/capabilities/statelessColorTemperatureStep.yml @@ -0,0 +1,14 @@ +name: Stateless Color Temperature Step +status: proposed +commands: + stepColorTemperatureByPercent: + arguments: + - name: stepSize + schema: + type: integer + minimum: -100 + maximum: 100 + optional: false + name: stepColorTemperatureByPercent +id: statelessColorTemperatureStep +version: 1 diff --git a/drivers/SmartThings/matter-switch/capabilities/statelessSwitchLevelStep.yml b/drivers/SmartThings/matter-switch/capabilities/statelessSwitchLevelStep.yml new file mode 100644 index 0000000000..e4f1418277 --- /dev/null +++ b/drivers/SmartThings/matter-switch/capabilities/statelessSwitchLevelStep.yml @@ -0,0 +1,14 @@ +name: Stateless Switch Level Step +status: proposed +commands: + stepLevel: + arguments: + - name: stepSize + schema: + type: integer + minimum: -100 + maximum: 100 + optional: false + name: stepLevel +id: statelessSwitchLevelStep +version: 1 diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-1800K-6500K.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-1800K-6500K.yml index 58c8e0fca6..d46df21c5c 100755 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-1800K-6500K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-1800K-6500K.yml @@ -7,12 +7,16 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" range: [1, 100] - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-2000K-7000K.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-2000K-7000K.yml index 4772e22f66..557fc6120a 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-2000K-7000K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-2000K-7000K.yml @@ -7,12 +7,16 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" range: [1, 100] - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-2200K-6500K.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-2200K-6500K.yml index 4977423135..92caf967a1 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-2200K-6500K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-2200K-6500K.yml @@ -7,12 +7,16 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" range: [1, 100] - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-2700K-6500K.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-2700K-6500K.yml index dbef511bbb..cfc20776be 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-2700K-6500K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-2700K-6500K.yml @@ -7,12 +7,16 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" range: [1, 100] - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-fan.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-fan.yml index 2fabc23bd7..e50af5addd 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-fan.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-fan.yml @@ -6,12 +6,16 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" range: [1, 100] - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion-1000K-15000K.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion-1000K-15000K.yml index dd48e4e81a..87206f7c25 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion-1000K-15000K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion-1000K-15000K.yml @@ -7,8 +7,12 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion.yml index 999e64a047..821e866b4e 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion.yml @@ -6,8 +6,12 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level.yml index 572686ffdd..94d4176446 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level.yml @@ -6,12 +6,16 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" range: [1, 100] - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-2-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-2-button.yml index 7c8b60ef56..7726032e2a 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-2-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-2-button.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-3-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-3-button.yml index 59600efd72..03fbd89c58 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-3-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-3-button.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-4-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-4-button.yml index b49b7f2254..6156f9caa2 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-4-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-4-button.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-5-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-5-button.yml index ee55a6a394..1b07b8c23c 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-5-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-5-button.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-6-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-6-button.yml index 805c97763e..a745fda2b8 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-6-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-6-button.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-7-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-7-button.yml index 5cd1666a5f..0e9e620c3e 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-7-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-7-button.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-8-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-8-button.yml index 4636359e92..aa62c77ba6 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-8-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-8-button.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-ColorTemperature-1500-9000k.yml b/drivers/SmartThings/matter-switch/profiles/light-level-ColorTemperature-1500-9000k.yml index f19e55ec9c..8760877585 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-ColorTemperature-1500-9000k.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-ColorTemperature-1500-9000k.yml @@ -7,12 +7,16 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" range: [1, 100] - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-button.yml index 9fc53f642b..6c215a946d 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-button.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2200K-6500K.yml b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2200K-6500K.yml index 79d6556485..56414b519f 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2200K-6500K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2200K-6500K.yml @@ -7,12 +7,16 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" range: [1, 100] - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2700K-6500K.yml b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2700K-6500K.yml index 75b2bd488c..f4601c8148 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2700K-6500K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2700K-6500K.yml @@ -7,12 +7,16 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" range: [1, 100] - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2710k-6500k.yml b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2710k-6500k.yml index b49179036f..9223bfa042 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2710k-6500k.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2710k-6500k.yml @@ -7,12 +7,16 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" range: [1, 100] - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature.yml b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature.yml index 4d130281d7..571033c33b 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature.yml @@ -6,12 +6,16 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" range: [1, 100] - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-energy-powerConsumption.yml b/drivers/SmartThings/matter-switch/profiles/light-level-energy-powerConsumption.yml index 03963ccbd2..0eb608818f 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-energy-powerConsumption.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-energy-powerConsumption.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-motion.yml b/drivers/SmartThings/matter-switch/profiles/light-level-motion.yml index bdea457c21..222efe927f 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-motion.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-motion.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-power-energy-powerConsumption.yml b/drivers/SmartThings/matter-switch/profiles/light-level-power-energy-powerConsumption.yml index f6c45ed1f7..83398b009c 100755 --- a/drivers/SmartThings/matter-switch/profiles/light-level-power-energy-powerConsumption.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-power-energy-powerConsumption.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-power.yml b/drivers/SmartThings/matter-switch/profiles/light-level-power.yml index 23625ada16..e6701c5030 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-power.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-power.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/light-level.yml b/drivers/SmartThings/matter-switch/profiles/light-level.yml index e266f497c9..e63693813b 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 config: values: - key: "level.value" diff --git a/drivers/SmartThings/matter-switch/profiles/plug-level-energy-powerConsumption.yml b/drivers/SmartThings/matter-switch/profiles/plug-level-energy-powerConsumption.yml index 86bd861bce..4ae29d2320 100644 --- a/drivers/SmartThings/matter-switch/profiles/plug-level-energy-powerConsumption.yml +++ b/drivers/SmartThings/matter-switch/profiles/plug-level-energy-powerConsumption.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 - id: energyMeter version: 1 - id: powerConsumptionReport diff --git a/drivers/SmartThings/matter-switch/profiles/plug-level-power-energy-powerConsumption.yml b/drivers/SmartThings/matter-switch/profiles/plug-level-power-energy-powerConsumption.yml index 17e7d6b7a0..477fb8b769 100644 --- a/drivers/SmartThings/matter-switch/profiles/plug-level-power-energy-powerConsumption.yml +++ b/drivers/SmartThings/matter-switch/profiles/plug-level-power-energy-powerConsumption.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 - id: powerMeter version: 1 - id: energyMeter diff --git a/drivers/SmartThings/matter-switch/profiles/plug-level-power.yml b/drivers/SmartThings/matter-switch/profiles/plug-level-power.yml index d175930a92..8bb1c56361 100644 --- a/drivers/SmartThings/matter-switch/profiles/plug-level-power.yml +++ b/drivers/SmartThings/matter-switch/profiles/plug-level-power.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 - id: powerMeter version: 1 - id: firmwareUpdate diff --git a/drivers/SmartThings/matter-switch/profiles/plug-level.yml b/drivers/SmartThings/matter-switch/profiles/plug-level.yml index 0d888b843f..90fa2ece47 100644 --- a/drivers/SmartThings/matter-switch/profiles/plug-level.yml +++ b/drivers/SmartThings/matter-switch/profiles/plug-level.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/switch-color-level.yml b/drivers/SmartThings/matter-switch/profiles/switch-color-level.yml index f1f9e78438..e5754e8ad6 100644 --- a/drivers/SmartThings/matter-switch/profiles/switch-color-level.yml +++ b/drivers/SmartThings/matter-switch/profiles/switch-color-level.yml @@ -6,8 +6,12 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/switch-level-colorTemperature.yml b/drivers/SmartThings/matter-switch/profiles/switch-level-colorTemperature.yml index 42e3ef6257..b5f844ccf7 100644 --- a/drivers/SmartThings/matter-switch/profiles/switch-level-colorTemperature.yml +++ b/drivers/SmartThings/matter-switch/profiles/switch-level-colorTemperature.yml @@ -6,8 +6,12 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 - id: colorTemperature version: 1 + - id: statelessColorTemperatureStep + version: 1 config: values: - key: "colorTemperature.value" diff --git a/drivers/SmartThings/matter-switch/profiles/switch-level.yml b/drivers/SmartThings/matter-switch/profiles/switch-level.yml index 8f3b9f5e5c..827fcdd898 100644 --- a/drivers/SmartThings/matter-switch/profiles/switch-level.yml +++ b/drivers/SmartThings/matter-switch/profiles/switch-level.yml @@ -6,6 +6,8 @@ components: version: 1 - id: switchLevel version: 1 + - id: statelessSwitchLevelStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/src/init.lua b/drivers/SmartThings/matter-switch/src/init.lua index 5436d57baf..c3f2bcafe2 100644 --- a/drivers/SmartThings/matter-switch/src/init.lua +++ b/drivers/SmartThings/matter-switch/src/init.lua @@ -286,6 +286,12 @@ local matter_driver_template = { [capabilities.level.ID] = { [capabilities.level.commands.setLevel.NAME] = capability_handlers.handle_set_level }, + [capabilities.statelessColorTemperatureStep.ID] = { + [capabilities.statelessColorTemperatureStep.commands.stepColorTemperatureByPercent.NAME] = capability_handlers.handle_step_color_temperature_by_percent, + }, + [capabilities.statelessSwitchLevelStep.ID] = { + [capabilities.statelessSwitchLevelStep.commands.stepLevel.NAME] = capability_handlers.handle_step_level, + }, [capabilities.switch.ID] = { [capabilities.switch.commands.off.NAME] = capability_handlers.handle_switch_off, [capabilities.switch.commands.on.NAME] = capability_handlers.handle_switch_on, diff --git a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua index 2c5241de3a..e985f24962 100644 --- a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua +++ b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua @@ -47,6 +47,17 @@ function CapabilityHandlers.handle_switch_set_level(driver, device, cmd) end +-- [[ STATELESS SWITCH LEVEL STEP CAPABILITY COMMANDS ]] -- + +function CapabilityHandlers.handle_step_level(driver, device, cmd) + local step_size = math.floor((cmd.args and cmd.args.stepSize or 0)/100.0 * 254) + if step_size == 0 then return end + local endpoint_id = device:component_to_endpoint(cmd.component) + local step_mode = step_size > 0 and clusters.LevelControl.types.StepMode.UP or clusters.LevelControl.types.StepMode.DOWN + device:send(clusters.LevelControl.server.commands.Step(device, endpoint_id, step_mode, math.abs(step_size), fields.TRANSITION_TIME, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) +end + + -- [[ COLOR CONTROL CAPABILITY COMMANDS ]] -- function CapabilityHandlers.handle_set_color(driver, device, cmd) @@ -109,6 +120,21 @@ function CapabilityHandlers.handle_set_color_temperature(driver, device, cmd) end +-- [[ STATELESS COLOR TEMPERATURE STEP CAPABILITY COMMANDS ]] -- + +function CapabilityHandlers.handle_step_color_temperature_by_percent(driver, device, cmd) + local step_percent_change = cmd.args and cmd.args.stepSize or 0 + if step_percent_change == 0 then return end + local endpoint_id = device:component_to_endpoint(cmd.component) + -- before the Matter 1.3 lua libs update (HUB FW 55), there was no ColorControl StepModeEnum type defined + local step_mode = step_percent_change > 0 and (clusters.ColorControl.types.StepModeEnum.DOWN or 3) or (clusters.ColorControl.types.StepModeEnum.UP or 1) + local min_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MIN, endpoint_id) or 2200 -- default min mireds + local max_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MAX, endpoint_id) or 6500 -- default max mireds + local color_change_in_mireds = st_utils.round((max_mireds - min_mireds) * (math.abs(step_percent_change)/100)) + device:send(clusters.ColorControl.server.commands.StepColorTemperature(device, endpoint_id, step_mode, color_change_in_mireds, fields.TRANSITION_TIME, min_mireds, max_mireds, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) +end + + -- [[ VALVE CAPABILITY COMMANDS ]] -- function CapabilityHandlers.handle_valve_open(driver, device, cmd) From d8673eba19656e0996dae69bdbed7234fa7eede6 Mon Sep 17 00:00:00 2001 From: Harrison Carter Date: Mon, 29 Dec 2025 11:34:26 -0600 Subject: [PATCH 02/10] add test cases, update rounding logic slightly --- .../statelessColorTemperatureStep.yml | 1 + .../capabilities/statelessSwitchLevelStep.yml | 1 + .../switch_handlers/capability_handlers.lua | 4 +- .../src/test/test_stateless_step.lua | 148 ++++++++++++++++++ 4 files changed, 152 insertions(+), 2 deletions(-) create mode 100644 drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua diff --git a/drivers/SmartThings/matter-switch/capabilities/statelessColorTemperatureStep.yml b/drivers/SmartThings/matter-switch/capabilities/statelessColorTemperatureStep.yml index 978293198a..dee4dd2266 100644 --- a/drivers/SmartThings/matter-switch/capabilities/statelessColorTemperatureStep.yml +++ b/drivers/SmartThings/matter-switch/capabilities/statelessColorTemperatureStep.yml @@ -1,5 +1,6 @@ name: Stateless Color Temperature Step status: proposed +attributes: {} commands: stepColorTemperatureByPercent: arguments: diff --git a/drivers/SmartThings/matter-switch/capabilities/statelessSwitchLevelStep.yml b/drivers/SmartThings/matter-switch/capabilities/statelessSwitchLevelStep.yml index e4f1418277..a751ab6cd5 100644 --- a/drivers/SmartThings/matter-switch/capabilities/statelessSwitchLevelStep.yml +++ b/drivers/SmartThings/matter-switch/capabilities/statelessSwitchLevelStep.yml @@ -1,5 +1,6 @@ name: Stateless Switch Level Step status: proposed +attributes: {} commands: stepLevel: arguments: diff --git a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua index e985f24962..b6a82311e3 100644 --- a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua +++ b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua @@ -130,8 +130,8 @@ function CapabilityHandlers.handle_step_color_temperature_by_percent(driver, dev local step_mode = step_percent_change > 0 and (clusters.ColorControl.types.StepModeEnum.DOWN or 3) or (clusters.ColorControl.types.StepModeEnum.UP or 1) local min_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MIN, endpoint_id) or 2200 -- default min mireds local max_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MAX, endpoint_id) or 6500 -- default max mireds - local color_change_in_mireds = st_utils.round((max_mireds - min_mireds) * (math.abs(step_percent_change)/100)) - device:send(clusters.ColorControl.server.commands.StepColorTemperature(device, endpoint_id, step_mode, color_change_in_mireds, fields.TRANSITION_TIME, min_mireds, max_mireds, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) + local step_size_in_mireds = (max_mireds - min_mireds) * st_utils.round((math.abs(step_percent_change)/100)) + device:send(clusters.ColorControl.server.commands.StepColorTemperature(device, endpoint_id, step_mode, step_size_in_mireds, fields.TRANSITION_TIME, min_mireds, max_mireds, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) end diff --git a/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua b/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua new file mode 100644 index 0000000000..c39e259697 --- /dev/null +++ b/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua @@ -0,0 +1,148 @@ +-- Copyright © 2022 SmartThings, Inc. +-- Licensed under the Apache License, Version 2.0 + +local test = require "integration_test" +local capabilities = require "st.capabilities" +local t_utils = require "integration_test.utils" +local clusters = require "st.matter.clusters" + +local mock_device_color_temp = test.mock_device.build_test_matter_device({ + profile = t_utils.get_profile_definition("light-level-colorTemperature.yml"), + manufacturer_info = { + vendor_id = 0x0000, + product_id = 0x0000, + }, + endpoints = { + { + endpoint_id = 1, + clusters = { + {cluster_id = clusters.OnOff.ID, cluster_type = "SERVER"}, + {cluster_id = clusters.ColorControl.ID, cluster_type = "BOTH", feature_map = 30}, + {cluster_id = clusters.LevelControl.ID, cluster_type = "SERVER"} + }, + device_types = { + {device_type_id = 0x0100, device_type_revision = 1}, -- On/Off Light + {device_type_id = 0x010C, device_type_revision = 1} -- Color Temperature Light + } + } + } +}) + +local cluster_subscribe_list = { + clusters.OnOff.attributes.OnOff, + clusters.LevelControl.attributes.CurrentLevel, + clusters.LevelControl.attributes.MaxLevel, + clusters.LevelControl.attributes.MinLevel, + clusters.ColorControl.attributes.CurrentHue, + clusters.ColorControl.attributes.CurrentSaturation, + clusters.ColorControl.attributes.CurrentX, + clusters.ColorControl.attributes.CurrentY, + clusters.ColorControl.attributes.ColorMode, + clusters.ColorControl.attributes.ColorTemperatureMireds, + clusters.ColorControl.attributes.ColorTempPhysicalMaxMireds, + clusters.ColorControl.attributes.ColorTempPhysicalMinMireds, +} + +local function set_color_mode(device, endpoint, color_mode) + test.socket.matter:__queue_receive({ + device.id, + clusters.ColorControl.attributes.ColorMode:build_test_report_data( + device, endpoint, color_mode) + }) + local read_req + if color_mode == clusters.ColorControl.types.ColorMode.CURRENT_HUE_AND_CURRENT_SATURATION then + read_req = clusters.ColorControl.attributes.CurrentHue:read() + read_req:merge(clusters.ColorControl.attributes.CurrentSaturation:read()) + else -- color_mode = clusters.ColorControl.types.ColorMode.CURRENTX_AND_CURRENTY + read_req = clusters.ColorControl.attributes.CurrentX:read() + read_req:merge(clusters.ColorControl.attributes.CurrentY:read()) + end + test.socket.matter:__expect_send({device.id, read_req}) +end + +local function test_init() + local subscribe_request = cluster_subscribe_list[1]:subscribe(mock_device_color_temp) + for i, cluster in ipairs(cluster_subscribe_list) do + if i > 1 then + subscribe_request:merge(cluster:subscribe(mock_device_color_temp)) + end + end + test.socket.matter:__expect_send({mock_device_color_temp.id, subscribe_request}) + test.mock_device.add_test_device(mock_device_color_temp) + set_color_mode(mock_device_color_temp, 1, clusters.ColorControl.types.ColorMode.CURRENT_HUE_AND_CURRENT_SATURATION) +end +test.set_test_init_function(test_init) + +test.register_message_test( + "Color Temperature Step Command Test", + { + { + channel = "capability", + direction = "receive", + message = { mock_device_color_temp:generate_test_message("main", capabilities.statelessColorTemperatureStep.stepColorTemperatureByPercent(25)) } + }, + { + channel = "matter", + direction = "send", + message = mock_device_color_temp:generate_test_message("matter", clusters.ColorControl.server.commands.StepColorTemperature(mock_device_color_temp, 1, clusters.ColorControl.types.StepModeEnum.UP, 1075, 10, 2200, 6500, 0, 0)) + }, + { + channel = "capability", + direction = "receive", + message = { mock_device_color_temp:generate_test_message("main", capabilities.statelessColorTemperatureStep.stepColorTemperatureByPercent(-50)) } + }, + { + channel = "matter", + direction = "send", + message = mock_device_color_temp:generate_test_message("matter", clusters.ColorControl.server.commands.StepColorTemperature(mock_device_color_temp, 1, clusters.ColorControl.types.StepModeEnum.DOWN, 2150, 10, 2200, 6500, 0, 0)) + }, + { + channel = "capability", + direction = "receive", + message = { mock_device_color_temp:generate_test_message("main", capabilities.statelessColorTemperatureStep.stepColorTemperatureByPercent(100)) } + }, + { + channel = "matter", + direction = "send", + message = mock_device_color_temp:generate_test_message("matter", clusters.ColorControl.server.commands.StepColorTemperature(mock_device_color_temp, 1, clusters.ColorControl.types.StepModeEnum.UP, 4300, 10, 2200, 6500, 0, 0)) + } + } +) + +test.register_message_test( + "Level Step Command Test", + { + { + channel = "capability", + direction = "receive", + message = { mock_device_color_temp:generate_test_message("main", capabilities.statelessSwitchLevelStep.stepLevel(25)) } + }, + { + channel = "matter", + direction = "send", + message = mock_device_color_temp:generate_test_message("matter", clusters.LevelControl.server.commands.StepLevel(mock_device_color_temp, 1, clusters.LevelControl.types.StepModeEnum.UP, 1075, 10, 254)) + }, + { + channel = "capability", + direction = "receive", + message = { mock_device_color_temp:generate_test_message("main", capabilities.statelessSwitchLevelStep.stepLevel(-50)) } + }, + { + channel = "matter", + direction = "send", + message = mock_device_color_temp:generate_test_message("matter", clusters.LevelControl.server.commands.StepLevel(mock_device_color_temp, 1, clusters.LevelControl.types.StepModeEnum.DOWN, 2150, 10, 254)) + }, + { + channel = "capability", + direction = "receive", + message = { mock_device_color_temp:generate_test_message("main", capabilities.statelessSwitchLevelStep.stepLevel(100)) } + }, + { + channel = "matter", + direction = "send", + message = mock_device_color_temp:generate_test_message("matter", clusters.LevelControl.server.commands.StepLevel(mock_device_color_temp, 1, clusters.LevelControl.types.StepModeEnum.UP, 4300, 10, 254)) + } + } +) + +test.run_registered_tests() From 49fba6fb040039114b7c55a11ca37d2ca00f5c13 Mon Sep 17 00:00:00 2001 From: Harrison Carter Date: Tue, 30 Dec 2025 13:00:21 -0600 Subject: [PATCH 03/10] add extra pre-1.3 checks for nil --- .../matter-switch/src/switch_handlers/capability_handlers.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua index b6a82311e3..8d59ddeb99 100644 --- a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua +++ b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua @@ -127,7 +127,7 @@ function CapabilityHandlers.handle_step_color_temperature_by_percent(driver, dev if step_percent_change == 0 then return end local endpoint_id = device:component_to_endpoint(cmd.component) -- before the Matter 1.3 lua libs update (HUB FW 55), there was no ColorControl StepModeEnum type defined - local step_mode = step_percent_change > 0 and (clusters.ColorControl.types.StepModeEnum.DOWN or 3) or (clusters.ColorControl.types.StepModeEnum.UP or 1) + local step_mode = step_percent_change > 0 and (clusters.ColorControl.types.StepModeEnum and clusters.ColorControl.types.StepModeEnum.DOWN or 3) or (clusters.ColorControl.types.StepModeEnum and clusters.ColorControl.types.StepModeEnum.UP or 1) local min_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MIN, endpoint_id) or 2200 -- default min mireds local max_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MAX, endpoint_id) or 6500 -- default max mireds local step_size_in_mireds = (max_mireds - min_mireds) * st_utils.round((math.abs(step_percent_change)/100)) From c2c2b1c48199f3da1811d0660b77dbc6c6add2e8 Mon Sep 17 00:00:00 2001 From: Harrison Carter Date: Tue, 30 Dec 2025 13:04:58 -0600 Subject: [PATCH 04/10] remove embedded cap defs, fix default mireds --- .../statelessColorTemperatureStep.yml | 15 --------------- .../capabilities/statelessSwitchLevelStep.yml | 15 --------------- .../src/switch_handlers/capability_handlers.lua | 4 ++-- 3 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 drivers/SmartThings/matter-switch/capabilities/statelessColorTemperatureStep.yml delete mode 100644 drivers/SmartThings/matter-switch/capabilities/statelessSwitchLevelStep.yml diff --git a/drivers/SmartThings/matter-switch/capabilities/statelessColorTemperatureStep.yml b/drivers/SmartThings/matter-switch/capabilities/statelessColorTemperatureStep.yml deleted file mode 100644 index dee4dd2266..0000000000 --- a/drivers/SmartThings/matter-switch/capabilities/statelessColorTemperatureStep.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Stateless Color Temperature Step -status: proposed -attributes: {} -commands: - stepColorTemperatureByPercent: - arguments: - - name: stepSize - schema: - type: integer - minimum: -100 - maximum: 100 - optional: false - name: stepColorTemperatureByPercent -id: statelessColorTemperatureStep -version: 1 diff --git a/drivers/SmartThings/matter-switch/capabilities/statelessSwitchLevelStep.yml b/drivers/SmartThings/matter-switch/capabilities/statelessSwitchLevelStep.yml deleted file mode 100644 index a751ab6cd5..0000000000 --- a/drivers/SmartThings/matter-switch/capabilities/statelessSwitchLevelStep.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Stateless Switch Level Step -status: proposed -attributes: {} -commands: - stepLevel: - arguments: - - name: stepSize - schema: - type: integer - minimum: -100 - maximum: 100 - optional: false - name: stepLevel -id: statelessSwitchLevelStep -version: 1 diff --git a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua index 8d59ddeb99..4db190c4e0 100644 --- a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua +++ b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua @@ -128,8 +128,8 @@ function CapabilityHandlers.handle_step_color_temperature_by_percent(driver, dev local endpoint_id = device:component_to_endpoint(cmd.component) -- before the Matter 1.3 lua libs update (HUB FW 55), there was no ColorControl StepModeEnum type defined local step_mode = step_percent_change > 0 and (clusters.ColorControl.types.StepModeEnum and clusters.ColorControl.types.StepModeEnum.DOWN or 3) or (clusters.ColorControl.types.StepModeEnum and clusters.ColorControl.types.StepModeEnum.UP or 1) - local min_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MIN, endpoint_id) or 2200 -- default min mireds - local max_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MAX, endpoint_id) or 6500 -- default max mireds + local min_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MIN, endpoint_id) or fields.COLOR_TEMPERATURE_MIRED_MIN -- default min mireds + local max_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MAX, endpoint_id) or fields.COLOR_TEMPERATURE_MIRED_MAX -- default max mireds local step_size_in_mireds = (max_mireds - min_mireds) * st_utils.round((math.abs(step_percent_change)/100)) device:send(clusters.ColorControl.server.commands.StepColorTemperature(device, endpoint_id, step_mode, step_size_in_mireds, fields.TRANSITION_TIME, min_mireds, max_mireds, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) end From 4f3299c9a80e9d6876a08f7183cf549025934d6a Mon Sep 17 00:00:00 2001 From: Harrison Carter Date: Wed, 7 Jan 2026 13:12:36 -0600 Subject: [PATCH 05/10] fix up logic --- .../matter-switch/src/switch_handlers/capability_handlers.lua | 4 +++- drivers/SmartThings/matter-switch/src/switch_utils/fields.lua | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua index 4db190c4e0..8801165d80 100644 --- a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua +++ b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua @@ -54,6 +54,7 @@ function CapabilityHandlers.handle_step_level(driver, device, cmd) if step_size == 0 then return end local endpoint_id = device:component_to_endpoint(cmd.component) local step_mode = step_size > 0 and clusters.LevelControl.types.StepMode.UP or clusters.LevelControl.types.StepMode.DOWN + print("Stepping level by ", math.abs(step_size)) device:send(clusters.LevelControl.server.commands.Step(device, endpoint_id, step_mode, math.abs(step_size), fields.TRANSITION_TIME, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) end @@ -130,7 +131,8 @@ function CapabilityHandlers.handle_step_color_temperature_by_percent(driver, dev local step_mode = step_percent_change > 0 and (clusters.ColorControl.types.StepModeEnum and clusters.ColorControl.types.StepModeEnum.DOWN or 3) or (clusters.ColorControl.types.StepModeEnum and clusters.ColorControl.types.StepModeEnum.UP or 1) local min_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MIN, endpoint_id) or fields.COLOR_TEMPERATURE_MIRED_MIN -- default min mireds local max_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MAX, endpoint_id) or fields.COLOR_TEMPERATURE_MIRED_MAX -- default max mireds - local step_size_in_mireds = (max_mireds - min_mireds) * st_utils.round((math.abs(step_percent_change)/100)) + local step_size_in_mireds = st_utils.round((max_mireds - min_mireds) * (math.abs(step_percent_change)/100.0)) + print("Stepping color temperature by ", step_size_in_mireds, " mireds", " with max mireds of ", max_mireds, " and min mireds of ", min_mireds) device:send(clusters.ColorControl.server.commands.StepColorTemperature(device, endpoint_id, step_mode, step_size_in_mireds, fields.TRANSITION_TIME, min_mireds, max_mireds, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) end diff --git a/drivers/SmartThings/matter-switch/src/switch_utils/fields.lua b/drivers/SmartThings/matter-switch/src/switch_utils/fields.lua index f0fd0166b4..bf0862f8de 100644 --- a/drivers/SmartThings/matter-switch/src/switch_utils/fields.lua +++ b/drivers/SmartThings/matter-switch/src/switch_utils/fields.lua @@ -27,8 +27,8 @@ SwitchFields.MIRED_KELVIN_CONVERSION_CONSTANT = 1000000 -- These values are a "sanity check" to check that values we are getting are reasonable local COLOR_TEMPERATURE_KELVIN_MAX = 15000 local COLOR_TEMPERATURE_KELVIN_MIN = 1000 -SwitchFields.COLOR_TEMPERATURE_MIRED_MAX = SwitchFields.MIRED_KELVIN_CONVERSION_CONSTANT/COLOR_TEMPERATURE_KELVIN_MIN -SwitchFields.COLOR_TEMPERATURE_MIRED_MIN = SwitchFields.MIRED_KELVIN_CONVERSION_CONSTANT/COLOR_TEMPERATURE_KELVIN_MAX +SwitchFields.COLOR_TEMPERATURE_MIRED_MAX = math.floor(SwitchFields.MIRED_KELVIN_CONVERSION_CONSTANT/COLOR_TEMPERATURE_KELVIN_MIN) +SwitchFields.COLOR_TEMPERATURE_MIRED_MIN = math.floor(SwitchFields.MIRED_KELVIN_CONVERSION_CONSTANT/COLOR_TEMPERATURE_KELVIN_MAX) SwitchFields.SWITCH_LEVEL_LIGHTING_MIN = 1 SwitchFields.CURRENT_HUESAT_ATTR_MIN = 0 From 00f1bf492b0fd829551fd9173301957299d9e610 Mon Sep 17 00:00:00 2001 From: Harrison Carter Date: Tue, 30 Dec 2025 16:28:17 -0600 Subject: [PATCH 06/10] fix tests --- .../src/test/test_stateless_step.lua | 87 +++++++++++-------- 1 file changed, 51 insertions(+), 36 deletions(-) diff --git a/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua b/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua index c39e259697..d4b99f48a0 100644 --- a/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua +++ b/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua @@ -2,7 +2,6 @@ -- Licensed under the Apache License, Version 2.0 local test = require "integration_test" -local capabilities = require "st.capabilities" local t_utils = require "integration_test.utils" local clusters = require "st.matter.clusters" @@ -33,33 +32,11 @@ local cluster_subscribe_list = { clusters.LevelControl.attributes.CurrentLevel, clusters.LevelControl.attributes.MaxLevel, clusters.LevelControl.attributes.MinLevel, - clusters.ColorControl.attributes.CurrentHue, - clusters.ColorControl.attributes.CurrentSaturation, - clusters.ColorControl.attributes.CurrentX, - clusters.ColorControl.attributes.CurrentY, - clusters.ColorControl.attributes.ColorMode, clusters.ColorControl.attributes.ColorTemperatureMireds, clusters.ColorControl.attributes.ColorTempPhysicalMaxMireds, clusters.ColorControl.attributes.ColorTempPhysicalMinMireds, } -local function set_color_mode(device, endpoint, color_mode) - test.socket.matter:__queue_receive({ - device.id, - clusters.ColorControl.attributes.ColorMode:build_test_report_data( - device, endpoint, color_mode) - }) - local read_req - if color_mode == clusters.ColorControl.types.ColorMode.CURRENT_HUE_AND_CURRENT_SATURATION then - read_req = clusters.ColorControl.attributes.CurrentHue:read() - read_req:merge(clusters.ColorControl.attributes.CurrentSaturation:read()) - else -- color_mode = clusters.ColorControl.types.ColorMode.CURRENTX_AND_CURRENTY - read_req = clusters.ColorControl.attributes.CurrentX:read() - read_req:merge(clusters.ColorControl.attributes.CurrentY:read()) - end - test.socket.matter:__expect_send({device.id, read_req}) -end - local function test_init() local subscribe_request = cluster_subscribe_list[1]:subscribe(mock_device_color_temp) for i, cluster in ipairs(cluster_subscribe_list) do @@ -69,78 +46,116 @@ local function test_init() end test.socket.matter:__expect_send({mock_device_color_temp.id, subscribe_request}) test.mock_device.add_test_device(mock_device_color_temp) - set_color_mode(mock_device_color_temp, 1, clusters.ColorControl.types.ColorMode.CURRENT_HUE_AND_CURRENT_SATURATION) end test.set_test_init_function(test_init) +local fields = require "switch_utils.fields" + test.register_message_test( "Color Temperature Step Command Test", { { channel = "capability", direction = "receive", - message = { mock_device_color_temp:generate_test_message("main", capabilities.statelessColorTemperatureStep.stepColorTemperatureByPercent(25)) } + message = { + mock_device_color_temp.id, + { capability = "statelessColorTemperatureStep", component = "main", command = "stepColorTemperatureByPercent", args = { 20 } } + } }, { channel = "matter", direction = "send", - message = mock_device_color_temp:generate_test_message("matter", clusters.ColorControl.server.commands.StepColorTemperature(mock_device_color_temp, 1, clusters.ColorControl.types.StepModeEnum.UP, 1075, 10, 2200, 6500, 0, 0)) + message = { + mock_device_color_temp.id, + clusters.ColorControl.server.commands.StepColorTemperature(mock_device_color_temp, 1, clusters.ColorControl.types.StepModeEnum.DOWN, 187, fields.TRANSITION_TIME, fields.COLOR_TEMPERATURE_MIRED_MIN, fields.COLOR_TEMPERATURE_MIRED_MAX, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE) + }, }, { channel = "capability", direction = "receive", - message = { mock_device_color_temp:generate_test_message("main", capabilities.statelessColorTemperatureStep.stepColorTemperatureByPercent(-50)) } + message = { + mock_device_color_temp.id, + { capability = "statelessColorTemperatureStep", component = "main", command = "stepColorTemperatureByPercent", args = { 90 } } + } }, { channel = "matter", direction = "send", - message = mock_device_color_temp:generate_test_message("matter", clusters.ColorControl.server.commands.StepColorTemperature(mock_device_color_temp, 1, clusters.ColorControl.types.StepModeEnum.DOWN, 2150, 10, 2200, 6500, 0, 0)) + message = { + mock_device_color_temp.id, + clusters.ColorControl.server.commands.StepColorTemperature(mock_device_color_temp, 1, clusters.ColorControl.types.StepModeEnum.DOWN, 841, fields.TRANSITION_TIME, fields.COLOR_TEMPERATURE_MIRED_MIN, fields.COLOR_TEMPERATURE_MIRED_MAX, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE) + }, }, { channel = "capability", direction = "receive", - message = { mock_device_color_temp:generate_test_message("main", capabilities.statelessColorTemperatureStep.stepColorTemperatureByPercent(100)) } + message = { + mock_device_color_temp.id, + { capability = "statelessColorTemperatureStep", component = "main", command = "stepColorTemperatureByPercent", args = { -50 } } + } }, { channel = "matter", direction = "send", - message = mock_device_color_temp:generate_test_message("matter", clusters.ColorControl.server.commands.StepColorTemperature(mock_device_color_temp, 1, clusters.ColorControl.types.StepModeEnum.UP, 4300, 10, 2200, 6500, 0, 0)) + message = { + mock_device_color_temp.id, + clusters.ColorControl.server.commands.StepColorTemperature(mock_device_color_temp, 1, clusters.ColorControl.types.StepModeEnum.UP, 467, fields.TRANSITION_TIME, fields.COLOR_TEMPERATURE_MIRED_MIN, fields.COLOR_TEMPERATURE_MIRED_MAX, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE) + }, } } ) + test.register_message_test( "Level Step Command Test", { { channel = "capability", direction = "receive", - message = { mock_device_color_temp:generate_test_message("main", capabilities.statelessSwitchLevelStep.stepLevel(25)) } + message = { + mock_device_color_temp.id, + { capability = "statelessSwitchLevelStep", component = "main", command = "stepLevel", args = { 25 } } + } }, { channel = "matter", direction = "send", - message = mock_device_color_temp:generate_test_message("matter", clusters.LevelControl.server.commands.StepLevel(mock_device_color_temp, 1, clusters.LevelControl.types.StepModeEnum.UP, 1075, 10, 254)) + message = { + mock_device_color_temp.id, + clusters.LevelControl.server.commands.Step(mock_device_color_temp, 1, clusters.LevelControl.types.StepModeEnum.UP, 63, fields.TRANSITION_TIME, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE) + }, }, { channel = "capability", direction = "receive", - message = { mock_device_color_temp:generate_test_message("main", capabilities.statelessSwitchLevelStep.stepLevel(-50)) } + message = { + mock_device_color_temp.id, + { capability = "statelessSwitchLevelStep", component = "main", command = "stepLevel", args = { -50 } } + } }, { channel = "matter", direction = "send", - message = mock_device_color_temp:generate_test_message("matter", clusters.LevelControl.server.commands.StepLevel(mock_device_color_temp, 1, clusters.LevelControl.types.StepModeEnum.DOWN, 2150, 10, 254)) + message = { + mock_device_color_temp.id, + clusters.LevelControl.server.commands.Step(mock_device_color_temp, 1, clusters.LevelControl.types.StepModeEnum.DOWN, 127, fields.TRANSITION_TIME, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE) + }, }, { channel = "capability", direction = "receive", - message = { mock_device_color_temp:generate_test_message("main", capabilities.statelessSwitchLevelStep.stepLevel(100)) } + message = { + mock_device_color_temp.id, + { capability = "statelessSwitchLevelStep", component = "main", command = "stepLevel", args = { 100 } } + } }, { channel = "matter", direction = "send", - message = mock_device_color_temp:generate_test_message("matter", clusters.LevelControl.server.commands.StepLevel(mock_device_color_temp, 1, clusters.LevelControl.types.StepModeEnum.UP, 4300, 10, 254)) + message = { + mock_device_color_temp.id, + clusters.LevelControl.server.commands.Step(mock_device_color_temp, 1, clusters.LevelControl.types.StepModeEnum.UP, 254, fields.TRANSITION_TIME, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE) + }, } } ) From 17f06e275ffa8ff3ab955f67227e712ee2eb9fe9 Mon Sep 17 00:00:00 2001 From: Harrison Carter Date: Wed, 7 Jan 2026 16:13:17 -0600 Subject: [PATCH 07/10] remove debug print statements --- .../matter-switch/src/switch_handlers/capability_handlers.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua index 8801165d80..569b36d8b8 100644 --- a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua +++ b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua @@ -54,7 +54,6 @@ function CapabilityHandlers.handle_step_level(driver, device, cmd) if step_size == 0 then return end local endpoint_id = device:component_to_endpoint(cmd.component) local step_mode = step_size > 0 and clusters.LevelControl.types.StepMode.UP or clusters.LevelControl.types.StepMode.DOWN - print("Stepping level by ", math.abs(step_size)) device:send(clusters.LevelControl.server.commands.Step(device, endpoint_id, step_mode, math.abs(step_size), fields.TRANSITION_TIME, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) end @@ -132,7 +131,6 @@ function CapabilityHandlers.handle_step_color_temperature_by_percent(driver, dev local min_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MIN, endpoint_id) or fields.COLOR_TEMPERATURE_MIRED_MIN -- default min mireds local max_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MAX, endpoint_id) or fields.COLOR_TEMPERATURE_MIRED_MAX -- default max mireds local step_size_in_mireds = st_utils.round((max_mireds - min_mireds) * (math.abs(step_percent_change)/100.0)) - print("Stepping color temperature by ", step_size_in_mireds, " mireds", " with max mireds of ", max_mireds, " and min mireds of ", min_mireds) device:send(clusters.ColorControl.server.commands.StepColorTemperature(device, endpoint_id, step_mode, step_size_in_mireds, fields.TRANSITION_TIME, min_mireds, max_mireds, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) end From 0335fce99831ca42814944e7dad3af726726272b Mon Sep 17 00:00:00 2001 From: Harrison Carter Date: Thu, 8 Jan 2026 15:16:43 -0600 Subject: [PATCH 08/10] move some cap defs after config, fix year, change floor to round --- .../profiles/light-color-level-1800K-6500K.yml | 8 ++++---- .../profiles/light-color-level-2000K-7000K.yml | 8 ++++---- .../profiles/light-color-level-2200K-6500K.yml | 8 ++++---- .../profiles/light-color-level-2700K-6500K.yml | 8 ++++---- .../matter-switch/profiles/light-color-level-fan.yml | 8 ++++---- .../light-color-level-illuminance-motion-1000K-15000K.yml | 4 ++-- .../profiles/light-color-level-illuminance-motion.yml | 4 ++-- .../matter-switch/profiles/light-color-level.yml | 8 ++++---- .../matter-switch/profiles/light-level-2-button.yml | 4 ++-- .../matter-switch/profiles/light-level-3-button.yml | 4 ++-- .../matter-switch/profiles/light-level-4-button.yml | 4 ++-- .../matter-switch/profiles/light-level-5-button.yml | 4 ++-- .../matter-switch/profiles/light-level-6-button.yml | 4 ++-- .../matter-switch/profiles/light-level-7-button.yml | 4 ++-- .../matter-switch/profiles/light-level-8-button.yml | 4 ++-- .../profiles/light-level-ColorTemperature-1500-9000k.yml | 8 ++++---- .../matter-switch/profiles/light-level-button.yml | 4 ++-- .../profiles/light-level-colorTemperature-2200K-6500K.yml | 8 ++++---- .../profiles/light-level-colorTemperature-2700K-6500K.yml | 8 ++++---- .../profiles/light-level-colorTemperature-2710k-6500k.yml | 8 ++++---- .../profiles/light-level-colorTemperature.yml | 8 ++++---- .../profiles/light-level-energy-powerConsumption.yml | 4 ++-- .../matter-switch/profiles/light-level-motion.yml | 4 ++-- .../light-level-power-energy-powerConsumption.yml | 4 ++-- .../matter-switch/profiles/light-level-power.yml | 4 ++-- .../SmartThings/matter-switch/profiles/light-level.yml | 4 ++-- .../matter-switch/profiles/switch-color-level.yml | 4 ++-- .../profiles/switch-level-colorTemperature.yml | 4 ++-- .../SmartThings/matter-switch/src/switch_utils/fields.lua | 5 +++-- .../matter-switch/src/test/test_stateless_step.lua | 2 +- 30 files changed, 82 insertions(+), 81 deletions(-) diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-1800K-6500K.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-1800K-6500K.yml index d46df21c5c..a0f5196b12 100755 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-1800K-6500K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-1800K-6500K.yml @@ -7,20 +7,20 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: colorTemperature version: 1 - - id: statelessColorTemperatureStep - version: 1 config: values: - key: "colorTemperature.value" range: [ 1800, 6500 ] + - id: statelessColorTemperatureStep + version: 1 - id: colorControl version: 1 - id: firmwareUpdate diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-2000K-7000K.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-2000K-7000K.yml index 557fc6120a..7424d241e2 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-2000K-7000K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-2000K-7000K.yml @@ -7,20 +7,20 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] - - id: colorTemperature + - id: statelessSwitchLevelStep version: 1 - - id: statelessColorTemperatureStep + - id: colorTemperature version: 1 config: values: - key: "colorTemperature.value" range: [ 2000, 7000 ] + - id: statelessColorTemperatureStep + version: 1 - id: colorControl version: 1 - id: firmwareUpdate diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-2200K-6500K.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-2200K-6500K.yml index 92caf967a1..a098cdd06f 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-2200K-6500K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-2200K-6500K.yml @@ -7,20 +7,20 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] - - id: colorTemperature + - id: statelessSwitchLevelStep version: 1 - - id: statelessColorTemperatureStep + - id: colorTemperature version: 1 config: values: - key: "colorTemperature.value" range: [ 2200, 6500 ] + - id: statelessColorTemperatureStep + version: 1 - id: colorControl version: 1 - id: firmwareUpdate diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-2700K-6500K.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-2700K-6500K.yml index cfc20776be..1b469ae8e8 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-2700K-6500K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-2700K-6500K.yml @@ -7,20 +7,20 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] - - id: colorTemperature + - id: statelessSwitchLevelStep version: 1 - - id: statelessColorTemperatureStep + - id: colorTemperature version: 1 config: values: - key: "colorTemperature.value" range: [ 2700, 6500 ] + - id: statelessColorTemperatureStep + version: 1 - id: colorControl version: 1 - id: firmwareUpdate diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-fan.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-fan.yml index e50af5addd..2f91bcb04e 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-fan.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-fan.yml @@ -6,20 +6,20 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] - - id: colorTemperature + - id: statelessSwitchLevelStep version: 1 - - id: statelessColorTemperatureStep + - id: colorTemperature version: 1 config: values: - key: "colorTemperature.value" range: [ 2700, 6500 ] + - id: statelessColorTemperatureStep + version: 1 - id: colorControl version: 1 - id: fanMode diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion-1000K-15000K.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion-1000K-15000K.yml index 87206f7c25..fb7a4fca94 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion-1000K-15000K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion-1000K-15000K.yml @@ -11,12 +11,12 @@ components: version: 1 - id: colorTemperature version: 1 - - id: statelessColorTemperatureStep - version: 1 config: values: - key: "colorTemperature.value" range: [ 1000, 15000 ] + - id: statelessColorTemperatureStep + version: 1 - id: colorControl version: 1 - id: motionSensor diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion.yml index 821e866b4e..50f68f60fc 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-illuminance-motion.yml @@ -10,12 +10,12 @@ components: version: 1 - id: colorTemperature version: 1 - - id: statelessColorTemperatureStep - version: 1 config: values: - key: "colorTemperature.value" range: [ 2200, 6500 ] + - id: statelessColorTemperatureStep + version: 1 - id: colorControl version: 1 - id: motionSensor diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level.yml index 94d4176446..2f0f673bee 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level.yml @@ -6,20 +6,20 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] - - id: colorTemperature + - id: statelessSwitchLevelStep version: 1 - - id: statelessColorTemperatureStep + - id: colorTemperature version: 1 config: values: - key: "colorTemperature.value" range: [ 2200, 6500 ] + - id: statelessColorTemperatureStep + version: 1 - id: colorControl version: 1 - id: firmwareUpdate diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-2-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-2-button.yml index 7726032e2a..ed76480116 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-2-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-2-button.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-3-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-3-button.yml index 03fbd89c58..9e3106d9de 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-3-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-3-button.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-4-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-4-button.yml index 6156f9caa2..43bcec5955 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-4-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-4-button.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-5-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-5-button.yml index 1b07b8c23c..2b98b9784d 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-5-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-5-button.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-6-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-6-button.yml index a745fda2b8..230b2ea341 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-6-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-6-button.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-7-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-7-button.yml index 0e9e620c3e..13b3ee9443 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-7-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-7-button.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-8-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-8-button.yml index aa62c77ba6..a2dc732257 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-8-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-8-button.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-ColorTemperature-1500-9000k.yml b/drivers/SmartThings/matter-switch/profiles/light-level-ColorTemperature-1500-9000k.yml index 8760877585..effe5f93b6 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-ColorTemperature-1500-9000k.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-ColorTemperature-1500-9000k.yml @@ -7,20 +7,20 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] - - id: colorTemperature + - id: statelessSwitchLevelStep version: 1 - - id: statelessColorTemperatureStep + - id: colorTemperature version: 1 config: values: - key: "colorTemperature.value" range: [ 1500, 9000 ] + - id: statelessColorTemperatureStep + version: 1 - id: colorControl version: 1 - id: firmwareUpdate diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-button.yml b/drivers/SmartThings/matter-switch/profiles/light-level-button.yml index 6c215a946d..8334e32feb 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-button.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-button.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2200K-6500K.yml b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2200K-6500K.yml index 56414b519f..2541fddc09 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2200K-6500K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2200K-6500K.yml @@ -7,20 +7,20 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] - - id: colorTemperature + - id: statelessSwitchLevelStep version: 1 - - id: statelessColorTemperatureStep + - id: colorTemperature version: 1 config: values: - key: "colorTemperature.value" range: [ 2200, 6500 ] + - id: statelessColorTemperatureStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2700K-6500K.yml b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2700K-6500K.yml index f4601c8148..7c845e8238 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2700K-6500K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2700K-6500K.yml @@ -7,20 +7,20 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] - - id: colorTemperature + - id: statelessSwitchLevelStep version: 1 - - id: statelessColorTemperatureStep + - id: colorTemperature version: 1 config: values: - key: "colorTemperature.value" range: [ 2700, 6500 ] + - id: statelessColorTemperatureStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2710k-6500k.yml b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2710k-6500k.yml index 9223bfa042..5ccc67ab4c 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2710k-6500k.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature-2710k-6500k.yml @@ -7,20 +7,20 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] - - id: colorTemperature + - id: statelessSwitchLevelStep version: 1 - - id: statelessColorTemperatureStep + - id: colorTemperature version: 1 config: values: - key: "colorTemperature.value" range: [ 2710, 6500 ] + - id: statelessColorTemperatureStep + version: 1 - id: colorControl version: 1 - id: firmwareUpdate diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature.yml b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature.yml index 571033c33b..5681a97e9e 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature.yml @@ -6,20 +6,20 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] - - id: colorTemperature + - id: statelessSwitchLevelStep version: 1 - - id: statelessColorTemperatureStep + - id: colorTemperature version: 1 config: values: - key: "colorTemperature.value" range: [ 2200, 6500 ] + - id: statelessColorTemperatureStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-energy-powerConsumption.yml b/drivers/SmartThings/matter-switch/profiles/light-level-energy-powerConsumption.yml index 0eb608818f..b2ddcc0a60 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-energy-powerConsumption.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-energy-powerConsumption.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: energyMeter version: 1 - id: powerConsumptionReport diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-motion.yml b/drivers/SmartThings/matter-switch/profiles/light-level-motion.yml index 222efe927f..54ce30abdf 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-motion.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-motion.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: motionSensor version: 1 - id: firmwareUpdate diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-power-energy-powerConsumption.yml b/drivers/SmartThings/matter-switch/profiles/light-level-power-energy-powerConsumption.yml index 83398b009c..31c6d44ee1 100755 --- a/drivers/SmartThings/matter-switch/profiles/light-level-power-energy-powerConsumption.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-power-energy-powerConsumption.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: powerMeter version: 1 - id: energyMeter diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-power.yml b/drivers/SmartThings/matter-switch/profiles/light-level-power.yml index e6701c5030..86d61c0345 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-power.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-power.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: powerMeter version: 1 - id: firmwareUpdate diff --git a/drivers/SmartThings/matter-switch/profiles/light-level.yml b/drivers/SmartThings/matter-switch/profiles/light-level.yml index e63693813b..3b286f8262 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level.yml @@ -6,12 +6,12 @@ components: version: 1 - id: switchLevel version: 1 - - id: statelessSwitchLevelStep - version: 1 config: values: - key: "level.value" range: [1, 100] + - id: statelessSwitchLevelStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/profiles/switch-color-level.yml b/drivers/SmartThings/matter-switch/profiles/switch-color-level.yml index e5754e8ad6..c684f632c9 100644 --- a/drivers/SmartThings/matter-switch/profiles/switch-color-level.yml +++ b/drivers/SmartThings/matter-switch/profiles/switch-color-level.yml @@ -10,12 +10,12 @@ components: version: 1 - id: colorTemperature version: 1 - - id: statelessColorTemperatureStep - version: 1 config: values: - key: "colorTemperature.value" range: [ 2200, 6500 ] + - id: statelessColorTemperatureStep + version: 1 - id: colorControl version: 1 - id: firmwareUpdate diff --git a/drivers/SmartThings/matter-switch/profiles/switch-level-colorTemperature.yml b/drivers/SmartThings/matter-switch/profiles/switch-level-colorTemperature.yml index b5f844ccf7..9cba419d02 100644 --- a/drivers/SmartThings/matter-switch/profiles/switch-level-colorTemperature.yml +++ b/drivers/SmartThings/matter-switch/profiles/switch-level-colorTemperature.yml @@ -10,12 +10,12 @@ components: version: 1 - id: colorTemperature version: 1 - - id: statelessColorTemperatureStep - version: 1 config: values: - key: "colorTemperature.value" range: [ 2200, 6500 ] + - id: statelessColorTemperatureStep + version: 1 - id: firmwareUpdate version: 1 - id: refresh diff --git a/drivers/SmartThings/matter-switch/src/switch_utils/fields.lua b/drivers/SmartThings/matter-switch/src/switch_utils/fields.lua index bf0862f8de..0ed3a7c08c 100644 --- a/drivers/SmartThings/matter-switch/src/switch_utils/fields.lua +++ b/drivers/SmartThings/matter-switch/src/switch_utils/fields.lua @@ -2,6 +2,7 @@ -- Licensed under the Apache License, Version 2.0 local clusters = require "st.matter.clusters" +local st_utils = require "st.utils" local capabilities = require "st.capabilities" local version = require "version" @@ -27,8 +28,8 @@ SwitchFields.MIRED_KELVIN_CONVERSION_CONSTANT = 1000000 -- These values are a "sanity check" to check that values we are getting are reasonable local COLOR_TEMPERATURE_KELVIN_MAX = 15000 local COLOR_TEMPERATURE_KELVIN_MIN = 1000 -SwitchFields.COLOR_TEMPERATURE_MIRED_MAX = math.floor(SwitchFields.MIRED_KELVIN_CONVERSION_CONSTANT/COLOR_TEMPERATURE_KELVIN_MIN) -SwitchFields.COLOR_TEMPERATURE_MIRED_MIN = math.floor(SwitchFields.MIRED_KELVIN_CONVERSION_CONSTANT/COLOR_TEMPERATURE_KELVIN_MAX) +SwitchFields.COLOR_TEMPERATURE_MIRED_MAX = st_utils.round(SwitchFields.MIRED_KELVIN_CONVERSION_CONSTANT/COLOR_TEMPERATURE_KELVIN_MIN) +SwitchFields.COLOR_TEMPERATURE_MIRED_MIN = st_utils.round(SwitchFields.MIRED_KELVIN_CONVERSION_CONSTANT/COLOR_TEMPERATURE_KELVIN_MAX) SwitchFields.SWITCH_LEVEL_LIGHTING_MIN = 1 SwitchFields.CURRENT_HUESAT_ATTR_MIN = 0 diff --git a/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua b/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua index d4b99f48a0..a1b3d69d6b 100644 --- a/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua +++ b/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua @@ -1,4 +1,4 @@ --- Copyright © 2022 SmartThings, Inc. +-- Copyright 2026 SmartThings, Inc. -- Licensed under the Apache License, Version 2.0 local test = require "integration_test" From 5e8a5ec84f7fca139db5c454ad4ff08117e4cc83 Mon Sep 17 00:00:00 2001 From: Harrison Carter Date: Thu, 8 Jan 2026 15:55:51 -0600 Subject: [PATCH 09/10] update handler to round from floor --- .../matter-switch/src/switch_handlers/capability_handlers.lua | 4 +++- .../matter-switch/src/test/test_stateless_step.lua | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua index 569b36d8b8..4dbb1cefc5 100644 --- a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua +++ b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua @@ -50,10 +50,11 @@ end -- [[ STATELESS SWITCH LEVEL STEP CAPABILITY COMMANDS ]] -- function CapabilityHandlers.handle_step_level(driver, device, cmd) - local step_size = math.floor((cmd.args and cmd.args.stepSize or 0)/100.0 * 254) + local step_size = st_utils.round((cmd.args and cmd.args.stepSize or 0)/100.0 * 254) if step_size == 0 then return end local endpoint_id = device:component_to_endpoint(cmd.component) local step_mode = step_size > 0 and clusters.LevelControl.types.StepMode.UP or clusters.LevelControl.types.StepMode.DOWN + print("level:", step_size) device:send(clusters.LevelControl.server.commands.Step(device, endpoint_id, step_mode, math.abs(step_size), fields.TRANSITION_TIME, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) end @@ -131,6 +132,7 @@ function CapabilityHandlers.handle_step_color_temperature_by_percent(driver, dev local min_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MIN, endpoint_id) or fields.COLOR_TEMPERATURE_MIRED_MIN -- default min mireds local max_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MAX, endpoint_id) or fields.COLOR_TEMPERATURE_MIRED_MAX -- default max mireds local step_size_in_mireds = st_utils.round((max_mireds - min_mireds) * (math.abs(step_percent_change)/100.0)) + print("percent:", step_size_in_mireds) device:send(clusters.ColorControl.server.commands.StepColorTemperature(device, endpoint_id, step_mode, step_size_in_mireds, fields.TRANSITION_TIME, min_mireds, max_mireds, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) end diff --git a/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua b/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua index a1b3d69d6b..69d33ed9dd 100644 --- a/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua +++ b/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua @@ -83,7 +83,7 @@ test.register_message_test( direction = "send", message = { mock_device_color_temp.id, - clusters.ColorControl.server.commands.StepColorTemperature(mock_device_color_temp, 1, clusters.ColorControl.types.StepModeEnum.DOWN, 841, fields.TRANSITION_TIME, fields.COLOR_TEMPERATURE_MIRED_MIN, fields.COLOR_TEMPERATURE_MIRED_MAX, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE) + clusters.ColorControl.server.commands.StepColorTemperature(mock_device_color_temp, 1, clusters.ColorControl.types.StepModeEnum.DOWN, 840, fields.TRANSITION_TIME, fields.COLOR_TEMPERATURE_MIRED_MIN, fields.COLOR_TEMPERATURE_MIRED_MAX, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE) }, }, { @@ -122,7 +122,7 @@ test.register_message_test( direction = "send", message = { mock_device_color_temp.id, - clusters.LevelControl.server.commands.Step(mock_device_color_temp, 1, clusters.LevelControl.types.StepModeEnum.UP, 63, fields.TRANSITION_TIME, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE) + clusters.LevelControl.server.commands.Step(mock_device_color_temp, 1, clusters.LevelControl.types.StepModeEnum.UP, 64, fields.TRANSITION_TIME, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE) }, }, { From 9bdd8d65313e6a3b0186f10ffbfffeb66417adf4 Mon Sep 17 00:00:00 2001 From: Harrison Carter Date: Fri, 9 Jan 2026 13:21:32 -0600 Subject: [PATCH 10/10] remove print statements from testing --- .../matter-switch/src/switch_handlers/capability_handlers.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua index 4dbb1cefc5..83ab2c763c 100644 --- a/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua +++ b/drivers/SmartThings/matter-switch/src/switch_handlers/capability_handlers.lua @@ -54,7 +54,6 @@ function CapabilityHandlers.handle_step_level(driver, device, cmd) if step_size == 0 then return end local endpoint_id = device:component_to_endpoint(cmd.component) local step_mode = step_size > 0 and clusters.LevelControl.types.StepMode.UP or clusters.LevelControl.types.StepMode.DOWN - print("level:", step_size) device:send(clusters.LevelControl.server.commands.Step(device, endpoint_id, step_mode, math.abs(step_size), fields.TRANSITION_TIME, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) end @@ -132,7 +131,6 @@ function CapabilityHandlers.handle_step_color_temperature_by_percent(driver, dev local min_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MIN, endpoint_id) or fields.COLOR_TEMPERATURE_MIRED_MIN -- default min mireds local max_mireds = switch_utils.get_field_for_endpoint(device, fields.COLOR_TEMP_BOUND_RECEIVED_MIRED..fields.COLOR_TEMP_MAX, endpoint_id) or fields.COLOR_TEMPERATURE_MIRED_MAX -- default max mireds local step_size_in_mireds = st_utils.round((max_mireds - min_mireds) * (math.abs(step_percent_change)/100.0)) - print("percent:", step_size_in_mireds) device:send(clusters.ColorControl.server.commands.StepColorTemperature(device, endpoint_id, step_mode, step_size_in_mireds, fields.TRANSITION_TIME, min_mireds, max_mireds, fields.OPTIONS_MASK, fields.OPTIONS_OVERRIDE)) end