[freeathome] Fix not updating values of room temperature devices (#17957

) * Fixed Pathnaming matching new binding name Signed-off-by: JankKeks <[email protected]>
openhab · Dec 23, 2024 · 5c76284 · 5c76284
1 parent 2cd8902
commit 5c76284
Show file tree

Hide file tree

Showing 27 changed files with 10 additions and 6 deletions.
diff --git a/.../internal/FreeAtHomeBindingConstants.java → .../internal/FreeAtHomeBindingConstants.java b/.../internal/FreeAtHomeBindingConstants.java → .../internal/FreeAtHomeBindingConstants.java
diff --git a/.../internal/FreeAtHomeDiscoveryService.java → .../internal/FreeAtHomeDiscoveryService.java b/.../internal/FreeAtHomeDiscoveryService.java → .../internal/FreeAtHomeDiscoveryService.java
diff --git a/...em/internal/FreeAtHomeHandlerFactory.java → ...me/internal/FreeAtHomeHandlerFactory.java b/...em/internal/FreeAtHomeHandlerFactory.java → ...me/internal/FreeAtHomeHandlerFactory.java
diff --git a/...FreeAtHomeBridgeHandlerConfiguration.java → ...FreeAtHomeBridgeHandlerConfiguration.java b/...FreeAtHomeBridgeHandlerConfiguration.java → ...FreeAtHomeBridgeHandlerConfiguration.java
diff --git a/...FreeAtHomeDeviceHandlerConfiguration.java → ...FreeAtHomeDeviceHandlerConfiguration.java b/...FreeAtHomeDeviceHandlerConfiguration.java → ...FreeAtHomeDeviceHandlerConfiguration.java
diff --git a/...ternal/datamodel/FreeAtHomeDatapoint.java → ...ternal/datamodel/FreeAtHomeDatapoint.java b/...ternal/datamodel/FreeAtHomeDatapoint.java → ...ternal/datamodel/FreeAtHomeDatapoint.java
diff --git a/...l/datamodel/FreeAtHomeDatapointGroup.java → ...l/datamodel/FreeAtHomeDatapointGroup.java b/...l/datamodel/FreeAtHomeDatapointGroup.java → ...l/datamodel/FreeAtHomeDatapointGroup.java
diff --git a/...al/datamodel/FreeAtHomeDeviceChannel.java → ...al/datamodel/FreeAtHomeDeviceChannel.java b/...al/datamodel/FreeAtHomeDeviceChannel.java → ...al/datamodel/FreeAtHomeDeviceChannel.java
diff --git a/...atamodel/FreeAtHomeDeviceDescription.java → ...atamodel/FreeAtHomeDeviceDescription.java b/...atamodel/FreeAtHomeDeviceDescription.java → ...atamodel/FreeAtHomeDeviceDescription.java
diff --git a/...rnal/handler/FreeAtHomeBridgeHandler.java → ...rnal/handler/FreeAtHomeBridgeHandler.java b/...rnal/handler/FreeAtHomeBridgeHandler.java → ...rnal/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);
             }
         }
     }

diff --git a/...rnal/handler/FreeAtHomeDeviceHandler.java → ...rnal/handler/FreeAtHomeDeviceHandler.java b/...rnal/handler/FreeAtHomeDeviceHandler.java → ...rnal/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,11 @@ 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) {
+        return new ChannelUID(thingUID, channelID, dpgLabel.substring(4));
+    }
+
     public void removeChannels() {
         Bridge bridge = this.getBridge();
 

diff --git a/...andler/FreeAtHomeDeviceStateListener.java → ...andler/FreeAtHomeDeviceStateListener.java b/...andler/FreeAtHomeDeviceStateListener.java → ...andler/FreeAtHomeDeviceStateListener.java
diff --git a/...l/type/FreeAtHomeChannelTypeProvider.java → ...l/type/FreeAtHomeChannelTypeProvider.java b/...l/type/FreeAtHomeChannelTypeProvider.java → ...l/type/FreeAtHomeChannelTypeProvider.java
diff --git a/...pe/FreeAtHomeChannelTypeProviderImpl.java → ...pe/FreeAtHomeChannelTypeProviderImpl.java b/...pe/FreeAtHomeChannelTypeProviderImpl.java → ...pe/FreeAtHomeChannelTypeProviderImpl.java
diff --git a/...nal/type/FreeAtHomeThingTypeProvider.java → ...nal/type/FreeAtHomeThingTypeProvider.java b/...nal/type/FreeAtHomeThingTypeProvider.java → ...nal/type/FreeAtHomeThingTypeProvider.java
diff --git a/...type/FreeAtHomeThingTypeProviderImpl.java → ...type/FreeAtHomeThingTypeProviderImpl.java b/...type/FreeAtHomeThingTypeProviderImpl.java → ...type/FreeAtHomeThingTypeProviderImpl.java
diff --git a/...em/internal/util/FidTranslationUtils.java → ...me/internal/util/FidTranslationUtils.java b/...em/internal/util/FidTranslationUtils.java → ...me/internal/util/FidTranslationUtils.java
diff --git a/...rnal/util/FreeAtHomeGeneralException.java → ...rnal/util/FreeAtHomeGeneralException.java b/...rnal/util/FreeAtHomeGeneralException.java → ...rnal/util/FreeAtHomeGeneralException.java
diff --git a/...FreeAtHomeHttpCommunicationException.java → ...FreeAtHomeHttpCommunicationException.java b/...FreeAtHomeHttpCommunicationException.java → ...FreeAtHomeHttpCommunicationException.java
diff --git a/...stem/internal/util/PIdContainerClass.java → ...home/internal/util/PIdContainerClass.java b/...stem/internal/util/PIdContainerClass.java → ...home/internal/util/PIdContainerClass.java
diff --git a/...em/internal/util/PidTranslationUtils.java → ...me/internal/util/PidTranslationUtils.java b/...em/internal/util/PidTranslationUtils.java → ...me/internal/util/PidTranslationUtils.java
diff --git a/...eathomesystem/internal/util/UidUtils.java → ...ng/freeathome/internal/util/UidUtils.java b/...eathomesystem/internal/util/UidUtils.java → ...ng/freeathome/internal/util/UidUtils.java
diff --git a/...econverter/BinaryValueStateConverter.java → ...econverter/BinaryValueStateConverter.java b/...econverter/BinaryValueStateConverter.java → ...econverter/BinaryValueStateConverter.java
diff --git a/...converter/BooleanValueStateConverter.java → ...converter/BooleanValueStateConverter.java b/...converter/BooleanValueStateConverter.java → ...converter/BooleanValueStateConverter.java
diff --git a/...converter/DecimalValueStateConverter.java → ...converter/DecimalValueStateConverter.java b/...converter/DecimalValueStateConverter.java → ...converter/DecimalValueStateConverter.java
diff --git a/...er/ShuttercontrolValueStateConverter.java → ...er/ShuttercontrolValueStateConverter.java b/...er/ShuttercontrolValueStateConverter.java → ...er/ShuttercontrolValueStateConverter.java
diff --git a/...uestateconverter/ValueStateConverter.java → ...uestateconverter/ValueStateConverter.java b/...uestateconverter/ValueStateConverter.java → ...uestateconverter/ValueStateConverter.java