Merge branch 'main' into matter-window-covering-support-tilt

SmartThingsCommunity · Dec 17, 2024 · 6e850bc · 6e850bc
2 parents d5424d3 + b2fa5b4
commit 6e850bc
Show file tree

Hide file tree

Showing 16 changed files with 184 additions and 201 deletions.
diff --git a/drivers/SmartThings/matter-sensor/fingerprints.yml b/drivers/SmartThings/matter-sensor/fingerprints.yml
@@ -69,6 +69,17 @@ matterManufacturer:
     vendorId: 0x1021
     productId: 0x0001
     deviceProfileName: motion-contact-battery
+  # Neo
+  - id: "4991/1122"
+    deviceLabel: Door Sensor
+    vendorId: 0x137F
+    productId: 0x0462
+    deviceProfileName: contact-battery
+  - id: "4991/1123"
+    deviceLabel: Motion Sensor
+    vendorId: 0x137F
+    productId: 0x0463
+    deviceProfileName: motion-battery
   #Tuo
   - id: "5150/3"
     deviceLabel: "TUO Temperature Sensor"

diff --git a/drivers/SmartThings/matter-sensor/profiles/aqs-temp-humidity-tvoc-meas.yml b/drivers/SmartThings/matter-sensor/profiles/aqs-temp-humidity-tvoc-meas.yml
@@ -0,0 +1,18 @@
+name: aqs-temp-humidity-tvoc-meas
+components:
+  - id: main
+    capabilities:
+      - id: airQualityHealthConcern
+        version: 1
+      - id: temperatureMeasurement
+        version: 1
+      - id: relativeHumidityMeasurement
+        version: 1
+      - id: tvocMeasurement
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+      - name: AirQualityDetector
diff --git a/drivers/SmartThings/matter-sensor/src/air-quality-sensor/init.lua b/drivers/SmartThings/matter-sensor/src/air-quality-sensor/init.lua
@@ -162,6 +162,7 @@ local supported_profiles =
   "aqs-temp-humidity-all-meas",
   "aqs-temp-humidity-co2-pm25-tvoc-meas",
   "aqs-temp-humidity-tvoc-level-pm25-meas",
+  "aqs-temp-humidity-tvoc-meas",
 }
 
 local AIR_QUALITY_MAP = {

diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor.lua
diff --git a/drivers/SmartThings/matter-switch/fingerprints.yml b/drivers/SmartThings/matter-switch/fingerprints.yml
@@ -417,6 +417,12 @@ matterManufacturer:
     vendorId: 0x115A
     productId: 0x004B
     deviceProfileName: light-color-level-2700K-6500K
+#Neo
+  - id: "4991/635"
+    deviceLabel: Power Plug
+    vendorId: 0x137F
+    productId: 0x027B
+    deviceProfileName: plug-binary
 #SONOFF
   - id: "SONOFF MINIR4M"
     deviceLabel: Smart Plug-in Unit

diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua
@@ -256,14 +256,6 @@ test.register_message_test(
         { capability = "switch", component = "main", command = "on", args = { } }
       }
     },
-    {
-      channel = "devices",
-      direction = "send",
-      message = {
-        "register_native_capability_cmd_handler",
-        { device_uuid = mock_device.id, capability_id = "switch", capability_cmd_id = "on" }
-      }
-    },
     {
       channel = "matter",
       direction = "send",

diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_switch_device_types.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_switch_device_types.lua
@@ -345,7 +345,9 @@ end
 
 local function test_init_water_valve()
   test.mock_device.add_test_device(mock_device_water_valve)
+  test.socket.device_lifecycle:__queue_receive({ mock_device_water_valve.id, "doConfigure" })
   mock_device_water_valve:expect_metadata_update({ profile = "water-valve-level" })
+  mock_device_water_valve:expect_metadata_update({ provisioning_state = "PROVISIONED" })
 end
 
 local function test_init_parent_child_different_types()
@@ -394,6 +396,7 @@ local function test_init_parent_child_unsupported_device_type()
   })
 end
 
+
 test.register_coroutine_test(
   "Test profile change on init for onoff parent cluster as server",
   function()

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,6 +348,7 @@ test.register_coroutine_test(
     function()
       test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
       test.socket.capability:__queue_receive({mock_device.id, { capability = "colorControl", component = "main", command = "setColor", args = { { hue = 50, saturation = 50 } } } })
+      mock_device:expect_native_cmd_handler_registration("colorControl", "setColor")
       test.socket.zigbee:__expect_send(
           {
             mock_device.id,
@@ -382,6 +383,7 @@ test.register_coroutine_test(
   function()
     test.socket.zigbee:__set_channel_ordering("relaxed")
     test.socket.capability:__queue_receive({mock_device.id, { capability = "colorTemperature", component = "main", command = "setColorTemperature", args = {1800}}})
+    mock_device:expect_native_cmd_handler_registration("colorTemperature", "setColorTemperature")
     test.socket.zigbee:__expect_send({mock_device.id, ColorControl.server.commands.MoveToColorTemperature(mock_device, 556, 0x0000)})
     test.socket.zigbee:__expect_send({mock_device.id, OnOff.server.commands.On(mock_device)})
     test.wait_for_events()

diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_led_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_led_bulb.lua
@@ -123,6 +123,7 @@ test.register_coroutine_test(
     test.socket.capability:__queue_receive({ mock_device.id,
       { capability = "colorTemperature", component = "main", command = "setColorTemperature", args = { 200 } } })
 
+    mock_device:expect_native_cmd_handler_registration("colorTemperature", "setColorTemperature")
     local temp_in_mired = math.floor(1000000 / 200)
     test.socket.zigbee:__expect_send(
       {

diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_light.lua b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_light.lua
@@ -128,6 +128,7 @@ test.register_coroutine_test(
     test.socket.capability:__queue_receive({ mock_device.id,
       { capability = "colorTemperature", component = "main", command = "setColorTemperature", args = { 200 } } })
 
+    mock_device:expect_native_cmd_handler_registration("colorTemperature", "setColorTemperature")
     local temp_in_mired = math.floor(1000000 / 200)
     test.socket.zigbee:__expect_send(
       {

diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_rgb_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_rgb_bulb.lua
@@ -131,6 +131,7 @@ test.register_coroutine_test(
     test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
     test.socket.capability:__queue_receive({mock_device.id, { capability = "colorControl", component = "main", command = "setHue", args = { 50 } } })
 
+    mock_device:expect_native_cmd_handler_registration("colorControl", "setHue")
     test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.On(mock_device) })
 
     local hue = math.floor((50 * 0xFE) / 100.0 + 0.5)
@@ -154,6 +155,7 @@ test.register_coroutine_test(
     test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
     test.socket.capability:__queue_receive({mock_device.id, { capability = "colorControl", component = "main", command = "setSaturation", args = { 50 } } })
 
+    mock_device:expect_native_cmd_handler_registration("colorControl", "setSaturation")
     test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.On(mock_device) })
 
     local saturation = math.floor((50 * 0xFE) / 100.0 + 0.5)
@@ -176,6 +178,7 @@ test.register_coroutine_test(
   function()
     test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
     test.socket.capability:__queue_receive({mock_device.id, { capability = "colorControl", component = "main", command = "setColor", args = { { hue = 50, saturation = 50 } } } })
+    mock_device:expect_native_cmd_handler_registration("colorControl", "setColor")
     test.socket.zigbee:__expect_send(
       {
         mock_device.id,

diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_rgbw_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_rgbw_bulb.lua
@@ -162,6 +162,7 @@ test.register_coroutine_test(
     test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
     test.socket.capability:__queue_receive({mock_device.id, { capability = "colorControl", component = "main", command = "setHue", args = { 50 } } })
 
+    mock_device:expect_native_cmd_handler_registration("colorControl", "setHue")
     test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.On(mock_device) })
 
     local hue = math.floor((50 * 0xFE) / 100.0 + 0.5)
@@ -185,6 +186,7 @@ test.register_coroutine_test(
     test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
     test.socket.capability:__queue_receive({mock_device.id, { capability = "colorControl", component = "main", command = "setSaturation", args = { 50 } } })
 
+    mock_device:expect_native_cmd_handler_registration("colorControl", "setSaturation")
     test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.On(mock_device) })
 
     local saturation = math.floor((50 * 0xFE) / 100.0 + 0.5)
@@ -208,6 +210,7 @@ test.register_coroutine_test(
     test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
     test.socket.capability:__queue_receive({mock_device.id, { capability = "colorControl", component = "main", command = "setColor", args = { { hue = 50, saturation = 50 } } } })
 
+    mock_device:expect_native_cmd_handler_registration("colorControl", "setColor")
     test.socket.zigbee:__expect_send({ mock_device.id, OnOff.server.commands.On(mock_device) })
 
     local hue = math.floor((50 * 0xFE) / 100.0 + 0.5)
@@ -228,7 +231,7 @@ test.register_coroutine_test(
 )
 
 test.register_coroutine_test(
-  "Set Saturation command test",
+  "Set ColorTemperature command test",
   function()
     test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
     test.socket.capability:__queue_receive({mock_device.id, { capability = "colorTemperature", component = "main", command = "setColorTemperature", args = { 200 } } })

diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_zll_rgbw_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_zll_rgbw_bulb.lua
@@ -197,6 +197,7 @@ test.register_coroutine_test(
     test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
     test.socket.capability:__queue_receive({mock_device.id, { capability = "colorControl", component = "main", command = "setHue", args = { 50 } } })
 
+    mock_device:expect_native_cmd_handler_registration("colorControl", "setHue")
     test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.On(mock_device) })
 
     local hue = math.floor((50 * 0xFE) / 100.0 + 0.5)
@@ -221,6 +222,7 @@ test.register_coroutine_test(
     test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
     test.socket.capability:__queue_receive({mock_device.id, { capability = "colorControl", component = "main", command = "setSaturation", args = { 50 } } })
 
+    mock_device:expect_native_cmd_handler_registration("colorControl", "setSaturation")
     test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.On(mock_device) })
 
     local saturation = math.floor((50 * 0xFE) / 100.0 + 0.5)
@@ -245,6 +247,7 @@ test.register_coroutine_test(
     test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
     test.socket.capability:__queue_receive({mock_device.id, { capability = "colorControl", component = "main", command = "setColor", args = { { hue = 50, saturation = 50 } } } })
 
+    mock_device:expect_native_cmd_handler_registration("colorControl", "setColor")
     test.socket.zigbee:__expect_send({ mock_device.id, OnOff.server.commands.On(mock_device) })
 
     local hue = math.floor((50 * 0xFE) / 100.0 + 0.5)

diff --git a/drivers/SmartThings/zigbee-thermostat/src/init.lua b/drivers/SmartThings/zigbee-thermostat/src/init.lua
@@ -376,6 +376,7 @@ local zigbee_thermostat_driver = {
     require("resideo_korea"),
     require("aqara")
   },
+  health_check = false,
 }
 
 defaults.register_for_default_handlers(zigbee_thermostat_driver, zigbee_thermostat_driver.supported_capabilities)

diff --git a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_double_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_double_switch.lua
@@ -437,7 +437,6 @@ test.register_coroutine_test(
       mock_parent.id,
       { capability = "switch", component = "main", command = "on", args = {} }
     })
-    mock_parent:expect_native_cmd_handler_registration("switch", "on")
 
     test.socket.zwave:__expect_send(
       zw_test_utils.zwave_test_build_send_command(
@@ -505,7 +504,6 @@ test.register_coroutine_test(
       mock_parent.id,
       { capability = "switch", component = "main", command = "off", args = {} }
     })
-    mock_parent:expect_native_cmd_handler_registration("switch", "off")
 
     test.socket.zwave:__expect_send(
       zw_test_utils.zwave_test_build_send_command(
@@ -572,7 +570,6 @@ test.register_coroutine_test(
       mock_child.id,
       { capability = "switch", component = "main", command = "on", args = {} }
     })
-    mock_child:expect_native_cmd_handler_registration("switch", "on")
 
     test.socket.zwave:__expect_send(
       zw_test_utils.zwave_test_build_send_command(
@@ -637,7 +634,6 @@ test.register_coroutine_test(
       mock_child.id,
       { capability = "switch", component = "main", command = "off", args = {} }
     })
-    mock_child:expect_native_cmd_handler_registration("switch", "off")
 
     test.socket.zwave:__expect_send(
       zw_test_utils.zwave_test_build_send_command(

diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zooz_double_plug.lua b/drivers/SmartThings/zwave-switch/src/test/test_zooz_double_plug.lua
@@ -191,14 +191,6 @@ test.register_message_test(
         { capability = "switch", command = "on", component = "switch1", args = {} }
       }
     },
-    {
-      channel = "devices",
-      direction = "send",
-      message = {
-        "register_native_capability_cmd_handler",
-        { device_uuid = mock_parent.id, capability_id = "switch", capability_cmd_id = "on" }
-      }
-    },
     {
       channel = "zwave",
       direction = "send",
@@ -223,14 +215,6 @@ test.register_message_test(
         { capability = "switch", command = "off", component = "main", args = {} }
       }
     },
-    {
-      channel = "devices",
-      direction = "send",
-      message = {
-        "register_native_capability_cmd_handler",
-        { device_uuid = mock_parent.id, capability_id = "switch", capability_cmd_id = "off" }
-      }
-    },
     {
       channel = "zwave",
       direction = "send",
@@ -256,14 +240,6 @@ test.register_message_test(
         { capability = "switch", command = "on", component = "switch1", args = {} }
       }
     },
-    {
-      channel = "devices",
-      direction = "send",
-      message = {
-        "register_native_capability_cmd_handler",
-        { device_uuid = mock_child.id, capability_id = "switch", capability_cmd_id = "on" }
-      }
-    },
     {
       channel = "zwave",
       direction = "send",
@@ -288,14 +264,6 @@ test.register_message_test(
         { capability = "switch", command = "off", component = "main", args = {} }
       }
     },
-    {
-      channel = "devices",
-      direction = "send",
-      message = {
-        "register_native_capability_cmd_handler",
-        { device_uuid = mock_child.id, capability_id = "switch", capability_cmd_id = "off" }
-      }
-    },
     {
       channel = "zwave",
       direction = "send",