fixed serial inter transaction delay

ssalonen · Feb 25, 2016 · 6f6f194 · 6f6f194
1 parent 10ab727
commit 6f6f194
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/...hab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/BaseModbusSlave.java b/...hab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/BaseModbusSlave.java
@@ -373,7 +373,6 @@ public void update(ModbusBinding binding) {
 
     /**
      * Updates OpenHAB item with data read from slave device
-     * works only for type "coil" and "holding"
      *
      * @param binding ModbusBinding
      * @param item item to update
@@ -402,7 +401,8 @@ private ModbusResponse getModbusData(ModbusRequest request) {
         try {
             connection = getConnection(endpoint);
             if (connection == null) {
-                logger.warn("ModbusSlave ({}) not connected -- aborting read request {}", name, request);
+                logger.warn("ModbusSlave ({}) not connected -- aborting read request {}. Endpoint {}", name, request,
+                        endpoint);
                 return null;
             }
             request.setUnitID(getId());
@@ -411,8 +411,9 @@ private ModbusResponse getModbusData(ModbusRequest request) {
             try {
                 transaction.execute();
             } catch (Exception e) {
-                logger.error("ModbusSlave ({}): Error getting modbus data for request {}. Error: {}", name, request,
-                        e.getMessage());
+                logger.error(
+                        "ModbusSlave ({}): Error getting modbus data for request {}. Error: {}. Endpoint {}. Connection: {}",
+                        name, request, e.getMessage(), endpoint, connection);
                 invalidate(endpoint, connection);
                 // Invalidated connections should not be returned
                 connection = null;
@@ -429,12 +430,6 @@ private ModbusResponse getModbusData(ModbusRequest request) {
         return response;
     }
 
-    // protected abstract boolean isConnected();
-    //
-    // protected abstract boolean connect();
-    //
-    // protected abstract void resetConnection();
-
     protected void onConnectionAcquire(ModbusSlaveConnection connection) {
     }
 

diff --git a/...in/java/org/openhab/binding/modbus/internal/pooling/ModbusSlaveConnectionFactoryImpl.java b/...in/java/org/openhab/binding/modbus/internal/pooling/ModbusSlaveConnectionFactoryImpl.java
@@ -95,9 +95,10 @@ public void activateObject(ModbusSlaveEndpoint endpoint, PooledObject<ModbusSlav
                             waited, config.getInterBorrowDelayMillis(), obj.getObject(), endpoint);
                 }
                 return;
+            } else {
+                // invariant: !connection.isConnected()
+                tryConnectDisconnected(endpoint, obj, connection, config);
             }
-            // invariant: !connection.isConnected()
-            tryConnectDisconnected(endpoint, obj, connection, config);
             lastBorrowMillis.put(endpoint, System.currentTimeMillis());
         } catch (Exception e) {
             logger.error("Error connecting connection {} for endpoint {}", obj.getObject(), endpoint, e.getMessage());