Skip to content
This repository has been archived by the owner on May 17, 2021. It is now read-only.

[sallegra] Added Sallegra binding (replaces #3520) #3680

Merged
merged 1 commit into from Jan 2, 2016

Conversation

watou
Copy link
Contributor

@watou watou commented Jan 2, 2016

  • Sallegra Dimmer DA-ET-4, Sallegra Relay R-ET-4 and Sallegra Input ADI-ET-8/8 are currently supported
  • Syncs the Openhab status with the actual status on the Sallegra Module

See wiki here.

Changed from copy of #3520 by formatting changes, resolve merge conflicts, etc.

@watou watou self-assigned this Jan 2, 2016
@watou watou added this to the 1.8.0 milestone Jan 2, 2016
@watou watou mentioned this pull request Jan 2, 2016
@watou
Copy link
Contributor Author

watou commented Jan 2, 2016

@hakan42 could you read through this PR quickly and merge if you think it looks good?

@hakan42
Copy link
Contributor

hakan42 commented Jan 2, 2016

Will do but it might take me another hour or so.

@hakan42
Copy link
Contributor

hakan42 commented Jan 2, 2016

What immediately comes to attention :

  • needs a rebase against master
  • could you add a section to openhab_defaults.cfg ?

@teichsta
Copy link
Member

teichsta commented Jan 2, 2016

@hakan42 since @watou's changes were quite focussed you don't need to review the whole PR in depth (@watou can you confirm this assumption?)

@watou
Copy link
Contributor Author

watou commented Jan 2, 2016

@teichsta correct -- just another set of eyes quickly before merge. I will rebase and squash, and then please quickly review and merge. Thank you!

@watou
Copy link
Contributor Author

watou commented Jan 2, 2016

Let me add the openhab_default.cfg section and squash.

@teichsta
Copy link
Member

teichsta commented Jan 2, 2016

ok, i've recently (a second ago) merged another PR which will break the openhab_default.cfg compatibility again …

@watou
Copy link
Contributor Author

watou commented Jan 2, 2016

fixing that now!

@teichsta
Copy link
Member

teichsta commented Jan 2, 2016

ah, sorry my fault i didn't see squashed already, sorry, sorry!

@watou
Copy link
Contributor Author

watou commented Jan 2, 2016

OK someone please check through and merge this before I go mad! 😄

teichsta added a commit that referenced this pull request Jan 2, 2016
[sallegra] Added Sallegra binding (replaces #3520)
@teichsta teichsta merged commit 302c720 into openhab:master Jan 2, 2016
@teichsta
Copy link
Member

teichsta commented Jan 2, 2016

done, thanks @watou!

@watou watou deleted the sallegra_binding branch January 2, 2016 16:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants