pulled formatting fixes

Signed-off-by: Kai Kreuzer <kai@openhab.org>
pull/4/head
Kai Kreuzer 2016-05-24 23:08:05 +02:00
parent d7283b790f
commit 61809303bb
8 changed files with 42 additions and 21 deletions

@ -1 +1 @@
Subproject commit c138f6648265dcc75f0bc16e40c810eab49aa9fd
Subproject commit 3e61b7c9010cf17d79c190b6db8ab209bed8184d

View File

@ -71,7 +71,7 @@ If you only want to discover one of the thing types, you can start a discovery s
### digitalSTROM-Server:
The digitalSTROM-Server thing has the following configuration parameter groups *Connection configuration*, *Server information* and *General configurations*.
####Connection configuration:
#### Connection configuration:
If the digitalSTROM-Server isnt found automatically, e.g. because the server isnt placed at the local network or the mDNS-service is deactivated, you have to insert the network address or URL and the authentication data manually through the graphical user interface or type it into the \*.thing with textual configuration.
| Parameter Label | Parameter ID | Description | Required | Advanced
@ -184,7 +184,8 @@ All devices support some of the following channels:
## Full Example
demo.things:
demo.things:
```
Bridge digitalstrom:dssBridge:1 [ ipAddress="dss.local.", userName="dssadmin", password="dssadmin", sensorDataUpdateIntervall=180] {
GE GE-KM200 [ dSID="3504175fe0000000000043d4", ActivePowerRefreshPriority="low", ElectricMeterRefreshPriority="medium", OutputCurrentRefreshPriority="high"]
@ -193,7 +194,8 @@ Bridge digitalstrom:dssBridge:1 [ ipAddress="dss.local.", userName="dssadmin",
}
```
demo.items:
demo.items:
```
Dimmer Brightness { channel="digitalstrom:GE:GE-KM200-1:brightness" }
Number ActivePower { channel="digitalstrom:GE:GE-KM200-1:activePower" }
@ -209,7 +211,8 @@ Rollershutter Shade { channel="digitalstrom:GR:GR-KM200-1:shade" }
Switch Scene { channel="digitalstrom:namedScene:scene1:scene" }
```
demo.sitemap:
demo.sitemap:
```
sitemap demo label="Main Menu"
{

View File

@ -62,12 +62,14 @@ The radio mode depends on the internet radio model (and probably its firmware ve
## Full Example
demo.things:
demo.things:
```
fsinternetradio:radio:radioInKitchen [ ip="192.168.0.42" ]
```
demo.items:
demo.items:
```
Switch RadioPower "Radio Power" { channel="fsinternetradio:radio:radioInKitchen:power" }
Switch RadioMute "Radio Mute" { channel="fsinternetradio:radio:radioInKitchen:mute" }
@ -78,7 +80,8 @@ String RadioInfo1 "Radio Info1" { channel="fsinternetradio:radio:radioInKitchen:
String RadioInfo2 "Radio Info2" { channel="fsinternetradio:radio:radioInKitchen:play-info-text" }
```
demo.sitemap:
demo.sitemap:
```
sitemap demo label="Main Menu"
{

View File

@ -30,7 +30,8 @@ In the thing file, this looks e.g. like
Bridge hue:bridge:1 [ ipAddress="192.168.0.64" ]
```
A user to authenticate against the Hue bridge is automatically generated. Please note that the generated user name cannot be written automatically to the .thing file, and has to be set manually. The generated user name can be found in the log files after pressing the authentication button on the bridge.
The user name can be set using the `userName` configuration value, e.g.:
The user name can be set using the `userName` configuration value, e.g.:
```
Bridge hue:bridge:1 [ ipAddress="192.168.0.64", userName="qwertzuiopasdfghjklyxcvbnm1234" ]
```
@ -54,7 +55,8 @@ All devices support some of the following channels:
## Full Example
demo.things:
demo.things:
```
Bridge hue:bridge:1 [ ipAddress="192.168.0.64" ] {
LCT001 bulb1 [ lightId="1" ]
@ -62,13 +64,15 @@ Bridge hue:bridge:1 [ ipAddress="192.168.0.64" ] {
}
```
demo.items:
demo.items:
```
Color Light { channel="hue:LCT001:1:bulb1:color" }
Dimmer Light_ColorTemp { channel="hue:LCT001:1:bulb1:color_temperature" }
```
demo.sitemap:
demo.sitemap:
```
sitemap demo label="Main Menu"
{

View File

@ -41,17 +41,20 @@ The bulb only supports the color channel:
## Full Example
demo.things:
demo.things:
```
Thing lifx:light:light1 [ deviceId="D073D5010E20" ]
```
demo.items:
demo.items:
```
Color Light { channel="lifx:light:light1:color" }
```
demo.sitemap:
demo.sitemap:
```
sitemap demo label="Main Menu"
{

View File

@ -41,10 +41,12 @@ The ntp binding has only one channel `dateTime`
## Full Example
Things:
```
ntp:ntp:demo [ hostname="nl.pool.ntp.org", refreshInterval=60, refreshNtp=30 ]
```
Items:
```
DateTime Date "Date [%1$tA, %1$td.%1$tm.%1$tY %1$tH:%1$tM]" { channel="ntp:ntp:demo:dateTime" }
```

View File

@ -51,12 +51,14 @@ Devices support some of the following channels:
## Full Example
demo.things:
demo.things:
```
wemo:socket:Switch1 [udn="Socket-1_0-221242K11xxxxx"]
```
demo.items:
demo.items:
```
Switch DemoSwitch { channel="wemo:socket:Switch1:state" }
Switch LightSwitch { channel="wemo:lightswitch:Lightswitch1:state" }
@ -67,7 +69,8 @@ Number InsightToday { channel="wemo:insight:Insight1:onToday" }
Number InsightTotal { channel="wemo:insight:Insight1:onTotal" }
```
demo.sitemap:
demo.sitemap:
```
sitemap demo label="Main Menu"
{

View File

@ -32,17 +32,20 @@ The weather information that is retrieved is available as these channels:
## Full Example
demo.things:
demo.things:
```
yahooweather:weather:berlin [ location="638242" ]
```
demo.items:
demo.items:
```
Number Temperature "Outside Temperature" { channel="yahooweather:weather:berlin:temperature" }
```
demo.sitemap:
demo.sitemap:
```
sitemap demo label="Main Menu"
{