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.

Sign up for GitHub

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

Jump to bottom

[boschshc] Support for Door/Window Contact II #16093

Merged
merged 10 commits into from Dec 31, 2023
Merged

[boschshc] Support for Door/Window Contact II #16093

merged 10 commits into from Dec 31, 2023

Conversation

david-pace
Copy link
Member

  • add new thing type for Door/Window Sensor II
  • add channel types for bypass state and communication quality
  • add handler extending the basic Door/Window Sensor handler
  • add service implementations
  • register handler in discovery service
  • add unit tests
  • re-generate i18n properties file
  • add documentation

closes #15954

@david-pace david-pace added the enhancement An enhancement or new feature for an existing add-on label Dec 20, 2023
@david-pace david-pace added the additional testing preferred The change works for the pull request author. A test from someone else is preferred though. label Dec 20, 2023
jlaur
jlaur requested changes Dec 21, 2023
View reviewed changes
Copy link
Contributor

@jlaur jlaur left a comment

Choose a reason for hiding this comment

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

Thanks! Just one very quick comment for now from reading the README.

bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml Outdated Show resolved Hide resolved
@david-pace david-pace force-pushed the 15954-window-contact-2 branch 2 times, most recently from f1916bc to 9427a02 Compare December 23, 2023 22:54
jlaur
jlaur requested changes Dec 24, 2023
View reviewed changes
Copy link
Contributor

@jlaur jlaur left a comment

Choose a reason for hiding this comment

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

Many thanks! I have now done a full review, and have only a few additional comments.

bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml Outdated Show resolved Hide resolved
bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/i18n/boschshc.properties Outdated Show resolved Hide resolved
bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml Outdated Show resolved Hide resolved
jlaur
jlaur requested changes Dec 26, 2023
View reviewed changes
Copy link
Contributor

@jlaur jlaur left a comment

Choose a reason for hiding this comment

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

Just a few comments to not forget about the signal-strength rename change.

bundles/org.openhab.binding.boschshc/README.md Outdated Show resolved Hide resolved
...hc/src/main/java/org/openhab/binding/boschshc/internal/devices/BoschSHCBindingConstants.java Outdated Show resolved Hide resolved
.../java/org/openhab/binding/boschshc/internal/devices/windowcontact/WindowContact2Handler.java Outdated Show resolved Hide resolved
.../java/org/openhab/binding/boschshc/internal/devices/windowcontact/WindowContact2Handler.java Outdated Show resolved Hide resolved
@david-pace david-pace added the work in progress A PR that is not yet ready to be merged label Dec 26, 2023
@david-pace david-pace mentioned this pull request Dec 28, 2023
Merged
@david-pace
Copy link
Member Author

david-pace commented Dec 30, 2023 •
edited

Hi @mike-bike, I think you mentioned that you have a Door/Window Contact II, right? Maybe you can help me to test the pull request code.

The Door/Window Contact II has a bypass/break feature (Pause in German), that allows to ignore the sensor signals for a specified amount of time (or also an unlimited amount of time). This can be activated in the Bosch Smart Home app in the device settings. I have activated the feature for a certain sensor, but I can't activate it for some reason. The app and the manual says it is activated with a double press on the button, and then the LED should blink orange as long as specified. But this does not work for me. Could you please verify if you can activate this break/Pause function on your Sensor? Thanks 👍

@mike-bike
Copy link

mike-bike commented Dec 30, 2023 via email

@david-pace
Copy link
Member Author

Thank you @mike-bike 👍 Actually I think I found out what the problem is: it only works when the door/window is closed. I tested it with an unmounted sensor and therefore it was considered "open". Thank you for your help 👍

Do you want a test JAR to test the openHAB support for the sensor before it is released? Not sure if you are testing another JAR for the long polling at the moment, in which case this might not make sense. Or maybe you don't want to mess up your system further with more SNAPSHOT JARs 😉 Anyway, let me know if you want to still test it on your system 👍

@david-pace david-pace removed additional testing preferred The change works for the pull request author. A test from someone else is preferred though. work in progress A PR that is not yet ready to be merged labels Dec 30, 2023
@david-pace david-pace changed the title [boschshc] Support for Door/Window Sensor II [boschshc] Support for Door/Window Contact II Dec 30, 2023
jlaur
jlaur approved these changes Dec 31, 2023
View reviewed changes
Copy link
Contributor

@jlaur jlaur left a comment

Choose a reason for hiding this comment

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

LGTM. Can be merged when the conflict is resolved.

david-pace and others added 8 commits December 31, 2023 01:19
@david-pace
[boschshc] Support for Door/Window Sensor II
e335bcb 
* add new thing type for Door/Window Sensor II
* add channel types for bypass state and communication quality
* add handler extending the basic Door/Window Sensor handler
* add service implementations
* register handler in discovery service
* add unit tests
* re-generate i18n properties file
* add documentation

closes openhab#15954

Signed-off-by: David Pace <dev@davidpace.de>
@david-pace
use system channel type signal-strength instead of custom string channel
3ab658b 
Signed-off-by: David Pace <dev@davidpace.de>
@david-pace @jlaur
Align channel ID with channel type ID signal-strength
740fc65 
Co-authored-by: Jacob Laursen <jacob-github@vindvejr.dk>
Signed-off-by: David Pace <dev@davidpace.de>
@david-pace
adapt review comments, enhance bypass channel implementation
ccd25ec 
* rename channel
* rename constants
* update README for signal-strength channel
* change bypass channel item type to Switch
* enhance bypass state descriptions
* add method to convert from Bosch bypass state to openHAB switch state
* enhance README for bypass channel
* add/enhance unit tests
* re-generate i18n property file

Signed-off-by: David Pace <dev@davidpace.de>
@david-pace
add communication quality state FETCHING
2fa4e99 
Signed-off-by: David Pace <dev@davidpace.de>
@david-pace
correct state options for bypass-state channel
eb2ed86 
Signed-off-by: David Pace <dev@davidpace.de>
@david-pace
remove UNDEF option since it is not displayed anyway
53f8b0a 
Signed-off-by: David Pace <dev@davidpace.de>
@david-pace
re-generate i18n properties file
775dd86 
Signed-off-by: David Pace <dev@davidpace.de>
@david-pace
apply spotless after rebase with manual merge
6045ff0 
Signed-off-by: David Pace <dev@davidpace.de>
@david-pace
fix column width in README
19fd2a1 
Signed-off-by: David Pace <dev@davidpace.de>
@david-pace
Copy link
Member Author

Commits were rebased on main. I also applied spotless and fixed the column width in the README file 👍

@jlaur jlaur merged commit 4585422 into openhab:main Dec 31, 2023
3 checks passed
@jlaur jlaur added this to the 4.2 milestone Dec 31, 2023
@david-pace david-pace deleted the 15954-window-contact-2 branch December 31, 2023 10:55
dbadia pushed a commit to dbadia/openhab2-addons that referenced this pull request Dec 31, 2023
@david-pace @dbadia
[boschshc] Support for Door/Window Contact II (openhab#16093)
acf818a 
* [boschshc] Support for Door/Window Sensor II

* add new thing type for Door/Window Sensor II
* add channel types for bypass state and communication quality
* add handler extending the basic Door/Window Sensor handler
* add service implementations
* register handler in discovery service
* add unit tests
* re-generate i18n properties file
* add documentation

closes openhab#15954

Signed-off-by: David Pace <dev@davidpace.de>
Cybso pushed a commit to Cybso/openhab-addons that referenced this pull request Jan 5, 2024
@david-pace @Cybso
[boschshc] Support for Door/Window Contact II (openhab#16093)
a2057f7 
* [boschshc] Support for Door/Window Sensor II

* add new thing type for Door/Window Sensor II
* add channel types for bypass state and communication quality
* add handler extending the basic Door/Window Sensor handler
* add service implementations
* register handler in discovery service
* add unit tests
* re-generate i18n properties file
* add documentation

closes openhab#15954

Signed-off-by: David Pace <dev@davidpace.de>
@david-pace david-pace mentioned this pull request Jan 7, 2024
Closed
@jlaur jlaur mentioned this pull request Feb 3, 2024
Merged
@david-pace david-pace mentioned this pull request Feb 3, 2024
Closed
austvik pushed a commit to austvik/openhab-addons that referenced this pull request Mar 27, 2024
@david-pace @austvik
[boschshc] Support for Door/Window Contact II (openhab#16093)
94e92ea 
* [boschshc] Support for Door/Window Sensor II

* add new thing type for Door/Window Sensor II
* add channel types for bypass state and communication quality
* add handler extending the basic Door/Window Sensor handler
* add service implementations
* register handler in discovery service
* add unit tests
* re-generate i18n properties file
* add documentation

closes openhab#15954

Signed-off-by: David Pace <dev@davidpace.de>
Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jlaur jlaur jlaur approved these changes

@GerdZanker GerdZanker Awaiting requested review from GerdZanker GerdZanker is a code owner

Assignees
No one assigned
Labels
enhancement An enhancement or new feature for an existing add-on
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.

[boschshc] Door/Window Contact II (New Version)
3 participants
@david-pace @mike-bike @jlaur