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

Zigbee #1

Merged
merged 4 commits into from
Mar 22, 2015
Merged

Zigbee #1

merged 4 commits into from
Mar 22, 2015

Conversation

khokher1
Copy link

No description provided.

@khokher1 khokher1 closed this Mar 22, 2015
@khokher1 khokher1 reopened this Mar 22, 2015
cdjackson added a commit that referenced this pull request Mar 22, 2015
@cdjackson cdjackson merged commit 0b608d6 into cdjackson:zigbee Mar 22, 2015
cdjackson pushed a commit that referenced this pull request Apr 10, 2015
Merge with master

Merge pull request #2 from openhab/master

Merge with master

initial contribution of the pulseaudio binding, including discovery
service

Signed-off-by: Tobias Bräutigam <[email protected]>

- check if the server is connectable before creating a bridge for it
- add binding to pom.xml

Signed-off-by: Tobias Bräutigam <[email protected]>

use real pulseaudio item names

Signed-off-by: Tobias Bräutigam <[email protected]>

- finer grained thing definitions
- sink-inputs can be rerouted

Signed-off-by: Tobias Bräutigam <[email protected]>

- fixed misdefined channel
- some code cleanup

Signed-off-by: Tobias Bräutigam <[email protected]>

the mdns bundles name has changed

Signed-off-by: Tobias Bräutigam <[email protected]>

missing part of the last commit

Signed-off-by: Tobias Bräutigam <[email protected]>

changes due to Kai´s code review

Signed-off-by: Tobias Bräutigam <[email protected]>

log message removed

Signed-off-by: Tobias Bräutigam <[email protected]>

moved client connection into a scheduled runnable

Signed-off-by: Tobias Bräutigam <[email protected]>
cdjackson added a commit that referenced this pull request Apr 10, 2015
* master: (40 commits)
  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
  removed background discovery code
  Adapted code to latest stable ESH release
  Improved default sitemap provider and demo files to make the Classic UI behave nice again. Also adapted AutoApproveService and removed ThingItemProvider as it was superceded by the ThingSetupManager of ESH.
  added info about Milight and Energenie
  updated information about rrd4j
  Implemented ItemRegistry, ItemUIRegistry and ChartProvider support for the compatibility layer. This fixes openhab#146.
  Added  InsteonPLM 1.7 binding
  Format start scripts and add check for not found equinox launcher
  Resource leak: 'socket' never closed
  ...

Conflicts:
	addons/binding/pom.xml
cdjackson added a commit that referenced this pull request Apr 10, 2015
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants