Merge pull request #1 from openhab/master

Merge with master

AUTHORS

@@ -1,7 +1,14 @@
 # This file lists all individuals having contributed content to the repository.
-# If you're submitting a patch, please add your name here in alphabetical order as part of the patch.
-#
-# For a list of active project maintainers, see the MAINTAINERS file.
-#
+# For how it is generated, see `project-orga/generate-authors.sh`.
+
+Dancho Penev <dpslavov@hotmail.com>
+Gerhard Riegler <gerhard.riegler@gmail.com>
+Gideon le Grange <gideon@legrange.me>
+Jochen Hiller <jo.hiller@googlemail.com>
 Kai Kreuzer <kai@openhab.org>
-Thomas Eichstädt-Engelen <thomas@openhab.org>
+kaikreuzer <kai@openhab.org>
+Karel Goderis <karel.goderis@me.com>
+kgoderis <karel.goderis@me.com>
+manroh <agenthanu@googlemail.com>
+Marcel Verpaalen <marcel@verpaalen.com>
+Oliver Libutzki <oliver@libutzki.de>

CONTRIBUTING.md

@@ -100,6 +100,18 @@ name and email address match your git configuration. The AUTHORS file is
 regenerated occasionally from the git commit history, so a mismatch may result
 in your changes being overwritten.
 
+### Merge approval
+
+openHAB maintainers use LGTM (Looks Good To Me) in comments on the code review
+to indicate acceptance.
+
+A change requires LGTMs from an absolute majority of the maintainers of each
+component affected. For example, if a change affects `docs/` and `addons/`, it
+needs an absolute majority from the maintainers of `docs/` AND, separately, an
+absolute majority of the maintainers of `addons/`.
+
+For more details see [MAINTAINERS.md](project-orga/MAINTAINERS.md)
+
 ### Sign your work
 
 The sign-off is a simple line at the end of the explanation for the
@@ -177,3 +189,29 @@ There are several exceptions to the signing requirement. Currently these are:
 
 Don't forget: being a maintainer is a time investment. Make sure you will have time to make yourself available.
 You don't have to be a maintainer to make a difference on the project!
+
+## Community Guidelines
+
+We want to keep the openHAB community awesome, growing and collaborative. We
+need your help to keep it that way. To help with this we've come up with some
+general guidelines for the community as a whole:
+
+* Be nice: Be courteous, respectful and polite to fellow community members: no
+ regional, racial, gender, or other abuse will be tolerated. We like nice people
+ way better than mean ones!
+
+* Encourage diversity and participation: Make everyone in our community
+ feel welcome, regardless of their background and the extent of their
+ contributions, and do everything possible to encourage participation in
+ our community.
+
+* Keep it legal: Basically, don't get us in trouble. Share only content that
+ you own, do not share private or sensitive information, and don't break the
+ law.
+
+* Stay on topic: Make sure that you are posting to the correct channel
+ and avoid off-topic discussions. Remember when you update an issue or
+ respond to an email you are potentially sending to a large number of
+ people. Please consider this before you update. Also remember that
+ nobody likes spam.
+

MAINTAINERS

@@ -0,0 +1 @@
+Kai Kreuzer <kai@openhab.org> (@kaikreuzer)

addons/binding/create_openhab_binding_skeleton.cmd

@@ -0,0 +1,16 @@
+@echo off
+
+
+SETLOCAL
+SET ARGC=0
+
+FOR %%x IN (%*) DO SET /A ARGC+=1
+
+IF %ARGC% NEQ 2 (
+ echo Usage: %0 BindingIdInCamelCase BindingIdInLowerCase
+ exit /B 1
+)
+
+mvn archetype:generate -N -DarchetypeGroupId=org.eclipse.smarthome.archetype -DarchetypeArtifactId=org.eclipse.smarthome.archetype.binding -DarchetypeVersion=0.7.0-SNAPSHOT -DgroupId=org.openhab.binding -DartifactId=org.openhab.binding.%2 -Dpackage=org.openhab.binding.%2 -DarchetypeCatalog='file://../archetype-catalog.xml' -Dversion=2.0.0-SNAPSHOT -DbindingId=%2 -DbindingIdCamelCase=%1 -DvendorName=openHAB -Dnamespace=org.openhab
+
+ENDLOCAL

addons/binding/create_openhab_binding_skeleton.sh

@@ -5,4 +5,4 @@ camelcaseId=$1
 
 id=`echo $camelcaseId | tr '[:upper:]' '[:lower:]'` 
 
-mvn archetype:generate -DarchetypeGroupId=org.eclipse.smarthome.archetype -DarchetypeArtifactId=org.eclipse.smarthome.archetype.binding -DarchetypeVersion=0.7.0-SNAPSHOT -DgroupId=org.openhab.binding -DartifactId=org.openhab.binding.$id -Dpackage=org.openhab.binding.$id -DarchetypeCatalog='file://../archetype-catalog.xml' -Dversion=2.0.0-SNAPSHOT -DbindingId=$id -DbindingIdCamelCase=$camelcaseId -DvendorName=openHAB -Dnamespace=org.openhab
+mvn archetype:generate -N -DarchetypeGroupId=org.eclipse.smarthome.archetype -DarchetypeArtifactId=org.eclipse.smarthome.archetype.binding -DarchetypeVersion=0.8.0-SNAPSHOT -DgroupId=org.openhab.binding -DartifactId=org.openhab.binding.$id -Dpackage=org.openhab.binding.$id -DarchetypeCatalog='file://../archetype-catalog.xml' -Dversion=2.0.0-SNAPSHOT -DbindingId=$id -DbindingIdCamelCase=$camelcaseId -DvendorName=openHAB -Dnamespace=org.openhab

addons/binding/org.openhab.binding.max/.classpath

@@ -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>

addons/binding/org.openhab.binding.max/.project

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.openhab.binding.max</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>

addons/binding/org.openhab.binding.max/ESH-INF/binding/binding.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<binding:binding id="max"
+ 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>MAX! Binding</name>
+ <description>This is the binding for the eQ-3 MAX! Home Solution.</description>
+ <author>Marcel Verpaalen</author>
+
+</binding:binding>

addons/binding/org.openhab.binding.max/ESH-INF/thing/bridge.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="max"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
+ xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 org.eclipse.smarthome.thing-description.xsd">
+
+<bridge-type id="bridge">
+ <label>MAX! Cube LAN gateway</label>
+ <description>This bridge represents the MAX!Cube LAN gateway.</description>
+
+ <config-description>
+ <parameter name="ipAddress" type="text">
+ <context>network_address</context>
+ <label>MAX! Cube LAN gateway IP</label>
+ <description>The IP address of the MAX! Cube LAN gateway</description>
+ <required>true</required>
+ </parameter>
+ <parameter name="port" type="integer">
+ <context>port</context>
+ <label>MAX! Cube LAN gateway port</label>
+ <description>Port of the LAN gateway</description>
+ <default>62910</default>
+ <required>false</required>
+ </parameter>
+ <parameter name="refreshInterval" type="integer">
+ <label>Refresh Interval</label>
+ <description>The refresh interval in ms which is used to poll given MAX! Cube.</description>
+ <default>30000</default>
+ <required>false</required>
+ </parameter>
+ <parameter name="serialNumber" type="text">
+ <label>Serial Number</label>
+ <description>The Serial Number identifies one specific device.</description>
+ <required>true</required>
+ </parameter>
+ <parameter name="exclusive" type="boolean">
+ <label>Exclusive Mode</label>
+ <description>If set to true, the binding will leave the connection to the Cube open.</description>
+ <default>false</default>
+ <required>false</required>
+ </parameter>
+ <parameter name="maxRequestsPerConnection" type="integer">
+ <label>Max Requests per Connection</label>
+ <description>In exclusive mode, how many requests are allowed until connection is closed and reopened.</description>
+ <default>1000</default>
+ <required>false</required>
+ </parameter>
+
+ </config-description>
+ </bridge-type>
+
+
+</thing:thing-descriptions>

addons/binding/org.openhab.binding.max/ESH-INF/thing/thing-types.xml

@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="max"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
+ xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
+
+ <thing-type id="thermostat">
+ <supported-bridge-type-refs>
+ <bridge-type-ref id="bridge" />
+ </supported-bridge-type-refs>
+
+ <label>MAX! HeatingThermostat</label>
+ <description>This is a MAX! HeatingThermostat</description>
+
+ <channels>
+ <channel id="valve" typeId="valve" />
+ <channel id="battery_low" typeId="battery" />
+ <channel id="mode" typeId="mode" />
+ <channel id="actual_temp" typeId="actual_temp" />
+ <channel id="set_temp" typeId="set_temp" />
+ </channels>
+
+ <config-description>
+ <parameter name="serialNumber" type="text">
+ <label>Serial Number</label>
+ <description>The Serial Number identifies one specific device.</description>
+ <required>true</required>
+ </parameter>
+ </config-description>
+ </thing-type>
+
+ <thing-type id="thermostatplus">
+ <supported-bridge-type-refs>
+ <bridge-type-ref id="bridge" />
+ </supported-bridge-type-refs>
+
+ <label>MAX! HeatingThermostat+</label>
+ <description>This is a MAX! HeatingThermostat+</description>
+
+ <channels>
+ <channel id="valve" typeId="valve" />
+ <channel id="battery_low" typeId="battery" />
+ <channel id="mode" typeId="mode" />
+ <channel id="actual_temp" typeId="actual_temp" />
+ <channel id="set_temp" typeId="set_temp" />
+ </channels>
+
+ <config-description>
+ <parameter name="serialNumber" type="text">
+ <label>Serial Number</label>
+ <description>The Serial Number identifies one specific device.</description>
+ <required>true</required>
+ </parameter>
+ </config-description>
+ </thing-type>
+
+ <thing-type id="wallthermostat">
+ <supported-bridge-type-refs>
+ <bridge-type-ref id="bridge" />
+ </supported-bridge-type-refs>
+
+ <label>MAX! WallThermostat+</label>
+ <description>This is a MAX! WallThermostat+</description>
+
+ <channels>
+ <channel id="valve" typeId="valve" />
+ <channel id="battery_low" typeId="battery" />
+ <channel id="mode" typeId="mode" />
+ <channel id="actual_temp" typeId="actual_temp" />
+ <channel id="set_temp" typeId="set_temp" />
+ </channels>
+
+ <config-description>
+ <parameter name="serialNumber" type="text">
+ <label>Serial Number</label>
+ <description>The Serial Number identifies one specific device.</description>
+ <required>true</required>
+ </parameter>
+ </config-description>
+ </thing-type>
+
+ <thing-type id="ecoswitch">
+ <supported-bridge-type-refs>
+ <bridge-type-ref id="bridge" />
+ </supported-bridge-type-refs>
+
+ <label>MAX! Ecoswitch</label>
+ <description>This is a MAX! EcoSwitch</description>
+
+ <channels>
+ <channel id="battery_low" typeId="battery" />
+ </channels>
+
+ <config-description>
+ <parameter name="serialNumber" type="text">
+ <label>Serial Number</label>
+ <description>The Serial Number identifies one specific device.</description>
+ <required>true</required>
+ </parameter>
+ </config-description>
+ </thing-type>
+
+ <thing-type id="shuttercontact">
+ <supported-bridge-type-refs>
+ <bridge-type-ref id="bridge" />
+ </supported-bridge-type-refs>
+
+ <label>MAX! Shutter Contact</label>
+ <description>This is a MAX! Shutter Contact</description>
+
+ <channels>
+ <channel id="contact_state" typeId="contact_state" />
+ <channel id="battery_low" typeId="battery" />
+ </channels>
+
+ <config-description>
+ <parameter name="serialNumber" type="text">
+ <label>Serial Number</label>
+ <description>The Serial Number identifies one specific device.</description>
+ <required>true</required>
+ </parameter>
+ </config-description>
+ </thing-type>
+
+ <channel-type id="valve">
+ <item-type>Number</item-type>
+ <label>Valve Position</label>
+ <description>Thermostat Valve Position</description>
+ </channel-type>
+
+ <channel-type id="battery">
+ <item-type>Switch</item-type>
+ <label>Battery Level Low</label>
+ <description>Battery charge Level</description>
+ </channel-type>
+
+ <channel-type id="mode">
+ <item-type>String</item-type>
+ <label>Mode</label>
+ <description>Thermostat Mode Setting</description>
+ </channel-type>
+
+ <channel-type id="actual_temp">
+ <item-type>Number</item-type>
+ <label>Actual Temperature</label>
+ <description>Actual measured room temperature</description>
+ </channel-type>
+
+ <channel-type id="set_temp">
+ <item-type>Number</item-type>
+ <label>Set Temperature</label>
+ <description>Thermostat temperature setpoint</description>
+ </channel-type>
+
+ <channel-type id="contact_state">
+ <item-type>Contact</item-type>
+ <label>Contact State</label>
+ <description>Contact state information</description>
+ </channel-type>
+
+ <channel-type id="eco_mode">
+ <item-type>Switch</item-type>
+ <label>Eco Mode</label>
+ <description>Eco Mode Activated</description>
+ </channel-type>
+
+</thing:thing-descriptions>

addons/binding/org.openhab.binding.max/META-INF/MANIFEST.MF

@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: MaxCube Binding
+Bundle-SymbolicName: org.openhab.binding.max;singleton:=true
+Bundle-Vendor: openHAB
+Bundle-Version: 2.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ClassPath: .
+Import-Package: com.google.common.base;version="10.0.1",
+ com.google.common.collect,
+ org.apache.commons.net.util,
+ org.eclipse.smarthome.config.core,
+ org.eclipse.smarthome.config.discovery,
+ org.eclipse.smarthome.core.common.registry,
+ org.eclipse.smarthome.core.library.items,
+ org.eclipse.smarthome.core.library.types,
+ org.eclipse.smarthome.core.thing,
+ org.eclipse.smarthome.core.thing.binding,
+ org.eclipse.smarthome.core.types,
+ org.osgi.framework,
+ org.slf4j
+Service-Component: OSGI-INF/*
+Export-Package: org.openhab.binding.max
+
+