Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade #1

Merged
merged 32 commits into from
Jan 15, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
191f9c3
changed target platform to use ESH fork
kaikreuzer Dec 21, 2014
954bc19
Added dynamic REST API documentation
kaikreuzer Dec 21, 2014
6d123ea
Binding skeleton creation script for Windows.
dpslavov Dec 24, 2014
1c1a945
Fixed ThingItemProvider to also work with ChannelGroups
kaikreuzer Dec 28, 2014
4dd227f
added link to screencast
kaikreuzer Dec 29, 2014
039f503
added jupnp bundle to launch configuration
kaikreuzer Dec 29, 2014
e2d4e26
changed parent pom names to "pom"
kaikreuzer Dec 30, 2014
3d2c1f7
fixes #90
kaikreuzer Dec 30, 2014
0e5fc4b
updated license headers for 2015
kaikreuzer Jan 1, 2015
9a9a214
Fixed ThingItemUIProvider to also work with ChannelGroups
gerrieg Jan 1, 2015
b879066
Merge pull request #93 from gerrieg/channel-group
kaikreuzer Jan 1, 2015
79c8a4f
fixed hostname in url
kaikreuzer Jan 1, 2015
a09d748
Initial contribution to NetworkHealth 2.0 binding
Jan 2, 2015
529abc8
improved format of logging
kaikreuzer Jan 2, 2015
aed383a
Update intro.md
kaikreuzer Jan 2, 2015
79c4c03
Added documentation about maintainers
kaikreuzer Jan 3, 2015
47fe347
MAX! binding enhancements
marcelrv Jan 4, 2015
a8aaff2
-Changed Device Description from Homematic to OpenHAB
Jan 5, 2015
6189115
Merge pull request #95 from TecSet/master
kaikreuzer Jan 5, 2015
eb63c7a
MAX simplify code now issue #64 is fixed
marcelrv Jan 5, 2015
72e9c69
Update CONTRIBUTING.md
kaikreuzer Jan 6, 2015
1389a89
Merge branch 'maxcube-R5' of https://github.com/marcelrv/openhab2 int…
kaikreuzer Jan 6, 2015
a3765da
Merged marcelrv-maxcube-R5 branch and applied auto formatter
kaikreuzer Jan 6, 2015
2dafc19
Update ide.md
sja Jan 7, 2015
e02ef9d
Merge pull request #102 from sja/patch-1
kaikreuzer Jan 7, 2015
e554439
fixes #103
kaikreuzer Jan 7, 2015
aa6e797
MAX! Update for new xsd definitions
marcelrv Jan 7, 2015
5cd572b
remove <tag>max</tag>
marcelrv Jan 12, 2015
90e4046
Merge pull request #105 from marcelrv/maxcube
kaikreuzer Jan 13, 2015
ab84b5c
Changed TP to again use official ESH repo as it now contains all we need
kaikreuzer Jan 13, 2015
2b3d5c3
adapted Sonos binding to changed method signature
kaikreuzer Jan 13, 2015
deffae8
Upgraded version of maven assembly plugin to make setting of executio…
kaikreuzer Jan 15, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
Gerhard Riegler <[email protected]>
Gideon le Grange <[email protected]>
Jochen Hiller <[email protected]>
Kai Kreuzer <[email protected]>
Thomas Eichstädt-Engelen <[email protected]>
kaikreuzer <[email protected]>
Karel Goderis <[email protected]>
kgoderis <[email protected]>
manroh <[email protected]>
Marcel Verpaalen <[email protected]>
Oliver Libutzki <[email protected]>
38 changes: 38 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.

1 change: 1 addition & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Kai Kreuzer <[email protected]> (@kaikreuzer)
16 changes: 16 additions & 0 deletions addons/binding/create_openhab_binding_skeleton.cmd
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion addons/binding/create_openhab_binding_skeleton.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ camelcaseId=$1

id=`echo $camelcaseId | tr '[:upper:]' '[:lower:]'`

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.$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
61 changes: 32 additions & 29 deletions addons/binding/org.openhab.binding.max/ESH-INF/thing/bridge.xml
Original file line number Diff line number Diff line change
@@ -1,53 +1,56 @@
<?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">
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">
<bridge-type id="bridge">
<label>MAX! Cube LAN gateway</label>
<description>This bridge represents the MAX!Cube LAN gateway.</description>
<description>This bridge represents the MAX!Cube LAN gateway.
</description>

<config-description>
<parameter name="ipAddress" type="text">
<context>network_address</context>
<parameter name="ipAddress" type="text" required="true">
<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>
<description>The IP address of the MAX! Cube LAN gateway
</description>
</parameter>
<parameter name="port" type="integer">
<context>port</context>
<parameter name="port" type="integer" required="false" min="1"
max="65335">
<context>network-address</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">
<parameter name="refreshInterval" type="integer" required="false">
<label>Refresh Interval</label>
<description>The refresh interval in ms which is used to poll given MAX! Cube.</description>
<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">
<parameter name="serialNumber" type="text" required="true">
<label>Serial Number</label>
<description>The Serial Number identifies one specific device.
</description>
</parameter>
<parameter name="exclusive" type="boolean" required="false">
<label>Exclusive Mode</label>
<description>If set to true, the binding will leave the connection to the Cube open.</description>
<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">
<parameter name="maxRequestsPerConnection" type="integer"
required="false">
<label>Max Requests per Connection</label>
<description>In exclusive mode, how many requests are allowed until connection is closed and reopened.</description>
<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>


</bridge-type>
</thing:thing-descriptions>
Loading