Merge pull request #1617 from SmartThingsCommunity/main

rolling up main to beta
SmartThingsCommunity · Sep 4, 2024 · 6487fd3 · 6487fd3
2 parents 77fc4a8 + 191899f
commit 6487fd3
Show file tree

Hide file tree

Showing 82 changed files with 3,002 additions and 27 deletions.
diff --git a/drivers/SmartThings/matter-sensor/profiles/temperature-humidity-battery.yml b/drivers/SmartThings/matter-sensor/profiles/temperature-humidity-battery.yml
@@ -19,3 +19,45 @@ preferences:
     explicit: true
   - preferenceId: humidityOffset
     explicit: true
+deviceConfig:
+  dashboard:
+    states:
+      - component: main
+        capability: temperatureMeasurement
+        version: 1
+        group: main
+        composite: true
+      - component: main
+        capability: relativeHumidityMeasurement
+        version: 1
+        group: main
+        values:
+          - label: "  {{humidity.value}} {{humidity.unit}}"
+        composite: true
+    actions: []
+    basicPlus: []
+  detailView:
+    - component: main
+      capability: temperatureMeasurement
+      version: 1
+    - component: main
+      capability: relativeHumidityMeasurement
+      version: 1
+    - component: main
+      capability: battery
+      version: 1
+    - component: main
+      capability: refresh
+      version: 1
+  automation:
+    conditions:
+      - component: main
+        capability: temperatureMeasurement
+        version: 1
+      - component: main
+        capability: relativeHumidityMeasurement
+        version: 1
+      - component: main
+        capability: battery
+        version: 1
+    actions: []
diff --git a/drivers/SmartThings/matter-sensor/profiles/temperature-humidity-pressure-battery.yml b/drivers/SmartThings/matter-sensor/profiles/temperature-humidity-pressure-battery.yml
@@ -21,3 +21,51 @@ preferences:
     explicit: true
   - preferenceId: humidityOffset
     explicit: true
+deviceConfig:
+  dashboard:
+    states:
+      - component: main
+        capability: temperatureMeasurement
+        version: 1
+        group: main
+        composite: true
+      - component: main
+        capability: relativeHumidityMeasurement
+        version: 1
+        group: main
+        values:
+          - label: "  {{humidity.value}} {{humidity.unit}}"
+        composite: true
+    actions: []
+    basicPlus: []
+  detailView:
+    - component: main
+      capability: temperatureMeasurement
+      version: 1
+    - component: main
+      capability: relativeHumidityMeasurement
+      version: 1
+    - component: main
+      capability: atmosphericPressureMeasurement
+      version: 1
+    - component: main
+      capability: battery
+      version: 1
+    - component: main
+      capability: refresh
+      version: 1
+  automation:
+    conditions:
+      - component: main
+        capability: temperatureMeasurement
+        version: 1
+      - component: main
+        capability: relativeHumidityMeasurement
+        version: 1
+      - component: main
+        capability: atmosphericPressureMeasurement
+        version: 1
+      - component: main
+        capability: battery
+        version: 1
+    actions: []
diff --git a/drivers/SmartThings/matter-sensor/profiles/temperature-humidity-pressure.yml b/drivers/SmartThings/matter-sensor/profiles/temperature-humidity-pressure.yml
@@ -19,3 +19,45 @@ preferences:
     explicit: true
   - preferenceId: humidityOffset
     explicit: true
+deviceConfig:
+  dashboard:
+    states:
+      - component: main
+        capability: temperatureMeasurement
+        version: 1
+        group: main
+        composite: true
+      - component: main
+        capability: relativeHumidityMeasurement
+        version: 1
+        group: main
+        values:
+          - label: "  {{humidity.value}} {{humidity.unit}}"
+        composite: true
+    actions: []
+    basicPlus: []
+  detailView:
+    - component: main
+      capability: temperatureMeasurement
+      version: 1
+    - component: main
+      capability: relativeHumidityMeasurement
+      version: 1
+    - component: main
+      capability: atmosphericPressureMeasurement
+      version: 1
+    - component: main
+      capability: refresh
+      version: 1
+  automation:
+    conditions:
+      - component: main
+        capability: temperatureMeasurement
+        version: 1
+      - component: main
+        capability: relativeHumidityMeasurement
+        version: 1
+      - component: main
+        capability: atmosphericPressureMeasurement
+        version: 1
+    actions: []
diff --git a/drivers/SmartThings/matter-sensor/profiles/temperature-humidity.yml b/drivers/SmartThings/matter-sensor/profiles/temperature-humidity.yml
@@ -17,3 +17,39 @@ preferences:
     explicit: true
   - preferenceId: humidityOffset
     explicit: true
+deviceConfig:
+  dashboard:
+    states:
+      - component: main
+        capability: temperatureMeasurement
+        version: 1
+        group: main
+        composite: true
+      - component: main
+        capability: relativeHumidityMeasurement
+        version: 1
+        group: main
+        values:
+          - label: "  {{humidity.value}} {{humidity.unit}}"
+        composite: true
+    actions: []
+    basicPlus: []
+  detailView:
+    - component: main
+      capability: temperatureMeasurement
+      version: 1
+    - component: main
+      capability: relativeHumidityMeasurement
+      version: 1
+    - component: main
+      capability: refresh
+      version: 1
+  automation:
+    conditions:
+      - component: main
+        capability: temperatureMeasurement
+        version: 1
+      - component: main
+        capability: relativeHumidityMeasurement
+        version: 1
+    actions: []
diff --git a/drivers/SmartThings/matter-switch/src/test/test_eve_energy.lua b/drivers/SmartThings/matter-switch/src/test/test_eve_energy.lua
@@ -91,6 +91,14 @@ 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",
@@ -113,6 +121,14 @@ test.register_message_test(
         { capability = "switch", component = "main", command = "off", args = {} }
       }
     },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_cmd_handler",
+        { device_uuid = mock_device.id, capability_id = "switch", capability_cmd_id = "off" }
+      }
+    },
     {
       channel = "matter",
       direction = "send",

diff --git a/drivers/SmartThings/matter-switch/src/test/test_light_illuminance_motion.lua b/drivers/SmartThings/matter-switch/src/test/test_light_illuminance_motion.lua
@@ -114,6 +114,14 @@ 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",
@@ -136,6 +144,14 @@ test.register_message_test(
         { capability = "switch", component = "main", command = "off", args = { } }
       }
     },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_cmd_handler",
+        { device_uuid = mock_device.id, capability_id = "switch", capability_cmd_id = "off" }
+      }
+    },
     {
       channel = "matter",
       direction = "send",
@@ -158,6 +174,14 @@ test.register_message_test(
 				{ capability = "switchLevel", component = "main", command = "setLevel", args = {20,20} }
 			}
 		},
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_cmd_handler",
+        { device_uuid = mock_device.id, capability_id = "switchLevel", capability_cmd_id = "setLevel" }
+      }
+    },
 		{
 			channel = "matter",
 			direction = "send",

diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_switch.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_switch.lua
@@ -124,6 +124,14 @@ 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",
@@ -146,6 +154,14 @@ test.register_message_test(
         { capability = "switch", component = "main", command = "off", args = { } }
       }
     },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_cmd_handler",
+        { device_uuid = mock_device.id, capability_id = "switch", capability_cmd_id = "off" }
+      }
+    },
     {
       channel = "matter",
       direction = "send",
@@ -168,6 +184,14 @@ test.register_message_test(
         { capability = "switchLevel", component = "main", command = "setLevel", args = {20,20} }
       }
     },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_cmd_handler",
+        { device_uuid = mock_device.id, capability_id = "switchLevel", capability_cmd_id = "setLevel" }
+      }
+    },
     {
       channel = "matter",
       direction = "send",

diff --git a/drivers/SmartThings/matter-switch/src/test/test_multi_switch_parent_child_lights.lua b/drivers/SmartThings/matter-switch/src/test/test_multi_switch_parent_child_lights.lua
@@ -147,6 +147,14 @@ 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",
@@ -182,6 +190,14 @@ test.register_message_test(
         { capability = "switch", component = "main", command = "on", args = { } }
       }
     },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_cmd_handler",
+        { device_uuid = mock_children[child1_ep].id, capability_id = "switch", capability_cmd_id = "on" }
+      }
+    },
     {
       channel = "matter",
       direction = "send",
@@ -217,6 +233,14 @@ test.register_message_test(
         { capability = "switch", component = "main", command = "on", args = { } }
       }
     },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_cmd_handler",
+        { device_uuid = mock_children[child2_ep].id, capability_id = "switch", capability_cmd_id = "on" }
+      }
+    },
     {
       channel = "matter",
       direction = "send",

diff --git a/drivers/SmartThings/matter-switch/src/test/test_multi_switch_parent_child_plugs.lua b/drivers/SmartThings/matter-switch/src/test/test_multi_switch_parent_child_plugs.lua
@@ -214,6 +214,14 @@ 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",
@@ -249,6 +257,14 @@ test.register_message_test(
         { capability = "switch", component = "main", command = "on", args = { } }
       }
     },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_cmd_handler",
+        { device_uuid = mock_children[child1_ep].id, capability_id = "switch", capability_cmd_id = "on" }
+      }
+    },
     {
       channel = "matter",
       direction = "send",
@@ -284,6 +300,14 @@ test.register_message_test(
         { capability = "switch", component = "main", command = "on", args = { } }
       }
     },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_cmd_handler",
+        { device_uuid = mock_children[child2_ep].id, capability_id = "switch", capability_cmd_id = "on" }
+      }
+    },
     {
       channel = "matter",
       direction = "send",