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

[myStrom] Add energy consumption since last API call channel for MyStrom Plug #15294

Merged
merged 9 commits into from
Jul 31, 2023
Merged

[myStrom] Add energy consumption since last API call channel for MyStrom Plug #15294

merged 9 commits into from
Jul 31, 2023

Conversation

grindfiner
Copy link
Contributor

@grindfiner grindfiner commented Jul 23, 2023 •
edited by jlaur
Loading

Closes #15030

@grindfiner
added missing Ws value for MyStrom Plug
91a6576 
Signed-off-by: grindfiner <125708464+grindfiner@users.noreply.github.com>
@grindfiner grindfiner requested a review from pail23 as a code owner July 23, 2023 10:16
@grindfiner grindfiner changed the title added missing Ws value for MyStrom Plug [myStrom] added missing Ws value for MyStrom Plug Jul 23, 2023
jlaur
jlaur requested changes Jul 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.

Thanks! In addition to my comments, please also update the README and add update instructions for the new channel. See https://www.openhab.org/docs/developer/bindings/thing-xml.html#updating-thing-types

bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/thing/thing-types.xml Outdated Show resolved Hide resolved
...b.binding.mystrom/src/main/java/org/openhab/binding/mystrom/internal/MyStromPlugHandler.java Outdated Show resolved Hide resolved
@jlaur jlaur changed the title [myStrom] added missing Ws value for MyStrom Plug [myStrom] Add missing Ws value for MyStrom Plug Jul 24, 2023
@jlaur jlaur added the enhancement An enhancement or new feature for an existing add-on label Jul 24, 2023
@grindfiner
adds README; changes channel type of Ws
93294a2 
Signed-off-by: grindfiner <125708464+grindfiner@users.noreply.github.com>
jlaur
jlaur requested changes Jul 25, 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 for the update. I have added some additional comments. After updating thing-types.xml, please regenerate the I18N properties file. See https://www.openhab.org/docs/developer/utils/i18n.html#generating-i18n-properties-file

bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/update/update.xml Outdated Show resolved Hide resolved
bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/update/update.xml Outdated Show resolved Hide resolved
bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/update/update.xml Outdated Show resolved Hide resolved
bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/update/update.xml Outdated Show resolved Hide resolved
bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/thing/thing-types.xml Outdated Show resolved Hide resolved
bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/thing/thing-types.xml Outdated Show resolved Hide resolved
bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/thing/thing-types.xml Outdated Show resolved Hide resolved
bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/thing/thing-types.xml Outdated Show resolved Hide resolved
@grindfiner grindfiner requested a review from jlaur July 25, 2023 22:08
grindfiner and others added 6 commits July 26, 2023 08:43
@grindfiner @jlaur
Update bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/…
ea6275c 
…thing/thing-types.xml

Co-authored-by: Jacob Laursen <jacob-github@vindvejr.dk>
Signed-off-by: grindfiner <125708464+grindfiner@users.noreply.github.com>
@grindfiner @jlaur
Update bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/…
7c7fff1 
…update/update.xml

Co-authored-by: Jacob Laursen <jacob-github@vindvejr.dk>
Signed-off-by: grindfiner <125708464+grindfiner@users.noreply.github.com>
@grindfiner @jlaur
Update bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/…
1da768d 
…update/update.xml

Co-authored-by: Jacob Laursen <jacob-github@vindvejr.dk>
Signed-off-by: grindfiner <125708464+grindfiner@users.noreply.github.com>
@grindfiner @jlaur
Update bundles/org.openhab.binding.mystrom/src/main/resources/OH-INF/…
160dbb4 
…thing/thing-types.xml

Co-authored-by: Jacob Laursen <jacob-github@vindvejr.dk>
Signed-off-by: grindfiner <125708464+grindfiner@users.noreply.github.com>
@grindfiner
changes ws-channel to energy-consumed-since-last-call-channel
34aed96 
Signed-off-by: grindfiner <125708464+grindfiner@users.noreply.github.com>
@grindfiner
fix thingTypeVersion property
869647f 
Signed-off-by: grindfiner <125708464+grindfiner@users.noreply.github.com>
jlaur
jlaur approved these changes Jul 30, 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

@jlaur jlaur changed the title [myStrom] Add missing Ws value for MyStrom Plug [myStrom] Add energy consumption since last API call channel for MyStrom Plug Jul 30, 2023
@jlaur
Copy link
Contributor

jlaur commented Jul 30, 2023 •
edited
Loading

@grindfiner - sorry, I see now that you are using a users.noreply.github.com e-mail address for the sign-off which is against policy: https://www.openhab.org/docs/developer/contributing.html#sign-your-work

Can I ask you to update the sign-offs to an e-mail address under which you can be reached?

@grindfiner
Copy link
Contributor Author

grindfiner commented Jul 30, 2023 •
edited
Loading

@grindfiner - sorry, I see now that you are using a users.noreply.github.com e-mail address for the sign-off which is against policy: https://www.openhab.org/docs/developer/contributing.html#sign-your-work

Can I ask you to update the sign-offs to an e-mail address under which you can be reached?

Oh, I didnt know that. I have researched on how to do this, but couldnt find anything that works. I have managed to change the last commit message but I dont know how to change all of them. Would the last commit be sufficient?

@jlaur
Copy link
Contributor

jlaur commented Jul 31, 2023

I have managed to change the last commit message but I dont know how to change all of them. Would the last commit be sufficient?

Sure, if you can push one commit that passes the DCO, I can use this for the merge commit.

@grindfiner
change instruction-set from update-channel to add-channel
ef4b6cc 
Signed-off-by: Tom Müller <tompetermueller01@gmail.com>
@grindfiner
Copy link
Contributor Author

I have force pushed the commit with my email and name. Please let me know if it´s fine now. Thanks!

@jlaur jlaur merged commit 27d784a into openhab:main Jul 31, 2023
@jlaur jlaur added this to the 4.1 milestone Jul 31, 2023
@jlaur jlaur mentioned this pull request Aug 1, 2023
Closed
Pshatsillo pushed a commit to Pshatsillo/openhab-addons that referenced this pull request Sep 29, 2023
@grindfiner @Pshatsillo
[myStrom] Add energy consumption since last API call channel for MySt…
0931659 
…rom Plug (openhab#15294)

* added missing Ws value for MyStrom Plug

Signed-off-by: Tom Müller <tompetermueller01@gmail.com>
austvik pushed a commit to austvik/openhab-addons that referenced this pull request Mar 27, 2024
@grindfiner @austvik
[myStrom] Add energy consumption since last API call channel for MySt…
abc51e3 
…rom Plug (openhab#15294)

* added missing Ws value for MyStrom Plug

Signed-off-by: Tom Müller <tompetermueller01@gmail.com>
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

@pail23 pail23 Awaiting requested review from pail23 pail23 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.1
Development

Successfully merging this pull request may close these issues.

[myStrom] Add missing „Ws“ value from report in MyStrom Switch / Smart Plug
2 participants
@grindfiner @jlaur