[ism8] Add UoM support #14206
[ism8] Add UoM support #14206
Conversation
Signed-off-by: lsiepel <leosiepel@gmail.com>
lsiepel
added
enhancement
Signed-off-by: lsiepel <leosiepel@gmail.com>
Signed-off-by: lsiepel <leosiepel@gmail.com>
Signed-off-by: lsiepel <leosiepel@gmail.com>
|
As this is a breaking change, did you think of adding a note to update.lst in distro repo? |
add breaking change alert for ISM8 related to: openhab/openhab-addons#14206
Yeah, thought about it, never done that before, hope it is right. |
|
Wanted to add the |
There is no documentation: openhab/openhab-core#3330 (comment) A few sources for information: |
Now there is: https://next.openhab.org/docs/developer/bindings/thing-xml.html#updating-thing-types |
Oke, i have read some more and used it elsewhere. So i can understand the basics, but now this binding is different, it adds the channels during setup dynamically. I have this problem with the following scenario: If not, this PR is ready to review/merge and the breaking change PR will still be needed. Edit: @jlaur would be nice if you can advice on how to proceed with the upgrade instructions. As there is not a 1:1 relation between old and new channels-types. |
|
@openhab/add-ons-maintainers This PR has been tested and confirmed to be working as expected. Can we get this merged? |
|
Seen some other PR's and for those cases when channels where automatically added the thing upgrade was not needed. So i think this is all set now. |
...openhab.binding.ism8/src/main/java/org/openhab/binding/ism8/internal/util/Ism8DomainMap.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Leo Siepel <leosiepel@gmail.com>
Signed-off-by: Leo Siepel <leosiepel@gmail.com>
Signed-off-by: Leo Siepel <leosiepel@gmail.com>
|
@openhab/add-ons-maintainers It would be nice to have this available in 4.2 M1 Anyone able to review ? |
| /** | ||
| * Channel id configuration parameter | ||
| * | ||
| */ |
There was a problem hiding this comment.
| /** | |
| * Channel id configuration parameter | |
| * | |
| */ |
|
|
||
| @Override | ||
| public void handleCommand(ChannelUID channelUID, Command command) { | ||
| this.logger.debug("Ism8: Handle command = {} {}", channelUID.getId(), command); |
There was a problem hiding this comment.
| this.logger.debug("Ism8: Handle command = {} {}", channelUID.getId(), command); | |
| logger.debug("Ism8: Handle command = {} {}", channelUID.getId(), command); |
| return true; | ||
| } | ||
| } catch (NumberFormatException e) { | ||
| this.logger.warn( |
There was a problem hiding this comment.
| this.logger.warn( | |
| logger.warn( |
| description, config); | ||
| } | ||
| } else { | ||
| this.logger.debug("Ism8: ID or type missing - Channel={} Cfg={}", description, config); |
There was a problem hiding this comment.
| this.logger.debug("Ism8: ID or type missing - Channel={} Cfg={}", description, config); | |
| logger.debug("Ism8: ID or type missing - Channel={} Cfg={}", description, config); |
| try { | ||
| svr.sendData(Ism8DomainMap.toISM8WriteData(dataPoint, command)); | ||
| } catch (IOException e) { | ||
| this.logger.debug("Writting to Ism8 DataPoint '{}' failed. '{}'", dataPoint.getId(), e.getMessage()); |
There was a problem hiding this comment.
| this.logger.debug("Writting to Ism8 DataPoint '{}' failed. '{}'", dataPoint.getId(), e.getMessage()); | |
| logger.debug("Writing to Ism8 DataPoint '{}' failed. '{}'", dataPoint.getId(), e.getMessage()); |
| e.getMessage()); | ||
| } | ||
| } else { | ||
| this.logger.debug("Ism8: ID or type missing - Channel={} Cfg={}", channel.getLabel(), |
There was a problem hiding this comment.
| this.logger.debug("Ism8: ID or type missing - Channel={} Cfg={}", channel.getLabel(), | |
| logger.debug("Ism8: ID or type missing - Channel={} Cfg={}", channel.getLabel(), |
| int id = Integer.parseInt(channel.getConfiguration().get(CHANNEL_CONFIG_ID).toString()); | ||
| if (id == dataPoint.getId()) { | ||
| if (dataPoint.getValueObject() != null) { | ||
| this.logger.debug("Ism8: updating channel {} with datapoint: {}", channel.getUID().getAsString(), |
There was a problem hiding this comment.
| this.logger.debug("Ism8: updating channel {} with datapoint: {}", channel.getUID().getAsString(), | |
| logger.debug("Ism8: updating channel {} with datapoint: {}", channel.getUID().getAsString(), |
| return true; | ||
| } | ||
| } else { | ||
| this.logger.debug("Ism8 channel: {} and DataPoint do not have a matching Id: {} vs {}", |
There was a problem hiding this comment.
| this.logger.debug("Ism8 channel: {} and DataPoint do not have a matching Id: {} vs {}", | |
| logger.debug("Ism8 channel: {} and DataPoint do not have a matching Id: {} vs {}", |
| channel.getUID(), id, dataPoint.getId()); | ||
| } | ||
| } catch (NumberFormatException e) { | ||
| this.logger.warn( |
There was a problem hiding this comment.
| this.logger.warn( | |
| logger.warn( |
| } | ||
| } | ||
| } | ||
| this.logger.debug("Ism8: no channel was found for DataPoint id: {}", dataPoint.getId()); |
There was a problem hiding this comment.
| this.logger.debug("Ism8: no channel was found for DataPoint id: {}", dataPoint.getId()); | |
| logger.debug("Ism8: no channel was found for DataPoint id: {}", dataPoint.getId()); |
Signed-off-by: Leo Siepel <leosiepel@gmail.com>
* Add UoM support Signed-off-by: lsiepel <leosiepel@gmail.com> Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
Signed-off-by: lsiepel leosiepel@gmail.com
Due to the change in channels, this is not backwards compatible. Channel configuration and linked Items have to be adapted.
Test jar for 3.4.1 is available here: https://1drv.ms/u/s!AnMcxmvEeupwjp4L347Q22cnMI1QQg?e=ROo8Y1
Tests have been performed by @schmidmuc (thanks for that!)
Fixes: #9598
Also replaces: #14665