Bckup again oct 8

drivers/SmartThings/zigbee-motion-sensor/config.yml

@@ -1,4 +1,4 @@
-name: 'Zigbee Motion Sensor'
+name: 'Zigbee Motion Sensor vX'
 packageKey: 'zigbee-motion-sensor'
 permissions:
   zigbee: {}

drivers/SmartThings/zigbee-motion-sensor/fingerprints.yml

@@ -9,6 +9,11 @@ zigbeeManufacturer:
     manufacturer: LUMI
     model: lumi.motion.agl02
     deviceProfileName: motion-illuminance-battery-aqara
+  - id: "LUMI/lumi.motion.ac02"
+    deviceLabel: Aqara Motion Sensor P1
+    manufacturer: LUMI
+    model: lumi.motion.ac02
+    deviceProfileName: motion-illuminance-battery-aqara
   - id: "LUMI/lumi.motion.agl04"
     deviceLabel: Aqara High Precision Motion Sensor
     manufacturer: LUMI

drivers/SmartThings/zigbee-motion-sensor/profiles/motion-illuminance-battery-aqara.yml

@@ -6,13 +6,19 @@ components:
         version: 1
       - id: illuminanceMeasurement
         version: 1
+      - id: battery
+        version: 1
       - id: stse.detectionFrequency
         version: 1
-      - id: battery
+      - id: stse.sensitivityAdjustment
         version: 1
       - id: firmwareUpdate
         version: 1
       - id: refresh
         version: 1
+      - id: voltageMeasurement
+        version: 1
+      - id: signalStrength
+        version: 1
     categories:
       - name: MotionSensor

drivers/SmartThings/zigbee-motion-sensor/src/aqara/init.lua

@@ -19,6 +19,12 @@ local FREQUENCY_ATTRIBUTE_ID = 0x0102
 
 local MOTION_DETECTED_UINT32 = 65536
 
+local FINGERPRINTS = {
+  { mfr = "LUMI", model = "lumi.motion.ac02" },
+  { mfr = "LUMI", model = "lumi.motion.agl02" },
+  { mfr = "LUMI", model = "lumi.motion.agl04" },
+  { mfr = "LUMI", model = "lumi.motion.ac02" }
+}
 
 local CONFIGURATIONS = {
   {

drivers/SmartThings/zigbee-switch/config.yml

@@ -1,4 +1,4 @@
-name: 'Zigbee Switch'
+name: 'Zigbee Switch Vx'
 packageKey: 'zigbee-switch'
 permissions:
   zigbee: {}

drivers/SmartThings/zigbee-switch/fingerprints.yml

@@ -400,7 +400,7 @@ zigbeeManufacturer:
     deviceLabel: "RM3500ZB Sinope Load Controller"
     manufacturer: Sinope Technologies
     model: RM3500ZB
-    deviceProfileName: switch-power-smartplug
+    deviceProfileName: switch-power-waterheater
   - id: "Sinope Dimmer Switch/DM2500ZB"
     deviceLabel: "DM2500ZB Sinope Dimmer"
     manufacturer: Sinope Technologies
@@ -950,6 +950,11 @@ zigbeeManufacturer:
     manufacturer: IKEA of Sweden
     model: "TRADFRI control outlet"
     deviceProfileName: basic-switch
+  - id: IKEA/INSPELNING Smart plug
+    deviceLabel: INSPELNING Smart plug
+    manufacturer: IKEA of Sweden
+    model: "INSPELNING Smart plug"
+    deviceProfileName: switch-power-energy  
   - id: MEGAMAN/BSZTM005
     deviceLabel: INGENIUM Switch
     manufacturer: MEGAMAN

drivers/SmartThings/zigbee-switch/profiles/switch-power-waterheater.yml

@@ -0,0 +1,82 @@
+name: switch-power-waterheater
+components:
+  - id: main
+    capabilities:
+      - id: switch
+        version: 1
+      - id: powerMeter
+        version: 1
+      - id: temperatureMeasurement
+        version: 1
+      - id: waterSensor
+        version: 1
+      - id: voltageMeasurement
+        version: 1
+      - id: currentMeasurement
+        version: 1
+      - id: energyMeter
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
+    categories:
+      - name: SmartPlug
+
+preferences:
+  - name: "lowTempProtection"
+    title: "Low Water Temperature Protection"
+    description: "Minimum temperature threshold to restart water heater"
+    required: false
+    preferenceType: enumeration
+    definition:
+      options:
+        0: "OFF"
+        45: "45 °C"
+        46: "46 °C"
+        47: "47 °C"
+        48: "48 °C"
+        49: "49 °C"
+        50: "50 °C"
+        51: "51 °C"
+        52: "52 °C"
+        53: "53 °C"
+        54: "54 °C"
+        55: "55 °C"
+      default: 45
+
+  # - title: "Min Measured Temperature"
+  #   name: "minMeasuredTempp"
+  #   description: "Lowest temperature recorded (°C) - Read Only"
+  #   required: false
+  #   preferenceType: number
+  #   definition:
+  #     minimum: -50
+  #     maximum: 100
+  #     default: 0
+
+  # - title: "Max Measured Temperature"
+  #   name: "maxMeasuredTempp"
+  #   description: "Highest temperature recorded (°C) - Read Only"
+  #   required: false
+  #   preferenceType: number
+  #   definition:
+  #     minimum: -50
+  #     maximum: 100
+  #     default: 0
+
+
+
+  # Tank Size not used yet
+  # - name: "tankSize"
+  #   title: "Tank Size"
+  #   description: "Select the size of the hot water tank"
+  #   required: false
+  #   preferenceType: enumeration
+  #   definition:
+  #     options:
+  #       40: "40 Gal"
+  #       50: "50 Gal"
+  #       60: "60 Gal"
+  #       80: "80 Gal"
+  #     default: 40

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

@@ -66,8 +66,43 @@ local zigbee_switch_driver_template = {
     capabilities.illuminanceMeasurement,
     capabilities.relativeHumidityMeasurement,
     capabilities.temperatureMeasurement,
+    capabilities.waterSensor,
+    capabilities.voltageMeasurement,
+
+  },
+  sub_drivers = {
+    lazy_load_if_possible("non_zigbee_devices"),
+    lazy_load_if_possible("hanssem"),
+    lazy_load_if_possible("aqara"),
+    lazy_load_if_possible("aqara-light"),
+    lazy_load_if_possible("ezex"),
+    lazy_load_if_possible("rexense"),
+    lazy_load_if_possible("sinope"),
+    lazy_load_if_possible("sinope-dimmer"),
+    require("sinope-waterheater"),
+    lazy_load_if_possible("zigbee-dimmer-power-energy"),
+    lazy_load_if_possible("zigbee-metering-plug-power-consumption-report"),
+    lazy_load_if_possible("jasco"),
+    lazy_load_if_possible("multi-switch-no-master"),
+    lazy_load_if_possible("zigbee-dual-metering-switch"),
+    lazy_load_if_possible("rgb-bulb"),
+    lazy_load_if_possible("zigbee-dimming-light"),
+    lazy_load_if_possible("white-color-temp-bulb"),
+    lazy_load_if_possible("rgbw-bulb"),
+    (version.api < 16) and lazy_load_if_possible("zll-dimmer-bulb") or nil,
+    lazy_load_if_possible("ikea-xy-color-bulb"),
+    lazy_load_if_possible("zll-polling"),
+    lazy_load_if_possible("zigbee-switch-power"),
+    lazy_load_if_possible("ge-link-bulb"),
+    lazy_load_if_possible("bad_on_off_data_type"),
+    lazy_load_if_possible("robb"),
+    lazy_load_if_possible("wallhero"),
+    lazy_load_if_possible("inovelli"), -- Combined driver for both VZM31-SN and VZM32-SN
+    lazy_load_if_possible("laisiao"),
+    lazy_load_if_possible("tuya-multi"),
+    lazy_load_if_possible("frient")
+
   },
-  sub_drivers = require("sub_drivers"),
   zigbee_handlers = {
     global = {
       [SIMPLE_METERING_ID] = {

drivers/SmartThings/zigbee-switch/src/sinope-waterheater/can_handle.lua

@@ -0,0 +1,16 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle_sinope_rm3500zb(opts, driver, device, ...)
+  if device ~= nil then
+    local manufacturer = device:get_manufacturer()
+    local model = device:get_model()
+
+    -- Check if this is an RM3500ZB
+    return manufacturer == "Sinope Technologies" and model == "RM3500ZB"
+  end
+
+  return false
+end
+
+return can_handle_sinope_rm3500zb