[freeathome] Fix not updating values of room temperature devices

bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeBridgeHandler.java → bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathome/internal/handler/FreeAtHomeBridgeHandler.java

@@ -429,9 +429,10 @@ public void setDatapointOnWebsocketFeedback(String receivedText) {
 
                 if (deviceHandler != null) {
                     deviceHandler.onDeviceStateChanged(eventDatapointID, value);
+                    logger.debug("Socket event processed: event-datapoint-ID {} value {}", eventDatapointID, value);
+                } else {
+                    logger.debug("Socket event not processed: event-datapoint-ID {} value {}", eventDatapointID, value);
                 }
-
-                logger.debug("Socket event processed: event-datapoint-ID {} value {}", eventDatapointID, value);
             }
         }
     }

bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeDeviceHandler.java → bundles/org.openhab.binding.freeathome/src/main/java/org/openhab/binding/freeathome/internal/handler/FreeAtHomeDeviceHandler.java

@@ -291,7 +291,6 @@ public void handleCommand(ChannelUID channelUID, Command command) {
         if (dpg == null) {
             logger.debug("Handle command for device (but invalid datapointgroup) {} - at channel {} - full command {}",
                     device.getDeviceId(), channelUID.getAsString(), command.toFullString());
-
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
                     "@text/conf-error.invalid-deviceconfig");
         } else {
@@ -480,8 +479,7 @@ public void updateChannels() throws FreeAtHomeGeneralException {
                         channelTypeUID = createChannelTypeForDatapointgroup(dpg, channelTypeUID);
                     }
 
-                    ChannelUID channelUID = new ChannelUID(thingUID, channel.getChannelId(),
-                            dpg.getLabel().substring(4));
+                    ChannelUID channelUID = createChannelUID(thingUID, channel.getChannelId(), dpg.getLabel());
 
                     String channelLabel = String.format("%s",
                             i18nProvider.getText(bundle, dpg.getLabel(), "-", locale));
@@ -568,7 +566,7 @@ private void reloadChannelTypes() throws FreeAtHomeGeneralException {
                     channelTypeUID = createChannelTypeForDatapointgroup(dpg, channelTypeUID);
                 }
 
-                ChannelUID channelUID = new ChannelUID(thingUID, channel.getChannelId());
+                ChannelUID channelUID = createChannelUID(thingUID, channel.getChannelId(), dpg.getLabel());
 
                 FreeAtHomeDatapoint outputDatapoint = dpg.getOutputDatapoint();
 
@@ -589,6 +587,12 @@ private void reloadChannelTypes() throws FreeAtHomeGeneralException {
         }
     }
 
+    // Create a channel UID. Makes sure that the channel UID is unique and generated the same way every time
+    private ChannelUID createChannelUID(ThingUID thingUID, String channelID, String dpgLabel) {
+        ChannelUID channelUID = new ChannelUID(thingUID, channelID, dpgLabel.substring(4));
+        return channelUID;
+    }
+
     public void removeChannels() {
         Bridge bridge = this.getBridge();