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

[shelly] Plus 1/1PM Add-On support; fix roller pos on open/close state #13520

Merged
merged 9 commits into from
Dec 5, 2022
Merged

[shelly] Plus 1/1PM Add-On support; fix roller pos on open/close state #13520

merged 9 commits into from
Dec 5, 2022

Conversation

markus7017
Copy link
Contributor

This PR

  • adds support for Shelly Plus 1/1PM Add-On
  • fixes the missing update of the roller position when roller reaches state open or close

@markus7017 markus7017 added enhancement An enhancement or new feature for an existing add-on work in progress A PR that is not yet ready to be merged labels Oct 8, 2022
@markus7017 markus7017 self-assigned this Oct 8, 2022
@markus7017 markus7017 force-pushed the shelly_snapshot_3.4pr5 branch from 0d8f79f to d0f6c47 Compare November 6, 2022 17:27
@markus7017 markus7017 requested a review from fwolter November 6, 2022 17:27
@fwolter
Copy link
Member

fwolter commented Nov 6, 2022

Is it still work in progress?

@markus7017 markus7017 removed the work in progress A PR that is not yet ready to be merged label Nov 9, 2022
@markus7017
Copy link
Contributor Author

nope, ready-to-go

fwolter
fwolter requested changes Nov 10, 2022
View reviewed changes
@markus7017
Copy link
Contributor Author

@fwolter changes are pushed

@lolodomo
Copy link
Contributor

@markus7017 : can you mention what are the issues this PR will close ? I guess at least #13493 .
More generally, could you please have a look at the 13 open issues related to Shelly and close some of them if they are already resolved ?

This was linked to issues Nov 14, 2022
[shelly] Support for Plus1 / Plus1PM Add-On #13493
Closed
[shelly] Roller position doesn't get updated on open/close position #13515
Closed
@markus7017 markus7017 mentioned this pull request Nov 14, 2022
Closed
@markus7017 markus7017 linked an issue Nov 14, 2022 that may be closed by this pull request
[shelly] Shelly actions very slow (delayed reception in openHAB) #13395
Closed
@markus7017
Copy link
Contributor Author

@lolodomo I closed those from older PRs and assigned some to this PR

@markus7017
Copy link
Contributor Author

@fwolter @lolodomo Anything missing to proceed?

@markus7017
Copy link
Contributor Author

@fwolter review changes applied

@markus7017
Added openhab#13493 Plus 1/1PM addon support; Fixed openhab#13515 pos…
95b03c1 
… for roller in

open/close state; various null warnings removed; README updated

Signed-off-by: Markus Michels <[email protected]>
@markus7017
digitalInput, analogInput and voltage added for Add-On; README updated
2ffe5c9 
Signed-off-by: Markus Michels <[email protected]>
@markus7017
shelly2-roller re-added (wrong assumption that Shelly 2 doesn't support
7cd02e9 
roller mode, because it has no power meter)

Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Markus Michels <[email protected]>
@markus7017
Initialization for Californium 2.7.3 fixed (no multicast packets where
3db092b 
received)

Signed-off-by: Markus Michels <[email protected]>
@markus7017
Analogous input support for Plus Addon changed; Allterco made a format
881b8a4 
change in the beta firmware

Signed-off-by: Markus Michels <[email protected]>
@markus7017
changes applied
198e65f 
Signed-off-by: Markus Michels <[email protected]>
@markus7017
README updated; Shelly Plus addon handling adjusted to latest firmware
f3d15ad 
(before was beta)

Signed-off-by: Markus Michels <[email protected]>
@markus7017 markus7017 force-pushed the shelly_snapshot_3.4pr5 branch from f258d09 to f3d15ad Compare December 1, 2022 19:23
@markus7017
Copy link
Contributor Author

@fwolter Could we please make sure that this PR goes into the final 3.4 release. Otherwise, the complete Gen1 series of devices has delayed responses and will for sure create a lot of support questions / frustration.

fwolter
fwolter approved these changes Dec 3, 2022
View reviewed changes
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 8f97236 into openhab:main Dec 5, 2022
@fwolter fwolter added this to the 3.4 milestone Dec 5, 2022
@openhab-bot
Copy link
Collaborator

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

https://community.openhab.org/t/shelly-beta-with-plus-pro-support/139554/1

@openhab-bot
Copy link
Collaborator

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

https://community.openhab.org/t/openhab-3-4-milestone-discussion/138093/162

@lolodomo
Copy link
Contributor

@markus7017 : your PR could have broken something. Could you exchange with the user on the community forum? See the link in the previous message.

morph166955 pushed a commit to morph166955/openhab-addons that referenced this pull request Dec 18, 2022
@markus7017 @fwolter @morph166955
[shelly] Plus 1/1PM Add-On support; fix roller pos on open/close state (
0a8f5b1 
openhab#13520)

* Added openhab#13493 Plus 1/1PM addon support; Fixed openhab#13515 pos for roller in
open/close state; various null warnings removed; README updated

Signed-off-by: Markus Michels <[email protected]>

* digitalInput, analogInput and voltage added for Add-On; README updated

Signed-off-by: Markus Michels <[email protected]>

* shelly2-roller re-added (wrong assumption that Shelly 2 doesn't support
roller mode, because it has no power meter)

Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Markus Michels <[email protected]>

* Initialization for Californium 2.7.3 fixed (no multicast packets where
received)

Signed-off-by: Markus Michels <[email protected]>

* Analogous input support for Plus Addon changed; Allterco made a format
change in the beta firmware

Signed-off-by: Markus Michels <[email protected]>

* changes applied

Signed-off-by: Markus Michels <[email protected]>

* README updated; Shelly Plus addon handling adjusted to latest firmware
(before was beta)

Signed-off-by: Markus Michels <[email protected]>

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

Signed-off-by: Fabian Wolter <[email protected]>

* fix JSON for Shelly1 - ext_switch_enable is a boolean, not an int

Signed-off-by: Markus Michels <[email protected]>

Signed-off-by: Markus Michels <[email protected]>
Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Fabian Wolter <[email protected]>
Co-authored-by: Fabian Wolter <[email protected]>
Signed-off-by: Ben Rosenblum <[email protected]>
@jlaur jlaur mentioned this pull request Dec 18, 2022
Merged
andrasU pushed a commit to andrasU/openhab-addons that referenced this pull request Dec 24, 2022
@markus7017 @fwolter @andrasU
[shelly] Plus 1/1PM Add-On support; fix roller pos on open/close state (
8e71e31 
openhab#13520)

* Added openhab#13493 Plus 1/1PM addon support; Fixed openhab#13515 pos for roller in
open/close state; various null warnings removed; README updated

Signed-off-by: Markus Michels <[email protected]>

* digitalInput, analogInput and voltage added for Add-On; README updated

Signed-off-by: Markus Michels <[email protected]>

* shelly2-roller re-added (wrong assumption that Shelly 2 doesn't support
roller mode, because it has no power meter)

Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Markus Michels <[email protected]>

* Initialization for Californium 2.7.3 fixed (no multicast packets where
received)

Signed-off-by: Markus Michels <[email protected]>

* Analogous input support for Plus Addon changed; Allterco made a format
change in the beta firmware

Signed-off-by: Markus Michels <[email protected]>

* changes applied

Signed-off-by: Markus Michels <[email protected]>

* README updated; Shelly Plus addon handling adjusted to latest firmware
(before was beta)

Signed-off-by: Markus Michels <[email protected]>

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

Signed-off-by: Fabian Wolter <[email protected]>

* fix JSON for Shelly1 - ext_switch_enable is a boolean, not an int

Signed-off-by: Markus Michels <[email protected]>

Signed-off-by: Markus Michels <[email protected]>
Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Fabian Wolter <[email protected]>
Co-authored-by: Fabian Wolter <[email protected]>
Signed-off-by: Andras Uhrin <[email protected]>
borazslo pushed a commit to borazslo/openhab-mideaac-addon that referenced this pull request Jan 8, 2023
@markus7017 @fwolter @borazslo
[shelly] Plus 1/1PM Add-On support; fix roller pos on open/close state (
6cf5be4 
openhab#13520)

* Added openhab#13493 Plus 1/1PM addon support; Fixed openhab#13515 pos for roller in
open/close state; various null warnings removed; README updated

Signed-off-by: Markus Michels <[email protected]>

* digitalInput, analogInput and voltage added for Add-On; README updated

Signed-off-by: Markus Michels <[email protected]>

* shelly2-roller re-added (wrong assumption that Shelly 2 doesn't support
roller mode, because it has no power meter)

Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Markus Michels <[email protected]>

* Initialization for Californium 2.7.3 fixed (no multicast packets where
received)

Signed-off-by: Markus Michels <[email protected]>

* Analogous input support for Plus Addon changed; Allterco made a format
change in the beta firmware

Signed-off-by: Markus Michels <[email protected]>

* changes applied

Signed-off-by: Markus Michels <[email protected]>

* README updated; Shelly Plus addon handling adjusted to latest firmware
(before was beta)

Signed-off-by: Markus Michels <[email protected]>

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

Signed-off-by: Fabian Wolter <[email protected]>

* fix JSON for Shelly1 - ext_switch_enable is a boolean, not an int

Signed-off-by: Markus Michels <[email protected]>

Signed-off-by: Markus Michels <[email protected]>
Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Fabian Wolter <[email protected]>
Co-authored-by: Fabian Wolter <[email protected]>
psmedley pushed a commit to psmedley/openhab-addons that referenced this pull request Feb 23, 2023
@markus7017 @fwolter @psmedley
[shelly] Plus 1/1PM Add-On support; fix roller pos on open/close state (
b284fc2 
openhab#13520)

* Added openhab#13493 Plus 1/1PM addon support; Fixed openhab#13515 pos for roller in
open/close state; various null warnings removed; README updated

Signed-off-by: Markus Michels <[email protected]>

* digitalInput, analogInput and voltage added for Add-On; README updated

Signed-off-by: Markus Michels <[email protected]>

* shelly2-roller re-added (wrong assumption that Shelly 2 doesn't support
roller mode, because it has no power meter)

Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Markus Michels <[email protected]>

* Initialization for Californium 2.7.3 fixed (no multicast packets where
received)

Signed-off-by: Markus Michels <[email protected]>

* Analogous input support for Plus Addon changed; Allterco made a format
change in the beta firmware

Signed-off-by: Markus Michels <[email protected]>

* changes applied

Signed-off-by: Markus Michels <[email protected]>

* README updated; Shelly Plus addon handling adjusted to latest firmware
(before was beta)

Signed-off-by: Markus Michels <[email protected]>

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

Signed-off-by: Fabian Wolter <[email protected]>

* fix JSON for Shelly1 - ext_switch_enable is a boolean, not an int

Signed-off-by: Markus Michels <[email protected]>

Signed-off-by: Markus Michels <[email protected]>
Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Fabian Wolter <[email protected]>
Co-authored-by: Fabian Wolter <[email protected]>
nemerdaud pushed a commit to nemerdaud/openhab-addons that referenced this pull request Feb 28, 2023
@markus7017 @fwolter @nemerdaud
[shelly] Plus 1/1PM Add-On support; fix roller pos on open/close state (
68322a4 
openhab#13520)

* Added openhab#13493 Plus 1/1PM addon support; Fixed openhab#13515 pos for roller in
open/close state; various null warnings removed; README updated

Signed-off-by: Markus Michels <[email protected]>

* digitalInput, analogInput and voltage added for Add-On; README updated

Signed-off-by: Markus Michels <[email protected]>

* shelly2-roller re-added (wrong assumption that Shelly 2 doesn't support
roller mode, because it has no power meter)

Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Markus Michels <[email protected]>

* Initialization for Californium 2.7.3 fixed (no multicast packets where
received)

Signed-off-by: Markus Michels <[email protected]>

* Analogous input support for Plus Addon changed; Allterco made a format
change in the beta firmware

Signed-off-by: Markus Michels <[email protected]>

* changes applied

Signed-off-by: Markus Michels <[email protected]>

* README updated; Shelly Plus addon handling adjusted to latest firmware
(before was beta)

Signed-off-by: Markus Michels <[email protected]>

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

Signed-off-by: Fabian Wolter <[email protected]>

* fix JSON for Shelly1 - ext_switch_enable is a boolean, not an int

Signed-off-by: Markus Michels <[email protected]>

Signed-off-by: Markus Michels <[email protected]>
Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Fabian Wolter <[email protected]>
Co-authored-by: Fabian Wolter <[email protected]>
@markus7017 markus7017 deleted the shelly_snapshot_3.4pr5 branch July 8, 2023 10:09
andrasU pushed a commit to andrasU/openhab-addons that referenced this pull request Jan 6, 2024
@markus7017 @fwolter @andrasU
[shelly] Plus 1/1PM Add-On support; fix roller pos on open/close state (
6bf0f4c 
openhab#13520)

* Added openhab#13493 Plus 1/1PM addon support; Fixed openhab#13515 pos for roller in
open/close state; various null warnings removed; README updated

Signed-off-by: Markus Michels <[email protected]>

* digitalInput, analogInput and voltage added for Add-On; README updated

Signed-off-by: Markus Michels <[email protected]>

* shelly2-roller re-added (wrong assumption that Shelly 2 doesn't support
roller mode, because it has no power meter)

Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Markus Michels <[email protected]>

* Initialization for Californium 2.7.3 fixed (no multicast packets where
received)

Signed-off-by: Markus Michels <[email protected]>

* Analogous input support for Plus Addon changed; Allterco made a format
change in the beta firmware

Signed-off-by: Markus Michels <[email protected]>

* changes applied

Signed-off-by: Markus Michels <[email protected]>

* README updated; Shelly Plus addon handling adjusted to latest firmware
(before was beta)

Signed-off-by: Markus Michels <[email protected]>

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

Signed-off-by: Fabian Wolter <[email protected]>

* fix JSON for Shelly1 - ext_switch_enable is a boolean, not an int

Signed-off-by: Markus Michels <[email protected]>

Signed-off-by: Markus Michels <[email protected]>
Signed-off-by: markus7017 <[email protected]>
Signed-off-by: Fabian Wolter <[email protected]>
Co-authored-by: Fabian Wolter <[email protected]>
Signed-off-by: Andras Uhrin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fwolter fwolter fwolter approved these changes

Assignees

@markus7017 markus7017

Labels
enhancement An enhancement or new feature for an existing add-on
Projects
None yet
Milestone
3.4
4 participants
@markus7017 @fwolter @lolodomo @openhab-bot