pr comments pt. 4

wkhenon · wkhenon · commit 671071f6b69d · 2026-03-11T17:47:09.000-04:00
- fix tab spacing - back out driver test changes (covered by #2773) - swap `color_temp_range` and `kelvin_min, kelvin_max` checks
diff --git a/drivers/SmartThings/zigbee-switch/src/stateless_handlers/can_handle.lua b/drivers/SmartThings/zigbee-switch/src/stateless_handlers/can_handle.lua
@@ -4,11 +4,11 @@
 local capabilities = require "st.capabilities"
 
 return function(opts, driver, device)
-    local can_handle = device:supports_capability(capabilities.statelessColorTemperatureStep)
-        or device:supports_capability(capabilities.statelessSwitchLevelStep)
-    if can_handle then
-        local subdriver = require("stateless_handlers")
-        return true, subdriver
-    end
-    return false
+  local can_handle = device:supports_capability(capabilities.statelessColorTemperatureStep)
+    or device:supports_capability(capabilities.statelessSwitchLevelStep)
+  if can_handle then
+    local subdriver = require("stateless_handlers")
+    return true, subdriver
+  end
+  return false
 end
diff --git a/drivers/SmartThings/zigbee-switch/src/stateless_handlers/init.lua b/drivers/SmartThings/zigbee-switch/src/stateless_handlers/init.lua
@@ -13,52 +13,52 @@ local OPTIONS_MASK = 0x01 -- default: The `ExecuteIfOff` option is overriden
 local IGNORE_COMMAND_IF_OFF = 0x00 -- default: the command will not be executed if the device is off
 
 local function step_color_temperature_by_percent_handler(driver, device, cmd)
-    local step_percent_change = cmd.args and cmd.args.stepSize or 0
-    if step_percent_change == 0 then return end
-    local step_mode = step_percent_change > 0 and clusters.ColorControl.types.CcStepMode.DOWN or clusters.ColorControl.types.CcStepMode.UP
+  local step_percent_change = cmd.args and cmd.args.stepSize or 0
+  if step_percent_change == 0 then return end
+  local step_mode = step_percent_change > 0 and clusters.ColorControl.types.CcStepMode.DOWN or clusters.ColorControl.types.CcStepMode.UP
 
-    local color_temp_range = device:get_latest_state("main", capabilities.colorTemperature.ID, capabilities.colorTemperature.colorTemperatureRange.NAME);
-    local kelvin_min = device:get_field(switch_utils.KELVIN_MIN);
-    local kelvin_max = device:get_field(switch_utils.KELVIN_MAX);
+  local color_temp_range = device:get_latest_state("main", capabilities.colorTemperature.ID, capabilities.colorTemperature.colorTemperatureRange.NAME);
+  local kelvin_min = device:get_field(switch_utils.KELVIN_MIN);
+  local kelvin_max = device:get_field(switch_utils.KELVIN_MAX);
 
-    local min_mireds
-    local max_mireds
-    if kelvin_min and kelvin_max then
-        -- First tier: use device values if available
-        min_mireds = st_utils.round(switch_utils.MIREDS_CONVERSION_CONSTANT / kelvin_max)
-        max_mireds = st_utils.round(switch_utils.MIREDS_CONVERSION_CONSTANT / kelvin_min)
-    elseif color_temp_range then
-        -- Second tier: use color_temp_range if available
-        min_mireds = st_utils.round(switch_utils.MIREDS_CONVERSION_CONSTANT / color_temp_range.maximum)
-        max_mireds = st_utils.round(switch_utils.MIREDS_CONVERSION_CONSTANT / color_temp_range.minimum)
-    else
-        -- Third tier: use defaults
-        min_mireds = switch_utils.COLOR_TEMPERATURE_MIRED_MIN
-        max_mireds = switch_utils.COLOR_TEMPERATURE_MIRED_MAX
-    end
+  local min_mireds
+  local max_mireds
+  if color_temp_range then
+    -- First tier: use color_temp_range if available
+    min_mireds = st_utils.round(switch_utils.MIREDS_CONVERSION_CONSTANT / color_temp_range.maximum)
+    max_mireds = st_utils.round(switch_utils.MIREDS_CONVERSION_CONSTANT / color_temp_range.minimum)
+  elseif kelvin_min and kelvin_max then
+    -- Second tier: use device values if available
+    min_mireds = st_utils.round(switch_utils.MIREDS_CONVERSION_CONSTANT / kelvin_max)
+    max_mireds = st_utils.round(switch_utils.MIREDS_CONVERSION_CONSTANT / kelvin_min)
+  else
+    -- Third tier: use defaults
+    min_mireds = switch_utils.COLOR_TEMPERATURE_MIRED_MIN
+    max_mireds = switch_utils.COLOR_TEMPERATURE_MIRED_MAX
+  end
 
-    local step_size_in_mireds = st_utils.round((max_mireds - min_mireds) * (math.abs(step_percent_change)/100.0))
-    device:send(clusters.ColorControl.server.commands.StepColorTemperature(device, step_mode, step_size_in_mireds, TRANSITION_TIME, min_mireds, max_mireds, OPTIONS_MASK, IGNORE_COMMAND_IF_OFF))
+  local step_size_in_mireds = st_utils.round((max_mireds - min_mireds) * (math.abs(step_percent_change)/100.0))
+  device:send(clusters.ColorControl.server.commands.StepColorTemperature(device, step_mode, step_size_in_mireds, TRANSITION_TIME, min_mireds, max_mireds, OPTIONS_MASK, IGNORE_COMMAND_IF_OFF))
 end
 
 local function step_level_handler(driver, device, cmd)
-    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 step_mode = step_size > 0 and clusters.Level.types.MoveStepMode.UP or clusters.Level.types.MoveStepMode.DOWN
-    device:send(clusters.Level.server.commands.Step(device, step_mode, math.abs(step_size), TRANSITION_TIME, OPTIONS_MASK, IGNORE_COMMAND_IF_OFF))
+  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 step_mode = step_size > 0 and clusters.Level.types.MoveStepMode.UP or clusters.Level.types.MoveStepMode.DOWN
+  device:send(clusters.Level.server.commands.Step(device, step_mode, math.abs(step_size), TRANSITION_TIME, OPTIONS_MASK, IGNORE_COMMAND_IF_OFF))
 end
 
 local stateless_handlers = {
-    Name = "Zigbee Stateless Step Handlers",
-    capability_handlers = {
-        [capabilities.statelessColorTemperatureStep.ID] = {
-            [capabilities.statelessColorTemperatureStep.commands.stepColorTemperatureByPercent.NAME] = step_color_temperature_by_percent_handler,
-        },
-        [capabilities.statelessSwitchLevelStep.ID] = {
-            [capabilities.statelessSwitchLevelStep.commands.stepLevel.NAME] = step_level_handler,
-        },
+  Name = "Zigbee Stateless Step Handlers",
+  capability_handlers = {
+    [capabilities.statelessColorTemperatureStep.ID] = {
+      [capabilities.statelessColorTemperatureStep.commands.stepColorTemperatureByPercent.NAME] = step_color_temperature_by_percent_handler,
     },
-    can_handle = require("stateless_handlers.can_handle")
+    [capabilities.statelessSwitchLevelStep.ID] = {
+      [capabilities.statelessSwitchLevelStep.commands.stepLevel.NAME] = step_level_handler,
+    },
+  },
+  can_handle = require("stateless_handlers.can_handle")
 }
 
 return stateless_handlers
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_all_capability_zigbee_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_all_capability_zigbee_bulb.lua
@@ -348,9 +348,6 @@ test.register_message_test(
         ColorControl.server.commands.StepColorTemperature(mock_device, ColorControl.types.CcStepMode.UP, 467, 3, switch_utils.COLOR_TEMPERATURE_MIRED_MIN, switch_utils.COLOR_TEMPERATURE_MIRED_MAX, 0x01, 0x00)
       },
     }
-  },
-  {
-     min_api_version = 20
   }
 )
 
@@ -451,14 +448,6 @@ test.register_coroutine_test(
                                          mock_device.id,
                                          ElectricalMeasurement.attributes.ActivePower:read(mock_device)
                                        })
-      test.socket.zigbee:__expect_send({
-                                         mock_device.id,
-                                         ColorControl.attributes.ColorTempPhysicalMaxMireds:read(mock_device)
-                                      })
-      test.socket.zigbee:__expect_send({
-                                         mock_device.id,
-                                         ColorControl.attributes.ColorTempPhysicalMinMireds:read(mock_device)
-                                      })
       test.socket.zigbee:__expect_send({
                                          mock_device.id,
                                          OnOff.attributes.OnOff:configure_reporting(mock_device, 0, 300)
@@ -539,21 +528,13 @@ test.register_coroutine_test(
                                          mock_device.id,
                                          SimpleMetering.attributes.Divisor:read(mock_device)
                                        })
-      test.socket.zigbee:__expect_send({
-                                         mock_device.id,
-                                         ColorControl.attributes.ColorTempPhysicalMaxMireds:configure_reporting(mock_device, 1, 43200, 1)
-                                       })
-      test.socket.zigbee:__expect_send({
-                                        mock_device.id,
-                                        ColorControl.attributes.ColorTempPhysicalMinMireds:configure_reporting(mock_device, 1, 43200, 1)
-                                      })
       test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTempPhysicalMaxMireds:read(mock_device) })
       test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTempPhysicalMinMireds:read(mock_device) })
 
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 20
+       min_api_version = 19
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_rgbw_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_rgbw_bulb.lua
@@ -82,18 +82,6 @@ test.register_coroutine_test(
         ColorControl.attributes.CurrentSaturation:configure_reporting(mock_device, 1, 3600, 16)
       }
     )
-    test.socket.zigbee:__expect_send(
-      {
-        mock_device.id,
-        ColorControl.attributes.ColorTempPhysicalMaxMireds:configure_reporting(mock_device, 1, 43200, 1)
-      }
-    )
-    test.socket.zigbee:__expect_send(
-      {
-        mock_device.id,
-        ColorControl.attributes.ColorTempPhysicalMinMireds:configure_reporting(mock_device, 1, 43200, 1)
-      }
-    )
 
     test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
@@ -103,7 +91,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 20
+     min_api_version = 19
   }
 )
 
@@ -376,10 +364,6 @@ test.register_message_test(
         ColorControl.server.commands.StepColorTemperature(mock_device, ColorControl.types.CcStepMode.UP, 467, 3, switch_utils.COLOR_TEMPERATURE_MIRED_MIN, switch_utils.COLOR_TEMPERATURE_MIRED_MAX, 0x01, 0x00)
       },
     }
-  },
-  {
-     inner_block_ordering = "relaxed",
-     min_api_version = 20
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_sengled_color_temp_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_sengled_color_temp_bulb.lua
@@ -39,8 +39,6 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure" })
     test.socket.zigbee:__set_channel_ordering("relaxed")
 
-    test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTempPhysicalMaxMireds:read(mock_device) })
-    test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTempPhysicalMinMireds:read(mock_device) })
     test.socket.zigbee:__expect_send({
       mock_device.id,
       zigbee_test_utils.build_bind_request(mock_device, zigbee_test_utils.mock_hub_eui, OnOff.ID)
@@ -72,18 +70,6 @@ test.register_coroutine_test(
         ColorControl.attributes.ColorTemperatureMireds:configure_reporting(mock_device, 1, 3600, 16)
       }
     )
-    test.socket.zigbee:__expect_send(
-      {
-        mock_device.id,
-        ColorControl.attributes.ColorTempPhysicalMaxMireds:configure_reporting(mock_device, 1, 43200, 1)
-      }
-    )
-    test.socket.zigbee:__expect_send(
-      {
-        mock_device.id,
-        ColorControl.attributes.ColorTempPhysicalMinMireds:configure_reporting(mock_device, 1, 43200, 1)
-      }
-    )
 
     test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
@@ -93,7 +79,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 20
+     min_api_version = 19
   }
 )
 
@@ -128,27 +114,11 @@ test.register_message_test(
         mock_device.id,
         ColorControl.attributes.ColorTemperatureMireds:read(mock_device)
       }
-    },
-    {
-      channel = "zigbee",
-      direction = "send",
-      message = {
-        mock_device.id,
-        ColorControl.attributes.ColorTempPhysicalMaxMireds:read(mock_device)
-      }
-    },
-    {
-      channel = "zigbee",
-      direction = "send",
-      message = {
-        mock_device.id,
-        ColorControl.attributes.ColorTempPhysicalMinMireds:read(mock_device)
-      }
     }
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 20
+    min_api_version = 19
   }
 )
 
@@ -195,10 +165,7 @@ test.register_coroutine_test(
       }
     )
     test.wait_for_events()
-  end,
-  {
-     min_api_version = 20
-  }
+  end
 )
 
 test.register_coroutine_test(

Original file line number	Diff line number	Diff line change
`@@ -82,18 +82,6 @@ test.register_coroutine_test(`
`82`	`82`	`ColorControl.attributes.CurrentSaturation:configure_reporting(mock_device, 1, 3600, 16)`
`83`	`83`	`}`
`84`	`84`	`)`
`85`		`- test.socket.zigbee:__expect_send(`
`86`		`- {`
`87`		`- mock_device.id,`
`88`		`- ColorControl.attributes.ColorTempPhysicalMaxMireds:configure_reporting(mock_device, 1, 43200, 1)`
`89`		`- }`
`90`		`- )`
`91`		`- test.socket.zigbee:__expect_send(`
`92`		`- {`
`93`		`- mock_device.id,`
`94`		`- ColorControl.attributes.ColorTempPhysicalMinMireds:configure_reporting(mock_device, 1, 43200, 1)`
`95`		`- }`
`96`		`- )`
`97`	`85`
`98`	`86`	`test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })`
`99`	`87`	`test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })`
`@@ -103,7 +91,7 @@ test.register_coroutine_test(`
`103`	`91`	`mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })`
`104`	`92`	`end,`
`105`	`93`	`{`
`106`		`- min_api_version = 20`
	`94`	`+ min_api_version = 19`
`107`	`95`	`}`
`108`	`96`	`)`
`109`	`97`
`@@ -376,10 +364,6 @@ test.register_message_test(`
`376`	`364`	`ColorControl.server.commands.StepColorTemperature(mock_device, ColorControl.types.CcStepMode.UP, 467, 3, switch_utils.COLOR_TEMPERATURE_MIRED_MIN, switch_utils.COLOR_TEMPERATURE_MIRED_MAX, 0x01, 0x00)`
`377`	`365`	`},`
`378`	`366`	`}`
`379`		`- },`
`380`		`- {`
`381`		`- inner_block_ordering = "relaxed",`
`382`		`- min_api_version = 20`
`383`	`367`	`}`
`384`	`368`	`)`
`385`	`369`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@ test.register_coroutine_test(`
`39`	`39`	`test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure" })`
`40`	`40`	`test.socket.zigbee:__set_channel_ordering("relaxed")`
`41`	`41`
`42`		`- test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTempPhysicalMaxMireds:read(mock_device) })`
`43`		`- test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTempPhysicalMinMireds:read(mock_device) })`
`44`	`42`	`test.socket.zigbee:__expect_send({`
`45`	`43`	`mock_device.id,`
`46`	`44`	`zigbee_test_utils.build_bind_request(mock_device, zigbee_test_utils.mock_hub_eui, OnOff.ID)`
`@@ -72,18 +70,6 @@ test.register_coroutine_test(`
`72`	`70`	`ColorControl.attributes.ColorTemperatureMireds:configure_reporting(mock_device, 1, 3600, 16)`
`73`	`71`	`}`
`74`	`72`	`)`
`75`		`- test.socket.zigbee:__expect_send(`
`76`		`- {`
`77`		`- mock_device.id,`
`78`		`- ColorControl.attributes.ColorTempPhysicalMaxMireds:configure_reporting(mock_device, 1, 43200, 1)`
`79`		`- }`
`80`		`- )`
`81`		`- test.socket.zigbee:__expect_send(`
`82`		`- {`
`83`		`- mock_device.id,`
`84`		`- ColorControl.attributes.ColorTempPhysicalMinMireds:configure_reporting(mock_device, 1, 43200, 1)`
`85`		`- }`
`86`		`- )`
`87`	`73`
`88`	`74`	`test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })`
`89`	`75`	`test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })`
`@@ -93,7 +79,7 @@ test.register_coroutine_test(`
`93`	`79`	`mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })`
`94`	`80`	`end,`
`95`	`81`	`{`
`96`		`- min_api_version = 20`
	`82`	`+ min_api_version = 19`
`97`	`83`	`}`
`98`	`84`	`)`
`99`	`85`
`@@ -128,27 +114,11 @@ test.register_message_test(`
`128`	`114`	`mock_device.id,`
`129`	`115`	`ColorControl.attributes.ColorTemperatureMireds:read(mock_device)`
`130`	`116`	`}`
`131`		`- },`
`132`		`- {`
`133`		`- channel = "zigbee",`
`134`		`- direction = "send",`
`135`		`- message = {`
`136`		`- mock_device.id,`
`137`		`- ColorControl.attributes.ColorTempPhysicalMaxMireds:read(mock_device)`
`138`		`- }`
`139`		`- },`
`140`		`- {`
`141`		`- channel = "zigbee",`
`142`		`- direction = "send",`
`143`		`- message = {`
`144`		`- mock_device.id,`
`145`		`- ColorControl.attributes.ColorTempPhysicalMinMireds:read(mock_device)`
`146`		`- }`
`147`	`117`	`}`
`148`	`118`	`},`
`149`	`119`	`{`
`150`	`120`	`inner_block_ordering = "relaxed",`
`151`		`- min_api_version = 20`
	`121`	`+ min_api_version = 19`
`152`	`122`	`}`
`153`	`123`	`)`
`154`	`124`
`@@ -195,10 +165,7 @@ test.register_coroutine_test(`
`195`	`165`	`}`
`196`	`166`	`)`
`197`	`167`	`test.wait_for_events()`
`198`		`- end,`
`199`		`- {`
`200`		`- min_api_version = 20`
`201`		`- }`
	`168`	`+ end`
`202`	`169`	`)`
`203`	`170`
`204`	`171`	`test.register_coroutine_test(`