Production Release 10/7

drivers/SmartThings/matter-switch/fingerprints.yml

@@ -241,6 +241,41 @@ matterManufacturer:
     vendorId: 0x1396
     productId: 0x11DE
     deviceProfileName: light-color-level
+  - id: "5014/4224"
+    deviceLabel: Linkind Smart Light Bulb
+    vendorId: 0x1396
+    productId: 0x1080
+    deviceProfileName: light-color-level
+  - id: "5014/4223"
+    deviceLabel: Linkind Smart Light Bulb
+    vendorId: 0x1396
+    productId: 0x107F
+    deviceProfileName: light-color-level
+  - id: "5014/4227"
+    deviceLabel: Linkind Smart Light Bulb
+    vendorId: 0x1396
+    productId: 0x1083
+    deviceProfileName: light-color-level
+  - id: "5014/4218"
+    deviceLabel: Linkind Smart Filament Bulb
+    vendorId: 0x1396
+    productId: 0x107A
+    deviceProfileName: light-color-level
+  - id: "5014/4220"
+    deviceLabel: Linkind Smart Filament Bulb
+    vendorId: 0x1396
+    productId: 0x107C
+    deviceProfileName: light-color-level
+  - id: "5014/4221"
+    deviceLabel: Linkind Smart Filament Bulb
+    vendorId: 0x1396
+    productId: 0x107D
+    deviceProfileName: light-color-level
+  - id: "5014/4713"
+    deviceLabel: Linkind Smart Outdoor Plug
+    vendorId: 0x1396
+    productId: 0x1269
+    deviceProfileName: plug-binary
 #Bosch Smart Home
   - id: "4617/12310"
     deviceLabel: Plug Compact [M]

drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_handlers/attribute_handlers.lua

@@ -18,8 +18,6 @@ CameraAttributeHandlers.enabled_state_factory = function(attribute)
       camera_utils.update_supported_attributes(device, ib, capabilities.imageControl, "imageFlipHorizontal")
     elseif attribute == capabilities.imageControl.imageFlipVertical then
       camera_utils.update_supported_attributes(device, ib, capabilities.imageControl, "imageFlipVertical")
-    elseif attribute == capabilities.cameraPrivacyMode.hardPrivacyMode then
-      camera_utils.update_supported_attributes(device, ib, capabilities.cameraPrivacyMode, "hardPrivacyMode")
     end
   end
 end
@@ -59,34 +57,48 @@ end
 
 function CameraAttributeHandlers.volume_level_handler(driver, device, ib, response)
   local component = device:endpoint_to_component(ib)
-  local max_volume = device:get_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. component) or camera_fields.ABS_VOL_MAX
-  local min_volume = device:get_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. component) or camera_fields.ABS_VOL_MIN
-  -- Convert from [min_volume, max_volume] to [0, 100] before emitting capability
+  local max_volume = camera_utils.get_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, component) or camera_fields.ABS_VOL_MAX
+  local min_volume = camera_utils.get_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, component) or camera_fields.ABS_VOL_MIN
   local limited_range = max_volume - min_volume
+  if limited_range <= 0 then
+    device:emit_event_for_endpoint(ib, capabilities.audioVolume.volume(0))
+    return
+  end
+  -- Convert from [min_volume, max_volume] to [0, 100] before emitting capability
   local normalized_volume = utils.round((ib.data.value - min_volume) * 100.0 / limited_range)
   device:emit_event_for_endpoint(ib, capabilities.audioVolume.volume(normalized_volume))
 end
 
 function CameraAttributeHandlers.max_volume_level_handler(driver, device, ib, response)
   local component = device:endpoint_to_component(ib)
   local max_volume = ib.data.value
-  local min_volume = device:get_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. component)
-  if max_volume > camera_fields.ABS_VOL_MAX or (min_volume and max_volume <= min_volume) then
+  local min_volume = camera_utils.get_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, component)
+  -- min == max is a valid (non-adjustable) range per the Matter spec, so only max < min is malformed;
+  -- an out-of-bounds value is clamped, but a malformed relationship is only logged and left as-is,
+  -- since volume_level_handler already guards against a non-positive range.
+  if max_volume > camera_fields.ABS_VOL_MAX then
     device.log.warn(string.format("Device reported invalid maximum (%d) %s volume level range value", ib.data.value, component))
     max_volume = camera_fields.ABS_VOL_MAX
+  elseif min_volume and max_volume < min_volume then
+    device.log.warn(string.format("Device reported invalid maximum (%d) %s volume level range value", ib.data.value, component))
   end
-  device:set_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. component, max_volume)
+  camera_utils.set_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, component, max_volume)
+  camera_cfg.reconcile_profile_and_capabilities(device)
 end
 
 function CameraAttributeHandlers.min_volume_level_handler(driver, device, ib, response)
   local component = device:endpoint_to_component(ib)
   local min_volume = ib.data.value
-  local max_volume = device:get_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. component)
-  if min_volume < camera_fields.ABS_VOL_MIN or (max_volume and min_volume >= max_volume) then
+  local max_volume = camera_utils.get_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, component)
+  -- See max_volume_level_handler: min == max is valid, only min > max is malformed and only logged.
+  if min_volume < camera_fields.ABS_VOL_MIN then
     device.log.warn(string.format("Device reported invalid minimum (%d) %s volume level range value", ib.data.value, component))
     min_volume = camera_fields.ABS_VOL_MIN
+  elseif max_volume and min_volume > max_volume then
+    device.log.warn(string.format("Device reported invalid minimum (%d) %s volume level range value", ib.data.value, component))
   end
-  device:set_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. component, min_volume)
+  camera_utils.set_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, component, min_volume)
+  camera_cfg.reconcile_profile_and_capabilities(device)
 end
 
 function CameraAttributeHandlers.status_light_enabled_handler(driver, device, ib, response)
@@ -450,7 +462,7 @@ end
 
 function CameraAttributeHandlers.camera_av_stream_management_attribute_list_handler(driver, device, ib, response)
   if not ib.data.elements then return end
-  local status_light_enabled_present, status_light_brightness_present = false, false
+  local status_light_enabled_present, status_light_brightness_present, hard_privacy_mode_present = false, false, false
   local attribute_ids = {}
   for _, attr in ipairs(ib.data.elements) do
     if attr.value == clusters.CameraAvStreamManagement.attributes.StatusLightEnabled.ID then
@@ -459,6 +471,8 @@ function CameraAttributeHandlers.camera_av_stream_management_attribute_list_hand
     elseif attr.value == clusters.CameraAvStreamManagement.attributes.StatusLightBrightness.ID then
       status_light_brightness_present = true
       table.insert(attribute_ids, clusters.CameraAvStreamManagement.attributes.StatusLightBrightness.ID)
+    elseif attr.value == clusters.CameraAvStreamManagement.attributes.HardPrivacyModeOn.ID then
+      hard_privacy_mode_present = true
     end
   end
   local component_map = device:get_field(fields.COMPONENT_TO_ENDPOINT_MAP) or {}
@@ -469,6 +483,7 @@ function CameraAttributeHandlers.camera_av_stream_management_attribute_list_hand
   }
   device:set_field(fields.COMPONENT_TO_ENDPOINT_MAP, component_map, {persist=true})
   camera_cfg.update_status_light_attribute_presence(device, status_light_enabled_present, status_light_brightness_present)
+  camera_cfg.update_hard_privacy_mode_attribute_presence(device, hard_privacy_mode_present)
   camera_cfg.reconcile_profile_and_capabilities(device)
 end
 

drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_handlers/capability_handlers.lua

@@ -59,8 +59,8 @@ end
 
 function CameraCapabilityHandlers.handle_set_volume(driver, device, cmd)
   local endpoint_id = device:component_to_endpoint(cmd.component)
-  local max_volume = device:get_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. cmd.component) or camera_fields.ABS_VOL_MAX
-  local min_volume = device:get_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. cmd.component) or camera_fields.ABS_VOL_MIN
+  local max_volume = camera_utils.get_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, cmd.component) or camera_fields.ABS_VOL_MAX
+  local min_volume = camera_utils.get_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, cmd.component) or camera_fields.ABS_VOL_MIN
   -- Convert from [0, 100] to [min_volume, max_volume] before writing attribute
   local volume_range = max_volume - min_volume
   local volume = utils.round(cmd.args.volume * volume_range / 100.0 + min_volume)
@@ -75,8 +75,8 @@ end
 
 function CameraCapabilityHandlers.handle_volume_up(driver, device, cmd)
   local endpoint_id = device:component_to_endpoint(cmd.component)
-  local max_volume = device:get_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. cmd.component) or camera_fields.ABS_VOL_MAX
-  local min_volume = device:get_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. cmd.component) or camera_fields.ABS_VOL_MIN
+  local max_volume = camera_utils.get_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, cmd.component) or camera_fields.ABS_VOL_MAX
+  local min_volume = camera_utils.get_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, cmd.component) or camera_fields.ABS_VOL_MIN
   local volume = device:get_latest_state(cmd.component, capabilities.audioVolume.ID, capabilities.audioVolume.volume.NAME)
   if not volume or volume >= max_volume then return end
   -- Convert from [0, 100] to [min_volume, max_volume] before writing attribute
@@ -91,8 +91,8 @@ end
 
 function CameraCapabilityHandlers.handle_volume_down(driver, device, cmd)
   local endpoint_id = device:component_to_endpoint(cmd.component)
-  local max_volume = device:get_field(camera_fields.MAX_VOLUME_LEVEL .. "_" .. cmd.component) or camera_fields.ABS_VOL_MAX
-  local min_volume = device:get_field(camera_fields.MIN_VOLUME_LEVEL .. "_" .. cmd.component) or camera_fields.ABS_VOL_MIN
+  local max_volume = camera_utils.get_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, cmd.component) or camera_fields.ABS_VOL_MAX
+  local min_volume = camera_utils.get_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, cmd.component) or camera_fields.ABS_VOL_MIN
   local volume = device:get_latest_state(cmd.component, capabilities.audioVolume.ID, capabilities.audioVolume.volume.NAME)
   if not volume or volume <= min_volume then return end
   -- Convert from [0, 100] to [min_volume, max_volume] before writing attribute
@@ -157,9 +157,15 @@ CameraCapabilityHandlers.ptz_set_position_factory = function(command)
     -- a single-axis command should only set (and clamp) the axis it targets.
     local pan, tilt, zoom
     if command == capabilities.mechanicalPanTiltZoom.commands.setPanTiltZoom then
-      pan = utils.clamp_value(cmd.args.pan, ptz_map[camera_fields.PAN_IDX].range.minimum, ptz_map[camera_fields.PAN_IDX].range.maximum)
-      tilt = utils.clamp_value(cmd.args.tilt, ptz_map[camera_fields.TILT_IDX].range.minimum, ptz_map[camera_fields.TILT_IDX].range.maximum)
-      zoom = utils.clamp_value(cmd.args.zoom, ptz_map[camera_fields.ZOOM_IDX].range.minimum, ptz_map[camera_fields.ZOOM_IDX].range.maximum)
+      if cmd.args.pan ~= nil then
+        pan = utils.clamp_value(cmd.args.pan, ptz_map[camera_fields.PAN_IDX].range.minimum, ptz_map[camera_fields.PAN_IDX].range.maximum)
+      end
+      if cmd.args.tilt ~= nil then
+        tilt = utils.clamp_value(cmd.args.tilt, ptz_map[camera_fields.TILT_IDX].range.minimum, ptz_map[camera_fields.TILT_IDX].range.maximum)
+      end
+      if cmd.args.zoom ~= nil then
+        zoom = utils.clamp_value(cmd.args.zoom, ptz_map[camera_fields.ZOOM_IDX].range.minimum, ptz_map[camera_fields.ZOOM_IDX].range.maximum)
+      end
     elseif command == capabilities.mechanicalPanTiltZoom.commands.setPan then
       pan = utils.clamp_value(cmd.args.pan, ptz_map[camera_fields.PAN_IDX].range.minimum, ptz_map[camera_fields.PAN_IDX].range.maximum)
     elseif command == capabilities.mechanicalPanTiltZoom.commands.setTilt then

drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/device_configuration.lua

@@ -33,6 +33,27 @@ local function set_status_light_presence(device, status_light_enabled_present, s
   device:set_field(camera_fields.STATUS_LIGHT_BRIGHTNESS_PRESENT, status_light_brightness_present == true, { persist = true })
 end
 
+local function get_hard_privacy_mode_presence(device)
+  return device:get_field(camera_fields.HARD_PRIVACY_MODE_PRESENT)
+end
+
+local function set_hard_privacy_mode_presence(device, hard_privacy_mode_present)
+  device:set_field(camera_fields.HARD_PRIVACY_MODE_PRESENT, hard_privacy_mode_present == true, { persist = true })
+end
+
+--- Leaves audioVolume as-is if the min/max levels aren't both known yet instead of guessing;
+--- otherwise requires max > min to include it.
+--- @param component string a profile component name
+--- @return should_include boolean whether audioVolume belongs on the component argument.
+local function should_include_volume_capability(device, component)
+  local min_volume = camera_utils.get_field_for_component(device, camera_fields.MIN_VOLUME_LEVEL, component)
+  local max_volume = camera_utils.get_field_for_component(device, camera_fields.MAX_VOLUME_LEVEL, component)
+  if min_volume == nil or max_volume == nil then
+    return device:supports_capability(capabilities.audioVolume, component)
+  end
+  return max_volume > min_volume
+end
+
 local function build_webrtc_supported_features()
   return {
     bundle = true,
@@ -100,12 +121,32 @@ local function build_video_stream_settings_supported_features(device)
   return supported_features
 end
 
-local function build_camera_privacy_supported_attributes()
-  return { "softRecordingPrivacyMode", "softLivestreamPrivacyMode" }
+local function camera_privacy_feature_supported(device)
+  return camera_utils.feature_supported(device, clusters.CameraAvStreamManagement.ID, clusters.CameraAvStreamManagement.types.Feature.PRIVACY)
 end
 
-local function build_camera_privacy_supported_commands()
-  return { "setSoftRecordingPrivacyMode", "setSoftLivestreamPrivacyMode" }
+-- SoftRecordingPrivacyModeEnabled/SoftLivestreamPrivacyModeEnabled are conditionally mandatory on the PRIV
+-- feature, while HardPrivacyModeOn has independent optional conformance.
+-- A device can support either, both, or neither, so each is built independently.
+local function build_camera_privacy_supported_attributes(device)
+  local supported_attributes = {}
+  if camera_privacy_feature_supported(device) then
+    table.insert(supported_attributes, "softRecordingPrivacyMode")
+    table.insert(supported_attributes, "softLivestreamPrivacyMode")
+  end
+  if get_hard_privacy_mode_presence(device) then
+    table.insert(supported_attributes, "hardPrivacyMode")
+  end
+  return supported_attributes
+end
+
+local function build_camera_privacy_supported_commands(device)
+  local supported_commands = {}
+  if camera_privacy_feature_supported(device) then
+    table.insert(supported_commands, "setSoftRecordingPrivacyMode")
+    table.insert(supported_commands, "setSoftLivestreamPrivacyMode")
+  end
+  return supported_commands
 end
 
 local function capabilities_needing_reinit(device)
@@ -155,8 +196,8 @@ local function capabilities_needing_reinit(device)
     capabilities_to_reinit.video_stream_settings = true
   end
 
-  if should_init(capabilities.cameraPrivacyMode, capabilities.cameraPrivacyMode.supportedAttributes, build_camera_privacy_supported_attributes()) or
-    should_init(capabilities.cameraPrivacyMode, capabilities.cameraPrivacyMode.supportedCommands, build_camera_privacy_supported_commands()) then
+  if should_init(capabilities.cameraPrivacyMode, capabilities.cameraPrivacyMode.supportedAttributes, build_camera_privacy_supported_attributes(device)) or
+    should_init(capabilities.cameraPrivacyMode, capabilities.cameraPrivacyMode.supportedCommands, build_camera_privacy_supported_commands(device)) then
     capabilities_to_reinit.camera_privacy_mode = true
   end
 
@@ -194,6 +235,7 @@ end
 
 function CameraDeviceConfiguration.match_profile(device)
   local status_light_enabled_present, status_light_brightness_present = get_status_light_presence(device)
+  local hard_privacy_mode_present = get_hard_privacy_mode_presence(device)
   local profile_update_requested = false
   local optional_supported_component_capabilities = {}
   local main_component_capabilities = {}
@@ -229,17 +271,21 @@ function CameraDeviceConfiguration.match_profile(device)
             table.insert(main_component_capabilities, capabilities.audioRecording.ID)
           end
           table.insert(microphone_component_capabilities, capabilities.audioMute.ID)
-          table.insert(microphone_component_capabilities, capabilities.audioVolume.ID)
+          if should_include_volume_capability(device, camera_fields.profile_components.microphone) then
+            table.insert(microphone_component_capabilities, capabilities.audioVolume.ID)
+          end
         end
         if clus_has_feature(clusters.CameraAvStreamManagement.types.Feature.SNAPSHOT) then
           table.insert(main_component_capabilities, capabilities.imageCapture.ID)
         end
-        if clus_has_feature(clusters.CameraAvStreamManagement.types.Feature.PRIVACY) then
+        if clus_has_feature(clusters.CameraAvStreamManagement.types.Feature.PRIVACY) or hard_privacy_mode_present then
           table.insert(main_component_capabilities, capabilities.cameraPrivacyMode.ID)
         end
         if clus_has_feature(clusters.CameraAvStreamManagement.types.Feature.SPEAKER) then
           table.insert(speaker_component_capabilities, capabilities.audioMute.ID)
-          table.insert(speaker_component_capabilities, capabilities.audioVolume.ID)
+          if should_include_volume_capability(device, camera_fields.profile_components.speaker) then
+            table.insert(speaker_component_capabilities, capabilities.audioVolume.ID)
+          end
         end
         if clus_has_feature(clusters.CameraAvStreamManagement.types.Feature.IMAGE_CONTROL) then
           table.insert(main_component_capabilities, capabilities.imageControl.ID)
@@ -361,8 +407,8 @@ end
 local function init_camera_privacy_mode(device)
   if device:supports_capability(capabilities.cameraPrivacyMode) then
     local av_stream_management_ep_ids = device:get_endpoints(clusters.CameraAvStreamManagement.ID)
-    device:emit_event_for_endpoint(av_stream_management_ep_ids[1], capabilities.cameraPrivacyMode.supportedAttributes(build_camera_privacy_supported_attributes()))
-    device:emit_event_for_endpoint(av_stream_management_ep_ids[1], capabilities.cameraPrivacyMode.supportedCommands(build_camera_privacy_supported_commands()))
+    device:emit_event_for_endpoint(av_stream_management_ep_ids[1], capabilities.cameraPrivacyMode.supportedAttributes(build_camera_privacy_supported_attributes(device)))
+    device:emit_event_for_endpoint(av_stream_management_ep_ids[1], capabilities.cameraPrivacyMode.supportedCommands(build_camera_privacy_supported_commands(device)))
   end
 end
 
@@ -442,6 +488,10 @@ function CameraDeviceConfiguration.update_status_light_attribute_presence(device
   set_status_light_presence(device, status_light_enabled_present, status_light_brightness_present)
 end
 
+function CameraDeviceConfiguration.update_hard_privacy_mode_attribute_presence(device, hard_privacy_mode_present)
+  set_hard_privacy_mode_presence(device, hard_privacy_mode_present)
+end
+
 function CameraDeviceConfiguration.reinitialize_changed_camera_capabilities_and_subscriptions(device, old_profile, new_profile)
   local changed_capabilities = changed_capabilities_from_profiles(old_profile, new_profile)
   initialize_selected_camera_capabilities(device, changed_capabilities)

drivers/SmartThings/matter-switch/src/sub_drivers/camera/camera_utils/fields.lua

@@ -16,6 +16,7 @@ CameraFields.TRIGGERED_ZONES = "__triggered_zones"
 CameraFields.DPTZ_VIEWPORTS = "__dptz_viewports"
 CameraFields.STATUS_LIGHT_ENABLED_PRESENT = "__status_light_enabled_present"
 CameraFields.STATUS_LIGHT_BRIGHTNESS_PRESENT = "__status_light_brightness_present"
+CameraFields.HARD_PRIVACY_MODE_PRESENT = "__hard_privacy_mode_present"
 
 CameraFields.CameraAVSMFeatureMapAttr = { ID = 0xFFFC, cluster = clusters.CameraAvStreamManagement.ID }
 CameraFields.CameraAVSULMFeatureMapAttr = { ID = 0xFFFC, cluster = clusters.CameraAvSettingsUserLevelManagement.ID }