Skip to content

Commit

Permalink
Merge branch 'master' into zigbee-mvn
Browse files Browse the repository at this point in the history
* master:
  fixed parent pom
  Update compatibility.md
  Merge pull request #1 from openhab/master
  Initial contribution of Astro binding.
  Added new listener method
  Update serial library from 3.8.8 to 3.9.3 for compatibility with OH1 Signed-off-by: Chris Jackson <[email protected]> (github: cdjackson)
  Update serial library from 3.8.8 to 3.9.3 for compatibility with OH1 Signed-off-by: Chris Jackson <[email protected]> (github: cdjackson)
  Update compatibility.md
  augment compability layer for TTS services
  Fix pom and dependencies of freebox binding
  Squashing all commits Initial Contribution of the Freebox 2.0 binding

Conflicts:
	addons/binding/pom.xml
  • Loading branch information
cdjackson committed Apr 9, 2015
2 parents bc1ee8a + 348c0e7 commit 5e9f94d
Show file tree
Hide file tree
Showing 110 changed files with 7,739 additions and 7 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

Dancho Penev <[email protected]>
Gerhard Riegler <[email protected]>
Gaël L'hopital <[email protected]>
Gideon le Grange <[email protected]>
Jochen Hiller <[email protected]>
Kai Kreuzer <[email protected]>
Expand Down
7 changes: 7 additions & 0 deletions addons/binding/org.openhab.binding.astro/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<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.astro/.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.astro</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="astro"
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>Astro Binding</name>
<description>The Astro binding calculates astronomical data from sun and moon.</description>
<author>Gerhard Riegler</author>

</binding:binding>
20 changes: 20 additions & 0 deletions addons/binding/org.openhab.binding.astro/ESH-INF/config/config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<config-description:config-descriptions
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:config-description="http://eclipse.org/smarthome/schemas/config-description/v1.0.0"
xsi:schemaLocation="http://eclipse.org/smarthome/schemas/config-description/v1.0.0
http://eclipse.org/smarthome/schemas/config-description-1.0.0.xsd">

<config-description uri="thing-type:astro:config">
<parameter name="geolocation" type="text" required="true">
<label>GeoLocation</label>
<description>The latitude and longitude separated with a comma (xx.xxxxxx,xx.xxxxxx)</description>
</parameter>
<parameter name="interval" type="integer" min="1" max="86400">
<label>interval</label>
<description>Refresh interval for positional data calculation in seconds.</description>
<default>300</default>
</parameter>
</config-description>

</config-description:config-descriptions>
Loading

0 comments on commit 5e9f94d

Please sign in to comment.