[shelly] BLU Motion, optimize ShellyManager for BLU devices #15401

markus7017 · 2023-08-10T15:11:32Z

The PR includes the following enhancements and fixes. Most changes are related to device discovery and initialization as well as BLU motion support. The other topics are small fixes, we were able to catch a bunch of them.

[shelly] Support for Shelly BLU Motion #15359: Shelly BLU Motion is supported
[shelly] Shelly Manager display actions, which are not available for BLU devices #15396: Cleanup in Shelly Manager for actions and firmware upgrade, which currently can’t be supported by the binding.
README updated

Signed-off-by: Markus Michels markus7017@gmail.com

bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties

bundles/org.openhab.binding.shelly/README.md

markus7017 · 2023-08-11T20:48:19Z

@lsiepel changes applied

markus7017 · 2023-08-13T19:41:53Z

@lsiepel anything missing?

lsiepel · 2023-08-16T21:05:47Z

@lsiepel anything missing?

I don't have shelly devices and this binding is not known area to me, so i guess it's better for others to review.

markus7017 · 2023-08-29T11:51:38Z

@openhab/add-ons-maintainers Could somebody please pick-up this PR

lolodomo · 2023-09-10T09:00:38Z

@markus7017 : why you don't create different small PRs for each fixed issue or new enhancement ? I am sure you will get quicker feedback. Recommendation for new PRs.

markus7017 · 2023-09-15T14:23:25Z

@lolodomo 90% (about 270 lines) are dependent on BLU motion, required changes to general initialization and decided to do
some cleanup related to that. The remaining 30 lines are related to small fixes I found along the way.

Creating a separate PR for every logic change or bug fix creates a lot of overhead and makes it hard to manage PRs in parallel. Due to longer response times I have already a bunch of new changes I kept out of this PR to keep it small. Allterco is delivering a lot of nee devices, which change a) in direct changes b) require changes to the generic logic and c) maybe bugs need to be fixed. So it's unrealistic to serialize those changes, complete one by the other and the create a dozen 50 line PRs.

Do I need to remove the 30 lines bug fixes and crate another PR for those?

lolodomo · 2023-09-23T17:32:31Z

Do I need to remove the 30 lines bug fixes and crate another PR for those?

Let's keep them.
My comment was only an advice for the future.

lolodomo · 2023-09-23T17:33:59Z

Note that there is one file in conflict.

bundles/org.openhab.binding.shelly/README.md

...inding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyDeviceProfile.java

....binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api2/Shelly2ApiClient.java

...ding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java

lolodomo · 2023-10-08T10:16:53Z

@markus7017 : I reviewed fully your PR. There is one important comment to consider. Please also note that a file conflict has to be resolved.

lolodomo · 2023-10-08T10:22:47Z

@markus7017 : I do not know if you are available now. There is a new milestone build that will start in few hours. If you can consider my comments and resolve the conflict, I will try to merge your PR just in time for the new milestone.

markus7017 · 2023-10-21T16:32:49Z

@lolodomo I was busy the last weeks, just working on this PR and 2 important fixes

openhab-bot · 2023-10-21T16:33:25Z

This pull request has been mentioned on openHAB Community. There might be relevant details there:

https://community.openhab.org/t/oh4-runs-out-of-memory/148699/93

markus7017 · 2023-10-21T17:38:02Z

@lolodomo one question: pom.xml still includes a dependency on org.eclipse.jetty.websocket. Is this still required? Should I keep it for backward compatibility?

jlaur · 2023-10-21T20:46:03Z

Do I need to remove the 30 lines bug fixes and crate another PR for those?

Let's keep them. My comment was only an advice for the future.

[...]

I was busy the last weeks, just working on this PR and 2 important fixes

I will not interfere with the agreement between you and @lolodomo, but just add that if those fixes are important/critical for 4.0 as well, I would advise you to create a separate PR with them so we can cherry-pick them into 4.0.x.

Also, I noticed many issues mentioned in the PR description. @markus7017, can you link those issues that will be closed by this PR? When they are linked, they will be automatically closed when the PR is merged, so it would make it easier to manage.

...inding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyDeviceProfile.java

...ding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java

lolodomo · 2023-10-22T07:33:33Z

@lolodomo one question: pom.xml still includes a dependency on org.eclipse.jetty.websocket. Is this still required? Should I keep it for backward compatibility?

That's strange, why did you do that first ?? You should rely on current version of Jetty "packaged" with OH server. We are currently at 9.4.52.v20230823 after upgrading to Karaf 4.4.4.
openhab/openhab-core#3814

lolodomo · 2023-10-22T07:41:56Z

@markus7017 : you marked all my comments as resolved without pushing any changes !

markus7017 · 2023-10-22T10:21:14Z

Also, I noticed many issues mentioned in the PR description. @markus7017, can you link those issues that will be closed by this PR? When they are linked, they will be automatically closed when the PR is merged, so it would make it easier to manage.

Hmm, I reviewed the above list, which is correct. Most of them were tiny fixes, one line or so.
#15393 is not a must, more a simplified handling for the user
#15398 caused duplicate entries in the Inbox
#15397 is a must for firmware 1.0+ and password protected devices due to strict RFC-based implementation
#15932 is cosmetics
#15350 an enhancement for new device
#15396 improved user experience
#15395 caused initialization failure for the Plus HT sensor
#15394 enhancement
#15393 fixes an initialization problem for TRV

and this one includes 2 fixes for resource leaks when discovery handler fails (NOE+IPv6)

All of them would be useful to fixes (serious) issues or little improvements. So would make sense also to get into 4.0.
@jlaur @lolodomo Let me now to to proceed. I could create another PR and fiddle out those lines included to the agreed list.

markus7017 · 2023-10-22T14:56:27Z

I know, I need to do a rebase and to double check that all resource leak fixes are included

Signed-off-by: Markus Michels <markus7017@gmail.com>

markus7017 · 2023-11-18T16:05:23Z

@lolodomo This is the left-over based one the 2 PRs before :-)

bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties

...helly/src/main/java/org/openhab/binding/shelly/internal/manager/ShellyManagerActionPage.java

...ding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java

Signed-off-by: Markus Michels <markus7017@gmail.com>

markus7017 · 2023-11-18T17:16:45Z

@lolodomo requested changes applied

lolodomo · 2023-11-18T19:26:30Z

@lolodomo requested changes applied

One comment in README you marked as resolved but you did not fix.

Please add these kind of entries in the future for an automatic closing of issues.

Closes #15359
Closes #15396

Signed-off-by: Markus Michels <markus7017@gmail.com>

lolodomo

LGTM, thank you

markus7017 · 2023-11-18T20:40:39Z

@lolodomo requested changes applied

One comment in README you marked as resolved but you did not fix.

Please add these kind of entries in the future for an automatic closing of issues.

Closes #15359 Closes #15396

@lolodomo
Isn't that done automatically when I add the issues under "Development" on the right side?
In addition Closes #15909

changes applied

markus7017 · 2023-11-18T20:50:49Z

@lolodomo thank you!!

lolodomo · 2023-11-18T20:54:00Z

@lolodomo thank you!!

As you can notice, small PR = faster review

…15401) Signed-off-by: Markus Michels <markus7017@gmail.com>

…15401) Signed-off-by: Markus Michels <markus7017@gmail.com> Signed-off-by: Jørgen Austvik <jaustvik@acm.org>

openhab-bot · 2024-07-04T08:14:38Z

This pull request has been mentioned on openHAB Community. There might be relevant details there:

https://community.openhab.org/t/shelly-binding/56862/3892

markus7017 added bug An unexpected problem or unintended behavior of an add-on enhancement An enhancement or new feature for an existing add-on labels Aug 10, 2023

markus7017 self-assigned this Aug 10, 2023

markus7017 requested review from kaikreuzer and jlaur August 10, 2023 15:12

lsiepel reviewed Aug 10, 2023

View reviewed changes

bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties Outdated Show resolved Hide resolved

lsiepel reviewed Aug 10, 2023

View reviewed changes

bundles/org.openhab.binding.shelly/README.md Outdated Show resolved Hide resolved

lolodomo requested changes Oct 8, 2023

View reviewed changes

lolodomo added the awaiting feedback label Oct 15, 2023

maniac103 reviewed Oct 22, 2023

View reviewed changes

...inding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyDeviceProfile.java Outdated Show resolved Hide resolved

maniac103 reviewed Oct 22, 2023

View reviewed changes

...ding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java Outdated Show resolved Hide resolved

markus7017 added the work in progress A PR that is not yet ready to be merged label Oct 22, 2023

markus7017 changed the title ~~[shelly] Fixes Gen2 Auth, add BLU Motion, improve discovery, optimize ShellyManager for BLU devices~~ [shelly] BLU Motion, improve discovery, optimize ShellyManager for BLU devices Nov 15, 2023

markus7017 changed the title ~~[shelly] BLU Motion, improve discovery, optimize ShellyManager for BLU devices~~ [shelly] BLU Motion, il, optimize ShellyManager for BLU devices Nov 15, 2023

markus7017 changed the title ~~[shelly] BLU Motion, il, optimize ShellyManager for BLU devices~~ [shelly] BLU Motion, optimize ShellyManager for BLU devices Nov 15, 2023

markus7017 added the awaiting other PR Depends on another PR label Nov 15, 2023

markus7017 added 4 commits November 18, 2023 16:39

rebase

c7739be

Signed-off-by: Markus Michels <markus7017@gmail.com>

review changes

8f3b7ab

Signed-off-by: Markus Michels <markus7017@gmail.com>

review changes

011744f

Signed-off-by: Markus Michels <markus7017@gmail.com>

review changed applied

c51cdf2

Signed-off-by: Markus Michels <markus7017@gmail.com>

markus7017 force-pushed the shelly_init_discovery_motion branch from ccf5d37 to c51cdf2 Compare November 18, 2023 15:39

This was unlinked from issues Nov 18, 2023

[shelly] Fix version detection for Gen2 #15392

Closed

[shelly] Binding sends basic auth even device is unprotected #15397

Closed

[shelly] Improve devices discovery for protected devices #15399

Closed

markus7017 linked an issue Nov 18, 2023 that may be closed by this pull request

[shelly] Shelly Mini device does not initialize when added via .things #15909

Closed

markus7017 removed awaiting other PR Depends on another PR bug An unexpected problem or unintended behavior of an add-on labels Nov 18, 2023

lolodomo requested changes Nov 18, 2023

View reviewed changes

review changes

0d9ae2e

Signed-off-by: Markus Michels <markus7017@gmail.com>

typo fixed

ee688dd

Signed-off-by: Markus Michels <markus7017@gmail.com>

lolodomo approved these changes Nov 18, 2023

View reviewed changes

lolodomo merged commit a535caa into openhab:main Nov 18, 2023
3 checks passed

lolodomo added this to the 4.1 milestone Nov 18, 2023

andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Nov 26, 2023

[shelly] BLU Motion, optimize ShellyManager for BLU devices (openhab#…

8f83521

…15401) Signed-off-by: Markus Michels <markus7017@gmail.com>

austvik pushed a commit to austvik/openhab-addons that referenced this pull request Mar 27, 2024

[shelly] BLU Motion, optimize ShellyManager for BLU devices (openhab#…

fe4475c

…15401) Signed-off-by: Markus Michels <markus7017@gmail.com> Signed-off-by: Jørgen Austvik <jaustvik@acm.org>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[shelly] BLU Motion, optimize ShellyManager for BLU devices #15401

[shelly] BLU Motion, optimize ShellyManager for BLU devices #15401

markus7017 commented Aug 10, 2023 •

edited

Loading

markus7017 commented Aug 11, 2023

markus7017 commented Aug 13, 2023

lsiepel commented Aug 16, 2023

markus7017 commented Aug 29, 2023

lolodomo commented Sep 10, 2023

markus7017 commented Sep 15, 2023

lolodomo commented Sep 23, 2023

lolodomo commented Sep 23, 2023

lolodomo commented Oct 8, 2023

lolodomo commented Oct 8, 2023

markus7017 commented Oct 21, 2023

openhab-bot commented Oct 21, 2023

markus7017 commented Oct 21, 2023

jlaur commented Oct 21, 2023 •

edited

Loading

lolodomo commented Oct 22, 2023

lolodomo commented Oct 22, 2023

markus7017 commented Oct 22, 2023

markus7017 commented Oct 22, 2023

markus7017 commented Nov 18, 2023

markus7017 commented Nov 18, 2023

lolodomo commented Nov 18, 2023

lolodomo left a comment

markus7017 commented Nov 18, 2023

markus7017 commented Nov 18, 2023

lolodomo commented Nov 18, 2023

openhab-bot commented Jul 4, 2024

[shelly] BLU Motion, optimize ShellyManager for BLU devices #15401

[shelly] BLU Motion, optimize ShellyManager for BLU devices #15401

Conversation

markus7017 commented Aug 10, 2023 • edited Loading

markus7017 commented Aug 11, 2023

markus7017 commented Aug 13, 2023

lsiepel commented Aug 16, 2023

markus7017 commented Aug 29, 2023

lolodomo commented Sep 10, 2023

markus7017 commented Sep 15, 2023

lolodomo commented Sep 23, 2023

lolodomo commented Sep 23, 2023

lolodomo commented Oct 8, 2023

lolodomo commented Oct 8, 2023

markus7017 commented Oct 21, 2023

openhab-bot commented Oct 21, 2023

markus7017 commented Oct 21, 2023

jlaur commented Oct 21, 2023 • edited Loading

lolodomo commented Oct 22, 2023

lolodomo commented Oct 22, 2023

markus7017 commented Oct 22, 2023

markus7017 commented Oct 22, 2023

markus7017 commented Nov 18, 2023

markus7017 commented Nov 18, 2023

lolodomo commented Nov 18, 2023

lolodomo left a comment

Choose a reason for hiding this comment

markus7017 commented Nov 18, 2023

markus7017 commented Nov 18, 2023

lolodomo commented Nov 18, 2023

openhab-bot commented Jul 4, 2024

markus7017 commented Aug 10, 2023 •

edited

Loading

jlaur commented Oct 21, 2023 •

edited

Loading