-
-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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.
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
[dsmr] Fix delivery demand labels #16739
Conversation
Signed-off-by: Leo Siepel <leosiepel@gmail.com>
Let's wait for @coop-git feedback. |
@lsiepel - no update instructions needed? |
I won't expect anyone to notice as it is just a label for a new channel in one milestone. But maybe better to do it anyway. I can come up with a commit later today. |
In that case probably not worth it, since just a regression from a recently merged PR only available in snapshot builds. I guess the real question then is: No update instructions needed for #15038? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM to show the correct wordings.
I will verify the whole setup later.
Signed-off-by: Leo Siepel <leosiepel@gmail.com>
Added them as they are needed for sure. Only users who downloaded a snapshot and re-created the thing will get a log entry, but that is acceptable. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems there is some mixup in the update instructions?
bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/update/instructions.xml
Outdated
Show resolved
Hide resolved
<properties> | ||
<property name="thingTypeVersion">1</property> | ||
</properties> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe you added this property to the wrong thing type. It should be added to thing id electricity_emucs_v1_0
in file meter_electricity_emucs_v1_0.xml
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
<add-channel id="emeter_actual_demand"> | ||
<type>dsmr:actualDeliveryBelgiumType</type> | ||
</add-channel> | ||
<add-channel id="emeter_maximum_demand_current_month"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to provide the label here as well, since the channel overrides it from its channel type.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see, wasn't aware, thanks.
Signed-off-by: Leo Siepel <leosiepel@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@jlaur 's comments were all handled. Lets merge this PR now to have it in milestone 3. |
* Fix delivery demand labels * Add upgrade instructions Signed-off-by: Leo Siepel <leosiepel@gmail.com>
* Fix delivery demand labels * Add upgrade instructions Signed-off-by: Leo Siepel <leosiepel@gmail.com>
Regression of: #15038 (label names and update instructions)
Fixes: #16731