import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.zway.internal.discovery.ZWayDeviceDiscoveryService;
import org.openhab.binding.zway.internal.handler.ZWayBridgeHandler;
import org.openhab.binding.zway.internal.handler.ZWayZAutomationDeviceHandler;
*
* @author Patrick Hecker - Initial contribution
*/
+@NonNullByDefault
@Component(service = ThingHandlerFactory.class, configurationPid = "binding.zway")
public class ZWayHandlerFactory extends BaseThingHandlerFactory {
}
@Override
- protected ThingHandler createHandler(Thing thing) {
+ protected @Nullable ThingHandler createHandler(Thing thing) {
if (ZWayBridgeHandler.SUPPORTED_THING_TYPE.equals(thing.getThingTypeUID())) {
ZWayBridgeHandler handler = new ZWayBridgeHandler((Bridge) thing);
registerDeviceDiscoveryService(handler);
import static org.openhab.binding.zway.internal.ZWayBindingConstants.*;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
/**
* The {@link ZWayBridgeConfiguration} class defines the model for a bridge configuration.
*
* @author Patrick Hecker - Initial contribution, remove openHAB configuration
*/
+@NonNullByDefault
public class ZWayBridgeConfiguration {
- private String zwayServerIpAddress;
- private Integer zwayServerPort;
- private String zwayServerProtocol;
+ private String zwayServerIpAddress = "localhost";
+ private Integer zwayServerPort = 8083;
+ private String zwayServerProtocol = "http";
- private String zwayServerUsername;
- private String zwayServerPassword;
+ private String zwayServerUsername = "admin";
+ private @Nullable String zwayServerPassword;
- private Integer pollingInterval;
+ private Integer pollingInterval = 3600;
public String getZWayIpAddress() {
return zwayServerIpAddress;
this.zwayServerUsername = username;
}
- public String getZWayPassword() {
+ public @Nullable String getZWayPassword() {
return zwayServerPassword;
}
@Override
public String toString() {
- return new ToStringBuilder(this).append(BRIDGE_CONFIG_ZWAY_SERVER_IP_ADDRESS, this.getZWayIpAddress())
- .append(BRIDGE_CONFIG_ZWAY_SERVER_PORT, this.getZWayPort())
- .append(BRIDGE_CONFIG_ZWAY_SERVER_PROTOCOL, this.getZWayProtocol())
- .append(BRIDGE_CONFIG_ZWAY_SERVER_USERNAME, this.getZWayUsername())
- .append(BRIDGE_CONFIG_ZWAY_SERVER_PASSWORD, this.getZWayPassword())
- .append(BRIDGE_CONFIG_POLLING_INTERVAL, this.getPollingInterval()).toString();
+ return getClass().getSimpleName() + "{ " + BRIDGE_CONFIG_ZWAY_SERVER_IP_ADDRESS + "=" + getZWayIpAddress()
+ + ", " + BRIDGE_CONFIG_ZWAY_SERVER_PORT + "=" + getZWayPort() + ", "
+ + BRIDGE_CONFIG_ZWAY_SERVER_PROTOCOL + "=" + getZWayProtocol() + ", "
+ + BRIDGE_CONFIG_ZWAY_SERVER_USERNAME + "=" + getZWayUsername() + ", "
+ + BRIDGE_CONFIG_ZWAY_SERVER_PASSWORD + "=" + getZWayPassword() + ", " + BRIDGE_CONFIG_POLLING_INTERVAL
+ + "=" + this.getPollingInterval() + "}";
}
}
import static org.openhab.binding.zway.internal.ZWayBindingConstants.DEVICE_CONFIG_VIRTUAL_DEVICE_ID;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
/**
* The {@link ZWayZAutomationDeviceConfiguration} class defines the model for a Z-Way device configuration.
*
* @author Patrick Hecker - Initial contribution
*/
+@NonNullByDefault
public class ZWayZAutomationDeviceConfiguration {
- private String deviceId;
+ private @Nullable String deviceId;
- public String getDeviceId() {
+ public @Nullable String getDeviceId() {
return deviceId;
}
- public void setDeviceId(String deviceId) {
+ public void setDeviceId(@Nullable String deviceId) {
this.deviceId = deviceId;
}
@Override
public String toString() {
- return new ToStringBuilder(this).append(DEVICE_CONFIG_VIRTUAL_DEVICE_ID, this.getDeviceId()).toString();
+ return getClass().getSimpleName() + "{ " + DEVICE_CONFIG_VIRTUAL_DEVICE_ID + "=" + getDeviceId() + "}";
}
}
import static org.openhab.binding.zway.internal.ZWayBindingConstants.DEVICE_CONFIG_NODE_ID;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
/**
* The {@link ZWayZWaveDeviceConfiguration} class defines the model for a Z-Wave device configuration.
*
* @author Patrick Hecker - Initial contribution
*/
+@NonNullByDefault
public class ZWayZWaveDeviceConfiguration {
- private Integer nodeId;
+ private @Nullable Integer nodeId;
- public Integer getNodeId() {
+ public @Nullable Integer getNodeId() {
return nodeId;
}
- public void setNodeId(Integer nodeId) {
+ public void setNodeId(@Nullable Integer nodeId) {
this.nodeId = nodeId;
}
@Override
public String toString() {
- return new ToStringBuilder(this).append(DEVICE_CONFIG_NODE_ID, this.getNodeId()).toString();
+ return getClass().getSimpleName() + "{ " + DEVICE_CONFIG_NODE_ID + "=" + getNodeId() + "}";
}
}
*/
package org.openhab.binding.zway.internal.converter;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.HSBType;
import org.openhab.core.library.types.OnOffType;
*
* @author Patrick Hecker - Initial contribution
*/
+@NonNullByDefault
public class ZWayDeviceStateConverter {
public static State toState(Device device, Channel channel) {
// Store level locally
} else if (device instanceof Doorlock) {
return getBinaryState(level.toLowerCase());
} else if (device instanceof SensorBinary) {
- if (channel.getAcceptedItemType().equals("Contact")) {
+ if ("Contact".equals(channel.getAcceptedItemType())) {
return getDoorlockState(level.toLowerCase());
} else {
return getBinaryState(level.toLowerCase());
} else if (device instanceof SwitchBinary) {
return getBinaryState(level.toLowerCase());
} else if (device instanceof SwitchMultilevel) {
- if (channel.getAcceptedItemType().equals("Rollershutter")
- || channel.getAcceptedItemType().equals("Dimmer")) {
+ if ("Rollershutter".equals(channel.getAcceptedItemType())
+ || "Dimmer".equals(channel.getAcceptedItemType())) {
return getPercentState(level);
} else {
return getMultilevelState(level);
* @param multilevel sensor value
* @return transformed openHAB state
*/
- private static State getMultilevelState(String multilevelValue) {
+ private static State getMultilevelState(@Nullable String multilevelValue) {
if (multilevelValue != null) {
return new DecimalType(multilevelValue);
}
return UnDefType.UNDEF;
}
- private static State getPercentState(String multilevelValue) {
+ private static State getPercentState(@Nullable String multilevelValue) {
if (multilevelValue != null) {
return new PercentType(multilevelValue);
}
* @param binary switch value
* @return transformed openHAB state
*/
- private static State getBinaryState(String binarySwitchState) {
+ private static State getBinaryState(@Nullable String binarySwitchState) {
if (binarySwitchState != null) {
- if (binarySwitchState.equals("on")) {
+ if ("on".equals(binarySwitchState)) {
return OnOffType.ON;
- } else if (binarySwitchState.equals("off")) {
+ } else if ("off".equals(binarySwitchState)) {
return OnOffType.OFF;
}
}
* @param binary sensor state
* @return
*/
- private static State getDoorlockState(String binarySensorState) {
+ private static State getDoorlockState(@Nullable String binarySensorState) {
if (binarySensorState != null) {
- if (binarySensorState.equals("on")) {
+ if ("on".equals(binarySensorState)) {
return OpenClosedType.OPEN;
- } else if (binarySensorState.equals("off")) {
+ } else if ("off".equals(binarySensorState)) {
return OpenClosedType.CLOSED;
}
}
* @param Z-Way color value
* @return transformed openHAB state
*/
- private static State getColorState(Color colorSwitchState) {
+ private static State getColorState(@Nullable Color colorSwitchState) {
if (colorSwitchState != null && colorSwitchState.getRed() != null && colorSwitchState.getGreen() != null
&& colorSwitchState.getBlue() != null) {
HSBType hsbType = HSBType.fromRGB(colorSwitchState.getRed(), colorSwitchState.getGreen(),
import java.util.regex.Pattern;
import org.apache.commons.net.util.SubnetUtils;
+import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.binding.zway.internal.ZWayBindingConstants;
import org.openhab.core.config.discovery.AbstractDiscoveryService;
import org.openhab.core.config.discovery.DiscoveryResult;
*
* @author Patrick Hecker - Initial contribution
*/
+@NonNullByDefault
@Component(service = DiscoveryService.class, configurationPid = "discovery.zway")
public class ZWayBridgeDiscoveryService extends AbstractDiscoveryService {
.withLabel("Z-Way Server " + ipAddress).build();
thingDiscovered(discoveryResult);
}
- } catch (Exception e) {
+ } catch (IOException e) {
logger.warn("Discovery resulted in an unexpected exception", e);
}
}
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.zway.internal.ZWayBindingConstants;
import org.openhab.binding.zway.internal.handler.ZWayBridgeHandler;
import org.openhab.core.config.discovery.AbstractDiscoveryService;
*
* @author Patrick Hecker - Initial contribution
*/
+@NonNullByDefault
public class ZWayDeviceDiscoveryService extends AbstractDiscoveryService {
private final Logger logger = LoggerFactory.getLogger(getClass());
private ZWayBridgeHandler mBridgeHandler;
private ZWayDeviceScan mZWayDeviceScanningRunnable;
- private ScheduledFuture<?> mZWayDeviceScanningJob;
+ private @Nullable ScheduledFuture<?> mZWayDeviceScanningJob;
public ZWayDeviceDiscoveryService(ZWayBridgeHandler bridgeHandler) {
super(ZWayBindingConstants.SUPPORTED_DEVICE_THING_TYPES_UIDS, SEARCH_TIME);
logger.debug("Starting scan on Z-Way Server {}", mBridgeHandler.getThing().getUID());
// Z-Way bridge have to be ONLINE because configuration is needed
- if (mBridgeHandler == null || !mBridgeHandler.getThing().getStatus().equals(ThingStatus.ONLINE)) {
+ if (!mBridgeHandler.getThing().getStatus().equals(ThingStatus.ONLINE)) {
logger.debug("Z-Way bridge handler not found or not ONLINE.");
return;
}
@Override
protected void startBackgroundDiscovery() {
- if (mZWayDeviceScanningJob == null || mZWayDeviceScanningJob.isCancelled()) {
+ ScheduledFuture<?> mZWayDeviceScanningJobLocal = mZWayDeviceScanningJob;
+ if (mZWayDeviceScanningJobLocal == null || mZWayDeviceScanningJobLocal.isCancelled()) {
logger.debug("Starting background scanning job");
mZWayDeviceScanningJob = scheduler.scheduleWithFixedDelay(mZWayDeviceScanningRunnable, INITIAL_DELAY,
SCAN_INTERVAL, TimeUnit.SECONDS);
@Override
protected void stopBackgroundDiscovery() {
- if (mZWayDeviceScanningJob != null && !mZWayDeviceScanningJob.isCancelled()) {
- mZWayDeviceScanningJob.cancel(false);
+ ScheduledFuture<?> mZWayDeviceScanningJobLocal = mZWayDeviceScanningJob;
+ if (mZWayDeviceScanningJobLocal != null && !mZWayDeviceScanningJobLocal.isCancelled()) {
+ mZWayDeviceScanningJobLocal.cancel(false);
mZWayDeviceScanningJob = null;
}
}
// Z-Way IP address
String zWayIpAddress = config.getZWayIpAddress();
- if (zWayIpAddress == null || zWayIpAddress.isBlank()) {
+ if (zWayIpAddress.isBlank()) {
config.setZWayIpAddress("localhost"); // default value
}
- // Z-Way Port
- if (config.getZWayPort() == null) {
- config.setZWayPort(8083);
- }
-
// Z-Way Protocol
String zWayProtocol = config.getZWayProtocol();
- if (zWayProtocol == null || zWayProtocol.isBlank()) {
+ if (zWayProtocol.isBlank()) {
config.setZWayProtocol("http");
}
// Z-Way Username
String zWayUsername = config.getZWayUsername();
- if (zWayUsername == null || zWayUsername.isBlank()) {
+ if (zWayUsername.isBlank()) {
config.setZWayUsername("admin"); // default value
}
- /***********************************
- ****** General configuration ******
- **********************************/
-
- // Polling interval
- if (config.getPollingInterval() == null) {
- config.setPollingInterval(3600);
- }
-
return config;
}
Map<String, String> properties = getThing().getProperties();
// Load location from properties
String location = properties.get(ZWayBindingConstants.DEVICE_PROP_LOCATION);
- if (location != null && !location.equals("") && getThing().getLocation() == null) {
+ if (location != null && !location.isBlank() && getThing().getLocation() == null) {
logger.debug("Set location to {}", location);
ThingBuilder thingBuilder = editThing();
thingBuilder.withLocation(location);
// Load device id from channel's properties for the compatibility of ZAutomation and ZWave devices
final Channel channel = getThing().getChannel(channelUID.getId());
- final String deviceId = channel.getProperties().get("deviceId");
+ final String deviceId = channel != null ? channel.getProperties().get("deviceId") : null;
if (deviceId != null) {
DeviceList deviceList = zwayBridgeHandler.getDeviceList();
}
// If at least one rule could mapped to a channel
- if (!id.equals("")) {
+ if (!id.isBlank()) {
addChannel(id, acceptedItemType, device.getMetrics().getTitle(), properties);
logger.debug(
# add-on
+
addon.zway.name = Z-Way Binding
addon.zway.description = Z-Way is a home automation software to configure and control a Z-Wave network. The ZAutomation interface provides all Z-Wave devices and handles incoming commands. The Z-Way Binding uses this HTTP interface to load all device and make them available during the discovery process.<br> Currently only a continuous polling is available!
# thing types
-thing-type.zway.zwayServer.label = Z-Way Server
-thing-type.zway.zwayServer.description = The Z-Way server represents a bridge with general settings and communication tasks.
-
-thing-type.config.zway.zwayServer.zwayServer.label = Z-Way server
-thing-type.config.zway.zwayServer.zwayServer.description = The configuration of the Z-Way server. Except for the username and password all the information detected during the discovery.
-thing-type.config.zway.zwayServer.binding.label = Options
-thing-type.config.zway.zwayServer.binding.description = These settings affect functions of the binding.
-
-thing-type.config.zway.zwayServer.zwayServerIpAddress.label = IP address
-thing-type.config.zway.zwayServer.zwayServerIpAddress.description = The IP address or hostname of the Z-Way server. If Z-Way and openHAB are running on the same machine, the default value can be used.
-thing-type.config.zway.zwayServer.zwayServerPort.label = Port
-thing-type.config.zway.zwayServer.zwayServerPort.description = The port of the Z-Way server
-thing-type.config.zway.zwayServer.zwayServerProtocol.label = Protocol
-thing-type.config.zway.zwayServer.zwayServerProtocol.description = Protocol to connect to the Z-Way server (http or https)
-thing-type.config.zway.zwayServer.zwayServerUsername.label = Username
-thing-type.config.zway.zwayServer.zwayServerUsername.description = Username to access the Z-Way server.
-thing-type.config.zway.zwayServer.zwayServerPassword.label = Password
-thing-type.config.zway.zwayServer.zwayServerPassword.description = Password to access the Z-Way server.
-
-thing-type.config.zway.zwayServer.pollingInterval.label = Polling Interval
-thing-type.config.zway.zwayServer.pollingInterval.description = Refresh device states and registration from Z-Way server.
thing-type.zway.zwayDevice.label = Z-Wave Device
thing-type.zway.zwayDevice.description = A Z-Wave device represents a device of real world. Each device function will be mapped to a separate channel. The bridge is necessary as an intermediary between openHAB thing and Z-Way device.
-
-thing-type.config.zway.zwayDevice.nodeId.label = Node Id
-thing-type.config.zway.zwayDevice.nodeId.description = Node Id of the Z-Wave device
-
+thing-type.zway.zwayServer.label = Z-Way Server
+thing-type.zway.zwayServer.description = The Z-Way server represents a bridge with general settings and communication tasks.
thing-type.zway.zwayVirtualDevice.label = Z-Way Virtual Device
thing-type.zway.zwayVirtualDevice.description = A Z-Way virtual device represents one sensor, actor or Z-Way App with the corresponding channel. The bridge is necessary as an intermediary between openHAB thing and Z-Way device.
+# thing types config
+
+bridge-type.config.zway.zwayServer.group.binding.label = Options
+bridge-type.config.zway.zwayServer.group.binding.description = These settings affect functions of the binding.
+bridge-type.config.zway.zwayServer.group.zwayServer.label = Z-Way Server
+bridge-type.config.zway.zwayServer.group.zwayServer.description = The configuration of the Z-Way server. Except for the username and password all the information detected during the discovery.
+bridge-type.config.zway.zwayServer.pollingInterval.label = Polling Interval
+bridge-type.config.zway.zwayServer.pollingInterval.description = Refresh device states and registration from Z-Way server.
+bridge-type.config.zway.zwayServer.zwayServerIpAddress.label = IP Address
+bridge-type.config.zway.zwayServer.zwayServerIpAddress.description = The IP address or hostname of the Z-Way server. If Z-Way and openHAB are running on the same machine, the default value can be used.
+bridge-type.config.zway.zwayServer.zwayServerPassword.label = Password
+bridge-type.config.zway.zwayServer.zwayServerPassword.description = Password to access the Z-Way server.
+bridge-type.config.zway.zwayServer.zwayServerPort.label = Port
+bridge-type.config.zway.zwayServer.zwayServerPort.description = The port of the Z-Way server
+bridge-type.config.zway.zwayServer.zwayServerProtocol.label = Protocol
+bridge-type.config.zway.zwayServer.zwayServerProtocol.description = Protocol to connect to the Z-Way server (http or https)
+bridge-type.config.zway.zwayServer.zwayServerProtocol.option.http = HTTP
+bridge-type.config.zway.zwayServer.zwayServerProtocol.option.https = HTTPS
+bridge-type.config.zway.zwayServer.zwayServerUsername.label = Username
+bridge-type.config.zway.zwayServer.zwayServerUsername.description = Username to access the Z-Way server.
+thing-type.config.zway.zwayDevice.nodeId.label = Node Id
+thing-type.config.zway.zwayDevice.nodeId.description = Node Id of the Z-Wave device
thing-type.config.zway.zwayVirtualDevice.deviceId.label = Device Id
thing-type.config.zway.zwayVirtualDevice.deviceId.description = Device Id of virtual device
# channel types
-channel-type.zway.sensorTemperature.label = Temperature
-channel-type.zway.sensorLuminosity.label = Luminiscence
-channel-type.zway.sensorHumidity.label = Humidity
+
+channel-type.zway.actions.label = Actions
+channel-type.zway.actions.description = Available actions of the Z-Wave Controller
+channel-type.zway.actions.state.option.REFRESH = Refresh all things
+channel-type.zway.battery.label = Battery
+channel-type.zway.doorlock.label = Doorlock
+channel-type.zway.exclusion.label = Exclusion
+channel-type.zway.exclusion.description = Start exclusion mode (after a timeout the exclusion will be automatically finished).
+channel-type.zway.inclusion.label = Inclusion
+channel-type.zway.inclusion.description = Start inclusion mode (after a timeout the inclusion will be automatically finished).
+channel-type.zway.secureInclusion.label = Secure Inclusion
+channel-type.zway.secureInclusion.description = Change inclusion type for further inclusions.
channel-type.zway.sensorBarometer.label = Barometer
-channel-type.zway.sensorUltraviolet.label = Ultraviolet
-channel-type.zway.sensorCO2.label = CarbonDioxide
+channel-type.zway.sensorBinary.label = Sensor Binary
+channel-type.zway.sensorBinary.description = This channel represents a universal channel if no further device information is available.
+channel-type.zway.sensorCO2.label = CO2
+channel-type.zway.sensorCo.label = Gas
+channel-type.zway.sensorDiscrete.label = Sensor Discrete
+channel-type.zway.sensorDiscrete.description = This channel represents a two-digit value. The first digit is the button/scene number and the second digit points to action/keyAttribute (have a look at http://z-wave.sigmadesigns.com/wp-content/uploads/2016/08/SDS12657-12-Z-Wave-Command-Class-Specification-A-M.pdf, p. 153).
+channel-type.zway.sensorDoorWindow.label = DoorWindow
channel-type.zway.sensorEnergy.label = Energy
+channel-type.zway.sensorFlood.label = Flood
+channel-type.zway.sensorHumidity.label = Humidity
+channel-type.zway.sensorLuminosity.label = Luminiscence
channel-type.zway.sensorMeterKWh.label = Energy
channel-type.zway.sensorMeterW.label = Energy
+channel-type.zway.sensorMotion.label = Motion
+channel-type.zway.sensorMultilevel.label = Sensor Multilevel
+channel-type.zway.sensorMultilevel.description = This channel represents a universal channel if no further device information is available.
channel-type.zway.sensorSmoke.label = Smoke
-channel-type.zway.sensorCo.label = Gas
-channel-type.zway.sensorFlood.label = Flood
channel-type.zway.sensorTamper.label = Tamper
-channel-type.zway.sensorDoorWindow.label = DoorWindow
-channel-type.zway.sensorMotion.label = Motion
-channel-type.zway.switchPowerOutlet.label = PowerOutlet
+channel-type.zway.sensorTemperature.label = Temperature
+channel-type.zway.sensorUltraviolet.label = Ultraviolet
+channel-type.zway.switchBinary.label = Switch Binary
+channel-type.zway.switchBinary.description = This channel represents a universal channel if no further device information is available.
+channel-type.zway.switchBlinds.label = Rollshutter
+channel-type.zway.switchColor.label = Switch Color
+channel-type.zway.switchColor.description = This channel represents the rgbw switch device type from Z-Way.
channel-type.zway.switchColorTemperature.label = Color Temperature
-
-# channel type without further information
-channel-type.zway.battery.label = Battery
-channel-type.zway.doorlock.label = Doorlock
-channel-type.zway.sensorBinary.label = Sensor binary
-channel-type.zway.sensorBinary.description = This channel represents a universal channel if no further device information is available.
-channel-type.zway.sensorMultilevel.label = Sensor multilevel
-channel-type.zway.sensorMultilevel.description = This channel represents a universal channel if no further device information is available.
-channel-type.zway.switchBinary.label = Switch binary
-channel-type.zway.switchBinary.description = This channel represents a universal channel if no further device information is available.
-channel-type.zway.switchMultilevel.label = Switch multilevel
-channel-type.zway.switchMultilevel.description = This channel represents a universal channel if no further device information is available.
-channel-type.zway.switchColor.label = Switch color
-channel-type.zway.switchColor.description = This channel represents the RGBW switch device type from Z-Way.
-channel-type.zway.switchControl.label = Switch control
+channel-type.zway.switchControl.label = Switch Control
channel-type.zway.switchControl.description = This channel represents a universal channel if no further device information is available.
-channel-type.zway.sensorDiscrete.label = Sensor discrete
-channel-type.zway.sensorDiscrete.description = This channel represents a two-digit value. The first digit is the button/scene number and the second digit points to action/keyAttribute (have a look at http://z-wave.sigmadesigns.com/wp-content/uploads/2016/08/SDS12657-12-Z-Wave-Command-Class-Specification-A-M.pdf, p. 153).
-channel-type.zway.thermostatMode.label = Thermostat mode
+channel-type.zway.switchMultilevel.label = Switch Multilevel
+channel-type.zway.switchMultilevel.description = This channel represents a universal channel if no further device information is available.
+channel-type.zway.switchPowerOutlet.label = PowerOutlet
+channel-type.zway.thermostatMode.label = Thermostat Mode
channel-type.zway.thermostatMode.description = The channel allows the control or display of a thermostat (mode). A thermostat can have up to three states (modes): off, heating and cooling. The state of heating and cooling is alternately set at the state on.
-channel-type.zway.thermostatSetPoint.label = Thermostat set point
+channel-type.zway.thermostatModeCC.label = Thermostat Mode (Command Class)
+channel-type.zway.thermostatModeCC.description = The channel allows the control or display of a thermostat (mode) from command class. The modes differ from device to device.
+channel-type.zway.thermostatSetPoint.label = Thermostat Set Point
-channel-type.zway.thermostatModeV2.label = Thermostat mode (Command Class)
-channel-type.zway.thermostatModeV2.description = The channel allows the control or display of a thermostat (mode) from command class. The modes differ from device to device.
+# thing types
-channel-type.zway.actions.label = Actions
-channel-type.zway.actions.description = Available actions of the Z-Wave Controller
-channel-type.zway.actions.option.REFRESH = Refresh all things
+thing-type.config.zway.zwayServer.pollingInterval.label = Polling Interval
+thing-type.config.zway.zwayServer.pollingInterval.description = Refresh device states and registration from Z-Way server.
+thing-type.config.zway.zwayServer.zwayServer.label = Z-Way server
+thing-type.config.zway.zwayServer.zwayServer.description = The configuration of the Z-Way server. Except for the username and password all the information detected during the discovery.
+thing-type.config.zway.zwayServer.binding.label = Options
+thing-type.config.zway.zwayServer.binding.description = These settings affect functions of the binding.
+thing-type.config.zway.zwayServer.zwayServerIpAddress.label = IP address
+thing-type.config.zway.zwayServer.zwayServerIpAddress.description = The IP address or hostname of the Z-Way server. If Z-Way and openHAB are running on the same machine, the default value can be used.
+thing-type.config.zway.zwayServer.zwayServerPort.label = Port
+thing-type.config.zway.zwayServer.zwayServerPort.description = The port of the Z-Way server
+thing-type.config.zway.zwayServer.zwayServerProtocol.label = Protocol
+thing-type.config.zway.zwayServer.zwayServerProtocol.description = Protocol to connect to the Z-Way server (http or https)
+thing-type.config.zway.zwayServer.zwayServerUsername.label = Username
+thing-type.config.zway.zwayServer.zwayServerUsername.description = Username to access the Z-Way server.
+thing-type.config.zway.zwayServer.zwayServerPassword.label = Password
+thing-type.config.zway.zwayServer.zwayServerPassword.description = Password to access the Z-Way server.
-channel-type.zway.secureInclusion.label = Secure inclusion
-channel-type.zway.secureInclusion.description = Change inclusion type for further inclusions.
-channel-type.zway.inclusion.label = Inclusion
-channel-type.zway.inclusion.description = Start inclusion mode (after a timeout the inclusion will be automatically finished).
-channel-type.zway.exclusion.label = Exclusion
-channel-type.zway.exclusion.description = Start exclusion mode (after a timeout the exclusion will be automatically finished).
+# channel type without further information
+
+channel-type.zway.actions.option.REFRESH = Refresh all things
+channel-type.zway.thermostatModeV2.label = Thermostat mode (Command Class)
+channel-type.zway.thermostatModeV2.description = The channel allows the control or display of a thermostat (mode) from command class. The modes differ from device to device.