minor fixes

openhab · Mar 26, 2020 · 29528e3 · 29528e3
1 parent 98f11b8
commit 29528e3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/...binding.comfoair/src/main/java/org/openhab/binding/comfoair/internal/ComfoAirHandler.java b/...binding.comfoair/src/main/java/org/openhab/binding/comfoair/internal/ComfoAirHandler.java
@@ -146,15 +146,20 @@ public void initialize() {
         }
         if (comfoAirConnector != null) {
             comfoAirConnector.open();
-            updateStatus(ThingStatus.ONLINE);
+            if (comfoAirConnector != null && comfoAirConnector.isConnected()) {
+                updateStatus(ThingStatus.ONLINE);
 
-            List<Channel> channels = this.thing.getChannels();
+                List<Channel> channels = this.thing.getChannels();
 
-            poller = scheduler.scheduleWithFixedDelay(() -> {
-                for (Channel channel : channels) {
-                    updateChannelState(channel);
-                }
-            }, 0, (config.refreshInterval > 0) ? config.refreshInterval : DEFAULT_REFRESH_INTERVAL, TimeUnit.SECONDS);
+                poller = scheduler.scheduleWithFixedDelay(() -> {
+                    for (Channel channel : channels) {
+                        updateChannelState(channel);
+                    }
+                }, 0, (config.refreshInterval > 0) ? config.refreshInterval : DEFAULT_REFRESH_INTERVAL,
+                        TimeUnit.SECONDS);
+            } else {
+                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR);
+            }
         } else {
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR);
         }

diff --git a/bundles/org.openhab.binding.comfoair/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.comfoair/src/main/resources/ESH-INF/thing/thing-types.xml
@@ -188,7 +188,7 @@
 	</channel-group-type>
 
 	<channel-group-type id="menuP1">
-		<label>Menu P1: Control states</label>
+		<label>Menu P1: Control States</label>
 		<channels>
 			<channel id="menu20Mode" typeId="menu20_mode" />
 			<channel id="menu21Mode" typeId="menu21_mode" />
@@ -204,7 +204,7 @@
 	</channel-group-type>
 
 	<channel-group-type id="menuP2">
-		<label>Menu P2: Delay settings</label>
+		<label>Menu P2: Delay Settings</label>
 		<channels>
 			<channel id="bathroomStartDelay" typeId="bathroom_start_delay" />
 			<channel id="bathroomEndDelay" typeId="bathroom_end_delay" />
@@ -218,7 +218,7 @@
 	</channel-group-type>
 
 	<channel-group-type id="menuP9">
-		<label>Menu P9: Option States</label>
+		<label>Menu P9: Option Control States</label>
 		<channels>
 			<channel id="chimneyState" typeId="chimney_state" />
 			<channel id="bypassState" typeId="bypass_state" />