[dsmr] Add support for Austrian meters, Fix for channel id detection #11458
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ctra - M-bus channels are dynamic and present in the obis id. The binding had most channel types fixed because most of the time these channels are the same. However the device identifier is the same for multiple devices. But the binding only registered only one and while the channel id was derived from this obis data. For detected meters this resulted in the channel id to be the same if there are multiple devices. This change looks at the channel id to assign it to the found device. This is a bit tricky because the general device has no channel and has channels that have different id's. So the binding needs to cover that case. This change also adds some optional channels to the emucs electra meter. Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
Improved the work done in pr openhab#11193 Also-by: Thomas <thomas@knaller.info> Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
Hilbrand
added
bug
kaikreuzer
added
rebuild
fwolter
approved these changes
Oct 30, 2021
dschoepel
pushed a commit
to dschoepel/openhab-addons
that referenced
this pull request
Nov 9, 2021
…penhab#11458) * Fix fix for channel id detection, Added missing channels to emucs electra - M-bus channels are dynamic and present in the obis id. The binding had most channel types fixed because most of the time these channels are the same. However the device identifier is the same for multiple devices. But the binding only registered only one and while the channel id was derived from this obis data. For detected meters this resulted in the channel id to be the same if there are multiple devices. This change looks at the channel id to assign it to the found device. This is a bit tricky because the general device has no channel and has channels that have different id's. So the binding needs to cover that case. This change also adds some optional channels to the emucs electra meter. Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl> * [dsmr] Add support for Austrian meters Improved the work done in pr openhab#11193 Also-by: Thomas <thomas@knaller.info> Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl> * [dsmr] Added Null handling annotations. Signed-off-by: Dave J Schoepel <dave@theschoepels.com>
jpg0
pushed a commit
to jpg0/openhab-addons
that referenced
this pull request
Nov 10, 2021
…penhab#11458) * Fix fix for channel id detection, Added missing channels to emucs electra - M-bus channels are dynamic and present in the obis id. The binding had most channel types fixed because most of the time these channels are the same. However the device identifier is the same for multiple devices. But the binding only registered only one and while the channel id was derived from this obis data. For detected meters this resulted in the channel id to be the same if there are multiple devices. This change looks at the channel id to assign it to the found device. This is a bit tricky because the general device has no channel and has channels that have different id's. So the binding needs to cover that case. This change also adds some optional channels to the emucs electra meter. Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl> * [dsmr] Add support for Austrian meters Improved the work done in pr openhab#11193 Also-by: Thomas <thomas@knaller.info> Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl> * [dsmr] Added Null handling annotations.
NickWaterton
pushed a commit
to NickWaterton/openhab-addons
that referenced
this pull request
Dec 30, 2021
…penhab#11458) * Fix fix for channel id detection, Added missing channels to emucs electra - M-bus channels are dynamic and present in the obis id. The binding had most channel types fixed because most of the time these channels are the same. However the device identifier is the same for multiple devices. But the binding only registered only one and while the channel id was derived from this obis data. For detected meters this resulted in the channel id to be the same if there are multiple devices. This change looks at the channel id to assign it to the found device. This is a bit tricky because the general device has no channel and has channels that have different id's. So the binding needs to cover that case. This change also adds some optional channels to the emucs electra meter. Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl> * [dsmr] Add support for Austrian meters Improved the work done in pr openhab#11193 Also-by: Thomas <thomas@knaller.info> Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl> * [dsmr] Added Null handling annotations. Signed-off-by: Nick Waterton <n.waterton@outlook.com>
nemerdaud
pushed a commit
to nemerdaud/openhab-addons
that referenced
this pull request
Jan 28, 2022
…penhab#11458) * Fix fix for channel id detection, Added missing channels to emucs electra - M-bus channels are dynamic and present in the obis id. The binding had most channel types fixed because most of the time these channels are the same. However the device identifier is the same for multiple devices. But the binding only registered only one and while the channel id was derived from this obis data. For detected meters this resulted in the channel id to be the same if there are multiple devices. This change looks at the channel id to assign it to the found device. This is a bit tricky because the general device has no channel and has channels that have different id's. So the binding needs to cover that case. This change also adds some optional channels to the emucs electra meter. Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl> * [dsmr] Add support for Austrian meters Improved the work done in pr openhab#11193 Also-by: Thomas <thomas@knaller.info> Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl> * [dsmr] Added Null handling annotations.
marcfischerboschio
pushed a commit
to bosch-io/openhab-addons
that referenced
this pull request
May 5, 2022
…penhab#11458) * Fix fix for channel id detection, Added missing channels to emucs electra - M-bus channels are dynamic and present in the obis id. The binding had most channel types fixed because most of the time these channels are the same. However the device identifier is the same for multiple devices. But the binding only registered only one and while the channel id was derived from this obis data. For detected meters this resulted in the channel id to be the same if there are multiple devices. This change looks at the channel id to assign it to the found device. This is a bit tricky because the general device has no channel and has channels that have different id's. So the binding needs to cover that case. This change also adds some optional channels to the emucs electra meter. Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl> * [dsmr] Add support for Austrian meters Improved the work done in pr openhab#11193 Also-by: Thomas <thomas@knaller.info> Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl> * [dsmr] Added Null handling annotations.
andan67
pushed a commit
to andan67/openhab-addons
that referenced
this pull request
Nov 6, 2022
…penhab#11458) * Fix fix for channel id detection, Added missing channels to emucs electra - M-bus channels are dynamic and present in the obis id. The binding had most channel types fixed because most of the time these channels are the same. However the device identifier is the same for multiple devices. But the binding only registered only one and while the channel id was derived from this obis data. For detected meters this resulted in the channel id to be the same if there are multiple devices. This change looks at the channel id to assign it to the found device. This is a bit tricky because the general device has no channel and has channels that have different id's. So the binding needs to cover that case. This change also adds some optional channels to the emucs electra meter. Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl> * [dsmr] Add support for Austrian meters Improved the work done in pr openhab#11193 Also-by: Thomas <thomas@knaller.info> Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl> * [dsmr] Added Null handling annotations.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pr contains 2 changes (and some style improvements)
M-bus channels are dynamic and present in the obis id.
The binding had most channel types fixed because most of the time these channels are the same.
However the device identifier is the same for multiple devices.
But the binding only registered only one and while the channel id was derived from this obis data.
For detected meters this resulted in the channel id to be the same if there are multiple devices.
This change looks at the channel id to assign it to the found device.
This is a bit tricky because the general device has no channel and has channels that have different id's.
So the binding needs to cover that case.
Added missing channels to emucs electra that where triggered by the unit tests after this fix.