diff --git a/bundles/org.openhab.binding.openwebnet/README.md b/bundles/org.openhab.binding.openwebnet/README.md index 18a43f5e7d093..7b2ab4585a330 100644 --- a/bundles/org.openhab.binding.openwebnet/README.md +++ b/bundles/org.openhab.binding.openwebnet/README.md @@ -142,8 +142,8 @@ Currently only stand-alone thermostats are supported (like [LN4691](https://cat | Channel Type ID (channel ID) | Applies to Thing Type IDs | Item Type | Description | Read/Write | Advanced | | ---------------------------- | ----------------------------------- | ------------------ | ------------------------------------------------- | :--------: | :------: | -| `temperature` | `bus_thermostat`, `bus_temp_sensor` | Number:Temperature | The zone currently sensed temperature (°C) | R | N | -| `setpointTemperature` | `bus_thermostat` | Number:Temperature | The zone setpoint temperature (°C) | R/W | N | +| `temperature` | `bus_thermostat`, `bus_temp_sensor` | Number:Temperature | The zone currently sensed temperature | R | N | +| `setpointTemperature` | `bus_thermostat` | Number:Temperature | The zone setpoint temperature | R/W | N | | `function` | `bus_thermostat` | String | The zone set thermo function: `COOLING`, `HEATING` or `GENERIC` (heating + cooling) | R/W | N | | `mode` | `bus_thermostat` | String | The zone set mode: `MANUAL`, `PROTECTION`, `OFF` | R/W | N | | `speedFanCoil` | `bus_thermostat` | String | The zone fancoil speed: `AUTO`, `SPEED_1`, `SPEED_2`, `SPEED_3` | R/W | N | diff --git a/bundles/org.openhab.binding.openwebnet/pom.xml b/bundles/org.openhab.binding.openwebnet/pom.xml index b5b8e3b955457..caefdc9197160 100644 --- a/bundles/org.openhab.binding.openwebnet/pom.xml +++ b/bundles/org.openhab.binding.openwebnet/pom.xml @@ -23,7 +23,7 @@ io.github.openwebnet4j openwebnet4j - 0.5.1 + 0.5.2 compile diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/OpenWebNetBindingConstants.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/OpenWebNetBindingConstants.java index 93572081acfaa..42c369ec0e978 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/OpenWebNetBindingConstants.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/OpenWebNetBindingConstants.java @@ -12,7 +12,6 @@ */ package org.openhab.binding.openwebnet; -import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.Set; @@ -74,23 +73,21 @@ public class OpenWebNetBindingConstants { // #SUPPORTED THINGS SETS // ## Generic - public static final Set GENERIC_SUPPORTED_THING_TYPES = new HashSet<>( - Arrays.asList(THING_TYPE_GENERIC_DEVICE)); + public static final Set GENERIC_SUPPORTED_THING_TYPES = Set.of(THING_TYPE_GENERIC_DEVICE); // ## Lighting - public static final Set LIGHTING_SUPPORTED_THING_TYPES = new HashSet<>( - Arrays.asList(THING_TYPE_ZB_ON_OFF_SWITCH, THING_TYPE_ZB_ON_OFF_SWITCH_2UNITS, THING_TYPE_ZB_DIMMER, - THING_TYPE_BUS_ON_OFF_SWITCH, THING_TYPE_BUS_DIMMER)); + public static final Set LIGHTING_SUPPORTED_THING_TYPES = Set.of(THING_TYPE_ZB_ON_OFF_SWITCH, + THING_TYPE_ZB_ON_OFF_SWITCH_2UNITS, THING_TYPE_ZB_DIMMER, THING_TYPE_BUS_ON_OFF_SWITCH, + THING_TYPE_BUS_DIMMER); // ## Automation - public static final Set AUTOMATION_SUPPORTED_THING_TYPES = new HashSet<>( - Arrays.asList(THING_TYPE_ZB_AUTOMATION, THING_TYPE_BUS_AUTOMATION)); + public static final Set AUTOMATION_SUPPORTED_THING_TYPES = Set.of(THING_TYPE_ZB_AUTOMATION, + THING_TYPE_BUS_AUTOMATION); // ## Thermoregulation - public static final Set THERMOREGULATION_SUPPORTED_THING_TYPES = new HashSet<>( - Arrays.asList(THING_TYPE_BUS_THERMOSTAT, THING_TYPE_BUS_TEMP_SENSOR)); + public static final Set THERMOREGULATION_SUPPORTED_THING_TYPES = Set.of(THING_TYPE_BUS_THERMOSTAT, + THING_TYPE_BUS_TEMP_SENSOR); // ## Energy Management - public static final Set ENERGY_MANAGEMENT_SUPPORTED_THING_TYPES = new HashSet<>( - Arrays.asList(THING_TYPE_BUS_ENERGY_METER)); + public static final Set ENERGY_MANAGEMENT_SUPPORTED_THING_TYPES = Set.of(THING_TYPE_BUS_ENERGY_METER); // ## Groups public static final Set DEVICE_SUPPORTED_THING_TYPES = Stream @@ -99,8 +96,8 @@ public class OpenWebNetBindingConstants { GENERIC_SUPPORTED_THING_TYPES) .flatMap(Collection::stream).collect(Collectors.toCollection(HashSet::new)); - public static final Set BRIDGE_SUPPORTED_THING_TYPES = new HashSet<>( - Arrays.asList(THING_TYPE_ZB_GATEWAY, THING_TYPE_BUS_GATEWAY)); + public static final Set BRIDGE_SUPPORTED_THING_TYPES = Set.of(THING_TYPE_ZB_GATEWAY, + THING_TYPE_BUS_GATEWAY); public static final Set ALL_SUPPORTED_THING_TYPES = Stream .of(DEVICE_SUPPORTED_THING_TYPES, BRIDGE_SUPPORTED_THING_TYPES).flatMap(Collection::stream) @@ -119,7 +116,6 @@ public class OpenWebNetBindingConstants { // thermo public static final String CHANNEL_TEMPERATURE = "temperature"; public static final String CHANNEL_FUNCTION = "function"; - // TODO REMOVE public static final String CHANNEL_HEATING_COOLING_MODE = "thermostatMode"; public static final String CHANNEL_TEMP_SETPOINT = "setpointTemperature"; public static final String CHANNEL_MODE = "mode"; public static final String CHANNEL_FAN_SPEED = "speedFanCoil"; diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetThermoregulationHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetThermoregulationHandler.java index ceefe0df2cfc7..3a2ac9a906d9e 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetThermoregulationHandler.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/handler/OpenWebNetThermoregulationHandler.java @@ -12,13 +12,18 @@ */ package org.openhab.binding.openwebnet.handler; -import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.*; -import static org.openhab.core.library.unit.SIUnits.CELSIUS; +import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_ACTUATOR; +import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_CONDITIONING_VALVE; +import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_FAN_SPEED; +import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_FUNCTION; +import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_HEATING_VALVE; +import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_MODE; +import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_TEMPERATURE; +import static org.openhab.binding.openwebnet.OpenWebNetBindingConstants.CHANNEL_TEMP_SETPOINT; import java.math.BigDecimal; import java.util.Set; -import javax.measure.Unit; import javax.measure.quantity.Temperature; import org.eclipse.jdt.annotation.NonNullByDefault; @@ -38,11 +43,6 @@ import org.openwebnet4j.message.FrameException; import org.openwebnet4j.message.MalformedFrameException; import org.openwebnet4j.message.Thermoregulation; -import org.openwebnet4j.message.Thermoregulation.FAN_COIL_SPEED; -import org.openwebnet4j.message.Thermoregulation.FUNCTION; -import org.openwebnet4j.message.Thermoregulation.OPERATION_MODE; -import org.openwebnet4j.message.Thermoregulation.VALVE_OR_ACTUATOR_STATUS; -import org.openwebnet4j.message.Thermoregulation.WHAT; import org.openwebnet4j.message.Where; import org.openwebnet4j.message.WhereThermo; import org.openwebnet4j.message.Who; @@ -66,9 +66,9 @@ public class OpenWebNetThermoregulationHandler extends OpenWebNetThingHandler { private boolean isTempSensor = false; // is the device a sensor or thermostat? - private Double currentSetPointTemp = 11.5d; // 11.5 is the default setTemp used in MyHomeUP mobile app + private double currentSetPointTemp = 11.5d; // 11.5 is the default setTemp used in MyHomeUP mobile app - private Thermoregulation.FUNCTION currentFunction = Thermoregulation.FUNCTION.GENERIC; + private Thermoregulation.Function currentFunction = Thermoregulation.Function.GENERIC; public OpenWebNetThermoregulationHandler(Thing thing) { super(thing); @@ -79,7 +79,6 @@ public void bridgeStatusChanged(ThingStatusInfo bridgeStatusInfo) { super.bridgeStatusChanged(bridgeStatusInfo); // when the bridge is ONLINE request for thing states (temp, setTemp, fanSpeed...) if (bridgeStatusInfo.getStatus().equals(ThingStatus.ONLINE)) { - logger.debug("bridgeStatusChanged() thing={}", thing.getUID()); refreshDevice(false); } } @@ -107,7 +106,6 @@ protected void handleChannelCommand(ChannelUID channel, Command command) { @Override protected void requestChannelState(ChannelUID channel) { - logger.debug("requestChannelState() thingUID={} channel={}", thing.getUID(), channel.getId()); refreshDevice(false); } @@ -126,12 +124,11 @@ protected String ownIdPrefix() { } private void handleSetFanSpeedCommand(Command command) { - logger.debug("handleSetFanSpeedCommand() (command={})", command); if (command instanceof StringType) { Where w = deviceWhere; if (w != null) { try { - FAN_COIL_SPEED speed = FAN_COIL_SPEED.valueOf(command.toString()); + Thermoregulation.FanCoilSpeed speed = Thermoregulation.FanCoilSpeed.valueOf(command.toString()); send(Thermoregulation.requestWriteFanCoilSpeed(w.value(), speed)); } catch (OWNException e) { logger.warn("handleSetFanSpeedCommand() {}", e.getMessage()); @@ -147,15 +144,12 @@ private void handleSetFanSpeedCommand(Command command) { } private void handleSetpointCommand(Command command) { - logger.debug("handleSetpointCommand() (command={})", command); if (command instanceof QuantityType || command instanceof DecimalType) { Where w = deviceWhere; if (w != null) { BigDecimal value = BigDecimal.ZERO; if (command instanceof QuantityType) { - Unit unit = CELSIUS; - QuantityType quantity = commandToQuantityType(command, unit); - value = quantity.toBigDecimal(); + value = new QuantityType(command.toFullString()).toBigDecimal(); } else { value = ((DecimalType) command).toBigDecimal(); } @@ -176,13 +170,7 @@ private void handleMode(Command command) { Where w = deviceWhere; if (w != null) { try { - OPERATION_MODE mode = OPERATION_MODE.valueOf(((StringType) command).toString()); - if (mode == OPERATION_MODE.MANUAL) { - logger.debug("handleMode() mode={} function={} setPointTemp={}°", mode.toString(), - currentFunction.toString(), currentSetPointTemp); - } else { - logger.debug("handleMode() mode={} function={}", mode.toString(), currentFunction.toString()); - } + Thermoregulation.OperationMode mode = Thermoregulation.OperationMode.valueOf(command.toString()); send(Thermoregulation.requestWriteMode(w.value(), mode, currentFunction, currentSetPointTemp)); } catch (OWNException e) { logger.warn("handleMode() {}", e.getMessage()); @@ -191,20 +179,17 @@ private void handleMode(Command command) { return; } } - } else { logger.warn("handleMode() Unsupported command {} for thing {}", command, getThing().getUID()); } } private void handleFunction(Command command) { - logger.debug("handleFunction() (command={})", command); if (command instanceof StringType) { Where w = deviceWhere; if (w != null) { try { - FUNCTION function = FUNCTION.valueOf(((StringType) command).toString()); - logger.debug("handleFunction() mode={}", function.toString()); + Thermoregulation.Function function = Thermoregulation.Function.valueOf(command.toString()); send(Thermoregulation.requestWriteFunction(w.value(), function)); } catch (OWNException e) { logger.warn("handleFunction() {}", e.getMessage()); @@ -218,10 +203,6 @@ private void handleFunction(Command command) { } } - private QuantityType commandToQuantityType(Command command, Unit unit) { - return new QuantityType(command.toFullString()); - } - @Override protected void handleMessage(BaseOpenMessage msg) { super.handleMessage(msg); @@ -231,17 +212,17 @@ protected void handleMessage(BaseOpenMessage msg) { if (msg.getDim() == null) { return; } - if (msg.getDim() == Thermoregulation.DIM.TEMPERATURE - || msg.getDim() == Thermoregulation.DIM.PROBE_TEMPERATURE) { + if (msg.getDim() == Thermoregulation.DimThermo.TEMPERATURE + || msg.getDim() == Thermoregulation.DimThermo.PROBE_TEMPERATURE) { updateTemperature((Thermoregulation) msg); - } else if (msg.getDim() == Thermoregulation.DIM.TEMP_SETPOINT - || msg.getDim() == Thermoregulation.DIM.COMPLETE_PROBE_STATUS) { + } else if (msg.getDim() == Thermoregulation.DimThermo.TEMP_SETPOINT + || msg.getDim() == Thermoregulation.DimThermo.COMPLETE_PROBE_STATUS) { updateSetpoint((Thermoregulation) msg); - } else if (msg.getDim() == Thermoregulation.DIM.VALVES_STATUS) { + } else if (msg.getDim() == Thermoregulation.DimThermo.VALVES_STATUS) { updateValveStatus((Thermoregulation) msg); - } else if (msg.getDim() == Thermoregulation.DIM.ACTUATOR_STATUS) { + } else if (msg.getDim() == Thermoregulation.DimThermo.ACTUATOR_STATUS) { updateActuatorStatus((Thermoregulation) msg); - } else if (msg.getDim() == Thermoregulation.DIM.FAN_COIL_SPEED) { + } else if (msg.getDim() == Thermoregulation.DimThermo.FAN_COIL_SPEED) { updateFanCoilSpeed((Thermoregulation) msg); } else { logger.debug("handleMessage() Ignoring unsupported DIM {} for thing {}. Frame={}", msg.getDim(), @@ -251,48 +232,42 @@ protected void handleMessage(BaseOpenMessage msg) { } private void updateModeAndFunction(Thermoregulation tmsg) { - logger.debug("updateModeAndFunction() for thing: {} msg={}", thing.getUID(), tmsg); - if (tmsg.getWhat() == null) { - logger.debug("updateModeAndFunction() Could not parse Mode from: {}", tmsg.getFrameValue()); + logger.debug("updateModeAndFunction() Could not parse Mode or Function from {} (what is null)", + tmsg.getFrameValue()); return; } - try { - logger.debug("updateModeAndFunction() WHAT={}", tmsg.getWhat()); - WHAT w = WHAT.fromValue(tmsg.getWhat().value()); + Thermoregulation.WhatThermo w = Thermoregulation.WhatThermo.fromValue(tmsg.getWhat().value()); - OPERATION_MODE mode = w.mode(); - FUNCTION function = w.function(); + if (w.mode() == null) { + logger.debug("updateModeAndFunction() Could not parse Mode from: {}", tmsg.getFrameValue()); + return; + } + if (w.function() == null) { + logger.debug("updateModeAndFunction() Could not parse Function from: {}", tmsg.getFrameValue()); + return; + } - if (w == WHAT.HEATING) { - function = FUNCTION.HEATING; - } else if (w == WHAT.CONDITIONING) { - function = FUNCTION.COOLING; - } + Thermoregulation.OperationMode mode = w.mode(); + Thermoregulation.Function function = w.function(); - if (mode == OPERATION_MODE.MANUAL) { - logger.debug("updateModeAndFunction() function={} mode={} setPointTemp={}°", function.toString(), - mode.toString(), currentSetPointTemp); - } else { - logger.debug("updateModeAndFunction() function={} mode={}", function.toString(), mode.toString()); - } + if (w == Thermoregulation.WhatThermo.HEATING) { + function = Thermoregulation.Function.HEATING; + } else if (w == Thermoregulation.WhatThermo.CONDITIONING) { + function = Thermoregulation.Function.COOLING; + } - updateState(CHANNEL_MODE, new StringType(mode.toString())); - updateState(CHANNEL_FUNCTION, new StringType(function.toString())); + updateState(CHANNEL_MODE, new StringType(mode.toString())); + updateState(CHANNEL_FUNCTION, new StringType(function.toString())); - // store current function - currentFunction = function; - } catch (Exception e) { - logger.warn("updateModeAndFunction() FrameException on frame {}: {}", tmsg, e.getMessage()); - // do not update channel state, simply skip wrong message - } + // store current function + currentFunction = function; } private void updateTemperature(Thermoregulation tmsg) { - logger.debug("updateTemperature() for thing: {}", thing.getUID()); try { - Double temp = Thermoregulation.parseTemperature(tmsg); + double temp = Thermoregulation.parseTemperature(tmsg); updateState(CHANNEL_TEMPERATURE, new DecimalType(temp)); } catch (FrameException e) { logger.warn("updateTemperature() FrameException on frame {}: {}", tmsg, e.getMessage()); @@ -301,10 +276,9 @@ private void updateTemperature(Thermoregulation tmsg) { } private void updateSetpoint(Thermoregulation tmsg) { - logger.debug("updateSetpoint() for thing: {}", thing.getUID()); String channelID = CHANNEL_TEMP_SETPOINT; try { - Double temp = Thermoregulation.parseTemperature(tmsg); + double temp = Thermoregulation.parseTemperature(tmsg); updateState(channelID, new DecimalType(temp)); // store current setPoint T currentSetPointTemp = temp; @@ -315,10 +289,8 @@ private void updateSetpoint(Thermoregulation tmsg) { } private void updateFanCoilSpeed(Thermoregulation tmsg) { - logger.debug("updateFanCoilSpeed() for thing: {}", thing.getUID()); - try { - FAN_COIL_SPEED speed = Thermoregulation.parseFanCoilSpeed(tmsg); + Thermoregulation.FanCoilSpeed speed = Thermoregulation.parseFanCoilSpeed(tmsg); updateState(CHANNEL_FAN_SPEED, new StringType(speed.toString())); } catch (FrameException e) { logger.warn("updateFanCoilSpeed() FrameException on frame {}: {}", tmsg, e.getMessage()); @@ -327,13 +299,13 @@ private void updateFanCoilSpeed(Thermoregulation tmsg) { } private void updateValveStatus(Thermoregulation tmsg) { - logger.debug("updateValveStatus() for thing: {}", thing.getUID()); - try { - VALVE_OR_ACTUATOR_STATUS cv = Thermoregulation.parseValveStatus(tmsg, WHAT.CONDITIONING); + Thermoregulation.ValveOrActuatorStatus cv = Thermoregulation.parseValveStatus(tmsg, + Thermoregulation.WhatThermo.CONDITIONING); updateState(CHANNEL_CONDITIONING_VALVE, new StringType(cv.toString())); - VALVE_OR_ACTUATOR_STATUS hv = Thermoregulation.parseValveStatus(tmsg, WHAT.HEATING); + Thermoregulation.ValveOrActuatorStatus hv = Thermoregulation.parseValveStatus(tmsg, + Thermoregulation.WhatThermo.HEATING); updateState(CHANNEL_HEATING_VALVE, new StringType(hv.toString())); } catch (FrameException e) { logger.warn("updateValveStatus() FrameException on frame {}: {}", tmsg, e.getMessage()); @@ -343,9 +315,8 @@ private void updateValveStatus(Thermoregulation tmsg) { } private void updateActuatorStatus(Thermoregulation tmsg) { - logger.debug("updateActuatorStatus() for thing: {}", thing.getUID()); try { - VALVE_OR_ACTUATOR_STATUS hv = Thermoregulation.parseActuatorStatus(tmsg); + Thermoregulation.ValveOrActuatorStatus hv = Thermoregulation.parseActuatorStatus(tmsg); updateState(CHANNEL_ACTUATOR, new StringType(hv.toString())); } catch (FrameException e) { logger.warn("updateActuatorStatus() FrameException on frame {}: {}", tmsg, e.getMessage()); diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java index 2cfe7a2a0f977..df53544edbbe3 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java @@ -153,7 +153,6 @@ public void newDiscoveryResult(Where where, OpenDeviceType deviceType, @Nullable deviceWho = Who.ENERGY_MANAGEMENT; break; } - default: logger.warn("Device type {} is not supported, default to GENERIC device (WHERE={})", deviceType, where); if (where instanceof WhereZigBee) { diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusTempSensor.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusTempSensor.xml index 7f48c8279656b..2770dc059bf1d 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusTempSensor.xml +++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusTempSensor.xml @@ -26,7 +26,7 @@ - + Example: Zone 2 --> where=2. For external sensors: sensor 5 --> where=500 diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermostat.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermostat.xml index 0458b3c5b873e..0b9051985a713 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermostat.xml +++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermostat.xml @@ -36,7 +36,7 @@ - + Example: Zone 2 --> where=2. diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml index 86ca7bb8219e0..fa04e3d36c036 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml +++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml @@ -29,7 +29,7 @@ Rollershutter - + Control the roller shutter position Blinds @@ -88,7 +88,7 @@ String - + Set speed of the Fan Coil (read/write) @@ -146,7 +146,7 @@ String - + Actuator status (read only)