[shelly] Improved Motion Support, Support CoIoT Unicast, fixes #10220

markus7017 · 2021-02-23T19:06:40Z

The PR adds some improvements

New channels device#sensorSleepTime, sensor#motionAction for Shelly Motion, sensor#motionTimestamp fixed on CoAP updazes
Support for CoIoT Unicast (the Motion doesn't support Multicast anymore), works also for other devices
H&T device#charger fixed
Version strong was not updated on RESTARTED in call cases (timing)
some other optimizations

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

markus7017 · 2021-02-24T09:10:31Z

@fwolter Allterco updated their firmware, which brings an important feature - helps the users and reduces my support. I want to include this in this PR.

Nevertheless, could you please have a first look to the Code and give feedback on code structure. The is a bigger one and adds a complete new component org.openhab.binding.shelly.internal.manager. I tried to encapsulate as good as I can by having the is separate Component and a clear interface to the Thing handler (ShellyManagerInterface).

I would work on your feedback before starting the review. So far I set the WIP label.

fwolter · 2021-02-24T17:10:45Z

If these are features which are independent from each other, it would be better to split these and file another PR for the updated firmware.

markus7017 · 2021-02-24T18:45:45Z

@fwolter It's one new component Shelly Manager, which has SOME dependencies/changes in the base code, but the new Manager component depends on the changes in the base code. It's not "10 independent features in one PR"

fwolter · 2021-02-24T19:22:13Z

Ok. As the backlog is quite extensive, I'm afraid I can't review this in the short-term.

markus7017 · 2021-02-24T19:45:38Z

@fwolter would it help if I split it

Part I: Base changes and supporting stuff (html+images, updated readme) - yes, it goes into the bundle, but doesn't get visible to the user
Part II: Actual Shelly Manager component

I estimate Part I is about 1/3rd of the total

fwolter · 2021-02-24T20:54:14Z

It makes sense if the two parts are useable from each other independently. If the changes in the first part are useless without part II, it doesn't make sense to split it.

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

markus7017 · 2021-02-26T08:09:34Z

@fwolter I reduced the scope of this PR to include regular changes, but not the Manager
I kindly request to do the review on short-term so I get out of the sitioation that the PR doesn't matches the current development and I need to keep this branch up-to-date

sensorSleepTime is now adadvanced; Roller set position 0/100 is mapped to UP/DOWN; Reference to Shelly Manager removed from README Signed-off-by: Markus Michels <markus7017@gmail.com>

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

markus7017 · 2021-02-28T17:01:08Z

@fwolter does that work for you?

fwolter

There are some checkstyle warnings, which could be fixed easily.

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

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

...b.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/ShellyHandlerFactory.java

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

...enhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/util/ShellyUtils.java

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

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

restarted, README updated, moved channel sensorSleepTime from group device to sensors Signed-off-by: Markus Michels <markus7017@gmail.com>

markus7017 · 2021-03-03T06:55:04Z

@fwolter Review changes are applied, was able to fix 2 more bugs, nothing open know at the moment

fwolter

There are two zip files in this PR.

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

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

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

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

markus7017 · 2021-03-03T15:29:38Z

@fwolter Changes applied a) regex b) not the smartes idea to work on a copy of the documents :-), zip files removed

fwolter

LGTM

Great that you figured out the regex!

openhab-bot · 2021-03-03T17:43:13Z

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

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

markus7017 · 2021-03-05T19:12:33Z

@fwolter We spoke abozt the regex expression, could you help to define the pattern, which extracts the version, but also -rc2" as sub identifier, samples for version strings:

20210226-072307/v1.1.0@f31e1d2b
20201124-092159/v1.9.0@57ac4ad8
20210115-103919/v1.9.4@e2732e05
20210226-115010/v1.9.6-dimmer2@1873d25e
20210122-154345/v1.10.0-rc1@00eeaa9b
20210303-090126/v1.10.0-rc2-153-gd87589bc6-master
20210209-101435/v1.10.0-rc2-g0cf9ee3-heads/v1.10.0-rc2

Currently I have the following pattern: "v\d+\.\d+\.\d+"
things gets the version, but strips the "-rc1" or "-rc2" or "-dimmer2"

Feedback welcome

fwolter · 2021-03-05T19:44:40Z

v\d+\.\d+\.\d+(-[a-z0-9]*)? should work.

…ab#10220) * New feature: Shelly Manager Signed-off-by: Markus Michels <markus7017@gmail.com> * Removed Shelly Manager to reduce PR size (will be another PR) Signed-off-by: Markus Michels <markus7017@gmail.com> * CoIoT initialization handles new COIOT options for the device, sensorSleepTime is now adadvanced; Roller set position 0/100 is mapped to UP/DOWN; Reference to Shelly Manager removed from README Signed-off-by: Markus Michels <markus7017@gmail.com> * Nullpointer check added on settings.coiot (4Pro has this null) Signed-off-by: Markus Michels <markus7017@gmail.com> * README updated Signed-off-by: Markus Michels <markus7017@gmail.com> * Use regex to extract fw version from string, check fw version to detect restarted, README updated, moved channel sensorSleepTime from group device to sensors Signed-off-by: Markus Michels <markus7017@gmail.com> * Review changes Signed-off-by: Markus Michels <markus7017@gmail.com> Signed-off-by: John Marshall <john.marshall.au@gmail.com>

…ab#10220) * New feature: Shelly Manager Signed-off-by: Markus Michels <markus7017@gmail.com> * Removed Shelly Manager to reduce PR size (will be another PR) Signed-off-by: Markus Michels <markus7017@gmail.com> * CoIoT initialization handles new COIOT options for the device, sensorSleepTime is now adadvanced; Roller set position 0/100 is mapped to UP/DOWN; Reference to Shelly Manager removed from README Signed-off-by: Markus Michels <markus7017@gmail.com> * Nullpointer check added on settings.coiot (4Pro has this null) Signed-off-by: Markus Michels <markus7017@gmail.com> * README updated Signed-off-by: Markus Michels <markus7017@gmail.com> * Use regex to extract fw version from string, check fw version to detect restarted, README updated, moved channel sensorSleepTime from group device to sensors Signed-off-by: Markus Michels <markus7017@gmail.com> * Review changes Signed-off-by: Markus Michels <markus7017@gmail.com>

New feature: Shelly Manager

dcd96c5

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

markus7017 self-assigned this Feb 23, 2021

markus7017 added the enhancement An enhancement or new feature for an existing add-on label Feb 23, 2021

markus7017 linked an issue Feb 23, 2021 that may be closed by this pull request

[shelly] Shelly Manager - device monitoring, actions and firmware update #10216

Closed

markus7017 requested a review from fwolter February 23, 2021 19:08

markus7017 added the work in progress A PR that is not yet ready to be merged label Feb 24, 2021

Removed Shelly Manager to reduce PR size (will be another PR)

012b954

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

markus7017 added bug An unexpected problem or unintended behavior of an add-on and removed work in progress A PR that is not yet ready to be merged labels Feb 26, 2021

markus7017 removed a link to an issue Feb 26, 2021

[shelly] Shelly Manager - device monitoring, actions and firmware update #10216

Closed

CoIoT initialization handles new COIOT options for the device,

164233b

sensorSleepTime is now adadvanced; Roller set position 0/100 is mapped to UP/DOWN; Reference to Shelly Manager removed from README Signed-off-by: Markus Michels <markus7017@gmail.com>

markus7017 changed the title ~~[shelly] Shelly Manager~~ [shelly] Improved Motion support, CoIoT multicast, fixed Feb 27, 2021

Nullpointer check added on settings.coiot (4Pro has this null)

39f6112

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

fwolter requested changes Mar 1, 2021

View reviewed changes

markus7017 changed the title ~~[shelly] Improved Motion support, CoIoT multicast, fixed~~ [shelly] Improved Motion support, CoIoT multicast, fixes Mar 2, 2021

markus7017 added 2 commits March 2, 2021 07:55

README updated

88eecd4

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

Use regex to extract fw version from string, check fw version to detect

8df4604

restarted, README updated, moved channel sensorSleepTime from group device to sensors Signed-off-by: Markus Michels <markus7017@gmail.com>

markus7017 changed the title ~~[shelly] Improved Motion support, CoIoT multicast, fixes~~ [shelly] Improved Motion Support, Support CoIoT Unicast, fixes Mar 3, 2021

fwolter requested changes Mar 3, 2021

View reviewed changes

Review changes

546d0ba

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

fwolter approved these changes Mar 3, 2021

View reviewed changes

fwolter merged commit 3af0392 into openhab:main Mar 3, 2021

fwolter added this to the 3.1 milestone Mar 3, 2021

markus7017 deleted the shelly_snapshot3.1-3 branch March 5, 2021 19:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[shelly] Improved Motion Support, Support CoIoT Unicast, fixes #10220

[shelly] Improved Motion Support, Support CoIoT Unicast, fixes #10220

markus7017 commented Feb 23, 2021 •

edited

markus7017 commented Feb 24, 2021 •

edited

fwolter commented Feb 24, 2021

markus7017 commented Feb 24, 2021

fwolter commented Feb 24, 2021

markus7017 commented Feb 24, 2021

fwolter commented Feb 24, 2021

markus7017 commented Feb 26, 2021

markus7017 commented Feb 28, 2021

fwolter left a comment

markus7017 commented Mar 3, 2021

fwolter left a comment

markus7017 commented Mar 3, 2021

fwolter left a comment

openhab-bot commented Mar 3, 2021

markus7017 commented Mar 5, 2021

fwolter commented Mar 5, 2021

[shelly] Improved Motion Support, Support CoIoT Unicast, fixes #10220

[shelly] Improved Motion Support, Support CoIoT Unicast, fixes #10220

Conversation

markus7017 commented Feb 23, 2021 • edited

markus7017 commented Feb 24, 2021 • edited

fwolter commented Feb 24, 2021

markus7017 commented Feb 24, 2021

fwolter commented Feb 24, 2021

markus7017 commented Feb 24, 2021

fwolter commented Feb 24, 2021

markus7017 commented Feb 26, 2021

markus7017 commented Feb 28, 2021

fwolter left a comment

Choose a reason for hiding this comment

markus7017 commented Mar 3, 2021

fwolter left a comment

Choose a reason for hiding this comment

markus7017 commented Mar 3, 2021

fwolter left a comment

Choose a reason for hiding this comment

openhab-bot commented Mar 3, 2021

markus7017 commented Mar 5, 2021

fwolter commented Mar 5, 2021

markus7017 commented Feb 23, 2021 •

edited

markus7017 commented Feb 24, 2021 •

edited