Merge branch 'SmartThingsCommunity:main' into Bosch_motion_sensor_support

Author: JanJakubiszyn

drivers/SmartThings/matter-lock/fingerprints.yml

@@ -51,6 +51,12 @@ matterManufacturer:
     vendorId: 0x1533
     productId: 0x0012
     deviceProfileName: lock-user-pin-battery
+  #Kwikset
+  - id: "5153/66"
+    deviceLabel: Kwikset Halo Select Plus
+    vendorId: 0x1421
+    productId: 0x0042
+    deviceProfileName: lock-user-pin-battery
   #Level
   - id: "4767/1"
     deviceLabel: Level Lock Plus (Matter)

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

@@ -82,7 +82,8 @@ local NEW_MATTER_LOCK_PRODUCTS = {
   {0x135D, 0x00B0}, -- Nuki, Smart Lock
   {0x15F2, 0x0001}, -- Viomi, AiSafety Smart Lock E100
   {0x158B, 0x0001}, -- Deasino, DS-MT01
-  {0x10E1, 0x2002}  -- VDA
+  {0x10E1, 0x2002}, -- VDA
+  {0x1421, 0x0042}, -- Kwikset Halo Select Plus
 }
 
 local battery_support = {

drivers/SmartThings/matter-sensor/fingerprints.yml

@@ -10,6 +10,11 @@ matterManufacturer:
     vendorId: 0x115F
     productId: 0x2003
     deviceProfileName: motion-illuminance-battery
+  - id: "4447/8197"
+    deviceLabel: Presence Multi-Sensor FP300
+    vendorId: 0x115F
+    productId: 0x2005
+    deviceProfileName: motion-illuminance-temperature-humidity-batteryLevel
   #Bosch
   - id: 4617/12309
     deviceLabel: "Door/window contact II [M]"

drivers/SmartThings/matter-switch/fingerprints.yml

@@ -3073,6 +3073,11 @@ matterGeneric:
       - id: 0x0101 # Dimmable Light
       - id: 0x0107 # Occupancy Sensor
     deviceProfileName: light-level-motion
+  - id: "matter/camera"
+    deviceLabel: Matter Camera
+    deviceTypes:
+      - id: 0x0142 # Camera
+    deviceProfileName: camera
 
 matterThing:
   - id: SmartThings/MatterThing

drivers/SmartThings/matter-switch/profiles/camera.yml

@@ -0,0 +1,128 @@
+name: camera
+components:
+  - id: main
+    capabilities:
+      - id: webrtc
+        version: 1
+        optional: true
+      - id: videoCapture2
+        version: 1
+        optional: true
+      - id: videoStreamSettings
+        version: 1
+        optional: true
+      - id: imageCapture
+        version: 1
+        optional: true
+      - id: mechanicalPanTiltZoom
+        version: 1
+        optional: true
+      - id: hdr
+        version: 1
+        optional: true
+      - id: nightVision
+        version: 1
+        optional: true
+      - id: imageControl
+        version: 1
+        optional: true
+      - id: audioRecording
+        version: 1
+        optional: true
+      - id: sounds
+        version: 1
+        optional: true
+      - id: cameraPrivacyMode
+        version: 1
+        optional: true
+      - id: zoneManagement
+        version: 1
+        optional: true
+      - id: localMediaStorage
+        version: 1
+        optional: true
+      - id: cameraViewportSettings
+        version: 1
+        optional: true
+      - id: motionSensor
+        version: 1
+        optional: true
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+      - name: Camera
+  - id: statusLed
+    optional: true
+    capabilities:
+      - id: switch
+        version: 1
+        optional: true
+      - id: mode
+        version: 1
+        optional: true
+  - id: speaker
+    optional: true
+    capabilities:
+      - id: audioMute
+        version: 1
+        optional: true
+      - id: audioVolume
+        version: 1
+        optional: true
+  - id: microphone
+    optional: true
+    capabilities:
+      - id: audioMute
+        version: 1
+        optional: true
+      - id: audioVolume
+        version: 1
+        optional: true
+  - id: doorbell
+    optional: true
+    capabilities:
+      - id: button
+        version: 1
+        optional: true
+deviceConfig:
+  dashboard:
+    states:
+    - component: main
+      capability: imageCapture
+      version: 1
+      values:
+        - label: "{{___PO_CODE_SAMSUNGELECTRONICS.IM_DEFAULT_IMAGE_CAPTURE}}"
+      visibleCondition:
+        component: main
+        capability: imageCapture
+        version: 1
+        value: captureTime.value
+        valueType: string
+        operator: CONTAINS
+        operand: T
+        isOffline: false
+    basicPlus:
+      - displayType: camera
+        camera:
+          image:
+            component: main
+            capability: imageCapture
+            version: 1
+            value: image.value
+  detailView:
+    - component: main
+      capability: webrtc
+      version: 1
+    - component: main
+      capability: mechanicalPanTiltZoom
+      version: 1
+  dpInfo:
+    - os: ios
+      dpUri: "storyboard://HMVSController/HMVSViewController"
+    - os: android
+      dpUri: "plugin://com.samsung.android.plugin.camera"
+metadata:
+  mnmn: SmartThingsEdge
+  vid: matter-camera

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

@@ -40,6 +40,7 @@ end
 
 function SwitchLifecycleHandlers.do_configure(driver, device)
   if device.network_type == device_lib.NETWORK_TYPE_MATTER and not switch_utils.detect_bridge(device) then
+    switch_cfg.set_device_control_options(device)
     device_cfg.match_profile(driver, device)
   end
 end
@@ -296,6 +297,7 @@ local matter_driver_template = {
   supported_capabilities = fields.supported_capabilities,
   sub_drivers = {
     require("sub_drivers.aqara_cube"),
+    switch_utils.lazy_load("sub_drivers.camera"),
     require("sub_drivers.eve_energy"),
     require("sub_drivers.third_reality_mk1")
   }