Skip to content

Commit

Permalink
updated generated content
Browse files Browse the repository at this point in the history
Signed-off-by: Kai Kreuzer <[email protected]>
  • Loading branch information
kaikreuzer committed Oct 7, 2016
1 parent 25b21f6 commit 0672d8d
Show file tree
Hide file tree
Showing 9 changed files with 88 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ project.pbxproj
*.xcworkspacedata
*.xcscmblueprint
*.xcuserstate
addons/uis/habmin/node_modules
addons/uis/habmin/target
1 change: 1 addition & 0 deletions _data/bindings.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion _repos/openhab
2 changes: 1 addition & 1 deletion _repos/openhab-bundles
2 changes: 1 addition & 1 deletion _repos/openhab2-addons
Submodule openhab2-addons updated 74 files
+4 −4 addons/binding/org.openhab.binding.avmfritz/about.html
+45 −44 ....binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/hardware/FritzahaContentExchange.java
+4 −4 addons/binding/org.openhab.binding.feed/about.html
+1 −1 addons/binding/org.openhab.binding.freebox/.classpath
+1 −1 addons/binding/org.openhab.binding.freebox/META-INF/MANIFEST.MF
+4 −4 addons/binding/org.openhab.binding.freebox/about.html
+1 −1 addons/binding/org.openhab.binding.freebox/build.properties
+ addons/binding/org.openhab.binding.freebox/lib/freeboxos-client-0.3.9.jar
+13 −4 ...s/binding/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/handler/FreeboxHandler.java
+24 −8 ...ding/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/handler/FreeboxThingHandler.java
+4 −4 addons/binding/org.openhab.binding.harmonyhub/about.html
+4 −4 addons/binding/org.openhab.binding.homematic/about.html
+1 −1 ....openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/type/HomematicTypeGeneratorImpl.java
+4 −4 addons/binding/org.openhab.binding.ipp/about.html
+4 −4 addons/binding/org.openhab.binding.kostalinverter/about.html
+7 −0 addons/binding/org.openhab.binding.miele/.classpath
+33 −0 addons/binding/org.openhab.binding.miele/.project
+11 −0 addons/binding/org.openhab.binding.miele/ESH-INF/binding/binding.xml
+99 −0 addons/binding/org.openhab.binding.miele/ESH-INF/thing/dishwasher.xml
+75 −0 addons/binding/org.openhab.binding.miele/ESH-INF/thing/fridge.xml
+114 −0 addons/binding/org.openhab.binding.miele/ESH-INF/thing/fridgefreezer.xml
+81 −0 addons/binding/org.openhab.binding.miele/ESH-INF/thing/hob.xml
+57 −0 addons/binding/org.openhab.binding.miele/ESH-INF/thing/hood.xml
+138 −0 addons/binding/org.openhab.binding.miele/ESH-INF/thing/oven.xml
+115 −0 addons/binding/org.openhab.binding.miele/ESH-INF/thing/tumbledryer.xml
+122 −0 addons/binding/org.openhab.binding.miele/ESH-INF/thing/washingmachine.xml
+44 −0 addons/binding/org.openhab.binding.miele/ESH-INF/thing/xgw3000.xml
+28 −0 addons/binding/org.openhab.binding.miele/META-INF/MANIFEST.MF
+19 −0 addons/binding/org.openhab.binding.miele/OSGI-INF/MieleHandlerFactory.xml
+20 −0 addons/binding/org.openhab.binding.miele/OSGI-INF/MieleMDNSDiscoveryParticipant.xml
+67 −0 addons/binding/org.openhab.binding.miele/README.md
+6 −0 addons/binding/org.openhab.binding.miele/build.properties
+24 −0 addons/binding/org.openhab.binding.miele/pom.xml
+41 −0 addons/binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/MieleBindingConstants.java
+58 −0 ...ing/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/ApplianceChannelSelector.java
+53 −0 ...ding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/ApplianceStatusListener.java
+79 −0 ...ns/binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/DishWasherHandler.java
+189 −0 ...ng/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/DishwasherChannelSelector.java
+150 −0 ...inding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/FridgeChannelSelector.java
+166 −0 ...org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/FridgeFreezerChannelSelector.java
+87 −0 ...binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/FridgeFreezerHandler.java
+79 −0 addons/binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/FridgeHandler.java
+137 −0 ...s/binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/HobChannelSelector.java
+61 −0 addons/binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/HobHandler.java
+137 −0 .../binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/HoodChannelSelector.java
+80 −0 addons/binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/HoodHandler.java
+287 −0 ...inding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/MieleApplianceHandler.java
+609 −0 ...s/binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/MieleBridgeHandler.java
+211 −0 .../binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/OvenChannelSelector.java
+79 −0 addons/binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/OvenHandler.java
+194 −0 ...g/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/TumbleDryerChannelSelector.java
+79 −0 ...s/binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/TumbleDryerHandler.java
+206 −0 ...rg.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/WashingMachineChannelSelector.java
+75 −0 ...inding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/handler/WashingMachineHandler.java
+149 −0 ...binding/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/MieleHandlerFactory.java
+168 −0 ...inding.miele/src/main/java/org/openhab/binding/miele/internal/discovery/MieleApplianceDiscoveryService.java
+97 −0 ...binding.miele/src/main/java/org/openhab/binding/miele/internal/discovery/MieleMDNSDiscoveryParticipant.java
+4 −4 addons/binding/org.openhab.binding.netatmo/about.html
+4 −4 addons/binding/org.openhab.binding.opensprinkler/about.html
+4 −4 addons/binding/org.openhab.binding.orvibo/about.html
+4 −4 addons/binding/org.openhab.binding.rfxcom/about.html
+2 −1 ...enhab.binding.systeminfo.test/src/main/groovy/org/openhab/binding/systeminfo/test/SysteminfoOSGiTest.groovy
+4 −4 addons/binding/org.openhab.binding.systeminfo/about.html
+3 −1 addons/binding/pom.xml
+14 −4 addons/io/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitTaggedItem.java
+2 −1 ...org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitThermostatImpl.java
+4 −0 addons/io/org.openhab.io.hueemulation/ESH-INF/config/config.xml
+6 −0 addons/io/org.openhab.io.hueemulation/README.md
+119 −40 .../io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/HueEmulationServlet.java
+18 −11 .../org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/HueEmulationUpnpServer.java
+21 −0 addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/HueGroup.java
+8 −0 addons/io/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/api/HueState.java
+3 −3 addons/ui/org.openhab.ui.cometvisu.php/about.html
+3 −3 addons/ui/org.openhab.ui.cometvisu/about.html
2 changes: 1 addition & 1 deletion _repos/smarthome
67 changes: 67 additions & 0 deletions addons/bindings/miele/readme.md
Original file line number Diff line number Diff line change
@@ -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"}
```

14 changes: 8 additions & 6 deletions addons/bindings/zwave/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions addons/io/hueemulation/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit 0672d8d

Please sign in to comment.