[modbus][sunspec] Support for SunSpec meters #7441
Merged
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
This commit adds support for SunSpec compatible meters. They are auto discovered and handled as separate things even if they are part of another device. This is due to the nature of the SunSpec format wich also handles the different report types as different blocks. Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu>
Travis tests were successfulHey @mrbig, |
cpmeister
requested changes
Apr 22, 2020
...nspec/src/main/java/org/openhab/binding/modbus/sunspec/internal/parser/MeterModelParser.java
Outdated
Show resolved
Hide resolved
...org.openhab.binding.modbus.sunspec/src/main/resources/ESH-INF/thing/meter-channel-groups.xml
Outdated
Show resolved
Hide resolved
.../org.openhab.binding.modbus.sunspec/src/main/resources/ESH-INF/thing/meter-channel-types.xml
Outdated
Show resolved
Hide resolved
.../org.openhab.binding.modbus.sunspec/src/main/resources/ESH-INF/thing/meter-channel-types.xml
Outdated
Show resolved
Hide resolved
.../org.openhab.binding.modbus.sunspec/src/main/resources/ESH-INF/thing/meter-channel-types.xml
Outdated
Show resolved
Hide resolved
cpmeister
added
the
enhancement
Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu>
Travis tests were successfulHey @mrbig, |
cpmeister
reviewed
Apr 22, 2020
...s.sunspec/src/main/java/org/openhab/binding/modbus/sunspec/internal/dto/MeterModelBlock.java
Outdated
Show resolved
Hide resolved
This way we could get rid of ~250 loc. Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu>
…decimal dots Some older installations of OpenHAB returned this values incorrectly Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu>
Travis tests were successfulHey @mrbig, |
|
Please note, I've included one more quick fix that technically reverts this change It caused problems when this bundle was run on OH 2.5.3 and I didn't want to risk the same issue in release. |
|
Thanks again for reviewing and merging this! |
yfre
pushed a commit
to yfre/openhab-addons
that referenced
this pull request
Apr 27, 2020
* [sunspec] Support for SunSpec meters This commit adds support for SunSpec compatible meters. They are auto discovered and handled as separate things even if they are part of another device. This is due to the nature of the SunSpec format wich also handles the different report types as different blocks. * [sunspec] fixed file endings and missing unit declaration * [sunspec] meter block dto refactored This way we could get rid of ~250 loc. * [sunspec] make sure we don't fail if the address/block size contains decimal dots Some older installations of OpenHAB returned this values incorrectly Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu> Signed-off-by: Eugen Freiter <freiter@gmx.de>
LoungeFlyZ
pushed a commit
to LoungeFlyZ/openhab2-addons
that referenced
this pull request
Jun 8, 2020
* [sunspec] Support for SunSpec meters This commit adds support for SunSpec compatible meters. They are auto discovered and handled as separate things even if they are part of another device. This is due to the nature of the SunSpec format wich also handles the different report types as different blocks. * [sunspec] fixed file endings and missing unit declaration * [sunspec] meter block dto refactored This way we could get rid of ~250 loc. * [sunspec] make sure we don't fail if the address/block size contains decimal dots Some older installations of OpenHAB returned this values incorrectly Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu>
J-N-K
pushed a commit
to J-N-K/openhab-addons
that referenced
this pull request
Jul 14, 2020
* [sunspec] Support for SunSpec meters This commit adds support for SunSpec compatible meters. They are auto discovered and handled as separate things even if they are part of another device. This is due to the nature of the SunSpec format wich also handles the different report types as different blocks. * [sunspec] fixed file endings and missing unit declaration * [sunspec] meter block dto refactored This way we could get rid of ~250 loc. * [sunspec] make sure we don't fail if the address/block size contains decimal dots Some older installations of OpenHAB returned this values incorrectly Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu>
CSchlipp
pushed a commit
to CSchlipp/openhab-addons
that referenced
this pull request
Jul 26, 2020
* [sunspec] Support for SunSpec meters This commit adds support for SunSpec compatible meters. They are auto discovered and handled as separate things even if they are part of another device. This is due to the nature of the SunSpec format wich also handles the different report types as different blocks. * [sunspec] fixed file endings and missing unit declaration * [sunspec] meter block dto refactored This way we could get rid of ~250 loc. * [sunspec] make sure we don't fail if the address/block size contains decimal dots Some older installations of OpenHAB returned this values incorrectly Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu> Signed-off-by: CSchlipp <christian@schlipp.de>
andrewfg
pushed a commit
to andrewfg/openhab-addons
that referenced
this pull request
Aug 31, 2020
* [sunspec] Support for SunSpec meters This commit adds support for SunSpec compatible meters. They are auto discovered and handled as separate things even if they are part of another device. This is due to the nature of the SunSpec format wich also handles the different report types as different blocks. * [sunspec] fixed file endings and missing unit declaration * [sunspec] meter block dto refactored This way we could get rid of ~250 loc. * [sunspec] make sure we don't fail if the address/block size contains decimal dots Some older installations of OpenHAB returned this values incorrectly Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu>
andrewfg
pushed a commit
to andrewfg/openhab-addons
that referenced
this pull request
Aug 31, 2020
* [sunspec] Support for SunSpec meters This commit adds support for SunSpec compatible meters. They are auto discovered and handled as separate things even if they are part of another device. This is due to the nature of the SunSpec format wich also handles the different report types as different blocks. * [sunspec] fixed file endings and missing unit declaration * [sunspec] meter block dto refactored This way we could get rid of ~250 loc. * [sunspec] make sure we don't fail if the address/block size contains decimal dots Some older installations of OpenHAB returned this values incorrectly Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu>
andrewfg
pushed a commit
to andrewfg/openhab-addons
that referenced
this pull request
Aug 31, 2020
* [sunspec] Support for SunSpec meters This commit adds support for SunSpec compatible meters. They are auto discovered and handled as separate things even if they are part of another device. This is due to the nature of the SunSpec format wich also handles the different report types as different blocks. * [sunspec] fixed file endings and missing unit declaration * [sunspec] meter block dto refactored This way we could get rid of ~250 loc. * [sunspec] make sure we don't fail if the address/block size contains decimal dots Some older installations of OpenHAB returned this values incorrectly Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu>
andrewfg
pushed a commit
to andrewfg/openhab-addons
that referenced
this pull request
Aug 31, 2020
* [sunspec] Support for SunSpec meters This commit adds support for SunSpec compatible meters. They are auto discovered and handled as separate things even if they are part of another device. This is due to the nature of the SunSpec format wich also handles the different report types as different blocks. * [sunspec] fixed file endings and missing unit declaration * [sunspec] meter block dto refactored This way we could get rid of ~250 loc. * [sunspec] make sure we don't fail if the address/block size contains decimal dots Some older installations of OpenHAB returned this values incorrectly Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu>
DaanMeijer
pushed a commit
to DaanMeijer/openhab-addons
that referenced
this pull request
Sep 1, 2020
* [sunspec] Support for SunSpec meters This commit adds support for SunSpec compatible meters. They are auto discovered and handled as separate things even if they are part of another device. This is due to the nature of the SunSpec format wich also handles the different report types as different blocks. * [sunspec] fixed file endings and missing unit declaration * [sunspec] meter block dto refactored This way we could get rid of ~250 loc. * [sunspec] make sure we don't fail if the address/block size contains decimal dots Some older installations of OpenHAB returned this values incorrectly Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu> Signed-off-by: Daan Meijer <daan@studioseptember.nl>
markus7017
pushed a commit
to markus7017/openhab-addons
that referenced
this pull request
Sep 19, 2020
* [sunspec] Support for SunSpec meters This commit adds support for SunSpec compatible meters. They are auto discovered and handled as separate things even if they are part of another device. This is due to the nature of the SunSpec format wich also handles the different report types as different blocks. * [sunspec] fixed file endings and missing unit declaration * [sunspec] meter block dto refactored This way we could get rid of ~250 loc. * [sunspec] make sure we don't fail if the address/block size contains decimal dots Some older installations of OpenHAB returned this values incorrectly Signed-off-by: Nagy Attila Gabor <mrbig@sneaker.hu>
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 is the last of my PRs of the new modbus/sunspec binding. First PR is #6331. This is also a split of the legacy PR #4220
Related issue: #3216
This one introduces a new inverter type for smart meters. The specification handles 4 meter types, but they share a common dataset. The only difference is in that 2, 3 phase inverters use more registers.
As with the others I've organized the channels into channel group by phase, so the thing type descriptions could be simpler to maintain.
Raw data is first parsed by the MeterModelParser into simple (unitless) types, then MeterHandler scales them and matches them with the correct unit and channel.
Thank you