Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[tr064] Adds new channels for DSL Max & Current Down-/Upstream Rate #9519

Merged
merged 1 commit into from Dec 25, 2020
Merged

[tr064] Adds new channels for DSL Max & Current Down-/Upstream Rate #9519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions bundles/org.openhab.binding.tr064/README.md
View file
Open in desktop
Expand Up @@ -78,12 +78,16 @@ This is an optional parameter and multiple values are allowed.
| `callList` | `String` | x | A string containing the call list as JSON (see below) |
| `deviceLog` | `String` | x | A string containing the last log messages |
| `dslCRCErrors` | `Number:Dimensionless` | x | DSL CRC Errors |
| `dslDownstreamMaxRate` | `Number:DataTransferRate` | x | DSL Max Downstream Rate |
| `dslDownstreamCurrRate` | `Number:DataTransferRate` | x | DSL Curr. Downstream Rate |
| `dslDownstreamNoiseMargin` | `Number:Dimensionless` | x | DSL Downstream Noise Margin |
| `dslDownstreamAttenuation` | `Number:Dimensionless` | x | DSL Downstream Attenuation |
| `dslEnable` | `Switch` | | DSL Enable |
| `dslFECErrors` | `Number:Dimensionless` | x | DSL FEC Errors |
| `dslHECErrors` | `Number:Dimensionless` | x | DSL HEC Errors |
| `dslStatus` | `Switch` | | DSL Status |
| `dslUpstreamMaxRate` | `Number:DataTransferRate` | x | DSL Max Upstream Rate |
| `dslUpstreamCurrRate` | `Number:DataTransferRate` | x | DSL Curr. Upstream Rate |
| `dslUpstreamNoiseMargin` | `Number:Dimensionless` | x | DSL Upstream Noise Margin |
| `dslUpstreamAttenuation` | `Number:Dimensionless` | x | DSL Upstream Attenuation |
| `inboundCalls` | `Number` | x | Number of inbound calls within the given number of days. |
Expand Down
3 changes: 3 additions & 0 deletions ...nding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPValueConverter.java
View file
Open in desktop
Expand Up @@ -85,6 +85,7 @@ public Optional<String> getSOAPValueFromCommand(Command command, String dataType
switch (dataType) {
case "ui2":
return Optional.of(String.valueOf(value.shortValue()));
case "i4":
case "ui4":
return Optional.of(String.valueOf(value.intValue()));
default:
Expand All @@ -94,6 +95,7 @@ public Optional<String> getSOAPValueFromCommand(Command command, String dataType
switch (dataType) {
case "ui2":
return Optional.of(String.valueOf(value.shortValue()));
case "i4":
case "ui4":
return Optional.of(String.valueOf(value.intValue()));
default:
Expand Down Expand Up @@ -132,6 +134,7 @@ public Optional<State> getStateFromSOAPValue(SOAPMessage soapMessage, String ele
case "string":
return new StringType(rawValue);
case "ui2":
case "i4":
case "ui4":
if (!unit.isEmpty()) {
return new QuantityType<>(rawValue + " " + unit);
Expand Down
24 changes: 24 additions & 0 deletions bundles/org.openhab.binding.tr064/src/main/resources/channels.xml
View file
Open in desktop
Expand Up @@ -194,6 +194,30 @@
serviceId="urn:WANDSLIfConfig-com:serviceId:WANDSLInterfaceConfig1"/>
<getAction name="GetInfo" argument="NewStatus"/>
</channel>
<channel name="dslDownstreamMaxRate" label="DSL Max Downstream Rate">
<item type="Number:DataTransferRate" unit="kbit/s" statePattern="%.1f Mbit/s"/>
<service deviceType="urn:dslforum-org:device:WANDevice:1"
serviceId="urn:WANDSLIfConfig-com:serviceId:WANDSLInterfaceConfig1"/>
<getAction name="GetInfo" argument="NewDownstreamMaxRate"/>
</channel>
<channel name="dslUpstreamMaxRate" label="DSL Max Upstream Rate">
<item type="Number:DataTransferRate" unit="kbit/s" statePattern="%.1f Mbit/s"/>
<service deviceType="urn:dslforum-org:device:WANDevice:1"
serviceId="urn:WANDSLIfConfig-com:serviceId:WANDSLInterfaceConfig1"/>
<getAction name="GetInfo" argument="NewUpstreamMaxRate"/>
</channel>
<channel name="dslDownstreamCurrRate" label="DSL Curr. Downstream Rate">
<item type="Number:DataTransferRate" unit="kbit/s" statePattern="%.1f Mbit/s"/>
<service deviceType="urn:dslforum-org:device:WANDevice:1"
serviceId="urn:WANDSLIfConfig-com:serviceId:WANDSLInterfaceConfig1"/>
<getAction name="GetInfo" argument="NewDownstreamCurrRate"/>
</channel>
<channel name="dslUpstreamCurrRate" label="DSL Curr. Upstream Rate">
<item type="Number:DataTransferRate" unit="kbit/s" statePattern="%.1f Mbit/s"/>
<service deviceType="urn:dslforum-org:device:WANDevice:1"
serviceId="urn:WANDSLIfConfig-com:serviceId:WANDSLInterfaceConfig1"/>
<getAction name="GetInfo" argument="NewUpstreamCurrRate"/>
</channel>
<channel name="dslDownstreamNoiseMargin" label="DSL Downstream Noise Margin">
<item type="Number:Dimensionless" unit="dB" statePattern="%.1f dB"/>
<service deviceType="urn:dslforum-org:device:WANDevice:1"
Expand Down