[shelly] Add support for Gen4 devices

[markus7017]

• Adds support for Gen4 Devices: Plus 1/1PM, Mini 1/1PM/EM, Pro 2PM, Plus Power Strip 4
• Some Gen4 devices are providing the measure frequency (new channel)
• README updated/fixed

Closing

• [shelly] Add support for Shelly 1/1PM Gen4 #18784
• [shelly] Add support for Shelly Mini 1/1PM and EM (former PM) #18785
• [shelly] Add support for Shelly Plus 2PM Gen4 #18921
• [shelly] Add support for Shelly Plus Power Strip 4 #18919

Waiting on #18902

[openhab-bot]

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

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

[jlaur]

This PR includes the code from #18775. It should be merged first, and this PR should then be rebased.

[markus7017]

I created a new PR ##18790, which should also be merged before this one. It separates the Plus 2PM fix and might also serve as back port to 4.3.x

After PR #18775 and #18790 are merged I do a rebase here.

[markus7017]

@mstormi requested to carve-out the 1.6.1 work around and do a backport to 4.3.x, which I support

I'll create another PR soon

See #18797

[lsiepel]

Please fix conflicts

[markus7017]

@jlaur I rebased, verified Pro 2+Pro 3 and it looks good.

[jlaur]

New comments added.

[markus7017]

@jlaur anything else?

[jlaur]

anything else?

Still this: https://github.com/openhab/openhab-addons/pull/18782/files#r2187012965

[markus7017]

anything else?

Still this: https://github.com/openhab/openhab-addons/pull/18782/files#r2187012965

I have no clue how to do that. I tried rebase etc., but it still shows up as a change
Could you please give advise

[jlaur]

I have no clue how to do that. I tried rebase etc., but it still shows up as a change
Could you please give advise

I don't know your fork and processes, so it's a bit hard for me to help. Your main branch does look strange to me though:
https://github.com/markus7017/openhab-addons/tree/main

Why is it 792 commits behind? Are you using this branch as your base branch?

[jlaur]

Why is it 792 commits behind? Are you using this branch as your base branch?

If indeed this is your base branch for creating new PR branches, then you are severely out of sync, and you are not using current code. So my advise is to bring the main branch in your fork back in sync, like you see mine here:

And then rebase as previously explained.

I guess this might also explain why your PR's often tend to overwrite/revert code from other branches?

[jlaur]

If indeed this is your base branch for creating new PR branches

You branch shelly_gen4-2 does look much closer to the upstream main branch though in the openhab/openhab-addons repository: main...markus7017:openhab-addons:shelly_gen4-2

I don't know how you manage this without having your fork's main branch as base (in between). But when looking at commits ahead of, you see some commits that are unrelated. So somehow you will need to get rid of them. Perhaps you can try an interactive rebase and simply drop them, but I don't know what will be the end result of that, given this (for me) strange setup.

The commit 200bb03 seems problematic, but it also contains other changes than those that should not be part of this PR.

[markus7017]

ok, option b) I close this PR and open a new one just including the final changes

[markus7017]

found it!! stupid,
one had a different comment, one was a duplicate

[jlaur]

Otherwise LGTM.

[jlaur]

LGTM