Updated com port logging. Update Ember library to fix synchronisation…

… issue. (#23) Signed-off-by: Chris Jackson <chris@cd-jackson.com>
openhab · Aug 15, 2017 · 974c26b · 974c26b · openhab-bot · Oct 1, 2017
1 parent efe126d
commit 974c26b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 6 deletions.
diff --git a/lib/com.zsmartsystems.zigbee-1.0.0-SNAPSHOT-sources.jar b/lib/com.zsmartsystems.zigbee-1.0.0-SNAPSHOT-sources.jar
diff --git a/lib/com.zsmartsystems.zigbee-1.0.0-SNAPSHOT.jar b/lib/com.zsmartsystems.zigbee-1.0.0-SNAPSHOT.jar
diff --git a/lib/com.zsmartsystems.zigbee.dongle.cc2531-1.0.0-SNAPSHOT-sources.jar b/lib/com.zsmartsystems.zigbee.dongle.cc2531-1.0.0-SNAPSHOT-sources.jar
diff --git a/lib/com.zsmartsystems.zigbee.dongle.cc2531-1.0.0-SNAPSHOT.jar b/lib/com.zsmartsystems.zigbee.dongle.cc2531-1.0.0-SNAPSHOT.jar
diff --git a/lib/com.zsmartsystems.zigbee.dongle.ember-1.0.0-SNAPSHOT-sources.jar b/lib/com.zsmartsystems.zigbee.dongle.ember-1.0.0-SNAPSHOT-sources.jar
diff --git a/lib/com.zsmartsystems.zigbee.dongle.ember-1.0.0-SNAPSHOT.jar b/lib/com.zsmartsystems.zigbee.dongle.ember-1.0.0-SNAPSHOT.jar
diff --git a/src/main/java/org/openhab/binding/zigbee/handler/ZigBeeCoordinatorEmberHandler.java b/src/main/java/org/openhab/binding/zigbee/handler/ZigBeeCoordinatorEmberHandler.java
@@ -18,6 +18,8 @@
 import org.eclipse.smarthome.core.thing.Bridge;
 import org.eclipse.smarthome.core.thing.ChannelUID;
 import org.eclipse.smarthome.core.thing.Thing;
+import org.eclipse.smarthome.core.thing.ThingStatus;
+import org.eclipse.smarthome.core.thing.ThingStatusDetail;
 import org.eclipse.smarthome.core.types.Command;
 import org.openhab.binding.zigbee.ZigBeeBindingConstants;
 import org.slf4j.Logger;
@@ -104,7 +106,7 @@ public void thingUpdated(Thing thing) {
     }
 
     private void openSerialPort(final String serialPortName, int baudRate) {
-        logger.info("Connecting to serial port [{}]", serialPortName);
+        logger.info("Connecting to serial port [{}] at {}", serialPortName, baudRate);
         try {
             CommPortIdentifier portIdentifier = CommPortIdentifier.getPortIdentifier(serialPortName);
             CommPort commPort = portIdentifier.open("org.openhab.binding.zigbee", 2000);
@@ -123,17 +125,20 @@ private void openSerialPort(final String serialPortName, int baudRate) {
 
             logger.info("Serial port [{}] is initialized.", portId);
         } catch (NoSuchPortException e) {
-            logger.error("Serial Error: Port {} does not exist", serialPortName);
+            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR,
+                    "Serial Error: Port" + serialPortName + " does not exist");
             return;
         } catch (PortInUseException e) {
-            logger.error("Serial Error: Port {} in use.", serialPortName);
+            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR,
+                    "Serial Error: Port" + serialPortName + " is in use");
             return;
         } catch (UnsupportedCommOperationException e) {
-            logger.error("Serial Error: Unsupported comm operation on Port {}.", serialPortName);
+            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR,
+                    "Serial Error: Unsupported comm operation on Port " + serialPortName);
             return;
         } catch (TooManyListenersException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR,
+                    "Serial Error: Too many listeners on Port " + serialPortName);
             return;
         }
 

diff --git a/src/main/java/org/openhab/binding/zigbee/handler/ZigBeeCoordinatorHandler.java b/src/main/java/org/openhab/binding/zigbee/handler/ZigBeeCoordinatorHandler.java
@@ -47,6 +47,7 @@
 import com.zsmartsystems.zigbee.ZigBeeNetworkNodeListener;
 import com.zsmartsystems.zigbee.ZigBeeNetworkStateListener;
 import com.zsmartsystems.zigbee.ZigBeeNode;
+import com.zsmartsystems.zigbee.internal.ZigBeeNetworkMeshMonitor;
 import com.zsmartsystems.zigbee.serialization.ZigBeeDeserializer;
 import com.zsmartsystems.zigbee.serialization.ZigBeeSerializer;
 import com.zsmartsystems.zigbee.transport.ZigBeeTransportState;
@@ -95,6 +96,7 @@ public abstract class ZigBeeCoordinatorHandler extends BaseBridgeHandler
 
     private ScheduledFuture<?> restartJob = null;
 
+    private ZigBeeNetworkMeshMonitor meshMonitor;
     private ZigBeeDiscoveryService discoveryService;
     private ServiceRegistration discoveryRegistration;
 
@@ -363,6 +365,10 @@ private void initialiseZigBee() {
         } catch (IllegalStateException e) {
             logger.debug("Error updating configuration", e);
         }
+
+        // Start the mesh monitor
+        meshMonitor = new ZigBeeNetworkMeshMonitor(networkManager);
+        meshMonitor.startup(86400);
     }
 
     // Create random network key