Skip to content

Commit

Permalink
Merge pull request #6 from openhab/master
Browse files Browse the repository at this point in the history
Merge with master
  • Loading branch information
peuter committed Sep 8, 2015
2 parents 8d6318c + bf9107c commit cbf1053
Show file tree
Hide file tree
Showing 1,008 changed files with 29,513 additions and 2,660 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ that feature *on top of* openHAB.

### Discuss your design on the mailing list

We recommend discussing your plans [in the issue tracker](https://github.com/openhab/openhab2/issues?labels=enhancement&page=1&state=open)
We recommend discussing your plans [in the discussion forum](https://community.openhab.org/c/openhab-2)
before starting to code - especially for more ambitious contributions.
This gives other contributors a chance to point you in the right
direction, give feedback on your design, and maybe point out if someone
Expand Down Expand Up @@ -169,7 +169,7 @@ One way to automate this, is customise your get ``commit.template`` by adding
a ``prepare-commit-msg`` hook to your openHAB checkout:

```
curl -o .git/hooks/prepare-commit-msg https://raw.github.com/openhab/openhab2/master/contrib/prepare-commit-msg.hook && chmod +x .git/hooks/prepare-commit-msg
curl -L -o .git/hooks/prepare-commit-msg https://raw.github.com/openhab/openhab2/master/contrib/prepare-commit-msg.hook && chmod +x .git/hooks/prepare-commit-msg
```

* Note: the above script expects to find your GitHub user name in ``git config --get github.user``
Expand Down
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ The open Home Automation Bus (openHAB) project aims at providing a universal int

It is designed to be absolutely vendor-neutral as well as hardware/protocol-agnostic. openHAB brings together different bus systems, hardware devices and interface protocols by dedicated bindings. These bindings send and receive commands and status updates on the openHAB event bus. This concept allows designing user interfaces with a unique look&feel, but with the possibility to operate devices based on a big number of different technologies. Besides the user interfaces, it also brings the power of automation logics across different system boundaries.

For further Information please refer to our homepage http://www.openhab.org.
For further Information please refer to our homepage [www.openhab.org](http://www.openhab.org).


## openHAB 1 vs. openHAB 2

So far the "productive" openHAB code is at http://github.com/openhab/openhab.
So far the productive openHAB code is at http://github.com/openhab/openhab.
This project here is the home of the next-generation openHAB aka openHAB 2.
A major focus of openHAB 2 is adding administration UIs to the system to make it more user-friendly for "regular" users (i.e. not the developer type). For this, openHAB 2 is now based on the [Eclipse SmartHome](http://www.eclipse.org/smarthome) project. You can find information about the relation of these projects in [this blogpost](http://kaikreuzer.blogspot.de/2014/06/openhab-20-and-eclipse-smarthome.html).
A major focus of openHAB 2 is adding administration UIs to the system to make it more user-friendly for regular users (i.e. not the developer type). For this, openHAB 2 is now based on the [Eclipse SmartHome](http://www.eclipse.org/smarthome) project. You can find information about the relation of these projects in [this blogpost](http://kaikreuzer.blogspot.de/2014/06/openhab-20-and-eclipse-smarthome.html).
There is a configuration UI prototype already available, called [Paper UI](https://www.youtube.com/watch?v=NolVoL8ewO0&feature=youtu.be).

openHAB 2 is currently under development and so far there is only an [alpha release available](https://github.com/openhab/openhab2/releases/tag/2.0.0-alpha1). Additionally, we have snapshot builds [available at CloudBees](https://openhab.ci.cloudbees.com/job/openHAB2/). openHAB 2.0 includes a [1.x compatibility layer](docs/sources/installation/compatibilitylayer.md), which allows using 1.x add-ons with the new runtime.
openHAB 2 is currently under development and so far there is only an [alpha release available](https://github.com/openhab/openhab2/releases/tag/2.0.0-alpha2). Additionally, snapshot builds are [available at CloudBees](https://openhab.ci.cloudbees.com/job/openHAB2/). openHAB 2.0 includes a [1.x compatibility layer](docs/sources/installation/compatibilitylayer.md), which allows using 1.x add-ons with the new runtime.

*Please read about [important changes and known limitations](docs/sources/installation/intro.md) before trying out the binary builds yourself.*
If you want to start playing with openHAB 2, please [read here about the runtime and its changes to version 1.x](docs/sources/intro.md). For some background information, you can also check out [this blog post](http://kaikreuzer.blogspot.de/2014/11/openhab-16-and-20-alpha-release.html) and [this one](http://kaikreuzer.blogspot.de/2015/05/openhab-17-and-20-alpha-2-release.html).

If you want to learn more about openHAB 2.0, please also check out [this blog post](http://kaikreuzer.blogspot.de/2014/11/openhab-16-and-20-alpha-release.html).

## Community: How to get involved
## Community: How to Get Involved

As any good open source project, openHAB welcomes community participation in the project. Read more in the [how to contribute](CONTRIBUTING.md) guide.

Expand All @@ -29,6 +29,7 @@ If you are not afraid of work in progress, you can have a learn [how openHAB 2 b

In case of problems or questions, please refer to the [openHAB 2 issue tracker](https://github.com/openhab/openhab2/issues?page=1&state=open).


## Trademark Disclaimer

Product names, logos, brands and other trademarks referred to within the openHAB website are the property of their respective trademark holders. These trademark holders are not affiliated with openHAB or our website. They do not sponsor or endorse our materials.
Product names, logos, brands and other trademarks referred to within the openHAB website are the property of their respective trademark holders. These trademark holders are not affiliated with openHAB or our website. They do not sponsor or endorse our materials.
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
<item-type>Number</item-type>
<label>Azimuth</label>
<description>The azimuth of the planet</description>
<state readOnly="true" pattern="%d °" />
<state readOnly="true" pattern="%.2f °" />
</channel-type>

<channel-type id="elevation">
<item-type>Number</item-type>
<label>Elevation</label>
<description>The elevation of the planet</description>
<state readOnly="true" pattern="%d °" />
<state readOnly="true" pattern="%.2f °" />
</channel-type>

<!-- sun range -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2014 openHAB UG (haftungsbeschraenkt) and others.
Copyright (c) 2014-2015 openHAB UG (haftungsbeschraenkt) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand Down
66 changes: 66 additions & 0 deletions addons/binding/org.openhab.binding.astro/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# Astro Binding

The Astro binding is used for calculating many DateTime and positional values for sun and moon.

## Supported Things

This binding supports two Things: Sun and Moon

## Discovery

Discovery is not necessary, because all calculations are done within the binding.

## Binding Configuration

No binding configuration required.

## Thing Configuration

The things requires the geolocation (latitude, longitude) for which the calculation is done. Optionally, a refresh interval (in seconds) can be defined to also calculate positional data like azimuth and elevation.

## Channels

* **thing** `sun`
* **group** `rise, set, noon, night, morningNight, astroDawn, nauticDawn, civilDawn, astroDusk, nauticDusk, civilDusk, eveningNight, daylight`
* **channel** `start, end` (DateTime), `duration` (Number)
* **group** `position`
* **channel** `azimuth, elevation` (Number)
* **group** `zodiac`
* **channel** `start, end` (DateTime), `sign` (String)
* **group** `season`
* **channel**: `spring, summer, autumn, winter` (DateTime), `name` (String)
* **group** `eclipse`
* **channel**: `total, partial, ring` (DateTime)
* **thing** `moon`
* **group** `rise, set`
* **channel** `start, end` (DateTime), `duration` (Number), **Note:** start and end is always equal, duration always 0.
* **group** `phase`
* **channel**: `firstQuarter, thirdQuarter, full, new` (DateTime), `age, illumination` (Number), `name` (String)
* **group** `eclipse`
* **channel**: `total, partial` (DateTime)
* **group** `distance`
* **channel**: `date` (DateTime), `kilometer, miles` (Number)
* **group** `perigee`
* **channel**: `date` (DateTime), `kilometer, miles` (Number)
* **group** `apogee`
* **channel**: `date` (DateTime), `kilometer, miles` (Number)
* **group** `zodiac`
* **channel** `sign` (String)
* **group** `position`
* **channel** `azimuth, elevation` (Number)

## Full Example

Things:
```
astro:sun:home [ geolocation="xx.xxxxxx,xx.xxxxxx", interval=60]
astro:moon:home [ geolocation="xx.xxxxxx,xx.xxxxxx", interval=60]
```
Items:
```
DateTime Sunrise_Time "Sunrise [%1$tH:%1$tM]" { channel="astro:sun:home:rise#start" }
DateTime Sunset_Time "Sunset [%1$tH:%1$tM]" { channel="astro:sun:home:set#start" }
Number Azimuth "Azimuth" { channel="astro:sun:home:position#azimuth" }
Number Elevation "Elevation" { channel="astro:sun:home:position#elevation" }
String MoonPhase "MoonPhase" { channel="astro:moon:home:phase#name" }
```
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@
</state>
</channel-type>
<channel-type id="temp-spaht">
<item-type>Switch</item-type>
<item-type>Number</item-type>
<label>The current spa/lo-temp heater settings</label>
<description>Spa Heat</description>
<category>Temperature</category>
Expand Down
90 changes: 90 additions & 0 deletions addons/binding/org.openhab.binding.autelis/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
# Autelis Pool Control Binding

Autelis manufactures a network enabled pool interface for many popular pool systems. See [the Autelis webiste](http://www.autelis.com) and the [Autelis Command Protocol](http://www.autelis.com/wiki/index.php?title=Pool_Control_(PI)_HTTP_Command_Reference) for more information.

This binding supports:
* Read circuit, auxiliary, temperature, pump, chemistry and system values
* Control circuit, auxiliary lighting scenes, and temperature set points


## Discovery

The binding will automatically look for a device with the DNS name 'poolcontrol'. If found it will try and connect with the factory default username and password.

## Binding Configuration

The binding requires no special configuration

## Thing Configuration

The Autelis binding requires the host, port, username and password

In the thing file, this looks e.g. like
```
Thing autelis:myPool [ host="192.168.1.10", port="80", user="admin", password="admin"]
```

## Channels

All devices support some of the following channels:

| Channel Type ID | Item Type | Description |
|-------------------------|------------------------|--------------|----------------- |------------- |
| system-runstate| Switch |
| system-model| Number |
| system-haddr| Number |
| system-opmode| Number |
| system-freeze| Number |
| system-sensor1| Number |
| system-sensor2| Number |
| system-sensor3| Number |
| system-sensor4| Number |
| system-sensor5| Number |
| system-version| String |
| system-time| Number |
| equipment-circuit1| Switch |
| equipment-circuit2| Switch |
| equipment-circuit3| Switch |
| equipment-circuit4| Switch |
| equipment-circuit5| Switch |
| equipment-circuit6| Switch |
| equipment-circuit7| Switch |
| equipment-circuit8| Switch |
| equipment-circuit9| Switch |
| equipment-circuit10| Switch |
| equipment-feature1| Number |
| equipment-feature2| Number |
| equipment-feature3| Number |
| equipment-feature4| Number |
| equipment-feature5| Number |
| equipment-feature6| Number |
| equipment-feature7| Number |
| equipment-feature8| Number |
| equipment-feature9| Number |
| equipment-feature10| Number |
| temp-poolht| Number |
| temp-spaht| Number |
| temp-htstatus| Number |
| temp-poolsp| Number |
| temp-spasp| Number |
| temp-pooltemp| Number |
| temp-spatemp| Number |
| temp-airtemp| Number |
| temp-tempunits| String |
| temp-htpump| Number |
| pump-pump1| String |
| pump-pump2| String |
| pump-pump3| String |
| pump-pump4| String |
| pump-pump5| String |
| pump-pump6| String |
| pump-pump7| String |
| pump-pump8| String |
| chlor-chloren| Number |
| chlor-poolsp| Number |
| chlor-spasp| Number |
| chlor-salt| Number |
| chlor-super| Number |
| chlor-chlorerr| Number |
| chlor-chlorname| String |
| lightscmd| String |
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ private String get(String url) {
logger.debug("Constructed url '{}' is not valid: {}", url,
e.getMessage());
} catch (IOException e) {
logger.error("Error accessing url '{}' : {} ", url, e.getMessage());
logger.debug("Error accessing url '{}' : {} ", url, e.getMessage());
}
return response;
}
Expand Down
10 changes: 10 additions & 0 deletions addons/binding/org.openhab.binding.avmfritz/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.3.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.3.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-module-jaxb-annotations-2.3.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
33 changes: 33 additions & 0 deletions addons/binding/org.openhab.binding.avmfritz/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.openhab.binding.avmfritz</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ds.core.builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<binding:binding id="avmfritz"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0"
xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd">

<name>AVM FRITZ! Binding</name>
<description>This is the binding for AVM Fritz! devices.</description>
<author>Robert Bausdorf</author>

</binding:binding>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# binding
binding.fritzaha.name = AVM Fritz! AHA
binding.fritzaha.description = AVM Fritz! AHA Geräte (DECT 100/200, Powerline 546E)

# thing types
thing-type.Fritz_DECT_200.description = Fritz!DECT200 schaltbare Steckdose

# channel types
channel-type.temperature.label = Temperatur
channel-type.temperature.description = Aktuell gemessene Temperatur

channel-type.energy.label = Verbrauch
channel-type.energy.description = Akkumulierter Energieverbrauch in Wh

channel-type.power.label = Last
channel-type.power.description = Aktuelle Last in W

channel-type.switch.label = Schalter
channel-type.switch.description = Schaltbare Steckdose
Loading

0 comments on commit cbf1053

Please sign in to comment.