Merge Switch and Button Drivers (#1547)

Merge Switch and Button Drivers These changes integrate the matter-button driver into the matter-switch driver so we can deprecate the matter-button driver.
SmartThingsCommunity · Sep 6, 2024 · 7bdefe1 · 7bdefe1
1 parent bc897af
commit 7bdefe1
Show file tree

Hide file tree

Showing 22 changed files with 1,986 additions and 72 deletions.
diff --git a/drivers/SmartThings/matter-button/fingerprints.yml b/drivers/SmartThings/matter-button/fingerprints.yml
diff --git a/drivers/SmartThings/matter-button/src/init.lua b/drivers/SmartThings/matter-button/src/init.lua
@@ -1,3 +1,10 @@
+-- As of September 2024, the matter-button driver has been deprecated in favor of being integrated into the matter-switch
+-- driver. All functionality and test cases present in this driver were carried over into matter-switch. Therefore,
+-- we are no longer accepting bug fixes or feature enhancements such as fingerprint adds to this driver.
+-- Note that this change won't affect devices using the button driver unless they are re-onboarded, in which case
+-- they would onboard to the switch driver, as all button fingerprints were removed from this driver and moved to
+-- the switch driver.
+
 local capabilities = require "st.capabilities"
 local log = require "log"
 local clusters = require "st.matter.generated.zap_clusters"

diff --git a/drivers/SmartThings/matter-switch/fingerprints.yml b/drivers/SmartThings/matter-switch/fingerprints.yml
@@ -2219,6 +2219,12 @@ matterManufacturer:
     vendorId: 0x139C
     productId: 0xAB01
     deviceProfileName: switch-binary
+#TUO
+  - id: "5150/1"
+    deviceLabel: "TUO Smart Button"
+    vendorId: 0x141E
+    productId: 0x0001
+    deviceProfileName: "button-battery"
 
 
 #Bridge devices need manufacturer specific fingerprints until
@@ -2335,6 +2341,11 @@ matterGeneric:
     deviceTypes:
       - id: 0x010B # Dimmable Plug-in Unit
     deviceProfileName: plug-level
+  - id: "button"
+    deviceLabel: Matter Button
+    deviceTypes:
+      - id: 0x000F
+    deviceProfileName: button-battery # err on the side of buttons having batteries, it'll get fixed in the driver
 
 matterThing:
   - id: SmartThings/MatterThing

diff --git a/drivers/SmartThings/matter-switch/profiles/2-button-battery.yml b/drivers/SmartThings/matter-switch/profiles/2-button-battery.yml
@@ -0,0 +1,20 @@
+name: 2-button-battery
+components:
+  - id: main
+    capabilities:
+      - id: button
+        version: 1
+      - id: battery
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button2
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
diff --git a/drivers/SmartThings/matter-switch/profiles/2-button.yml b/drivers/SmartThings/matter-switch/profiles/2-button.yml
@@ -0,0 +1,18 @@
+name: 2-button
+components:
+  - id: main
+    capabilities:
+      - id: button
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button2
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
diff --git a/drivers/SmartThings/matter-switch/profiles/3-button-battery.yml b/drivers/SmartThings/matter-switch/profiles/3-button-battery.yml
@@ -0,0 +1,26 @@
+name: 3-button-battery
+components:
+  - id: main
+    capabilities:
+      - id: button
+        version: 1
+      - id: battery
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button2
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button3
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
diff --git a/drivers/SmartThings/matter-switch/profiles/3-button.yml b/drivers/SmartThings/matter-switch/profiles/3-button.yml
@@ -0,0 +1,24 @@
+name: 3-button
+components:
+  - id: main
+    capabilities:
+      - id: button
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button2
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button3
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
diff --git a/drivers/SmartThings/matter-switch/profiles/4-button-battery.yml b/drivers/SmartThings/matter-switch/profiles/4-button-battery.yml
@@ -0,0 +1,32 @@
+name: 4-button-battery
+components:
+  - id: main
+    capabilities:
+      - id: button
+        version: 1
+      - id: battery
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button2
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button3
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button4
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
diff --git a/drivers/SmartThings/matter-switch/profiles/4-button.yml b/drivers/SmartThings/matter-switch/profiles/4-button.yml
@@ -0,0 +1,30 @@
+name: 4-button
+components:
+  - id: main
+    capabilities:
+      - id: button
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button2
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button3
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button4
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
diff --git a/drivers/SmartThings/matter-switch/profiles/5-button-battery.yml b/drivers/SmartThings/matter-switch/profiles/5-button-battery.yml
@@ -0,0 +1,38 @@
+name: 5-button-battery
+components:
+  - id: main
+    capabilities:
+      - id: button
+        version: 1
+      - id: battery
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button2
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button3
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button4
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button5
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
diff --git a/drivers/SmartThings/matter-switch/profiles/5-button.yml b/drivers/SmartThings/matter-switch/profiles/5-button.yml
@@ -0,0 +1,36 @@
+name: 5-button
+components:
+  - id: main
+    capabilities:
+      - id: button
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button2
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button3
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button4
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button5
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
diff --git a/drivers/SmartThings/matter-switch/profiles/6-button-battery.yml b/drivers/SmartThings/matter-switch/profiles/6-button-battery.yml
@@ -0,0 +1,44 @@
+name: 6-button-battery
+components:
+  - id: main
+    capabilities:
+      - id: button
+        version: 1
+      - id: battery
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button2
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button3
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button4
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button5
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button6
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
diff --git a/drivers/SmartThings/matter-switch/profiles/6-button.yml b/drivers/SmartThings/matter-switch/profiles/6-button.yml
@@ -0,0 +1,42 @@
+name: 6-button
+components:
+  - id: main
+    capabilities:
+      - id: button
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button2
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button3
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button4
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button5
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController
+  - id: button6
+    capabilities:
+      - id: button
+        version: 1
+    categories:
+    - name: RemoteController