[WWSTCERT-13446, WWSTCERT-13450, WWSTCERT-13454, WWSTCERT-13458] SONOFF/SWV1C

drivers/SmartThings/zigbee-valve/fingerprints.yml

@@ -39,5 +39,23 @@ zigbeeManufacturer :
     manufacturer: Compacta
     model: ZBVC1(1023A)
     deviceProfileName: valve-battery-powerSource
-
-
+  - id: SONOFF/SWV-ZFE
+    deviceLabel: SONOFF Water Valve
+    manufacturer: SONOFF
+    model: SWV-ZFE
+    deviceProfileName: valve-battery
+  - id: SONOFF/SWV-ZFU
+    deviceLabel: SONOFF Water Valve
+    manufacturer: SONOFF
+    model: SWV-ZFU
+    deviceProfileName: valve-battery
+  - id: SONOFF/SWV-ZNE
+    deviceLabel: SONOFF Water Valve
+    manufacturer: SONOFF
+    model: SWV-ZNE
+    deviceProfileName: valve-battery
+  - id: SONOFF/SWV-ZNU
+    deviceLabel: SONOFF Water Valve
+    manufacturer: SONOFF
+    model: SWV-ZNU
+    deviceProfileName: valve-battery

drivers/SmartThings/zigbee-valve/profiles/valve-battery.yml

@@ -0,0 +1,14 @@
+name: valve-battery
+components:
+- id: main
+  capabilities:
+  - id: valve
+    version: 1
+  - id: battery
+    version: 1
+  - id: firmwareUpdate
+    version: 1
+  - id: refresh
+    version: 1
+  categories :
+  - name: WaterValve

drivers/SmartThings/zigbee-valve/src/init.lua

@@ -1,13 +1,24 @@
--- Copyright 2022 SmartThings, Inc.
--- Licensed under the Apache License, Version 2.0
-
+-- Copyright 2022 SmartThings
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
 
 local ZigbeeDriver = require "st.zigbee"
 local defaults = require "st.zigbee.defaults"
 
 --ZCL
 local zcl_clusters = require "st.zigbee.zcl.clusters"
 local Basic               = zcl_clusters.Basic
+local PowerConfiguration  = zcl_clusters.PowerConfiguration
 --Capability
 local capabilities = require "st.capabilities"
 local battery = capabilities.battery
@@ -27,6 +38,17 @@ local zigbee_valve_driver_template = {
     refresh
   },
   cluster_configurations = {
+    [battery.ID] = {
+      {
+        cluster = PowerConfiguration.ID,
+        attribute = PowerConfiguration.attributes.BatteryPercentageRemaining.ID,
+        minimum_interval = 300,
+        maximum_interval = 900,
+        data_type = PowerConfiguration.attributes.BatteryPercentageRemaining.base_type,
+        reportable_change = 2,
+        configurable = true
+      }
+    },
     [powerSource.ID] = {
       {
         cluster = Basic.ID,

drivers/SmartThings/zigbee-valve/src/sonoff/can_handle.lua

@@ -0,0 +1,20 @@
+-- Copyright 2026 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local FINGERPRINTS = {
+  { mfr = "SONOFF", model = "SWV-ZFU" },
+  { mfr = "SONOFF", model = "SWV-ZFE" },
+  { mfr = "SONOFF", model = "SWV-ZNU" },
+  { mfr = "SONOFF", model = "SWV-ZNE" },
+}
+
+local function sonoff_can_handle(opts, driver, device, ...)
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:get_manufacturer() == fingerprint.mfr and device:get_model() == fingerprint.model then
+      return true, require "sonoff"
+    end
+  end
+  return false
+end
+
+return sonoff_can_handle

drivers/SmartThings/zigbee-valve/src/sonoff/init.lua

@@ -0,0 +1,96 @@
+-- Copyright 2026 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local capabilities = require "st.capabilities"
+local zcl_clusters = require "st.zigbee.zcl.clusters"
+local OnOff = zcl_clusters.OnOff
+local PowerConfiguration = zcl_clusters.PowerConfiguration
+local utils = require "st.utils"
+
+-- Battery Polling Interval (seconds): SWV1C is a battery sleep device, polling every 2 hours
+local BATTERY_POLL_INTERVAL = 7200
+
+--- OnOff Property Reporting Handler → Valve Capability Point Event
+--- It must be handled explicitly because the child driver defines capability_handlers.
+--- The default OnOff→valve mapping from the parent driver will be skipped (only OnOff→switch remains)
+--- @param driver table Driver instance
+--- @param device table Device instance
+--- @param value table Zigbee attribute value
+local function onoff_attr_handler(driver, device, value)
+  local is_on = value.value ~= false and value.value ~= 0
+  if is_on then
+    device:emit_event(capabilities.valve.valve.open())
+  else
+    device:emit_event(capabilities.valve.valve.closed())
+  end
+end
+
+--- Battery Percentage Attribute Handler
+--- Zigbee BatteryPercentageRemaining range 0-200 (0%-100%), needs to be divided by 2
+--- @param driver table Driver instance
+--- @param device table Device instance
+--- @param value table Zigbee attribute value
+local function battery_percentage_handler(driver, device, value)
+  local raw = value.value
+  local percent = utils.round(raw / 2)
+  device:emit_event(capabilities.battery.battery(percent))
+end
+
+--- Lifecycle initialization handler
+--- Ensures battery data is available by periodically actively reading BatteryPercentageRemaining
+--- @param driver table Driver instance
+--- @param device table Device instance
+local function device_init(driver, device)
+  device.thread:call_on_schedule(
+    BATTERY_POLL_INTERVAL,
+    function()
+      device:send(PowerConfiguration.attributes.BatteryPercentageRemaining:read(device))
+    end
+  )
+end
+
+--- valve.open ability handler
+--- @param driver table driver instance
+--- @param device table device instance
+--- @param command table ability command
+local function valve_open_handler(driver, device, command)
+  device:send(OnOff.server.commands.On(device))
+  device:send(OnOff.attributes.OnOff:read(device))
+end
+
+--- valve.close capability handler
+--- @param driver table driver instance
+--- @param device table device instance
+--- @param command table capability command
+local function valve_close_handler(driver, device, command)
+  device:send(OnOff.server.commands.Off(device))
+  device:send(OnOff.attributes.OnOff:read(device))
+end
+
+local sonoff_valve_handler = {
+  NAME = "SONOFF Water Valve Handler",
+  lifecycle_handlers = {
+    init = device_init
+  },
+  capability_handlers = {
+    [capabilities.valve.ID] = {
+      [capabilities.valve.commands.open.NAME] = valve_open_handler,
+      [capabilities.valve.commands.close.NAME] = valve_close_handler,
+    }
+  },
+  zigbee_handlers = {
+    attr = {
+      -- OnOff property reporting → valve event (to compensate for the defect of the parent driver's default mapping being skipped)
+      [OnOff.ID] = {
+        [OnOff.attributes.OnOff.ID] = onoff_attr_handler
+      },
+      -- Battery percentage attribute reporting → battery event
+      [PowerConfiguration.ID] = {
+        [PowerConfiguration.attributes.BatteryPercentageRemaining.ID] = battery_percentage_handler
+      }
+    }
+  },
+  can_handle = require "sonoff.can_handle",
+}
+
+return sonoff_valve_handler

drivers/SmartThings/zigbee-valve/src/sub_drivers.lua

@@ -5,5 +5,6 @@ local lazy_load_if_possible = require "lazy_load_subdriver"
 local sub_drivers = {
    lazy_load_if_possible("sinope"),
    lazy_load_if_possible("ezex"),
+   lazy_load_if_possible("sonoff"),
 }
 return sub_drivers

drivers/SmartThings/zigbee-valve/src/test/test_lazy_load_subdriver.lua

@@ -0,0 +1,42 @@
+-- Copyright 2026 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function load_helper(api, lazy_loader, legacy_module)
+  package.loaded["version"] = { api = api }
+  package.loaded["st.zigbee"] = {
+    lazy_load_sub_driver = function(name)
+      assert(name == legacy_module)
+      return lazy_loader
+    end,
+    lazy_load_sub_driver_v2 = function(name)
+      assert(name == legacy_module)
+      return lazy_loader
+    end,
+  }
+  package.preload[legacy_module] = function()
+    return legacy_module
+  end
+
+  return dofile("lazy_load_subdriver.lua")
+end
+
+local legacy_module = "test-sub-driver"
+local marker = {}
+
+print('Running test "lazy loader supports all API branches"')
+
+local helper = load_helper(16, marker, legacy_module)
+assert(helper(legacy_module) == marker)
+
+helper = load_helper(10, marker, legacy_module)
+assert(helper(legacy_module) == marker)
+
+helper = load_helper(8, marker, legacy_module)
+assert(helper(legacy_module) == legacy_module)
+
+package.preload[legacy_module] = nil
+package.loaded["version"] = nil
+package.loaded["st.zigbee"] = nil
+
+print("PASSED")
+print("Passed 1 of 1 tests")