From 0672d8da6f663c21fc49c8cfcdab7edb1fff0b4a Mon Sep 17 00:00:00 2001 From: Kai Kreuzer <kai@openhab.org> Date: Fri, 7 Oct 2016 10:44:39 +0200 Subject: [PATCH] updated generated content Signed-off-by: Kai Kreuzer <kai@openhab.org> --- .gitignore | 2 + _data/bindings.csv | 1 + _repos/openhab | 2 +- _repos/openhab-bundles | 2 +- _repos/openhab2-addons | 2 +- _repos/smarthome | 2 +- addons/bindings/miele/readme.md | 67 ++++++++++++++++++++++++++++++++ addons/bindings/zwave/readme.md | 14 ++++--- addons/io/hueemulation/readme.md | 6 +++ 9 files changed, 88 insertions(+), 10 deletions(-) create mode 100644 addons/bindings/miele/readme.md diff --git a/.gitignore b/.gitignore index f10746dc82..29ad8aa027 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ project.pbxproj *.xcworkspacedata *.xcscmblueprint *.xcuserstate +addons/uis/habmin/node_modules +addons/uis/habmin/target diff --git a/_data/bindings.csv b/_data/bindings.csv index 60dfbf2c37..6f6dc65e6e 100644 --- a/_data/bindings.csv +++ b/_data/bindings.csv @@ -22,6 +22,7 @@ kostalinverter,Kostal inverter,"Scrapes the web interface of the inverter for th lutron,Lutron,"This binding integrates with [Lutron](http://www.lutron.com) light control systems." max,MAX!,"This is the binding for the [eQ-3 MAX! Home Solution](http://www.eq-3.de/)." meteostick,Meteostick,"This is the binding for the [Meteostick](http://www.smartbedded.com/wiki/index.php/Meteostick) weather receiver dongle. This is an RF receiver that can receive data directly from Davis weather devices (and others)" +miele,Miele@Home,"This binding integrates Miele@Home appliances. Miele@Home is a Zigbee based network to interconnect and control Miele appliances that are equipped with special modules. See www.miele.de for the list of supported appliances" milight,Milight,"The openHAB2 Milight binding allows to send commands to multiple Milight bridges." netatmo,Netatmo,"The Netatmo binding integrates the following Netatmo products :" network,Network,"This binding allows to check, whether a device is currently available on the network." diff --git a/_repos/openhab b/_repos/openhab index 8a2ca43bd2..d1e454b765 160000 --- a/_repos/openhab +++ b/_repos/openhab @@ -1 +1 @@ -Subproject commit 8a2ca43bd278d0acfeddb9f9ad12a98068d3687f +Subproject commit d1e454b765370a3069854fe7daebf7a3628d7e89 diff --git a/_repos/openhab-bundles b/_repos/openhab-bundles index 9edf6432b9..2669e4cc94 160000 --- a/_repos/openhab-bundles +++ b/_repos/openhab-bundles @@ -1 +1 @@ -Subproject commit 9edf6432b9302e125c109c54c9b49312f75de48b +Subproject commit 2669e4cc94c91ca5333a665569d0a0f4a718bc44 diff --git a/_repos/openhab2-addons b/_repos/openhab2-addons index 79e9245d7f..53a3283b3a 160000 --- a/_repos/openhab2-addons +++ b/_repos/openhab2-addons @@ -1 +1 @@ -Subproject commit 79e9245d7fff85968fa5a3b7f86de594d93036d5 +Subproject commit 53a3283b3a7562d9826b6c44a6d7c67116827e1a diff --git a/_repos/smarthome b/_repos/smarthome index ce70ff4f20..234fdac752 160000 --- a/_repos/smarthome +++ b/_repos/smarthome @@ -1 +1 @@ -Subproject commit ce70ff4f20f6f75a1fcb346c19ea6909f701fc4a +Subproject commit 234fdac752bcdd66548e3a3dd10411337451e330 diff --git a/addons/bindings/miele/readme.md b/addons/bindings/miele/readme.md new file mode 100644 index 0000000000..935eb6c75d --- /dev/null +++ b/addons/bindings/miele/readme.md @@ -0,0 +1,67 @@ +--- +layout: documentation +--- + +{% include base.html %} + +# Miele@Home Binding + +This binding integrates Miele@Home appliances. Miele@Home is a Zigbee based network to interconnect and control Miele appliances that are equipped with special modules. See www.miele.de for the list of supported appliances + + +## Supported Things + +Dishwasher +Fridge +Fridge/Freezer combination +Hob +Hood +Oven +Microwave/Oven combination +Tumbledryer +Washingmachine + +## Discovery + +The binding is able to auto-discover the Miele XGW3000 gateway. When an XGW3000 gateway is discovered, all appliances can be subsequently discovered + + +## Thing Configuration + +Each appliances needs the device Zigbee UID as configuration parameter. The Zigbee UID is nowhere to be found on the appliances, but since the discovery works quite reliable, a manual configuration is not needed. + +However, in the thing file, a manual configuration looks e.g. like + +``` +Bridge miele:xgw3000:dilbeek [ipAddress="192.168.0.18", interface="192.168.0.5"] { +Things: +Thing fridgefreezer freezer [uid="00124b000424be44#2"] +Thing hood hood [uid="001d63fffe020685#210"] +Thing fridge fridge [uid="00124b000424bdc0#2"] +Thing oven oven [uid="001d63fffe020390#210"] +Thing oven microwave [uid="001d63fffe0206eb#210"] +Thing hob hob [uid="00124b000424bed7#2"] +Thing dishwasher dishwasher [uid="001d63fffe020683#210"] +Thing tumbledryer dryer [uid="001d63fffe0200ba#210"] +Thing washingmachine washingmachine [uid="001d63fffe020505#210"] +} +``` + +## Channels + +Until the Miele protocol is fully documented the definition of the channels in use can be found at https://github.com/openhab/openhab2-addons/tree/master/addons/binding + + +## Full Example + +demo.items: + +``` +String MieleFridgeState (gMiele,gMieleFridge) {channel="miele:fridge:dilbeek:fridge:state"} +Switch MieleFridgeSuperCool (gMiele,gMieleFridge) {channel="miele:fridge:dilbeek:fridge:supercool"} +Number MieleFridgeCurrent (gMiele,gMieleFridge) {channel="miele:fridge:dilbeek:fridge:current"} +Number MieleFridgeTarget (gMiele,gMieleFridge) {channel="miele:fridge:dilbeek:fridge:target"} +Contact MieleFridgeDoor (gMiele,gMieleFridge) {channel="miele:fridge:dilbeek:fridge:door"} +Switch MieleFridgeStart (gMiele,gMieleFridge) {channel="miele:fridge:dilbeek:fridge:start"} +``` + diff --git a/addons/bindings/zwave/readme.md b/addons/bindings/zwave/readme.md index 38242ed36f..0601489c20 100644 --- a/addons/bindings/zwave/readme.md +++ b/addons/bindings/zwave/readme.md @@ -101,12 +101,14 @@ There are a huge number of things supported by the Z-Wave binding, so configurat Things configured manually require the following minimum configuration to be set. -: -| Configuration | Description | -|------------------|---------------------------------------------------------------------------------------------------------------| -| zwave_nodeid | Sets the node id of the node within the network. | -| zwave_deviceid | Specifies the manufacturer device ID for this device (as decimal). This is used to get the thing type from the database. | -| zwave_devicetype | Specifies the manufacturer device type for this device (as decimal). This is used to get the thing type from the database. | -| zwave_version | Specifies the application version for this device. This is used to get the thing type from the database. | +| Configuration | Description | +|--------------------|---------------------------------------------------------------------------------------------------------------| +| zwave_nodeid | Sets the node id of the node within the network. | +| zwave_manufacturer | Sets the manufacturer ID for this device (as decimal). This is used to get the thing type from the database. | +| zwave_deviceid | Specifies the device ID for this device (as decimal). This is used to get the thing type from the database. | +| zwave_devicetype | Specifies the device type for this device (as decimal). This is used to get the thing type from the database. | +| zwave_version | Specifies the application version for this device. This is used to get the thing type from the database. | + ## Channels diff --git a/addons/io/hueemulation/readme.md b/addons/io/hueemulation/readme.md index 8e49ed9b78..f965574703 100644 --- a/addons/io/hueemulation/readme.md +++ b/addons/io/hueemulation/readme.md @@ -23,6 +23,12 @@ Pairing can be turned on and off: org.openhab.hueemulation:pairingEnabled=false ``` +(Optional) For systems with multiple IP addresses the IP to use for UPNP may be specified, otherwise the first non loopback address will be used. + +``` +org.openhab.hueemulation:discoveryIp=192.168.1.100 +``` + ## Device Tagging To expose an item on the service, apply a supported tag (which are "Lighting", "Switchable", "TargetTemperature") to it. The item label will be used as the Hue device name.