Add new-matter-lock driver

drivers/SmartThings/matter-lock/fingerprints.yml

@@ -15,15 +15,15 @@ matterManufacturer:
     deviceLabel: Aqara Smart Lock U200
     vendorId: 0x115F
     productId: 0x2802
-    deviceProfileName: lock-lockalarm-nobattery
+    deviceProfileName: lock-user-pin
   - id: "4447/10241"
     deviceLabel: Aqara Smart Lock U300
     vendorId: 0x115F
     productId: 0x2801
-    deviceProfileName: lock-lockalarm-nobattery
+    deviceProfileName: lock-user-pin
 matterGeneric:
   - id: "matter/door-lock"
     deviceLabel: Matter Door Lock
     deviceTypes:
       - id: 0x000A # Door Lock
-    deviceProfileName: base-lock
+    deviceProfileName: base-lock

drivers/SmartThings/matter-lock/profiles/lock-user-pin-schedule.yml

@@ -0,0 +1,27 @@
+name: lock-user-pin-schedule
+components:
+- id: main
+  capabilities:
+  - id: lock
+    version: 1
+    config:
+      values:
+      - key: "lock.value"
+        enabledValues:
+        - locked
+        - unlocked
+        - not fully locked
+  - id: lockAlarm
+    version: 1
+  - id: remoteControlStatus
+    version: 1
+  - id: lockUsers
+    version: 1
+  - id: lockCredentials
+    version: 1
+  - id: lockSchedules
+    version: 1
+  - id: refresh
+    version: 1
+  categories:
+  - name: SmartLock

drivers/SmartThings/matter-lock/profiles/lock-user-pin.yml

@@ -0,0 +1,25 @@
+name: lock-user-pin
+components:
+- id: main
+  capabilities:
+  - id: lock
+    version: 1
+    config:
+      values:
+      - key: "lock.value"
+        enabledValues:
+        - locked
+        - unlocked
+        - not fully locked
+  - id: lockAlarm
+    version: 1
+  - id: remoteControlStatus
+    version: 1
+  - id: lockUsers
+    version: 1
+  - id: lockCredentials
+    version: 1
+  - id: refresh
+    version: 1
+  categories:
+  - name: SmartLock

drivers/SmartThings/matter-lock/profiles/lock-user-schedule.yml

@@ -0,0 +1,25 @@
+name: lock-user-schedule
+components:
+- id: main
+  capabilities:
+  - id: lock
+    version: 1
+    config:
+      values:
+      - key: "lock.value"
+        enabledValues:
+        - locked
+        - unlocked
+        - not fully locked
+  - id: lockAlarm
+    version: 1
+  - id: remoteControlStatus
+    version: 1
+  - id: lockUsers
+    version: 1
+  - id: lockSchedules
+    version: 1
+  - id: refresh
+    version: 1
+  categories:
+  - name: SmartLock

drivers/SmartThings/matter-lock/profiles/lock-user.yml

@@ -0,0 +1,23 @@
+name: lock-user
+components:
+- id: main
+  capabilities:
+  - id: lock
+    version: 1
+    config:
+      values:
+      - key: "lock.value"
+        enabledValues:
+        - locked
+        - unlocked
+        - not fully locked
+  - id: lockAlarm
+    version: 1
+  - id: remoteControlStatus
+    version: 1
+  - id: lockUsers
+    version: 1
+  - id: refresh
+    version: 1
+  categories:
+  - name: SmartLock

drivers/SmartThings/matter-lock/src/init.lua

@@ -78,7 +78,7 @@ local function lock_state_handler(driver, device, ib, response)
   local LockState = DoorLock.attributes.LockState
   local attr = capabilities.lock.lock
   local LOCK_STATE = {
-    [LockState.NOT_FULLY_LOCKED] = attr.not_fully_locked(),
+    [LockState.NOT_FULLY_LOCKED] = attr.unknown(),
     [LockState.LOCKED] = attr.locked(),
     [LockState.UNLOCKED] = attr.unlocked(),
     [UNLATCHED_STATE] = attr.unlocked(), -- Fully unlocked with latch pulled
@@ -97,16 +97,6 @@ local function handle_battery_percent_remaining(driver, device, ib, response)
   end
 end
 
-local function handle_battery_charge_level(driver, device, ib, response)
-  if ib.data.value == clusters.PowerSource.types.BatChargeLevelEnum.OK then
-    device:emit_event(capabilities.batteryLevel.battery.normal())
-  elseif ib.data.value == clusters.PowerSource.types.BatChargeLevelEnum.WARNING then
-    device:emit_event(capabilities.batteryLevel.battery.warning())
-  elseif ib.data.value == clusters.PowerSource.types.BatChargeLevelEnum.CRITICAL then
-    device:emit_event(capabilities.batteryLevel.battery.critical())
-  end
-end
-
 local function max_pin_code_len_handler(driver, device, ib, response)
   device:emit_event(capabilities.lockCodes.maxCodeLength(ib.data.value, {visibility = {displayed = false}}))
 end
@@ -583,7 +573,6 @@ local matter_lock_driver = {
       },
       [PowerSource.ID] = {
         [PowerSource.attributes.BatPercentRemaining.ID] = handle_battery_percent_remaining,
-        [PowerSource.attributes.BatChargeLevel.ID] = handle_battery_charge_level,
       },
     },
     event = {
@@ -604,7 +593,6 @@ local matter_lock_driver = {
   subscribed_attributes = {
     [capabilities.lock.ID] = {DoorLock.attributes.LockState},
     [capabilities.battery.ID] = {PowerSource.attributes.BatPercentRemaining},
-    [capabilities.batteryLevel.ID] = {PowerSource.attributes.BatChargeLevel},
   },
   subscribed_events = {
     [capabilities.tamperAlert.ID] = {DoorLock.events.DoorLockAlarm, DoorLock.events.LockOperation},
@@ -630,10 +618,9 @@ local matter_lock_driver = {
     capabilities.lockCodes,
     capabilities.tamperAlert,
     capabilities.battery,
-    capabilities.batteryLevel,
   },
   sub_drivers = {
-    require("aqara-lock"),
+    require("new-matter-lock"),
   },
   lifecycle_handlers = {init = device_init, added = device_added},
 }

drivers/SmartThings/matter-lock/src/lock_utils.lua

@@ -25,7 +25,13 @@ local lock_utils = {
   COTA_CODE_NAME = "ST Remote Operation Code",
   COTA_CRED_INDEX = "cotaCredIndex",
   NONFUNCTIONAL = "nonFunctional",
-  COTA_READ_INITIALIZED = "cotaReadInitialized"
+  COTA_READ_INITIALIZED = "cotaReadInitialized",
+  BUSY_STATE = "busyState",
+  COMMAND_NAME = "commandName",
+  USER_INDEX = "userIndex",
+  USER_TYPE = "userType",
+  CRED_INDEX = "credentialIndex",
+  CRED_DATA = "credentialData"
 }
 local capabilities = require "st.capabilities"
 local json = require "st.json"