Skip to content

Commit c5d210b

Browse files
committed
First working integration test
1 parent 4d06ad9 commit c5d210b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

modules/hivemq-edge-module-modbus/src/main/java/com/hivemq/edge/adapters/modbus/ModbusProtocolAdapter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.hivemq.edge.adapters.modbus;
1717

18-
import com.digitalpetri.modbus.ModbusResponseException;
1918
import com.hivemq.adapter.sdk.api.ProtocolAdapterInformation;
2019
import com.hivemq.adapter.sdk.api.data.DataPoint;
2120
import com.hivemq.adapter.sdk.api.discovery.NodeTree;
@@ -60,7 +59,6 @@
6059

6160
public class ModbusProtocolAdapter implements PollingProtocolAdapter<ModbusToMqttMapping> {
6261
private static final Logger log = LoggerFactory.getLogger(ModbusProtocolAdapter.class);
63-
private final @NotNull Object lock = new Object();
6462
private final @NotNull ProtocolAdapterInformation adapterInformation;
6563
private final @NotNull ModbusAdapterConfig adapterConfig;
6664
private final @NotNull ProtocolAdapterState protocolAdapterState;
@@ -101,8 +99,8 @@ public void stop(@NotNull final ProtocolAdapterStopInput input, @NotNull final P
10199
.disconnect()
102100
.whenComplete((unused,t) -> {
103101
if(t == null) {
104-
protocolAdapterState.setConnectionStatus(DISCONNECTED);
105102
output.stoppedSuccessfully();
103+
protocolAdapterState.setConnectionStatus(DISCONNECTED);
106104
} else {
107105
output.failStop(t, "Error encountered closing connection to Modbus device.");
108106
}
@@ -116,6 +114,7 @@ public void poll(
116114

117115
//-- If a previously linked job has terminally disconnected the client
118116
//-- we need to ensure any orphaned jobs tidy themselves up properly
117+
119118
readRegisters(pollingInput.getPollingContext(), modbusClient)
120119
.whenComplete((modbusdata, throwable) -> {
121120
if (throwable != null) {

modules/hivemq-edge-module-modbus/src/main/java/com/hivemq/edge/adapters/modbus/impl/ModbusClient.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public CompletableFuture<Void> connect() {
107107
* Holding registers are 16bit.
108108
*/
109109
public @NotNull CompletableFuture<DataPoint> readHoldingRegisters(final int startIdx, final int count, final @NotNull ModbusDataType dataType, final int unitId) {
110+
110111
return modbusClient
111112
.<ReadHoldingRegistersResponse>sendRequest(new ReadHoldingRegistersRequest(startIdx, Math.min(count,
112113
DEFAULT_MAX_INPUT_REGISTERS)), unitId)

0 commit comments

Comments
 (0)