Incorporate review feedback #1

openhab · Nov 30, 2020 · 73b34d5 · 73b34d5
1 parent dcdb243
commit 73b34d5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/bundles/org.openhab.binding.modbus.sbc/README.md b/bundles/org.openhab.binding.modbus.sbc/README.md
@@ -15,12 +15,11 @@ This binding does not support discovery.
 
 ## Thing Configuration
 
-The following configuration parameters apply to `ald1Unidirectional` and `ald1Bidirectional`.
+The following configuration parameter applys to `ald1Unidirectional` and `ald1Bidirectional`.
 
 | Name          | Description                              | Type    | Required |
 |---------------|------------------------------------------|---------|----------|
-| address       | Modbus slave address of the energy meter | Integer | yes      |
-| pollIntervall | Time between polling the data in ms      | Integer | yes      |
+| pollInterval  | Time between polling the data in ms      | Integer | yes      |
 
 The Thing needs a Modbus serial slave Bridge to operate.
 

diff --git a/...binding.modbus.sbc/src/main/java/org/openhab/binding/modbus/sbc/internal/ALD1Handler.java b/...binding.modbus.sbc/src/main/java/org/openhab/binding/modbus/sbc/internal/ALD1Handler.java
@@ -66,7 +66,7 @@ public void initialize() {
             return;
         }
 
-        ModbusReadRequestBlueprint localBlueprint = blueprint = new ModbusReadRequestBlueprint(config.address,
+        ModbusReadRequestBlueprint localBlueprint = blueprint = new ModbusReadRequestBlueprint(getSlaveId(),
                 ModbusReadFunctionCode.READ_MULTIPLE_REGISTERS, FIRST_READ_ADDRESS - 1, READ_LENGTH, TRIES);
 
         updateStatus(ThingStatus.UNKNOWN);

diff --git a/...nding.modbus.sbc/src/main/java/org/openhab/binding/modbus/sbc/internal/ALD1Registers.java b/...nding.modbus.sbc/src/main/java/org/openhab/binding/modbus/sbc/internal/ALD1Registers.java
@@ -29,8 +29,8 @@
 @NonNullByDefault
 public enum ALD1Registers {
     TOTAL_ENERGY(0.01f, 28, UINT32, SmartHomeUnits.KILOWATT_HOUR),
-    PARTIAL_ENERGY(0.01f, 30, UINT32, SmartHomeUnits.KILOWATT_HOUR),
-    FEEDING_BACK_ENERGY(0.01f, 30, UINT32, SmartHomeUnits.KILOWATT_HOUR),
+    PARTIAL_ENERGY(0.01f, 30, UINT32, SmartHomeUnits.KILOWATT_HOUR), // only unidirectional meters
+    FEEDING_BACK_ENERGY(0.01f, 30, UINT32, SmartHomeUnits.KILOWATT_HOUR), // only bidirectional meters
     VOLTAGE(1, 36, UINT16, SmartHomeUnits.VOLT),
     CURRENT(0.1f, 37, UINT16, SmartHomeUnits.AMPERE),
     ACTIVE_POWER(10, 38, INT16, SmartHomeUnits.WATT),

diff --git a/bundles/org.openhab.binding.modbus.sbc/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.modbus.sbc/src/main/resources/OH-INF/config/config.xml
@@ -5,15 +5,9 @@
 	xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd">
 
 	<config-description uri="thing-type:modbus-sbc:ald1">
-		<parameter name="address" type="integer" required="true" min="1" max="247">
-			<label>Modbus Address</label>
-			<description>Modbus slave address of the energy meter.</description>
-			<default>1</default>
-		</parameter>
-
 		<parameter name="pollInterval" type="integer" required="true" min="100" unit="ms">
 			<label>Poll Interval</label>
-			<description>Time between polling the data.</description>
+			<description>Time between polling the data in ms.</description>
 			<default>5000</default>
 		</parameter>
 	</config-description>