WWSTCERT-8461 Aqara dimmer controller t1 #2468

haedo-doo · 2025-10-15T06:30:55Z

Check all that apply

Type of Change

WWST Certification Request
- If this is your first time contributing code:
  - I have reviewed the README.md file
  - I have reviewed the CODE_OF_CONDUCT.md file
  - I have signed the CLA
- I plan on entering a WWST Certification Request or have entered a request through the WWST Certification console at developer.smartthings.com
Bug fix
New feature
Refactor

Checklist

I have performed a self-review of my code
I have commented my code in hard-to-understand areas
I have verified my changes by testing with a device or have communicated a plan for testing
I am adding new behavior, such as adding a sub-driver, and have added and run new unit tests to cover the new behavior

Description of Change

Summary of Completed Tests

github-actions · 2025-10-15T06:31:25Z

Duplicate profile check: Passed - no duplicate profiles detected.

github-actions · 2025-10-15T06:32:10Z

Channel deleted.

github-actions · 2025-10-15T06:36:39Z

Test Results

71 files 468 suites 0s ⏱️
2 455 tests 2 455 ✅ 0 💤 0 ❌
4 168 runs 4 168 ✅ 0 💤 0 ❌

Results for commit 260854a.

♻️ This comment has been updated with latest results.

github-actions · 2025-10-15T06:36:41Z

File	Coverage
All files	`97%`	✅
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/preferences.lua	`97%`	✅
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/init.lua	`94%`	✅
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/lazy_load_subdriver.lua	`57%`	❌
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/wallhero/init.lua	`97%`	✅
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/frient/init.lua	`94%`	✅
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/inovelli/init.lua	`98%`	✅
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/lifecycle_handlers/device_added.lua	`70%`	❌
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/jasco/init.lua	`92%`	✅
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/aqara/init.lua	`94%`	✅
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/tuya-multi/can_handle.lua	`90%`	✅
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/inovelli/vzm32-sn/init.lua	`95%`	✅
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/aqara-light/init.lua	`89%`	❌
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/configurations/init.lua	`98%`	✅
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/laisiao/init.lua	`87%`	❌
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/aqara/version/init.lua	`94%`	✅
/home/runner/work/SmartThingsEdgeDrivers/SmartThingsEdgeDrivers/drivers/SmartThings/zigbee-switch/src/ge-link-bulb/init.lua	`93%`	✅

Minimum allowed coverage is 90%

Generated by 🐒 cobertura-action against 260854a

greens · 2025-10-23T19:07:58Z

drivers/SmartThings/zigbee-switch/src/preferences.lua


 local devices = {
  AQARA_LIGHT = {
    MATCHING_MATRIX = { mfr = "LUMI", model = "lumi.light.acn004" },


you should just be able to add the new model here rather than duplicating this map entirely

Sorry for the late confirmation. It's been updated—please check again.

greens · 2025-10-23T19:10:39Z

drivers/SmartThings/zigbee-switch/src/aqara-light/init.lua

+local function init(self, device)
+  local min = 2700
+  local max = 6000
+
+  if device:get_model() == "lumi.light.cwacn1" then
+    max = 6500
+  end
+  device:emit_event(capabilities.colorTemperature.colorTemperatureRange({ minimum = min, maximum = max }))
+end
+


I understand the instinct here so that existing devices get this change, but we do not want this event to fire every time the driver starts.

I would add this event to the added handler as well, and a follow-up PR a week later should be created to remove this code here in init. I'd also add gating to check for an existing colorTemperatureRange value before emitting this event.

Sorry, I'm a bit confused. Should I add this event to the added handler and remove the one in init in a follow-up PR a week later—instead of doing it now?

So we want to make sure that existing already-installed devices get this change, which is (I assumed) why you placed it in init, since that is called every time the driver starts, rather than in added, which is only called once in the lifecycle of the device.

In general, this code should only be in the added handler, but for a week, I recommend having it in both added and init so that already-installed devices will update.

After that there should be a follow-up PR to remove the code from init since it will no longer be needed.

OK, got it. I'll add this event to the added handler first and remove the code from init in a follow-up PR later. Thanks!

greens · 2025-11-11T21:59:21Z

drivers/SmartThings/zigbee-switch/src/preferences.lua

+    local matrix = device.MATCHING_MATRIX
+    if not matrix then goto continue end
+
+    -- Single table format: { mfr = "...", model = "..." }
+    if matrix.mfr and matrix.model then
+      if matrix.mfr == mfr and matrix.model == model then
+        return device.PARAMETERS
+      end
+      goto continue
+    end
+    -- Array format: { { mfr = "...", model = "..." }, ... }
+    if type(matrix) == "table" then
+      for _, match in ipairs(matrix) do
+        if match.mfr == mfr and match.model == model then
+          return device.PARAMETERS
+        end
+      end
    end
+    ::continue::


what was the bug here that required this rewrite?

If I add the new model here rather than duplicating the entire map, preferences won't work properly because the existing get_device_parameters function can't handle the Array format for the model.

I've left some suggestions that seem a lot simpler than this rewrite, based on how this is handled elsewhere in the code base.

Thanks for the suggestions, I've updated the code.

greens · 2025-11-12T22:55:44Z

drivers/SmartThings/zigbee-switch/src/preferences.lua

    }
  },
  AQARA_LIGHT_BULB = {
    MATCHING_MATRIX = { mfr = "Aqara", model = "lumi.light.acn014" },


Suggested change

MATCHING_MATRIX = {

{ mfr = "Aqara", model = "lumi.light.acn014" },

}

drivers/SmartThings/zigbee-switch/src/preferences.lua

greens · 2025-11-13T23:43:36Z

drivers/SmartThings/zigbee-switch/src/aqara-light/init.lua

+  if device:get_model() == "lumi.light.cwacn1" then
+    max = 6500
+  end
+  device:emit_event(capabilities.colorTemperature.colorTemperatureRange({ minimum = min, maximum = max }))


Can you add the emit_event_if_latest_state_missing check for this code, since it runs every time the driver starts?

greens · 2025-11-17T22:37:58Z

You will need to rebase now, as we did a major reconfiguration of the zigbee switch driver code to reduce memory usage

haedo-doo · 2025-11-18T00:35:29Z

You will need to rebase now, as we did a major reconfiguration of the zigbee switch driver code to reduce memory usage

I've rebased.

greens requested review from greens, pegor-karoglanian and wkhenon October 23, 2025 19:05

greens reviewed Oct 23, 2025

View reviewed changes

greens changed the title ~~Aqara dimmer controller t1~~ WWSTCERT-8419 Aqara dimmer controller t1 Oct 23, 2025

greens changed the title ~~WWSTCERT-8419 Aqara dimmer controller t1~~ WWSTCERT-8419/8461 Aqara dimmer controller t1 Oct 23, 2025

greens changed the title ~~WWSTCERT-8419/8461 Aqara dimmer controller t1~~ WWSTCERT-8461 Aqara dimmer controller t1 Oct 28, 2025

greens reviewed Nov 11, 2025

View reviewed changes

wkhenon approved these changes Nov 12, 2025

View reviewed changes

greens reviewed Nov 12, 2025

View reviewed changes

drivers/SmartThings/zigbee-switch/src/preferences.lua Show resolved Hide resolved

greens reviewed Nov 13, 2025

View reviewed changes

haedo-doo added 9 commits November 18, 2025 09:17

add Aqara Dimmer Controller T1(0-10v)

9e843e4

Change the color temperature range without adding a profile

4bf7c5f

Fix test_aqara_led_bulb bug

0f59aa0

fix deviceLabel format

074ab37

add the new model instead of duplicating

4983622

fix preference bug

fb405e9

Copy the issue event to the added handler

e7e228a

Simplify the get_device_parameters code

c92c0cc

add emit_event_if_latest_state_missing check code

b13bde7

haedo-doo force-pushed the Aqara-DimmerControllerT1 branch from ce4156c to b13bde7 Compare November 18, 2025 00:24

remove unused function is_aqara_products in int.lua

1349b7a

Move the new model to can_handle.lua.

260854a

greens merged commit 1f59baa into SmartThingsCommunity:main Dec 2, 2025
12 checks passed

WWSTCERT-8461 Aqara dimmer controller t1 #2468

WWSTCERT-8461 Aqara dimmer controller t1 #2468

Uh oh!

Conversation

haedo-doo commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Type of Change

Checklist

Description of Change

Summary of Completed Tests

Uh oh!

github-actions bot commented Oct 15, 2025

Uh oh!

github-actions bot commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

github-actions bot commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

greens commented Nov 17, 2025

Uh oh!

haedo-doo commented Nov 18, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

haedo-doo commented Oct 15, 2025 •

edited

Loading

github-actions bot commented Oct 15, 2025 •

edited

Loading

github-actions bot commented Oct 15, 2025 •

edited

Loading

github-actions bot commented Oct 15, 2025 •

edited

Loading