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

[enocean] Adds support for the D2_06_50 EEP type #10949

Merged
merged 15 commits into from
Jul 31, 2021
Merged

Conversation

DrRSatzteil
Copy link
Contributor

@DrRSatzteil DrRSatzteil commented Jul 6, 2021

Signed-off-by: Thomas Lauterbach lauterbachthomas@gmail.com

[enocean] Adds support for the D2_06_50 EEP type (window sash and handle sensors)

This PR adds a new device type windowSashHandleSensor (channels: handle state, sash state, breach alarm trigger, battery level, battery low) with the EEP profile D2_60_50 as used by Siegenia Senso Secure devices. I'm aware that these devices could be additionally configured with a proprietary teach-in cmd, however since I do not own their gateway and this does not seem to be documented somewhere just a regular tech-in cmd is used.

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
@DrRSatzteil DrRSatzteil changed the title Initial D2_06_20 EEP Implementation. [enocean] Adds support for the D2_06_50 EEP type Jul 6, 2021
@DrRSatzteil DrRSatzteil marked this pull request as ready for review July 6, 2021 09:12
@DrRSatzteil DrRSatzteil requested a review from fruggy83 as a code owner July 6, 2021 09:12
Thomas Lauterbach added 5 commits July 8, 2021 11:45
Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
This reverts commit 9451010.

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
Thomas Lauterbach added 2 commits July 8, 2021 16:09
Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
@DrRSatzteil
Copy link
Contributor Author

DrRSatzteil commented Jul 8, 2021

I still found one minor issue. Maybe you can give me some guidance:

When I select the trigger channel in a rule via Main UI it does not show the label of the channel but this:
Screenshot_2021-07-08-18-16-09-062_org openhab habdroid

Thomas Lauterbach added 2 commits July 8, 2021 20:20
Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
@DrRSatzteil
Copy link
Contributor Author

Just checked with other bindings and they behave the same. This seems to be either "as designed" or a more general bug. So I won't investigate any further

Thomas Lauterbach added 3 commits July 8, 2021 23:52
Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
@fruggy83
Copy link
Contributor

Hi @DrRSatzteil

I would also guess that this behaviour ist correct. If you create a trigger rule by dsl, you also have to set the channel Id (this is what you see here). If you do not want to use the channel Id, you still have to use the thing name and channel name to clearly define the trigger channel. So I guess they just use channel Id to make things easy :)

By the way, you have requested a review but you are still pushing commits to this pr. Could you revoke the review request or give me sign when you are finished and I can start with the review? Thanks a lot.

@DrRSatzteil DrRSatzteil marked this pull request as draft July 10, 2021 05:42
@DrRSatzteil
Copy link
Contributor Author

Hi @fruggy83

Sorry, yes I shouldn't have requested the review already. I converted this to a draft again and will review my changes once more. I realised that my last commit requires some Readme changes. Once I'm done with that I'll give you a sign. Thank you!

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
@DrRSatzteil DrRSatzteil marked this pull request as ready for review July 11, 2021 08:02
@DrRSatzteil
Copy link
Contributor Author

I udpated the README and I did not discover any more problems. This should be ready for review.

@Skinah Skinah added the enhancement An enhancement or new feature for an existing add-on label Jul 13, 2021
Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
@DrRSatzteil DrRSatzteil requested a review from fwolter July 28, 2021 19:11
Copy link
Member

@fwolter fwolter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fwolter fwolter merged commit 02c2513 into openhab:main Jul 31, 2021
@fwolter fwolter added this to the 3.2 milestone Jul 31, 2021
frederictobiasc pushed a commit to frederictobiasc/openhab-addons that referenced this pull request Oct 26, 2021
* Initial D2_06_20 EEP Implementation.

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added data validation

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added channels for calibration

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added manufacturer ID for discovery

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* Revert "added data validation"

This reverts commit 9451010.

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* fixing discovery by setting manufacturerId

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* fix spotless

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added calibration channels

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* removed validation override

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added manufacturer suffix

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* channel description updated

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added calibration channels

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* mentioning calibration channels in documentation

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* shortened thing label

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

Co-authored-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
thinkingstone pushed a commit to thinkingstone/openhab-addons that referenced this pull request Nov 7, 2021
* Initial D2_06_20 EEP Implementation.

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added data validation

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added channels for calibration

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added manufacturer ID for discovery

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* Revert "added data validation"

This reverts commit 9451010.

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* fixing discovery by setting manufacturerId

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* fix spotless

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added calibration channels

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* removed validation override

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added manufacturer suffix

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* channel description updated

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added calibration channels

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* mentioning calibration channels in documentation

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* shortened thing label

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

Co-authored-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
dschoepel pushed a commit to dschoepel/openhab-addons that referenced this pull request Nov 9, 2021
* Initial D2_06_20 EEP Implementation.

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added data validation

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added channels for calibration

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added manufacturer ID for discovery

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* Revert "added data validation"

This reverts commit 9451010.

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* fixing discovery by setting manufacturerId

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* fix spotless

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added calibration channels

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* removed validation override

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added manufacturer suffix

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* channel description updated

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added calibration channels

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* mentioning calibration channels in documentation

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* shortened thing label

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

Co-authored-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
Signed-off-by: Dave J Schoepel <dave@theschoepels.com>
marcfischerboschio pushed a commit to bosch-io/openhab-addons that referenced this pull request May 5, 2022
* Initial D2_06_20 EEP Implementation.

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added data validation

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added channels for calibration

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added manufacturer ID for discovery

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* Revert "added data validation"

This reverts commit 9451010.

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* fixing discovery by setting manufacturerId

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* fix spotless

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added calibration channels

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* removed validation override

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added manufacturer suffix

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* channel description updated

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* added calibration channels

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* mentioning calibration channels in documentation

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

* shortened thing label

Signed-off-by: Thomas Lauterbach <lauterbachthomas@gmail.com>

Co-authored-by: Thomas Lauterbach <lauterbachthomas@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement An enhancement or new feature for an existing add-on
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants