Merge pull request #1868 from SmartThingsCommunity/beta

Rollup beta to production
SmartThingsCommunity · Jan 13, 2025 · 3455539 · 3455539
2 parents 2c72b7b + 4dc339e
commit 3455539
Show file tree

Hide file tree

Showing 35 changed files with 488 additions and 148 deletions.
diff --git a/.github/workflows/duplicate-profiles.yml b/.github/workflows/duplicate-profiles.yml
@@ -31,7 +31,7 @@ jobs:
           python ./.github/scripts/check_duplicates.py
 
       - name: Upload duplicate profile comment artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: duplicate_profile_comment
           path: |
@@ -40,7 +40,7 @@ jobs:
       - run: echo ${{ github.event.number }} > pr_number.txt
 
       - name: Upload PR info
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pr_number
           path: |

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -139,14 +139,14 @@ jobs:
           LUA_PATH: ${{ steps.lua_path.outputs.lua_path }}
       - name: Upload test artifact
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: tests
           path: |
             tools/test_output/*.xml
       - name: Upload coverage artifact
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage
           path: |
@@ -156,13 +156,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Upload event file artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: event-file
           path: ${{ github.event_path }}
       - run: echo ${{ github.event.number }} > pr_number.txt
       - name: Upload pr number artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pr_number
           path: |

diff --git a/.github/workflows/upload-driver-packages.yml b/.github/workflows/upload-driver-packages.yml
@@ -40,7 +40,7 @@ jobs:
         run: |
           zip -v ${{env.package_key}}.zip config.yml fingerprints.yml search-parameters.y*ml $(find . -name "*.pem") $(find . -name "*.crt") $(find profiles -name "*.y*ml") $(find . -name "*.lua") -x "*test*"
       - name: Upload packaged driver artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.package_key }}
           path: |
@@ -51,14 +51,14 @@ jobs:
     steps:
       - run: echo ${{ github.event.number }} > pr_number.txt
       - name: Upload pr number artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pr_number
           path: |
             pr_number.txt
       - run: echo ${{ github.head_ref }} > head_ref.txt
       - name: Upload head ref artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: head_ref
           path: |

diff --git a/drivers/SmartThings/matter-lock/fingerprints.yml b/drivers/SmartThings/matter-lock/fingerprints.yml
@@ -22,21 +22,31 @@ matterManufacturer:
     productId: 0x0003
     deviceProfileName: lock-nocodes-notamper-batteryLevel
   #Nuki
-  - id: "Nuki Smart Lock Pro"
-    deviceLabel: Nuki Smart Lock Pro
-    vendorId: 0x135d
-    productId: 0xb1
+  - id: "4957/161"
+    deviceLabel: Nuki Smart Lock Ultra
+    vendorId: 0x135D
+    productId: 0x00A1
     deviceProfileName: lock-nocodes-notamper
   - id: "Nuki Smart Lock"
     deviceLabel: Nuki Smart Lock
     vendorId: 0x135d
     productId: 0xb0
     deviceProfileName: lock-nocodes-notamper
-  - id: "4957/161"
-    deviceLabel: Nuki Smart Lock Ultra
+  - id: "Nuki Smart Lock Pro"
+    deviceLabel: Nuki Smart Lock Pro
+    vendorId: 0x135d
+    productId: 0xb1
+    deviceProfileName: lock-nocodes-notamper
+  - id: "4957/178"
+    deviceLabel: Nuki Smart Lock Pro
     vendorId: 0x135D
-    productId: 0x00A1
+    productId: 0x00B2
     deviceProfileName: lock-nocodes-notamper
+  - id: "4957/193"
+    deviceLabel: Nuki Smart Lock Go
+    vendorId: 0x135D
+    productId: 0x00C1
+    deviceProfileName: lock-nocodes-notamper   
 matterGeneric:
   - id: "matter/door-lock"
     deviceLabel: Matter Door Lock

diff --git a/drivers/SmartThings/matter-switch/fingerprints.yml b/drivers/SmartThings/matter-switch/fingerprints.yml
@@ -9,7 +9,113 @@ matterManufacturer:
     deviceLabel: Aqara LED Bulb T2 CCT
     vendorId: 0x115F
     productId: 0x1802
-    deviceProfileName: light-level-colorTemperature-2700K-6500K  
+    deviceProfileName: light-level-colorTemperature-2700K-6500K
+  - id: "4447/6149"
+    deviceLabel: Aqara LED Bulb T2 RGB CCT
+    vendorId: 0x115F
+    productId: 0x1805
+    deviceProfileName: light-color-level  
+  - id: "4447/6150"
+    deviceLabel: Aqara LED Bulb T2 CCT
+    vendorId: 0x115F
+    productId: 0x1806
+    deviceProfileName: light-level-colorTemperature-2700K-6500K
+#AiDot
+  - id: "Linkind/Smart/Light/Bulb/A19/RGBTW"
+    deviceLabel: Linkind Smart Light Bulb A19 RGBTW
+    vendorId: 0x1168
+    productId: 0x03e8
+    deviceProfileName: light-color-level-1800K-6500K
+  - id: "OREiN/Smart/Light/Bulb/A19/RGBTW"
+    deviceLabel: OREiN Smart Light Bulb A19 RGBTW
+    vendorId: 0x1168
+    productId: 0x03ea
+    deviceProfileName: light-color-level-1800K-6500K
+  - id: "Linkind/Smart/Light/Bulb/BR30/RGBTW"
+    deviceLabel: Linkind Smart Light Bulb BR30 RGBTW
+    vendorId: 0x1168
+    productId: 0x03eb
+    deviceProfileName: light-color-level-1800K-6500K
+  - id: "OREiN/Smart/Light/Bulb/BR30/RGBTW"
+    deviceLabel: OREiN Smart Light Bulb BR30 RGBTW
+    vendorId: 0x1168
+    productId: 0x03ec
+    deviceProfileName: light-color-level-1800K-6500K
+  - id: "Consciot/Smart/Light/Bulb/A19/RGBT"
+    deviceLabel: Consciot Smart Light Bulb A19 RGBT
+    vendorId: 0x1168
+    productId: 0x0405
+    deviceProfileName: light-color-level-1800K-6500K
+  - id: "4456/1010"
+    deviceLabel: Aidot OREiN Matter Smart Light Bulb BR30 RGBTW 1200lm
+    vendorId: 0x1168
+    productId: 0x03F2
+    deviceProfileName: light-color-level-1800K-6500K
+  - id: "4456/1011"
+    deviceLabel: Smart Light Bulb A60
+    vendorId: 0x1168
+    productId: 0x03F3
+    deviceProfileName: light-color-level-1800K-6500K
+  - id: "4456/1012"
+    deviceLabel: Aidot Linkind Matter Smart Light Bulb BR30 RGBTW 1200lm
+    vendorId: 0x1168
+    productId: 0x03F4
+    deviceProfileName: light-color-level-1800K-6500K
+  - id: "4456/1013"
+    deviceLabel: Matter Smart Light Bulb A21 RGBTW 1600lm
+    vendorId: 0x1168
+    productId: 0x03F5
+    deviceProfileName: light-color-level-1800K-6500K  
+  - id: "AiDot/Smart/Light/Bulb/A19/RGBTW"
+    deviceLabel: AiDot Smart Light Bulb A19 RGBT
+    vendorId: 0x1168
+    productId: 0x03f8
+    deviceProfileName: light-color-level-1800K-6500K
+  - id: "Linkind/Smart/Light/Bulb/A19/CCT"
+    deviceLabel: Smart Light Bulb A19 CCT
+    vendorId: 0x1168
+    productId: 0x03f9
+    deviceProfileName: light-level-colorTemperature-2700K-6500K
+  - id: "4456/1024"
+    deviceLabel: Smart Plug
+    vendorId: 0x1168
+    productId: 0x0400
+    deviceProfileName: plug-binary  
+  - id: "4456/1007"
+    deviceLabel: Matter Smart Light Bulb A21 RGBTW 1600lm
+    vendorId: 0x1168
+    productId: 0x03EF
+    deviceProfileName: light-color-level-1800K-6500K
+  - id: "4456/1005"
+    deviceLabel: Matter Smart Light Bulb A19 RGBTW 1100lm
+    vendorId: 0x1168
+    productId: 0x03ED
+    deviceProfileName: light-color-level-1800K-6500K
+  - id: "4456/1006"
+    deviceLabel: Matter Smart Light Bulb A19 RGBTW 1100lm
+    vendorId: 0x1168
+    productId: 0x03EE
+    deviceProfileName: light-color-level-1800K-6500K
+  - id: "4456/1102"
+    deviceLabel: Matter Smart Plug
+    vendorId: 0x1168
+    productId: 0x044E
+    deviceProfileName: plug-binary
+  - id: "4456/1019"
+    deviceLabel: Matter Smart Filament  Bulb ST58 CCT
+    vendorId: 0x1168
+    productId: 0x03FB
+    deviceProfileName: light-level-colorTemperature-2700K-6500K
+  - id: "4456/1020"
+    deviceLabel: AiDot OREiN Matter Smart Filament Bulb ST58 CCT
+    vendorId: 0x1168
+    productId: 0x03FC
+    deviceProfileName: light-level-colorTemperature-2700K-6500K
+  - id: "5014/4096"
+    deviceLabel: Linkind LED Light Strip EL6
+    vendorId: 0x1396
+    productId: 0x1000
+    deviceProfileName: light-color-level-1800K-6500K 
 #Chengdu
   - id: "5218/8197"
     deviceLabel: Magic Cube DS001
@@ -492,92 +598,6 @@ matterManufacturer:
     productId: 0x9002
     deviceProfileName: light-color-level-2700K-6500K
 
-#AiDot
-  - id: "Linkind/Smart/Light/Bulb/A19/RGBTW"
-    deviceLabel: Linkind Smart Light Bulb A19 RGBTW
-    vendorId: 0x1168
-    productId: 0x03e8
-    deviceProfileName: light-color-level-1800K-6500K
-  - id: "OREiN/Smart/Light/Bulb/A19/RGBTW"
-    deviceLabel: OREiN Smart Light Bulb A19 RGBTW
-    vendorId: 0x1168
-    productId: 0x03ea
-    deviceProfileName: light-color-level-1800K-6500K
-  - id: "Linkind/Smart/Light/Bulb/BR30/RGBTW"
-    deviceLabel: Linkind Smart Light Bulb BR30 RGBTW
-    vendorId: 0x1168
-    productId: 0x03eb
-    deviceProfileName: light-color-level-1800K-6500K
-  - id: "OREiN/Smart/Light/Bulb/BR30/RGBTW"
-    deviceLabel: OREiN Smart Light Bulb BR30 RGBTW
-    vendorId: 0x1168
-    productId: 0x03ec
-    deviceProfileName: light-color-level-1800K-6500K
-  - id: "Consciot/Smart/Light/Bulb/A19/RGBT"
-    deviceLabel: Consciot Smart Light Bulb A19 RGBT
-    vendorId: 0x1168
-    productId: 0x0405
-    deviceProfileName: light-color-level-1800K-6500K
-  - id: "AiDot/Smart/Light/Bulb/A19/RGBTW"
-    deviceLabel: AiDot Smart Light Bulb A19 RGBT
-    vendorId: 0x1168
-    productId: 0x03f8
-    deviceProfileName: light-color-level-1800K-6500K
-  - id: "4456/1024"
-    deviceLabel: Smart Plug
-    vendorId: 0x1168
-    productId: 0x0400
-    deviceProfileName: plug-binary
-  - id: "4456/1011"
-    deviceLabel: Smart Light Bulb A60
-    vendorId: 0x1168
-    productId: 0x03F3
-    deviceProfileName: light-color-level-1800K-6500K
-  - id: "Linkind/Smart/Light/Bulb/A19/CCT"
-    deviceLabel: Smart Light Bulb A19 CCT
-    vendorId: 0x1168
-    productId: 0x03f9
-    deviceProfileName: light-level-colorTemperature-2700K-6500K
-  - id: "4456/1013"
-    deviceLabel: Matter Smart Light Bulb A21 RGBTW 1600lm
-    vendorId: 0x1168
-    productId: 0x03F5
-    deviceProfileName: light-color-level-1800K-6500K
-  - id: "4456/1007"
-    deviceLabel: Matter Smart Light Bulb A21 RGBTW 1600lm
-    vendorId: 0x1168
-    productId: 0x03EF
-    deviceProfileName: light-color-level-1800K-6500K
-  - id: "4456/1005"
-    deviceLabel: Matter Smart Light Bulb A19 RGBTW 1100lm
-    vendorId: 0x1168
-    productId: 0x03ED
-    deviceProfileName: light-color-level-1800K-6500K
-  - id: "4456/1006"
-    deviceLabel: Matter Smart Light Bulb A19 RGBTW 1100lm
-    vendorId: 0x1168
-    productId: 0x03EE
-    deviceProfileName: light-color-level-1800K-6500K
-  - id: "4456/1102"
-    deviceLabel: Matter Smart Plug
-    vendorId: 0x1168
-    productId: 0x044E
-    deviceProfileName: plug-binary
-  - id: "4456/1019"
-    deviceLabel: Matter Smart Filament  Bulb ST58 CCT
-    vendorId: 0x1168
-    productId: 0x03FB
-    deviceProfileName: light-level-colorTemperature-2700K-6500K
-  - id: "4456/1020"
-    deviceLabel: AiDot OREiN Matter Smart Filament Bulb ST58 CCT
-    vendorId: 0x1168
-    productId: 0x03FC
-    deviceProfileName: light-level-colorTemperature-2700K-6500K
-  - id: "5014/4096"
-    deviceLabel: Linkind LED Light Strip EL6
-    vendorId: 0x1396
-    productId: 0x1000
-    deviceProfileName: light-color-level-1800K-6500K
 #U-Tec
   - id: "5247/3"
     deviceLabel: U-tec Smart Matter Plug

diff --git a/drivers/SmartThings/matter-thermostat/src/init.lua b/drivers/SmartThings/matter-thermostat/src/init.lua
@@ -819,7 +819,7 @@ local function sequence_of_operation_handler(driver, device, ib, response)
   -- or not the device supports emergency heat or fan only
   local supported_modes = {capabilities.thermostatMode.thermostatMode.off.NAME}
 
-  local auto = device:get_endpoints(clusters.Thermostat.ID, {feature_bitmap = clusters.Thermostat.types.ThermostatFeature.auto})
+  local auto = device:get_endpoints(clusters.Thermostat.ID, {feature_bitmap = clusters.Thermostat.types.ThermostatFeature.AUTOMODE})
   if #auto > 0 then
     table.insert(supported_modes, capabilities.thermostatMode.thermostatMode.auto.NAME)
   end