public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[tr064] fix comment in SOAP request (#9671) 

* fix comment in SAOP request
* fix typo in channel-name

Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
This commit is contained in:
J-N-K 2021-01-03 18:46:50 +01:00 committed by GitHub
parent 0fdf1e34c3
commit bebc76e452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/util/Util.java
View File

@ -219,7 +219,8 @@ public class Util {
parameters.forEach(parameter -> { parameters.forEach(parameter -> {
// remove comment: split parameter at '#', discard everything after that and remove // remove comment: split parameter at '#', discard everything after that and remove
// trailing spaces // trailing spaces
String normalizedParameter = UIDUtils.encode(parameter.split("#")[0].trim()); String rawParameter = parameter.split("#")[0].trim();
String normalizedParameter = UIDUtils.encode(rawParameter);
ChannelUID channelUID = new ChannelUID(thing.getUID(), ChannelUID channelUID = new ChannelUID(thing.getUID(),
channelId + "_" + normalizedParameter); channelId + "_" + normalizedParameter);
ChannelBuilder channelBuilder = ChannelBuilder ChannelBuilder channelBuilder = ChannelBuilder
@ -228,7 +229,7 @@ public class Util {
.withLabel(channelTypeDescription.getLabel() + " " + parameter); .withLabel(channelTypeDescription.getLabel() + " " + parameter);
thingBuilder.withChannel(channelBuilder.build()); thingBuilder.withChannel(channelBuilder.build());
Tr064ChannelConfig channelConfig1 = new Tr064ChannelConfig(channelConfig); Tr064ChannelConfig channelConfig1 = new Tr064ChannelConfig(channelConfig);
channelConfig1.setParameter(parameter); channelConfig1.setParameter(rawParameter);
channels.put(channelUID, channelConfig1); channels.put(channelUID, channelConfig1);
}); });
} }

2
bundles/org.openhab.binding.tr064/src/main/resources/channels.xml
View File

@ -236,7 +236,7 @@
serviceId="urn:WANDSLIfConfig-com:serviceId:WANDSLInterfaceConfig1"/> serviceId="urn:WANDSLIfConfig-com:serviceId:WANDSLInterfaceConfig1"/>
<getAction name="GetInfo" argument="NewDownstreamAttenuation"/> <getAction name="GetInfo" argument="NewDownstreamAttenuation"/>
</channel> </channel>
<channel name="dslUpstreamAttentuation" label="DSL Upstream Attenuation"> <channel name="dslUpstreamAttenuation" label="DSL Upstream Attenuation">
<item type="Number:Dimensionless" unit="dB" statePattern="%.1f dB"/> <item type="Number:Dimensionless" unit="dB" statePattern="%.1f dB"/>
<service deviceType="urn:dslforum-org:device:WANDevice:1" <service deviceType="urn:dslforum-org:device:WANDevice:1"
serviceId="urn:WANDSLIfConfig-com:serviceId:WANDSLInterfaceConfig1"/> serviceId="urn:WANDSLIfConfig-com:serviceId:WANDSLInterfaceConfig1"/>