Fix handling of multiple sprinklers (openhab#16630)

Signed-off-by: Mark Hilbush <[email protected]>
jlaur · Apr 14, 2024 · 815ada9 · 815ada9
1 parent 5cf2a99
commit 815ada9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...rc/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveBridgeHandler.java b/...rc/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveBridgeHandler.java
@@ -321,11 +321,11 @@ private void updateAllStatuses() {
         List<OrbitBhyveDevice> devices = getDevices();
         for (Thing th : getThing().getThings()) {
             if (th.isEnabled()) {
-                String deviceId = th.getUID().getId();
                 ThingHandler handler = th.getHandler();
                 if (handler instanceof OrbitBhyveSprinklerHandler sprinklerHandler) {
+                    String deviceId = sprinklerHandler.getSprinklerId();
                     for (OrbitBhyveDevice device : devices) {
-                        if (deviceId.equals(th.getUID().getId())) {
+                        if (deviceId.equals(device.getId())) {
                             updateDeviceStatus(device, sprinklerHandler);
                         }
                     }
@@ -345,9 +345,9 @@ private void updateDeviceStatus(@Nullable OrbitBhyveDevice device, @Nullable Orb
 
     private void updateDeviceStatus(String deviceId) {
         for (Thing th : getThing().getThings()) {
-            if (deviceId.equals(th.getUID().getId())) {
-                ThingHandler handler = th.getHandler();
-                if (handler instanceof OrbitBhyveSprinklerHandler sprinklerHandler) {
+            ThingHandler handler = th.getHandler();
+            if (handler instanceof OrbitBhyveSprinklerHandler sprinklerHandler) {
+                if (deviceId.equals(sprinklerHandler.getSprinklerId())) {
                     OrbitBhyveDevice device = getDevice(deviceId);
                     updateDeviceStatus(device, sprinklerHandler);
                 }

diff --git a/...main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveSprinklerHandler.java b/...main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveSprinklerHandler.java
@@ -120,7 +120,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
         }
     }
 
-    private String getSprinklerId() {
+    public String getSprinklerId() {
         return getThing().getConfiguration().get("id") != null ? getThing().getConfiguration().get("id").toString()
                 : "";
     }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
-        private String getSprinklerId() {
+        public String getSprinklerId() {
             return getThing().getConfiguration().get("id") != null ? getThing().getConfiguration().get("id").toString()
                     : "";
         }
@@ Expand Down @@