Merge branch 'SmartThingsCommunity:main' into appartme-flood-sensor

Author: r-slezak

.github/workflows/jenkins-driver-tests.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         version:
-          [ 59, 60, dev]
+          [ 59, 60, 61, dev]
 
     runs-on: ubuntu-latest
     steps:

drivers/Aqara/aqara-bath-heater/profiles/aqara-bath-heater.yml

@@ -8,165 +8,18 @@ components:
         version: 1
       - id: colorTemperature
         version: 1
-        config:
-          values:
-            - key: "colorTemperature.value"
-              range: [2700, 6500]
       - id: thermostatMode
         version: 1
-        config:
-          values:
-            - key: "thermostatMode.value"
-              enabledValues:
-                - "off"
-                - "heat"
-                - "dryair"
-                - "cool"
-                - "fanonly"
       - id: thermostatHeatingSetpoint
         version: 1
-        config:
-          values:
-            - key: "thermostatHeatingSetpoint.value"
-              range: [16, 45]
-              unit: "C"
       - id: fanOscillationMode
         version: 1
-        config:
-          values:
-            - key: "fanOscillationMode.value"
-              enabledValues:
-                - "swing"
-                - "fixed"
       - id: fanMode
         version: 1
-        config:
-          values:
-            - key: "fanMode.value"
-              enabledValues:
-                - "low"
-                - "medium"
-                - "high"
       - id: refresh
         version: 1
     categories:
       - name: Thermostat
-deviceConfig:
-  dashboard:
-    states:
-      - component: main
-        capability: switch
-        version: 1
-      - component: main
-        capability: fanMode
-        version: 1
-    actions:
-    - component: main
-      capability: switch
-      version: 1
-  detailView:
-  - component: main
-    capability: switch
-    version: 1
-  - component: main
-    capability: switchLevel
-    version: 1
-  - component: main
-    capability: colorTemperature
-    version: 1
-  - component: main
-    capability: thermostatMode
-    version: 1
-  - component: main
-    capability: thermostatHeatingSetpoint
-    version: 1
-    visibleCondition:
-      component: main
-      capability: thermostatMode
-      version: 1
-      value: thermostatMode.value
-      operator: EQUALS
-      operand: "heat"
-  - component: main
-    capability: fanOscillationMode
-    version: 1
-    visibleCondition:
-      component: main
-      capability: thermostatMode
-      version: 1
-      value: thermostatMode.value
-      operator: ONE_OF
-      operand: '["heat", "dryair", "cool"]'
-  - component: main
-    capability: fanMode
-    version: 1
-    visibleCondition:
-      component: main
-      capability: thermostatMode
-      version: 1
-      value: thermostatMode.value
-      operator: ONE_OF
-      operand: '["heat", "dryair", "cool", "fanonly"]'
-  - component: main
-    capability: refresh
-    version: 1
-  automation:
-    conditions:
-    - component: main
-      capability: switch
-      version: 1
-    - component: main
-      capability: switchLevel
-      version: 1
-    - component: main
-      capability: colorTemperature
-      version: 1
-    - component: main
-      capability: thermostatMode
-      version: 1
-    - component: main
-      capability: thermostatHeatingSetpoint
-      version: 1
-    - component: main
-      capability: fanOscillationMode
-      version: 1
-    - component: main
-      capability: fanMode
-      version: 1
-      values:
-        - key: "fanMode.value"
-          enabledValues:
-            - "low"
-            - "medium"
-            - "high"
-    actions:
-    - component: main
-      capability: switch
-      version: 1
-    - component: main
-      capability: switchLevel
-      version: 1
-    - component: main
-      capability: colorTemperature
-      version: 1
-    - component: main
-      capability: thermostatMode
-      version: 1
-    - component: main
-      capability: thermostatHeatingSetpoint
-      version: 1
-    - component: main
-      capability: fanOscillationMode
-      version: 1
-    - component: main
-      capability: fanMode
-      version: 1
-      values:
-        - key: "setFanMode.fanMode"
-          enabledValues:
-            - "low"
-            - "medium"
-            - "high"
 preferences:
   - preferenceId: stse.nightLightMode
     explicit: true
@@ -178,3 +31,6 @@ preferences:
     explicit: true
   - preferenceId: stse.thermostatCtrl
     explicit: true
+metadata:
+  mnmn: SolutionsEngineering
+  vid: SmartThings-smartthings-Aqara_Bath_Heater

drivers/Aqara/aqara-bath-heater/src/init.lua

@@ -429,6 +429,7 @@ local function device_added(driver, device)
         capabilities.fanOscillationMode.fanOscillationMode.NAME) == nil then
     device:emit_event(capabilities.fanOscillationMode.fanOscillationMode(OSC.SWING))
   end
+  device:emit_event(capabilities.colorTemperature.colorTemperatureRange({ value = {minimum = 2700, maximum = 6500} }))
 end
 
 local function send_night_light(device, new)

drivers/Aqara/aqara-bath-heater/src/test/test_aqara_bath_heater.lua

@@ -619,6 +619,8 @@ test.register_coroutine_test(
       capabilities.fanMode.fanMode("medium")))
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
       capabilities.fanOscillationMode.fanOscillationMode("swing")))
+    test.socket.capability:__expect_send(mock_device:generate_test_message("main",
+      capabilities.colorTemperature.colorTemperatureRange({ value = {minimum = 2700, maximum = 6500} })))
   end
 )
 

drivers/SmartThings/matter-lock/fingerprints.yml

@@ -25,6 +25,25 @@ matterManufacturer:
     vendorId: 0x115F
     productId: 0x2804
     deviceProfileName: lock
+  - id: "4447/10255"
+    deviceLabel: Aqara Smart Lock U500 Rim
+    vendorId: 0x115F
+    productId: 0x280F
+    deviceProfileName: lock-modular
+  - id: "4447/10256"
+    deviceLabel: Aqara Smart Lock U500 Glass Door
+    vendorId: 0x115F
+    productId: 0x2810
+    deviceProfileName: lock-modular
+  - id: "4447/10314"
+    deviceLabel: Aqara Smart Lock U600
+    vendorId: 0x115F
+    productId: 0x284A
+  - id: "4447/10253"
+    deviceLabel: Aqara Smart Lock J200
+    vendorId: 0x115F
+    productId: 0x280D
+    deviceProfileName: lock-modular
   #Eufy
   - id: "5427/1"
     deviceLabel: eufy Smart Lock E31

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

@@ -9,8 +9,10 @@ local NEW_MATTER_LOCK_PRODUCTS = {
   {0x115f, 0x286A}, -- AQARA, U200 US
   {0x115f, 0x2805}, -- Aqara Smart Lock J200 Set
   {0x115f, 0x280e}, -- AQARA Smart Gate Lock U500
-  {0x115f, 0x280f}, -- AQARA Smart Rim Lock U500
-  {0x115f, 0x2810}, -- AQARA Smart Glass Door Lock U500
+  {0x115F, 0x280F}, -- Aqara Smart Lock U500 Rim
+  {0x115F, 0x2810}, -- Aqara Smart Lock U500 Glass Door
+  {0x115F, 0x284A}, -- Aqara Smart Lock U600
+  {0x115F, 0x280D}, -- Aqara Smart Lock J200
   {0x147F, 0x0001}, -- U-tec
   {0x147F, 0x0007}, -- ULTRALOQ Bolt Pro Smart Matter Door Lock
   {0x147F, 0x0008}, -- Ultraloq, Bolt Smart Matter Door Lock

drivers/SmartThings/matter-sensor/src/sensor_handlers/attribute_handlers.lua

@@ -89,7 +89,8 @@ function AttributeHandlers.soil_moisture_measurement_limits_handler(driver, devi
   local min_val = ib.data.elements and ib.data.elements.min_measured_value and ib.data.elements.min_measured_value.value
   local max_val = ib.data.elements and ib.data.elements.max_measured_value and ib.data.elements.max_measured_value.value
   if not (min_val and max_val) or (min_val >= max_val) or (min_val < sensor_utils.SOIL_MOISTURE_MIN) or (max_val > sensor_utils.SOIL_MOISTURE_MAX) then
-    device.log.warn_with({hub_logs = true}, string.format("Device reported invalid soil moisture limits: min=%d, max=%d", min_val, max_val))
+    device.log.warn_with({hub_logs = true}, string.format("Device reported invalid soil moisture limits: min=%s, max=%s", min_val, max_val))
+    return
   end
   sensor_utils.set_field_for_endpoint(device, fields.SOIL_LIMIT_MIN, ib.endpoint_id, min_val)
   sensor_utils.set_field_for_endpoint(device, fields.SOIL_LIMIT_MAX, ib.endpoint_id, max_val)

drivers/SmartThings/matter-switch/fingerprints.yml

@@ -557,6 +557,11 @@ matterManufacturer:
     vendorId: 0x1339
     productId: 0x0056
     deviceProfileName: light-color-level
+  - id: "4921/85"
+    deviceLabel: Dual Socket Smart Plug
+    vendorId: 0x1339
+    productId: 0x0055
+    deviceProfileName: plug-binary
 #Govee
   - id: "4999/24740"
     deviceLabel: Govee Square Ceiling Light (12 inch)
@@ -4169,6 +4174,12 @@ matterManufacturer:
     vendorId: 0x1392
     productId: 0x0106
     deviceProfileName: plug-power-energy-powerConsumption
+#GIANT LIGHTING
+  - id: "5707/1"
+    deviceLabel: Floor Lamp
+    vendorId: 0x164B
+    productId: 0x0001
+    deviceProfileName: light-color-level
 
 
 matterGeneric:

drivers/SmartThings/matter-switch/src/sub_drivers/ikea_scroll/scroll_handlers/event_handlers.lua

@@ -17,7 +17,9 @@ local function rotate_amount_event_helper(device, endpoint_id, num_presses_to_ha
   local scroll_direction = switch_utils.tbl_contains(scroll_fields.ENDPOINTS_UP_SCROLL, endpoint_id) and 1 or -1
   local scroll_amount = st_utils.clamp_value(scroll_direction * scroll_fields.PER_SCROLL_EVENT_ROTATION * num_presses_to_handle, -100, 100)
 
-  device:emit_event_for_endpoint(endpoint_id, capabilities.knob.rotateAmount(scroll_amount, {state_change = true}))
+  if event_utils.is_valid_scroll_amount(device, scroll_amount) then
+    device:emit_event_for_endpoint(endpoint_id, capabilities.knob.rotateAmount(scroll_amount, {state_change = true}))
+  end
 end
 
 -- Used by ENDPOINTS_UP_SCROLL and ENDPOINTS_DOWN_SCROLL, not ENDPOINTS_PUSH

drivers/SmartThings/matter-switch/src/sub_drivers/ikea_scroll/scroll_utils/event_utils.lua

@@ -1,10 +1,36 @@
 -- Copyright © 2026 SmartThings, Inc.
 -- Licensed under the Apache License, Version 2.0
 
+local st_utils = require "st.utils"
 local clusters = require "st.matter.clusters"
+local scroll_fields = require "sub_drivers.ikea_scroll.scroll_utils.fields"
 
 local IkeaScrollEventUtils = {}
 
+
+function IkeaScrollEventUtils.requeue_clear_scroll_state(device)
+  -- cancel any previously queued clear state actions to prevent unintended clears
+  if device:get_field(scroll_fields.CLEAR_STATE_TIMER) then
+    device.thread:cancel_timer(device:get_field(scroll_fields.CLEAR_STATE_TIMER))
+  end
+  local new_timer = device.thread:call_with_delay(scroll_fields.CLEAR_STATE_DELAY_S, function()
+    device:set_field(scroll_fields.GLOBAL_ROTATE_AMOUNT_STATE, 0)
+  end)
+  device:set_field(scroll_fields.CLEAR_STATE_TIMER, new_timer)
+end
+
+function IkeaScrollEventUtils.is_valid_scroll_amount(device, scroll_amount)
+  local global_rotate_amount_state = device:get_field(scroll_fields.GLOBAL_ROTATE_AMOUNT_STATE) or 0
+  local is_rotate_amount_state_at_bounds = (scroll_amount < 0 and global_rotate_amount_state <= -100) or (scroll_amount > 0 and global_rotate_amount_state >= 100)
+  if is_rotate_amount_state_at_bounds then
+    return false
+  end
+
+  device:set_field(scroll_fields.GLOBAL_ROTATE_AMOUNT_STATE, st_utils.clamp_value(global_rotate_amount_state + scroll_amount, -100, 100))
+  IkeaScrollEventUtils.requeue_clear_scroll_state(device)
+  return true
+end
+
 -- inspect all info blocks to find the last one that is not an InitialPress event. We will
 -- only try to emit a rotateAmount event if the current info block being handled is that last one.
 function IkeaScrollEventUtils.is_last_valid_info_block(cur_info_block_event_id, cur_info_block_value, info_blocks)