@homebridge-plugins/homebridge-ewelink 12.15.3-beta.2 → 12.15.3-beta.4

package/CHANGELOG.md

@@ -7,7 +7,20 @@ All notable changes to `@homebridge-plugins/homebridge-ewelink` will be document
 ### Changed
 
 - chore: remove the looking-for-maintainers message
+- feat: add support for the snzb-01m zigbee button (7039)
+- feat: add support for the wireless temperature and humidity sensor (242)
+- feat: add support for the three gear fan (17)
+- feat: expose the light level on the snzb-03p and snzb-06p sensors (7002/7016)
+- feat: add power readings for outlets reporting phase values (226)
+- feat: add power readings for the mini dimmer (277)
+- feat: expose the spm-4relay sub units as multi channel outlets with power readings (130)
+- feat: expose the dust and light levels on the sonoff sc (18)
+- feat: add a child lock control for the trvzb radiator valve (7017)
+- feat: expose the wall button presses on the mini r3/r4 for detached relay setups (138)
+- fix: correct the multi channel format and add power readings for the s60zbtpf zigbee outlet (7032)
+- fix: stop treating the dualr3 lite as a power monitoring device (165)
 - fix: time out stalled http requests so device fetching cannot hang forever (#788) (@glenmarks-hub)
+- fix: apply the request timeout to the login request too (#788)
 - fix: use the switch_00 param for the swv-zne irrigation valve (7047) (#778)
 - chore(github): update the setup-node action to v7
 

package/lib/connection/http.js

@@ -86,6 +86,7 @@ export default class {
           'X-CK-Appid': this.appId,
           'X-CK-Nonce': randomBytes(4).toString('hex'),
         },
+        timeout: 30000,
       })
 
       // Parse the response

package/lib/device/fan-gear.js

@@ -0,0 +1,234 @@
+import { generateRandomString, sleep } from '../utils/functions.js'
+
+/*
+  UIID 17: the "three gear fan", controlled with named params rather than
+  switch channels (matching AlexxIT/SonoffLAN's XFan17):
+  - fan: 'on'/'off'
+  - speed: 'slow'/'moderate'/'fast'
+  - shake: 'on'/'off' (oscillation)
+*/
+export default class {
+  constructor(platform, accessory) {
+    // Set up variables from the platform
+    this.hapChar = platform.api.hap.Characteristic
+    this.hapErr = platform.api.hap.HapStatusError
+    this.hapServ = platform.api.hap.Service
+    this.lang = platform.lang
+    this.log = platform.log
+    this.platform = platform
+
+    // Set up variables from the accessory
+    this.name = accessory.displayName
+    this.accessory = accessory
+
+    // Initially set the online flag as true (to be then updated as false if necessary)
+    this.isOnline = true
+
+    // Set up custom variables for this device type
+    const deviceConf = platform.deviceConf[accessory.context.eweDeviceId] || {}
+
+    // Set the correct logging variables for this accessory
+    switch (deviceConf.overrideLogging) {
+      case 'standard':
+        this.enableLogging = true
+        this.enableDebugLogging = false
+        break
+      case 'debug':
+        this.enableLogging = true
+        this.enableDebugLogging = true
+        break
+      case 'disable':
+        this.enableLogging = false
+        this.enableDebugLogging = false
+        break
+      default:
+        this.enableLogging = !platform.config.disableDeviceLogging
+        this.enableDebugLogging = platform.config.debug
+        break
+    }
+
+    // Conversion objects between eWeLink speed labels and HomeKit values
+    this.speed2value = {
+      slow: 1,
+      moderate: 2,
+      fast: 3,
+    }
+    this.value2speed = {
+      1: 'slow',
+      2: 'moderate',
+      3: 'fast',
+    }
+
+    // Add the fan service if it doesn't already exist
+    this.service = this.accessory.getService(this.hapServ.Fan) || this.accessory.addService(this.hapServ.Fan)
+
+    // Add the set handler to the fan on/off characteristic
+    this.service
+      .getCharacteristic(this.hapChar.On)
+      .onSet(async value => this.internalStateUpdate(value))
+
+    // Add the set handler to the fan rotation speed characteristic
+    this.service
+      .getCharacteristic(this.hapChar.RotationSpeed)
+      .setProps({
+        maxValue: 3,
+        minStep: 1,
+        minValue: 0,
+        unit: 'unitless', // This is actually from HAP for Bluetooth LE Specification, but fits
+      })
+      .onSet(async value => this.internalSpeedUpdate(value))
+
+    // Add the set handler to the fan swing mode (oscillation) characteristic
+    this.service
+      .getCharacteristic(this.hapChar.SwingMode)
+      .onSet(async value => this.internalShakeUpdate(value))
+
+    // Add the get handlers only if the user hasn't disabled the disableNoResponse setting
+    if (!platform.config.disableNoResponse) {
+      this.service.getCharacteristic(this.hapChar.On).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.On).value
+      })
+      this.service.getCharacteristic(this.hapChar.RotationSpeed).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.RotationSpeed).value
+      })
+      this.service.getCharacteristic(this.hapChar.SwingMode).onGet(() => {
+        if (!this.isOnline) {
+          throw new this.hapErr(-70402)
+        }
+        return this.service.getCharacteristic(this.hapChar.SwingMode).value
+      })
+    }
+
+    // Output the customised options to the log
+    const normalLogging = this.enableLogging ? 'standard' : 'disable'
+    const opts = JSON.stringify({
+      logging: this.enableDebugLogging ? 'debug' : normalLogging,
+    })
+    this.log('[%s] %s %s.', this.name, this.lang.devInitOpts, opts)
+  }
+
+  async internalStateUpdate(value) {
+    try {
+      const newState = value ? 'on' : 'off'
+      if (newState === this.cacheState) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, { fan: newState })
+      this.cacheState = newState
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curState, newState)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalSpeedUpdate(value) {
+    try {
+      // This acts like a debounce function when endlessly sliding the slider
+      const updateKey = generateRandomString(5)
+      this.updateKey = updateKey
+      await sleep(500)
+      if (updateKey !== this.updateKey) {
+        return
+      }
+      if (value === 0) {
+        // A zero speed value means turning the fan off
+        await this.platform.sendDeviceUpdate(this.accessory, { fan: 'off' })
+        this.cacheState = 'off'
+        if (this.enableLogging) {
+          this.log('[%s] %s [off].', this.name, this.lang.curState)
+        }
+        return
+      }
+      const newSpeed = this.value2speed[value]
+      if (newSpeed === this.cacheSpeed) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, { fan: 'on', speed: newSpeed })
+      this.cacheState = 'on'
+      this.cacheSpeed = newSpeed
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curSpeed, newSpeed)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.RotationSpeed,
+          this.speed2value[this.cacheSpeed] || 0,
+        )
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async internalShakeUpdate(value) {
+    try {
+      const newShake = value === this.hapChar.SwingMode.SWING_ENABLED ? 'on' : 'off'
+      if (newShake === this.cacheShake) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, { shake: newShake })
+      this.cacheShake = newShake
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curOscillation, newShake)
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.SwingMode,
+          this.cacheShake === 'on'
+            ? this.hapChar.SwingMode.SWING_ENABLED
+            : this.hapChar.SwingMode.SWING_DISABLED,
+        )
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
+  async externalUpdate(params) {
+    try {
+      if (params.fan && params.fan !== this.cacheState) {
+        this.cacheState = params.fan
+        this.service.updateCharacteristic(this.hapChar.On, this.cacheState === 'on')
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curState, this.cacheState)
+        }
+      }
+      if (params.speed && params.speed !== this.cacheSpeed && this.speed2value[params.speed]) {
+        this.cacheSpeed = params.speed
+        this.service.updateCharacteristic(this.hapChar.RotationSpeed, this.speed2value[this.cacheSpeed])
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curSpeed, this.cacheSpeed)
+        }
+      }
+      if (params.shake && params.shake !== this.cacheShake) {
+        this.cacheShake = params.shake
+        this.service.updateCharacteristic(
+          this.hapChar.SwingMode,
+          this.cacheShake === 'on'
+            ? this.hapChar.SwingMode.SWING_ENABLED
+            : this.hapChar.SwingMode.SWING_DISABLED,
+        )
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, false)
+    }
+  }
+
+  markStatus(isOnline) {
+    this.isOnline = isOnline
+  }
+}

package/lib/device/index.js

@@ -1,6 +1,7 @@
 import deviceAirConditioner from './air-conditioner.js'
 import deviceCurtain from './curtain.js'
 import deviceDiffuser from './diffuser.js'
+import deviceFanGear from './fan-gear.js'
 import deviceFan from './fan.js'
 import deviceGroup from './group.js'
 import deviceHumidifier from './humidifier.js'
@@ -36,6 +37,7 @@ export default {
   deviceCurtain,
   deviceDiffuser,
   deviceFan,
+  deviceFanGear,
   deviceGroup,
   deviceHumidifier,
   deviceLightCCT,

package/lib/device/light-dimmer.js

@@ -4,6 +4,7 @@ import { generateRandomString, hasProperty, sleep } from '../utils/functions.js'
 export default class {
   constructor(platform, accessory) {
     // Set up variables from the platform
+    this.eveChar = platform.eveChar
     this.hapChar = platform.api.hap.Characteristic
     this.hapErr = platform.api.hap.HapStatusError
     this.hapServ = platform.api.hap.Service
@@ -54,6 +55,20 @@ export default class {
     this.service = this.accessory.getService(this.hapServ.Lightbulb)
       || this.accessory.addService(this.hapServ.Lightbulb)
 
+    // The MINI dimmer also reports power readings
+    if (this.accessory.context.eweUIID === 277) {
+      this.powerReadings = true
+      if (!this.service.testCharacteristic(this.eveChar.CurrentConsumption)) {
+        this.service.addCharacteristic(this.eveChar.CurrentConsumption)
+      }
+      if (!this.service.testCharacteristic(this.eveChar.ElectricCurrent)) {
+        this.service.addCharacteristic(this.eveChar.ElectricCurrent)
+      }
+      if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
+        this.service.addCharacteristic(this.eveChar.Voltage)
+      }
+    }
+
     // Add the set handler to the lightbulb on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
@@ -232,6 +247,37 @@ export default class {
           break
         default:
       }
+
+      if (this.powerReadings) {
+        let logger = false
+        let power
+        let voltage
+        let current
+        if (hasProperty(params, 'power')) {
+          power = Number.parseFloat(params.power) / 100
+          this.service.updateCharacteristic(this.eveChar.CurrentConsumption, power)
+          logger = true
+        }
+        if (hasProperty(params, 'voltage')) {
+          voltage = Number.parseFloat(params.voltage) / 100
+          this.service.updateCharacteristic(this.eveChar.Voltage, voltage)
+          logger = true
+        }
+        if (hasProperty(params, 'current')) {
+          current = Number.parseFloat(params.current) / 100
+          this.service.updateCharacteristic(this.eveChar.ElectricCurrent, current)
+          logger = true
+        }
+        if (params.updateSource && logger && this.enableLogging) {
+          this.log(
+            '[%s] %s%s%s.',
+            this.name,
+            power !== undefined ? `${this.lang.curPower} [${power}W]` : '',
+            voltage !== undefined ? ` ${this.lang.curVolt} [${voltage}V]` : '',
+            current !== undefined ? ` ${this.lang.curCurr} [${current}A]` : '',
+          )
+        }
+      }
     } catch (err) {
       this.platform.deviceUpdateError(this.accessory, err, false)
     }

package/lib/device/sensor-temp-humi.js

@@ -55,6 +55,14 @@ export default class {
       minStep: 0.1,
     })
     this.cacheTemp = this.tempService.getCharacteristic(this.hapChar.CurrentTemperature).value
+
+    // The Sonoff SC also reports dust, light and noise levels (uiid 18)
+    if (this.accessory.context.eweUIID === 18) {
+      this.airService = this.accessory.getService(this.hapServ.AirQualitySensor)
+        || this.accessory.addService(this.hapServ.AirQualitySensor)
+      this.lightService = this.accessory.getService(this.hapServ.LightSensor)
+        || this.accessory.addService(this.hapServ.LightSensor)
+    }
     this.updateCache()
 
     // Add the humidity sensor service if it doesn't already exist
@@ -101,6 +109,35 @@ export default class {
 
   async externalUpdate(params) {
     try {
+      if (this.airService && hasProperty(params, 'dusty')) {
+        // The device reports a level from 1 (best) to 10 (worst)
+        const rawDust = Number.parseInt(params.dusty, 10)
+        if (!Number.isNaN(rawDust)) {
+          const newQuality = Math.max(Math.min(Math.ceil(rawDust / 2), 5), 1)
+          if (newQuality !== this.cacheDust) {
+            this.cacheDust = newQuality
+            this.airService.updateCharacteristic(this.hapChar.AirQuality, this.cacheDust)
+            if (params.updateSource && this.enableLogging) {
+              this.log('[%s] %s [%s].', this.name, this.lang.curAirQuality, rawDust)
+            }
+          }
+        }
+      }
+      if (this.lightService && hasProperty(params, 'light')) {
+        // The device reports a level from 1 (darkest) to 10 (brightest),
+        // mapped to a nominal lux value for HomeKit
+        const rawLight = Number.parseInt(params.light, 10)
+        if (!Number.isNaN(rawLight)) {
+          const newLux = Math.max(rawLight * 10, 0.0001)
+          if (newLux !== this.cacheLux) {
+            this.cacheLux = newLux
+            this.lightService.updateCharacteristic(this.hapChar.CurrentAmbientLightLevel, this.cacheLux)
+            if (params.updateSource && this.enableLogging) {
+              this.log('[%s] %s [%s].', this.name, this.lang.curLightLevel, rawLight)
+            }
+          }
+        }
+      }
       if (hasProperty(params, 'temperature')) {
         const rawTemp = Number(params.temperature)
         if (Number.isNaN(rawTemp) || rawTemp < -270 || rawTemp > 270) {

package/lib/device/switch-single.js

@@ -88,7 +88,9 @@ export default class {
       case 32:
       case 182:
       case 190:
+      case 226:
       case 276:
+      case 7032:
         // Add Eve power characteristics
         this.powerReadings = true
         if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -104,7 +106,7 @@ export default class {
           this.service.addCharacteristic(this.eveChar.Voltage)
         }
 
-        if ([190, 276].includes(this.accessory.context.eweUIID)) {
+        if ([190, 276, 7032].includes(this.accessory.context.eweUIID)) {
           this.divisor = 100
         }
         break
@@ -134,6 +136,14 @@ export default class {
       this.isSCM = true
     }
 
+    // The MINI R3/R4 family reports wall button presses, useful in detached relay mode
+    if (this.accessory.context.eweUIID === 138) {
+      this.buttonService = this.accessory.getService(this.hapServ.StatelessProgrammableSwitch)
+        || this.accessory.addService(this.hapServ.StatelessProgrammableSwitch)
+    } else if (this.accessory.getService(this.hapServ.StatelessProgrammableSwitch)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.StatelessProgrammableSwitch))
+    }
+
     // Add the set handler to the switch on/off characteristic
     this.service
       .getCharacteristic(this.hapChar.On)
@@ -225,6 +235,21 @@ export default class {
 
   async externalUpdate(params) {
     try {
+      if (
+        this.buttonService
+        && hasProperty(params, 'key')
+        && [0, 1, 2].includes(params.key)
+        && params.trigTime
+        && params.trigTime !== this.lastTrigTime
+      ) {
+        this.lastTrigTime = params.trigTime
+        this.buttonService.updateCharacteristic(this.hapChar.ProgrammableSwitchEvent, params.key)
+        if (params.updateSource && this.enableLogging) {
+          const doubleLong = params.key === 1 ? this.lang.buttonDouble : this.lang.buttonLong
+          const textLabel = params.key === 0 ? this.lang.buttonSingle : doubleLong
+          this.log('[%s] %s [%s].', this.name, this.lang.buttonEvent, textLabel)
+        }
+      }
       if (!this.isSCM && hasProperty(params, 'switch')) {
         // Normalize boolean switch values (UIID 226 uses true/false)
         const newState = typeof params.switch === 'boolean'
@@ -250,6 +275,17 @@ export default class {
       if (!this.powerReadings) {
         return
       }
+
+      // Some models (e.g. uiid 226) report their readings under phase names
+      if (hasProperty(params, 'phase_0_p')) {
+        params.power = params.phase_0_p
+      }
+      if (hasProperty(params, 'phase_0_v')) {
+        params.voltage = params.phase_0_v
+      }
+      if (hasProperty(params, 'phase_0_c')) {
+        params.current = params.phase_0_c
+      }
       let logger = false
       let power
       let voltage

package/lib/device/zigbee/sensor-motion.js

@@ -53,6 +53,14 @@ export default class {
     this.battService = this.accessory.getService(this.hapServ.Battery)
       || this.accessory.addService(this.hapServ.Battery)
 
+    // SNZB-03P models also report a binary bright/dark light level (uiid 7002)
+    if (accessory.context.eweUIID === 7002) {
+      this.lightService = this.accessory.getService(this.hapServ.LightSensor)
+        || this.accessory.addService(this.hapServ.LightSensor)
+    } else if (this.accessory.getService(this.hapServ.LightSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.LightSensor))
+    }
+
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {
       log: () => {},
@@ -70,6 +78,18 @@ export default class {
 
   async externalUpdate(params) {
     try {
+      if (this.lightService && hasProperty(params, 'brState')) {
+        // The device reports a binary state, so map brighter/darker to a
+        // nominal high/low lux value for HomeKit
+        const newLux = params.brState === 'brighter' ? 100 : 0.0001
+        if (newLux !== this.cacheLux) {
+          this.cacheLux = newLux
+          this.lightService.updateCharacteristic(this.hapChar.CurrentAmbientLightLevel, this.cacheLux)
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curLightLevel, params.brState)
+          }
+        }
+      }
       if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
         this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0)

package/lib/device/zigbee/sensor-occupancy.js

@@ -53,6 +53,14 @@ export default class {
     this.battService = this.accessory.getService(this.hapServ.Battery)
       || this.accessory.addService(this.hapServ.Battery)
 
+    // SNZB-06P models also report a binary bright/dark light level (uiid 7016)
+    if (accessory.context.eweUIID === 7016) {
+      this.lightService = this.accessory.getService(this.hapServ.LightSensor)
+        || this.accessory.addService(this.hapServ.LightSensor)
+    } else if (this.accessory.getService(this.hapServ.LightSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.LightSensor))
+    }
+
     // Pass the accessory to Fakegato to set up with Eve
     this.accessory.eveService = new platform.eveService('motion', this.accessory, {
       log: () => {},
@@ -70,6 +78,18 @@ export default class {
 
   async externalUpdate(params) {
     try {
+      if (this.lightService && hasProperty(params, 'brState')) {
+        // The device reports a binary state, so map brighter/darker to a
+        // nominal high/low lux value for HomeKit
+        const newLux = params.brState === 'brighter' ? 100 : 0.0001
+        if (newLux !== this.cacheLux) {
+          this.cacheLux = newLux
+          this.lightService.updateCharacteristic(this.hapChar.CurrentAmbientLightLevel, this.cacheLux)
+          if (params.updateSource && this.enableLogging) {
+            this.log('[%s] %s [%s].', this.name, this.lang.curLightLevel, params.brState)
+          }
+        }
+      }
       if (hasProperty(params, 'battery') && params.battery !== this.cacheBatt) {
         this.cacheBatt = params.battery
         this.cacheBattScaled = Math.max(Math.min(this.cacheBatt, 100), 0)

package/lib/device/zigbee/thermostat.js

@@ -77,6 +77,14 @@ export default class {
     this.service = this.accessory.getService(this.hapServ.Thermostat)
       || this.accessory.addService(this.hapServ.Thermostat)
 
+    // The TRVZB supports a child lock, exposed as the lock physical controls characteristic
+    if (!this.service.testCharacteristic(this.hapChar.LockPhysicalControls)) {
+      this.service.addCharacteristic(this.hapChar.LockPhysicalControls)
+    }
+    this.service
+      .getCharacteristic(this.hapChar.LockPhysicalControls)
+      .onSet(async value => this.internalLockUpdate(value))
+
     // Set custom properties of the current temperature characteristic
     this.service.getCharacteristic(this.hapChar.CurrentTemperature).setProps({
       minStep: 0.1,
@@ -223,8 +231,45 @@ export default class {
     }
   }
 
+  async internalLockUpdate(value) {
+    try {
+      const newLock = value === this.hapChar.LockPhysicalControls.CONTROL_LOCK_ENABLED
+      if (newLock === this.cacheLock) {
+        return
+      }
+      await this.platform.sendDeviceUpdate(this.accessory, { childLock: newLock })
+      this.cacheLock = newLock
+      if (this.enableLogging) {
+        this.log('[%s] %s [%s].', this.name, this.lang.curChildLock, newLock ? 'on' : 'off')
+      }
+    } catch (err) {
+      this.platform.deviceUpdateError(this.accessory, err, true)
+      setTimeout(() => {
+        this.service.updateCharacteristic(
+          this.hapChar.LockPhysicalControls,
+          this.cacheLock
+            ? this.hapChar.LockPhysicalControls.CONTROL_LOCK_ENABLED
+            : this.hapChar.LockPhysicalControls.CONTROL_LOCK_DISABLED,
+        )
+      }, 2000)
+      throw new this.hapErr(-70402)
+    }
+  }
+
   async externalUpdate(params) {
     try {
+      if (hasProperty(params, 'childLock') && params.childLock !== this.cacheLock) {
+        this.cacheLock = params.childLock
+        this.service.updateCharacteristic(
+          this.hapChar.LockPhysicalControls,
+          this.cacheLock
+            ? this.hapChar.LockPhysicalControls.CONTROL_LOCK_ENABLED
+            : this.hapChar.LockPhysicalControls.CONTROL_LOCK_DISABLED,
+        )
+        if (params.updateSource && this.enableLogging) {
+          this.log('[%s] %s [%s].', this.name, this.lang.curChildLock, this.cacheLock ? 'on' : 'off')
+        }
+      }
       if (hasProperty(params, 'workMode')) {
         let workMode
         let hkWorkMode

package/lib/platform.js

@@ -1107,6 +1107,15 @@ export default class {
         this.applyAccessoryLogging(accessory)
         accessory.control = new deviceTypes.deviceFan(this, accessory)
         /**/
+      } else if (platformConsts.devices.fanGear.includes(uiid)) {
+        /**
+         FANS [GEAR]
+         *
+         */
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device, `${device.deviceid}SWX`)
+        this.applyAccessoryLogging(accessory)
+        accessory.control = new deviceTypes.deviceFanGear(this, accessory)
+        /**/
       } else if (platformConsts.devices.diffuser.includes(uiid)) {
         /**
          ******

package/lib/utils/constants.js

@@ -291,9 +291,9 @@ export default {
       275,
       277,
     ],
-    switchSingle: [1, 6, 14, 24, 27, 216, 225, 226, 268, 1009, 1256, 7004, 7005, 7010, 7028, 7032, 20001],
+    switchSingle: [1, 6, 14, 24, 27, 216, 225, 226, 268, 1009, 1256, 7004, 7005, 7010, 7028, 20001],
     switchSCM: [77, 78, 81, 107, 112, 138, 160, 191, 209, 264],
-    switchSCMPower: [182, 190, 276],
+    switchSCMPower: [182, 190, 276, 7032],
     switchSinglePower: [5, 32],
     switchMulti: [
       2,
@@ -316,6 +316,7 @@ export default {
       141,
       161,
       162,
+      165,
       210,
       211,
       212,
@@ -329,7 +330,7 @@ export default {
       7040,
       20004,
     ],
-    switchMultiPower: [126, 165, 262],
+    switchMultiPower: [126, 130, 262],
     switchMate: [177],
     switchMan: [174],
     lightDimmer: [36, 44, 57, 277, 20006],
@@ -346,17 +347,18 @@ export default {
     panel: [133, 195, 228],
     virtual: [265],
     fan: [34],
+    fanGear: [17],
     humidifier: [19],
     diffuser: [25],
     camera: [87],
     rfBridge: [28, 98],
     zbBridge: [66, 128, 168, 243], // 128 not technically Zigbee, but same data structure
-    zbSwitchStateless: [1000, 7000],
+    zbSwitchStateless: [1000, 7000, 7039],
     zbLightDimmer: [1257],
     zbLightCCT: [1258],
     zbLightRGBCCT: [3258, 7009],
     zbMotor: [1514, 7006, 7034],
-    zbSensorAmbient: [1770, 1771, 7014, 7033, 7038],
+    zbSensorAmbient: [242, 1770, 1771, 7014, 7033, 7038],
     zbSensorMotion: [2026, 7002],
     zbSensorOccupancy: [7016],
     zbSensorContact: [3026, 7003],
@@ -365,7 +367,7 @@ export default {
     zbThermostat: [7017],
     zbWaterValve: [7027, 7047],
     group: [5000],
-    template: [130], // SPM sub unit
+    template: [], // Currently unused
     cannotSupport: [0, 65, 118, 119, 120, 121, 204, 223, 20000],
     garageSensors: [102, 154, 3026],
     skipUpdateRequest: [1000],
@@ -464,6 +466,7 @@ export default {
     11: 1, // "CURTAIN" (King Q4 Cover)
     14: 1, // "SWITCH_CHANGE" (Sonoff SV)
     15: 1, // "THERMOSTAT" (TH10, TH16)
+    17: 1, // Three gear fan
     18: 1, // "SENSORS_CENTER" (Sonoff SC)
     19: 1, // "HUMIDIFIER"
     22: 1, // "RGB_BALL_LIGHT" (B1, B1_R2)
@@ -504,7 +507,8 @@ export default {
     126: 2, // "DUALR3"
     127: 1, // "GTTA127"
     128: 1, // SPM Main Unit (same data structure as zigbee bridge)
-    130: 1, // SPM Sub Unit
+    130: 4, // SPM-4Relay sub unit
+    242: 1, // Wireless temperature and humidity sensor
     133: 1, // "NSPANEL"
     135: 1, // ""
     136: 1, // RGB Five-Color Light_Support 2.4G eWeLink-Remote
@@ -561,6 +565,7 @@ export default {
     5000: 1, // Custom uiid for groups
     5026: 1, // Zigbee Smoke Sensor
     7000: 1, // Zigbee Button?
+    7039: 1, // SNZB-01M Zigbee Button
     7002: 1, // Zigbee Human Body Sensor_Support OTA
     7003: 1, // Zigbee Door Magnet_Support OTA
     7004: 1, // Zigbee Single-Channel Switch ­_Support OTA
@@ -605,7 +610,6 @@ export default {
     12: 0, // "EW-RE"
     13: 0, // "FIREPLACE"
     16: 0, // "COLD_WARM_LED"
-    17: 0, // "THREE_GEAR_FAN"
     23: 0, // "NEST_THERMOSTAT"
     26: 0, // "RuiMiTeWenKongQi"
     35: 0, // "EZVIZ_CAMERA",

package/lib/utils/lang-en.js

@@ -37,6 +37,11 @@ export default {
   curPur: 'current purifying',
   curScene: 'current scene',
   curSpeed: 'current speed',
+  curOscillation: 'current oscillation',
+  curAirQuality: 'current air quality level',
+  curChildLock: 'current child lock',
+  buttonEvent: 'button event',
+  curLightLevel: 'current light level',
   curState: 'current state',
   curTarg: 'current target',
   curTemp: 'current temperature',

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "Homebridge eWeLink",
   "alias": "eWeLink",
   "type": "module",
-  "version": "12.15.3-beta.2",
+  "version": "12.15.3-beta.4",
   "description": "Homebridge plugin to integrate eWeLink devices into HomeKit.",
   "author": {
     "name": "bwp91",