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

[modbus] Clarifying error messages with invalid configuration (#11292) 

Resolves #10814

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
This commit is contained in:
Sami Salonen 2021-10-11 13:41:35 +03:00 committed by GitHub
parent 01c0b199fd
commit 22e8a37ee9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java
View File

@ -718,11 +718,14 @@ public class ModbusDataThingHandler extends BaseThingHandler {
} }
if (valueTypeBitCount >= 16 && readSubIndex.isPresent()) { if (valueTypeBitCount >= 16 && readSubIndex.isPresent()) {
String errmsg = String String errmsg = String.format(
.format("readStart=X.Y is not allowed to be used with value types larger than 16bit!"); "readStart=X.Y notation is not allowed to be used with value types larger than 16bit! Use readStart=X instead.");
throw new ModbusConfigurationException(errmsg); throw new ModbusConfigurationException(errmsg);
} else if (!bitQuery && valueTypeBitCount < 16 && !readSubIndex.isPresent()) { } else if (!bitQuery && valueTypeBitCount < 16 && !readSubIndex.isPresent()) {
String errmsg = String.format("readStart=X.Y must be used with value types less than 16bit!"); // User has specified value type which is less than register width (16 bits).
// readStart=X.Y notation must be used to define which data to extract from the 16 bit register.
String errmsg = String
.format("readStart=X.Y must be used with value types (readValueType) less than 16bit!");
throw new ModbusConfigurationException(errmsg); throw new ModbusConfigurationException(errmsg);
} else if (readSubIndex.isPresent() && (readSubIndex.get() + 1) * valueTypeBitCount > 16) { } else if (readSubIndex.isPresent() && (readSubIndex.get() + 1) * valueTypeBitCount > 16) {
// the sub index Y (in X.Y) is above the register limits // the sub index Y (in X.Y) is above the register limits