Merge branch 'master' into disable-sensor

README.md

@@ -32,6 +32,7 @@ Note that this is an unofficial plugin.
 * Shelly HD
 * [Shelly H&T](https://shelly.cloud/shelly-humidity-and-temperature/)
 * [Shelly i3](https://shelly.cloud/products/shelly-i3-smart-home-automation-device/)
+* [Shelly Motion](https://shelly.cloud/shelly-motion-smart-home-automation-sensor/) <sup>4</sup>
 * [Shelly Plug](https://shelly.cloud/shelly-plug/)
 * [Shelly Plug S](https://shelly.cloud/shelly-plug-s/)
 * [Shelly Plug US](https://shelly.cloud/products/shelly-plug-us-smart-home-automation-device/)
@@ -50,6 +51,10 @@ must have been calibrated and be running firmware version 1.4.9 or later.
 
 <sup>3</sup> Requires firmware version 1.8.0 or later.
 
+<sup>4</sup> Requires setting the `Internet & Security -> CoIoT -> Remote
+address` option on the Shelly device to the IP address of your device running
+homebridge.
+
 ## Installation
 1. Install Homebridge by following
    [the instructions](https://github.com/homebridge/homebridge/wiki).

accessories/factory.js

@@ -29,6 +29,7 @@ module.exports = homebridge => {
     ShellyRelayMotionSensorAccessory,
     ShellyRelayOccupancySensorAccessory,
     ShellySenseAccessory,
+    ShellyMotionAccessory,
   } = require('./sensors')(homebridge)
 
   const {
@@ -561,6 +562,20 @@ module.exports = homebridge => {
   }
   FACTORIES.set('SHWT-1', ShellyFloodFactory)
 
+  /**
+   * Shelly Motion factory.
+   */
+  class ShellyMotionFactory extends AccessoryFactory {
+    get defaultAccessoryType() {
+      return 'sensor'
+    }
+
+    _createAccessory(accessoryType, ...opts) {
+      return new ShellyMotionAccessory(this.device, ...opts)
+    }
+  }
+  FACTORIES.set('SHMOS-01', ShellyMotionFactory)
+
   /**
    * Returns the factory for the given device.
    */

accessories/sensors.js

@@ -177,6 +177,16 @@ module.exports = homebridge => {
     }
   }
 
+  class ShellyMotionAccessory extends ShellySensorAccessory {
+    constructor(device, index, config, log) {
+      super(device, index, config, log, [
+        new MotionSensorAbility('motion'),
+        new LightSensorAbility('illuminance'),
+        new BatteryAbility('battery'),
+      ])
+    }
+  }
+
   return {
     ShellyDoorWindowAccessory,
     ShellyDoorWindow2Accessory,
@@ -187,5 +197,6 @@ module.exports = homebridge => {
     ShellyRelayMotionSensorAccessory,
     ShellyRelayOccupancySensorAccessory,
     ShellySenseAccessory,
+    ShellyMotionAccessory,
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-shelly",
-  "version": "0.16.0",
+  "version": "0.18.0",
   "description": "Shelly plugin for Homebridge",
   "main": "index.js",
   "bin": "bin/homebridge-shelly",
@@ -37,7 +37,7 @@
     "colors": "^1.3.3",
     "command-line-commands": "^2.0.1",
     "express": "^4.17.1",
-    "shellies": "^1.3.0"
+    "shellies": "^1.5.0"
   },
   "devDependencies": {
     "eslint": "^7.5.0",