demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-26 15:21:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of multiple sprinklers (#16630)

Browse Source 
Signed-off-by: Mark Hilbush <mark@hilbush.com>
This commit is contained in:
Mark Hilbush 2024-04-14 14:04:39 -04:00 committed by GitHub
parent 5cf2a99fe3
commit 815ada9afc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveBridgeHandler.java
View File

@ -321,11 +321,11 @@ public class OrbitBhyveBridgeHandler extends ConfigStatusBridgeHandler {
List<OrbitBhyveDevice> devices = getDevices(); List<OrbitBhyveDevice> devices = getDevices();
for (Thing th : getThing().getThings()) { for (Thing th : getThing().getThings()) {
if (th.isEnabled()) { if (th.isEnabled()) {
String deviceId = th.getUID().getId();
ThingHandler handler = th.getHandler(); ThingHandler handler = th.getHandler();
if (handler instanceof OrbitBhyveSprinklerHandler sprinklerHandler) { if (handler instanceof OrbitBhyveSprinklerHandler sprinklerHandler) {
String deviceId = sprinklerHandler.getSprinklerId();
for (OrbitBhyveDevice device : devices) { for (OrbitBhyveDevice device : devices) {
if (deviceId.equals(th.getUID().getId())) { if (deviceId.equals(device.getId())) {
updateDeviceStatus(device, sprinklerHandler); updateDeviceStatus(device, sprinklerHandler);
} }
} }
@ -345,9 +345,9 @@ public class OrbitBhyveBridgeHandler extends ConfigStatusBridgeHandler {
private void updateDeviceStatus(String deviceId) { private void updateDeviceStatus(String deviceId) {
for (Thing th : getThing().getThings()) { for (Thing th : getThing().getThings()) {
if (deviceId.equals(th.getUID().getId())) { ThingHandler handler = th.getHandler();
ThingHandler handler = th.getHandler(); if (handler instanceof OrbitBhyveSprinklerHandler sprinklerHandler) {
if (handler instanceof OrbitBhyveSprinklerHandler sprinklerHandler) { if (deviceId.equals(sprinklerHandler.getSprinklerId())) {
OrbitBhyveDevice device = getDevice(deviceId); OrbitBhyveDevice device = getDevice(deviceId);
updateDeviceStatus(device, sprinklerHandler); updateDeviceStatus(device, sprinklerHandler);
} }

2
bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveSprinklerHandler.java
View File

@ -120,7 +120,7 @@ public class OrbitBhyveSprinklerHandler extends BaseThingHandler {
} }
} }
private String getSprinklerId() { public String getSprinklerId() {
return getThing().getConfiguration().get("id") != null ? getThing().getConfiguration().get("id").toString() return getThing().getConfiguration().get("id") != null ? getThing().getConfiguration().get("id").toString()
: ""; : "";
} }