- * This is an asynchronous method. Once the read is complete - * {@link BluetoothDeviceListener.onCharacteristicReadComplete} - * method will be called with the completion state. - *
- * Note that {@link BluetoothDeviceListener.onCharacteristicUpdate} will be called when the read value is received.
+ * This is an asynchronous method. Once the read is complete the returned future will be updated with the result.
*
* @param characteristic the {@link BluetoothCharacteristic} to read.
- * @return true if the characteristic read is started successfully
+ * @return a future that returns the read data is successful, otherwise throws an exception
*/
- public abstract boolean readCharacteristic(BluetoothCharacteristic characteristic);
+ public abstract CompletableFuture
- * This is an asynchronous method. Once the write is complete
- * {@link BluetoothDeviceListener.onCharacteristicWriteComplete} method will be called with the completion state.
+ * This is an asynchronous method. Once the write is complete the returned future will be updated with the result.
*
- * @param characteristic the {@link BluetoothCharacteristic} to read.
- * @return true if the characteristic write is started successfully
+ * @param characteristic the {@link BluetoothCharacteristic} to write.
+ * @param value the data to write
+ * @return a future that returns null upon a successful write, otherwise throws an exception
+ */
+ public abstract CompletableFuture<@Nullable Void> writeCharacteristic(BluetoothCharacteristic characteristic,
+ byte[] value);
+
+ /**
+ * Returns if notification is enabled for the given characteristic.
+ *
+ * @param characteristic the {@link BluetoothCharacteristic} to check if notifications are enabled.
+ * @return true if notification is enabled, false if notification is disabled, characteristic is missing on device
+ * or notifications are not supported.
*/
- public abstract boolean writeCharacteristic(BluetoothCharacteristic characteristic);
+ public abstract boolean isNotifying(BluetoothCharacteristic characteristic);
/**
* Enables notifications for a characteristic. Only a single read or write operation can be requested at once.
@@ -259,7 +266,7 @@ public BluetoothAdapter getAdapter() {
* @param characteristic the {@link BluetoothCharacteristic} to receive notifications for.
* @return true if the characteristic notification is started successfully
*/
- public abstract boolean enableNotifications(BluetoothCharacteristic characteristic);
+ public abstract CompletableFuture<@Nullable Void> enableNotifications(BluetoothCharacteristic characteristic);
/**
* Disables notifications for a characteristic. Only a single read or write operation can be requested at once.
@@ -269,7 +276,7 @@ public BluetoothAdapter getAdapter() {
* @param characteristic the {@link BluetoothCharacteristic} to disable notifications for.
* @return true if the characteristic notification is stopped successfully
*/
- public abstract boolean disableNotifications(BluetoothCharacteristic characteristic);
+ public abstract CompletableFuture<@Nullable Void> disableNotifications(BluetoothCharacteristic characteristic);
/**
* Enables notifications for a descriptor. Only a single read or write operation can be requested at once.
@@ -366,6 +373,12 @@ public final boolean hasListeners() {
protected abstract Collection
* Uses the warnings.xml from the resources directory instead of accessing the api endpoint. * + *
* The XML has 2 Entries: + * *
-
- *
- Amtliche WARNUNG vor WINDBÖEN, MINOR - *
- Amtliche WARNUNG vor STURMBÖEN, MODERATE + *
- Amtliche WARNUNG vor WINDBÖEN, MINOR + *
- Amtliche WARNUNG vor STURMBÖEN, MODERATE *
", " "); - str = StringEscapeUtils.unescapeHtml(str); + str = str.replace("%FC", "ü"); + str = str.replace("%DC", "Ü"); + str = str.replace("%E4", "ä"); + str = str.replace("%C4", "Ä"); + str = str.replace("%F6", "ö"); + str = str.replace("%D6", "Ö"); + str = str.replace("%DF", "ß"); + str = str.replace(" ", ""); + str = str.replace("
", " "); + str = str.replace("ü", "ü"); + str = str.replace("ä", "ä"); + str = str.replace("ö", "ö"); + str = str.replace("Ü", "Ü"); + str = str.replace("Ä", "Ä"); + str = str.replace("Ö", "Ö"); return str; } @@ -222,7 +228,7 @@ public UrlLoader(String url, String startLine, String endLine) throws IOExceptio includeLine = false; } } - if ((includeLine == null || includeLine) && StringUtils.isNotBlank(line)) { + if ((includeLine == null || includeLine) && !line.isBlank()) { line(line); } } diff --git a/bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/thing/bridge.xml index cd8d9b8bd1705..468b5aa670428 100644 --- a/bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/thing/bridge.xml +++ b/bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/thing/bridge.xml @@ -37,11 +37,6 @@
uid is not a valid LIFX thing type UID
+ */
+ public static LifxProduct getLikelyProduct(ThingTypeUID uid) throws IllegalArgumentException {
+ for (LifxProduct product : LifxProduct.values()) {
+ if (product.getThingTypeUID().equals(uid)) {
+ return product;
+ }
+ }
+
+ throw new IllegalArgumentException(uid + " is not a valid product thing type UID");
+ }
+
+ /**
+ * Returns the product that has the given product ID.
+ *
+ * @param id the product ID
+ * @return the product that has the given product ID
+ * @throws IllegalArgumentException when id is not a valid LIFX product ID
+ */
+ public static LifxProduct getProductFromProductID(long id) throws IllegalArgumentException {
+ for (LifxProduct product : LifxProduct.values()) {
+ if (product.id == id) {
+ return product;
+ }
+ }
+
+ throw new IllegalArgumentException(id + " is not a valid product ID");
+ }
+
+ Listuid is not a valid LIFX thing type UID
- */
- public static Product getLikelyProduct(ThingTypeUID uid) throws IllegalArgumentException {
- for (Product product : Product.values()) {
- if (product.getThingTypeUID().equals(uid)) {
- return product;
- }
- }
-
- throw new IllegalArgumentException(uid + " is not a valid product thing type UID");
- }
-
- /**
- * Returns the product that has the given product ID.
- *
- * @param id the product ID
- * @return the product that has the given product ID
- * @throws IllegalArgumentException when id is not a valid LIFX product ID
- */
- public static Product getProductFromProductID(long id) throws IllegalArgumentException {
- for (Product product : Product.values()) {
- if (product.id == id) {
- return product;
- }
- }
-
- throw new IllegalArgumentException(id + " is not a valid product ID");
- }
-}
diff --git a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxMessageUtil.java b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxMessageUtil.java
index 7218a29f3dcc5..03c8135e2d7f3 100644
--- a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxMessageUtil.java
+++ b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxMessageUtil.java
@@ -17,8 +17,8 @@
import java.util.UUID;
import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.openhab.binding.lifx.internal.LifxProduct.TemperatureRange;
import org.openhab.binding.lifx.internal.fields.HSBK;
-import org.openhab.binding.lifx.internal.protocol.Product.TemperatureRange;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.IncreaseDecreaseType;
import org.openhab.core.library.types.PercentType;
@@ -26,7 +26,7 @@
/**
* Utility class for sharing message utility methods between objects.
*
- * @author Wouter Born - Extracted methods from LifxLightHandler
+ * @author Wouter Born - Initial contribution
*/
@NonNullByDefault
public final class LifxMessageUtil {
diff --git a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxNetworkUtil.java b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxNetworkUtil.java
index 4d4774801447a..eca9a34a17efa 100644
--- a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxNetworkUtil.java
+++ b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxNetworkUtil.java
@@ -34,7 +34,7 @@
* The {@link LifxNetworkUtil} provides network interface information to the LIFX binding objects. The information is
* updated when it is older than {@link #UPDATE_INTERVAL_MILLIS}.
*
- * @author Wouter Born - Periodically update available interface information
+ * @author Wouter Born - Initial contribution
*/
@NonNullByDefault
public final class LifxNetworkUtil {
diff --git a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxSelectorUtil.java b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxSelectorUtil.java
index 10dec21b90a22..1630ec296acd5 100644
--- a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxSelectorUtil.java
+++ b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxSelectorUtil.java
@@ -32,17 +32,17 @@
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.lifx.internal.LifxSelectorContext;
+import org.openhab.binding.lifx.internal.dto.Packet;
+import org.openhab.binding.lifx.internal.dto.PacketFactory;
+import org.openhab.binding.lifx.internal.dto.PacketHandler;
import org.openhab.binding.lifx.internal.fields.MACAddress;
-import org.openhab.binding.lifx.internal.protocol.Packet;
-import org.openhab.binding.lifx.internal.protocol.PacketFactory;
-import org.openhab.binding.lifx.internal.protocol.PacketHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Utility class for sharing {@link Selector} logic between objects.
*
- * @author Wouter Born - Make selector logic reusable between discovery and handlers
+ * @author Wouter Born - Initial contribution
*/
@NonNullByDefault
public class LifxSelectorUtil {
diff --git a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxThrottlingUtil.java b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxThrottlingUtil.java
index 397df9e07ea02..8001d1e74b5e7 100644
--- a/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxThrottlingUtil.java
+++ b/bundles/org.openhab.binding.lifx/src/main/java/org/openhab/binding/lifx/internal/util/LifxThrottlingUtil.java
@@ -31,7 +31,7 @@
* sent to LIFX lights. The LIFX LAN Protocol Specification states that lights can process up to 20 messages per second,
* not more.
*
- * @author Karel Goderis - Initial Contribution
+ * @author Karel Goderis - Initial contribution
* @author Wouter Born - Deadlock fix
*/
@NonNullByDefault
diff --git a/bundles/org.openhab.binding.lifx/src/test/java/org/openhab/binding/lifx/internal/LifxProductTest.java b/bundles/org.openhab.binding.lifx/src/test/java/org/openhab/binding/lifx/internal/LifxProductTest.java
new file mode 100644
index 0000000000000..d0547ed6709fb
--- /dev/null
+++ b/bundles/org.openhab.binding.lifx/src/test/java/org/openhab/binding/lifx/internal/LifxProductTest.java
@@ -0,0 +1,140 @@
+/**
+ * Copyright (c) 2010-2021 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.lifx.internal;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.openhab.binding.lifx.internal.LifxProduct.Feature.*;
+import static org.openhab.binding.lifx.internal.LifxProduct.TemperatureRange.*;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.junit.jupiter.api.Test;
+import org.openhab.binding.lifx.internal.LifxProduct.Features;
+import org.openhab.binding.lifx.internal.LifxProduct.Upgrade;
+
+/**
+ * Tests {@link LifxProduct}.
+ *
+ * @author Wouter Born - Initial contribution
+ */
+@NonNullByDefault
+public class LifxProductTest {
+
+ @Test
+ public void productIDsAreUnique() {
+ Set1: Hash-based
2: Token-based | 0: Automatic | A method used to authenticate user in the Miniserver. | +| ID | Name | Values | Default | Description | +|-----------------|-----------------------|-------------------------------------------------|--------------|-------------------------------------------------------| +| `authMethod` | Authentication method | 0: Automatic
1: Hash-based
2: Token-based | 0: Automatic | A method used to authenticate user in the Miniserver. | +| `webSocketType` | WebSocket protocol | 0: Automatic
1: Force HTTPS
2: Force HTTP | 0: Automatic | Communication protocol used for WebSocket connection. | ### Timeouts diff --git a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxBindingConfiguration.java b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxBindingConfiguration.java index 1cebb8770567a..5d817bd2f4021 100644 --- a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxBindingConfiguration.java +++ b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxBindingConfiguration.java @@ -24,9 +24,13 @@ public class LxBindingConfiguration { */ public String host; /** - * Port of web service of the Miniserver + * Port of HTTP web service of the Miniserver */ public int port; + /** + * Port of HTTPS web service of the Miniserver + */ + public int httpsPort; /** * User name used to log into the Miniserver */ @@ -76,4 +80,8 @@ public class LxBindingConfiguration { * Authentication method (0-auto, 1-hash, 2-token) */ public int authMethod; + /** + * WebSocket connection type (0-auto, 1-HTTPS, 2-HTTP) + */ + public int webSocketType; } diff --git a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxServerHandler.java b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxServerHandler.java index aa6b9d58dedc0..17517e2b3faa5 100644 --- a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxServerHandler.java +++ b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxServerHandler.java @@ -32,6 +32,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.client.ClientUpgradeRequest; import org.eclipse.jetty.websocket.client.WebSocketClient; @@ -72,7 +73,7 @@ public class LxServerHandler extends BaseThingHandler implements LxServerHandlerApi { private static final String SOCKET_URL = "/ws/rfc6455"; - private static final String CMD_CFG_API = "jdev/cfg/api"; + private static final String CMD_CFG_API = "jdev/cfg/apiKey"; private static final Gson GSON; @@ -139,6 +140,7 @@ public LxServerHandler(Thing thing, LxDynamicStateDescriptionProvider provider) @Override public void handleCommand(ChannelUID channelUID, Command command) { + logger.debug("[{}] Handle command: channelUID={}, command={}", debugId, channelUID, command); if (command instanceof RefreshType) { updateChannelState(channelUID); return; @@ -146,6 +148,8 @@ public void handleCommand(ChannelUID channelUID, Command command) { try { LxControl control = channels.get(channelUID); if (control != null) { + logger.debug("[{}] Dispatching command to control UUID={}, name={}", debugId, control.getUuid(), + control.getName()); control.handleCommand(channelUID, command); } else { logger.error("[{}] Received command {} for unknown control.", debugId, command); @@ -182,7 +186,7 @@ public void initialize() { jettyThreadPool.setDaemon(true); socket = new LxWebSocket(debugId, this, bindingConfig, host); - wsClient = new WebSocketClient(); + wsClient = new WebSocketClient(new SslContextFactory.Client(true)); wsClient.setExecutor(jettyThreadPool); if (debugId > 1) { reconnectDelay.set(0); @@ -478,8 +482,16 @@ private void updateStateValue(LxStateUpdate update) { Map
@@ -34,6 +36,7 @@ * @author Jeff Lauterbach - Initial Contribution * */ +@NonNullByDefault public class LEDMapFeedback extends RadioRAFeedback { private String bitmap; // 15 bit String of (0,1). 1 is ON, 0 is OFF diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/LocalZoneChangeFeedback.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/LocalZoneChangeFeedback.java index 96fff4fc67db4..5cd9391f28a14 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/LocalZoneChangeFeedback.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/LocalZoneChangeFeedback.java @@ -12,6 +12,10 @@ */ package org.openhab.binding.lutron.internal.radiora.protocol; +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Feedback for when a device was changed locally (not through Master Control) *
@@ -37,13 +41,22 @@ * LZC,04,ON * * + * In a bridged system, a system parameter S1 or S2 will be appended. + * + *
+ * LZC,04,ON,S2 + *+ * * @author Jeff Lauterbach - Initial Contribution * */ +@NonNullByDefault public class LocalZoneChangeFeedback extends RadioRAFeedback { + private final Logger logger = LoggerFactory.getLogger(LocalZoneChangeFeedback.class); private int zoneNumber; // 1 to 32 private State state; // ON, OFF, CHG + private int system; // 1 or 2, or 0 for none public enum State { ON, @@ -56,6 +69,18 @@ public LocalZoneChangeFeedback(String msg) { zoneNumber = Integer.parseInt(params[1].trim()); state = State.valueOf(params[2].trim().toUpperCase()); + + system = 0; + if (params.length > 3) { + String sysParam = params[3].trim().toUpperCase(); + if ("S1".equals(sysParam)) { + system = 1; + } else if ("S2".equals(sysParam)) { + system = 2; + } else { + logger.debug("Invalid 3rd parameter {} in LZC message. Should be S1 or S2.", sysParam); + } + } } public State getState() { @@ -65,4 +90,8 @@ public State getState() { public int getZoneNumber() { return zoneNumber; } + + public int getSystem() { + return system; + } } diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/RadioRACommand.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/RadioRACommand.java index 180f48f223df1..ba103e665dd7b 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/RadioRACommand.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/RadioRACommand.java @@ -14,12 +14,15 @@ import java.util.List; +import org.eclipse.jdt.annotation.NonNullByDefault; + /** * Abstract base class for commands. * * @author Jeff Lauterbach - Initial Contribution * */ +@NonNullByDefault public abstract class RadioRACommand { protected static final String FIELD_SEPARATOR = ","; diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/RadioRAFeedback.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/RadioRAFeedback.java index 366eddec09a94..5ee20a6d6a146 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/RadioRAFeedback.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/RadioRAFeedback.java @@ -12,12 +12,15 @@ */ package org.openhab.binding.lutron.internal.radiora.protocol; +import org.eclipse.jdt.annotation.NonNullByDefault; + /** * Base class for Feedback from RadioRA * * @author Jeff Lauterbach - Initial Contribution * */ +@NonNullByDefault public class RadioRAFeedback { public String[] parse(String msg, int numParams) { diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/SetDimmerLevelCommand.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/SetDimmerLevelCommand.java index ae17a3781bf44..16f4762e8e1f6 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/SetDimmerLevelCommand.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/SetDimmerLevelCommand.java @@ -15,6 +15,9 @@ import java.util.ArrayList; import java.util.List; +import org.eclipse.jdt.annotation.NonNullByDefault; +import org.eclipse.jdt.annotation.Nullable; + /** * Set Dimmer Level (SDL) * Set an individual Dimmer’s light level. @@ -22,15 +25,18 @@ * @author Jeff Lauterbach - Initial Contribution * */ +@NonNullByDefault public class SetDimmerLevelCommand extends RadioRACommand { private int zoneNumber; // 1 to 32 private int dimmerLevel; // 0 to 100 - private Integer fadeSec; // 0 to 240 (optional) + private @Nullable Integer fadeSec; // 0 to 240 (optional) + private int system; // 1 or 2, or 0 for none - public SetDimmerLevelCommand(int zoneNumber, int dimmerLevel) { + public SetDimmerLevelCommand(int zoneNumber, int dimmerLevel, int system) { this.zoneNumber = zoneNumber; this.dimmerLevel = dimmerLevel; + this.system = system; } public void setFadeSeconds(int seconds) { @@ -52,6 +58,10 @@ public List
@@ -26,22 +30,39 @@ * Example: *
* Zones 2 and 9 are ON, all others are OFF, and Zones 31 and 32 are unassigned. + * In a bridged system, a system parameter S1 or S2 will be appended. * *
* ZMP,010000001000000000000000000000XX + * ZMP,00100000010000000000000000000000,S2 ** * @author Jeff Lauterbach - Initial Contribution * */ +@NonNullByDefault public class ZoneMapFeedback extends RadioRAFeedback { + private final Logger logger = LoggerFactory.getLogger(ZoneMapFeedback.class); private String zoneStates; // 32 bit String of (0,1,X) + private int system; // 1 or 2, or 0 for none public ZoneMapFeedback(String msg) { String[] params = parse(msg, 1); zoneStates = params[1]; + + system = 0; + if (params.length > 2) { + String sysParam = params[2].trim().toUpperCase(); + if ("S1".equals(sysParam)) { + system = 1; + } else if ("S2".equals(sysParam)) { + system = 2; + } else { + logger.debug("Invalid 2nd parameter {} in ZMP message. Should be S1 or S2.", sysParam); + } + } } public String getZoneStates() { @@ -55,4 +76,8 @@ public char getZoneValue(int zone) { return zoneStates.charAt(zone - 1); } + + public int getSystem() { + return system; + } } diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/ZoneMapInquiryCommand.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/ZoneMapInquiryCommand.java index caf411b744229..11e6cba15b1ba 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/ZoneMapInquiryCommand.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/radiora/protocol/ZoneMapInquiryCommand.java @@ -15,12 +15,15 @@ import java.util.Collections; import java.util.List; +import org.eclipse.jdt.annotation.NonNullByDefault; + /** * Requests an updated ZoneMap. * * @author Jeff Lauterbach - Initial Contribution * */ +@NonNullByDefault public class ZoneMapInquiryCommand extends RadioRACommand { @Override diff --git a/bundles/org.openhab.binding.lutron/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.lutron/src/main/resources/OH-INF/thing/thing-types.xml index d9e9459ac6e8c..b3b40832e227c 100644 --- a/bundles/org.openhab.binding.lutron/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.lutron/src/main/resources/OH-INF/thing/thing-types.xml @@ -1203,6 +1203,11 @@
`action{"did":"settings-set-start-time","siid":9,"aiid":2,"in":[2.0]}`
`action{"did":"settings-set-end-time","siid":9,"aiid":3,"in":[3.0]}`
`action{"did":"settings-set-frequency","siid":9,"aiid":4,"in":[4.0]}`
`action{"did":"settings-set-screen-off","siid":9,"aiid":5,"in":[5.0]}`
`action{"did":"settings-set-device-off","siid":9,"aiid":6,"in":[6.0]}`
`action{"did":"settings-set-temp-unit","siid":9,"aiid":7,"in":[7.0]}`
Please test and feedback if they are working to they can be linked to a channel. | | Mi Multifunction Air Monitor | miio:basic | [cgllc.airmonitor.b1](#cgllc-airmonitor-b1) | Yes | | | Qingping Air Monitor | miio:basic | [cgllc.airmonitor.s1](#cgllc-airmonitor-s1) | Yes | | | Mi Universal Remote | miio:unsupported | chuangmi.ir.v2 | No | | @@ -197,6 +198,8 @@ Currently the miio binding supports more than 260 different models. | Mi IH Pressure Rice Cooker | miio:unsupported | chunmi.cooker.press1 | No | | | Mi IH Pressure Rice Cooker | miio:unsupported | chunmi.cooker.press2 | No | | | Gosund Smart Plug | miio:basic | [cuco.plug.cp1](#cuco-plug-cp1) | Yes | | +| Mi Smart Antibacterial Humidifier | miio:basic | [deerma.humidifier.jsq](#deerma-humidifier-jsq) | Yes | | +| Mi S Smart humidifer | miio:basic | [deerma.humidifier.jsq1](#deerma-humidifier-jsq1) | Yes | | | Mi Smart Humidifier | miio:basic | [deerma.humidifier.mjjsq](#deerma-humidifier-mjjsq) | Yes | | | Mi Fresh Air Ventilator A1-150 | miio:basic | [dmaker.airfresh.a1](#dmaker-airfresh-a1) | Yes | | | Mi Fresh Air Ventilator | miio:basic | [dmaker.airfresh.t2017](#dmaker-airfresh-t2017) | Yes | | @@ -208,6 +211,10 @@ Currently the miio binding supports more than 260 different models. | Mi Robot Vacuum Mop 1C STYTJ01ZHM | miio:basic | [dreame.vacuum.mc1808](#dreame-vacuum-mc1808) | Yes | Identified manual actions for execution
`action{"did":"battery-start-charge","siid":2,"aiid":1,"in":[]}`
`action{"did":"vacuum-start-sweep","siid":3,"aiid":1,"in":[]}`
`action{"did":"vacuum-stop-sweeping","siid":3,"aiid":2,"in":[]}`
`action{"did":"brush-cleaner-reset-brush-life","siid":26,"aiid":1,"in":[]}`
`action{"did":"filter-reset-filter-life","siid":27,"aiid":1,"in":[]}`
`action{"did":"brush-cleaner-reset-brush-life","siid":28,"aiid":1,"in":[]}`
`action{"did":"clean-start-clean","siid":18,"aiid":1,"in":[]}`
`action{"did":"clean-stop-clean","siid":18,"aiid":2,"in":[]}`
`action{"did":"remote-start-remote","siid":21,"aiid":1,"in":[1.0, 2.0]}`
`action{"did":"remote-stop-remote","siid":21,"aiid":2,"in":[]}`
`action{"did":"remote-exit-remote","siid":21,"aiid":3,"in":[]}`
`action{"did":"map-map-req","siid":23,"aiid":1,"in":[2.0]}`
`action{"did":"audio-position","siid":24,"aiid":1,"in":[]}`
`action{"did":"audio-set-voice","siid":24,"aiid":2,"in":[]}`
`action{"did":"audio-play-sound","siid":24,"aiid":3,"in":[]}`
Please test and feedback if they are working to they can be linked to a channel.
Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | | Dreame Robot Vacuum-Mop F9 | miio:basic | [dreame.vacuum.p2008](#dreame-vacuum-p2008) | Yes | Identified manual actions for execution
`action{"did":"vacuum-start-sweep","siid":2,"aiid":1,"in":[]}`
`action{"did":"vacuum-stop-sweeping","siid":2,"aiid":2,"in":[]}`
`action{"did":"battery-start-charge","siid":3,"aiid":1,"in":[]}`
`action{"did":"brush-cleaner-reset-brush-life","siid":9,"aiid":1,"in":[]}`
`action{"did":"brush-cleaner-reset-brush-life","siid":10,"aiid":1,"in":[]}`
`action{"did":"filter-reset-filter-life","siid":11,"aiid":1,"in":[]}`
`action{"did":"vacuum-extend-start-clean","siid":4,"aiid":1,"in":[10.0]}`
`action{"did":"vacuum-extend-stop-clean","siid":4,"aiid":2,"in":[]}`
`action{"did":"map-map-req","siid":6,"aiid":1,"in":[2.0]}`
`action{"did":"map-update-map","siid":6,"aiid":2,"in":[4.0]}`
`action{"did":"audio-position","siid":7,"aiid":1,"in":[]}`
`action{"did":"audio-play-sound","siid":7,"aiid":2,"in":[]}`
`action{"did":"time-delete-timer","siid":8,"aiid":1,"in":[3.0]}`
Please test and feedback if they are working to they can be linked to a channel.
Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | | Dreame Robot Vacuum D9 | miio:basic | [dreame.vacuum.p2009](#dreame-vacuum-p2009) | Yes | Identified manual actions for execution not linked in the database >`action{"did":"vacuum-extend-start-clean","siid":4,"aiid":1,"in":[10.0]}`
`action{"did":"vacuum-extend-stop-clean","siid":4,"aiid":2,"in":[]}`
`action{"did":"map-map-req","siid":6,"aiid":1,"in":[2.0]}`
`action{"did":"map-update-map","siid":6,"aiid":2,"in":[4.0]}`
`action{"did":"audio-position","siid":7,"aiid":1,"in":[]}`
`action{"did":"audio-play-sound","siid":7,"aiid":2,"in":[]}`
`action{"did":"time-delete-timer","siid":8,"aiid":1,"in":[3.0]}`
| +| Trouver Robot LDS Vacuum-Mop Finder | miio:basic | [dreame.vacuum.p2036](#dreame-vacuum-p2036) | Yes | Identified manual actions for execution not linked in the database >`action{"did":"vacuum-extend-start-clean","siid":4,"aiid":1,"in":[10.0]}`
`action{"did":"vacuum-extend-stop-clean","siid":4,"aiid":2,"in":[]}`
`action{"did":"map-map-req","siid":6,"aiid":1,"in":[2.0]}`
`action{"did":"map-update-map","siid":6,"aiid":2,"in":[4.0]}`
`action{"did":"audio-position","siid":7,"aiid":1,"in":[]}`
`action{"did":"audio-play-sound","siid":7,"aiid":2,"in":[]}`
`action{"did":"time-delete-timer","siid":8,"aiid":1,"in":[3.0]}`
| +| Mi Robot Vacuum-Mop 2 Pro+ | miio:basic | [dreame.vacuum.p2041o](#dreame-vacuum-p2041o) | Yes | Identified manual actions for execution
`action{"did":"vacuum-start-sweep","siid":2,"aiid":1,"in":[]}`
`action{"did":"vacuum-stop-sweeping","siid":2,"aiid":2,"in":[]}`
`action{"did":"battery-start-charge","siid":3,"aiid":1,"in":[]}`
`action{"did":"brush-cleaner-reset-brush-life","siid":9,"aiid":1,"in":[]}`
`action{"did":"brush-cleaner-reset-brush-life","siid":10,"aiid":1,"in":[]}`
`action{"did":"filter-reset-filter-life","siid":11,"aiid":1,"in":[]}`
`action{"did":"vacuum-extend-start-clean","siid":4,"aiid":1,"in":[10.0]}`
`action{"did":"vacuum-extend-stop-clean","siid":4,"aiid":2,"in":[]}`
`action{"did":"map-map-req","siid":6,"aiid":1,"in":[2.0]}`
`action{"did":"map-update-map","siid":6,"aiid":2,"in":[4.0]}`
`action{"did":"audio-position","siid":7,"aiid":1,"in":[]}`
`action{"did":"audio-play-sound","siid":7,"aiid":2,"in":[]}`
`action{"did":"time-delete-timer","siid":8,"aiid":1,"in":[3.0]}`
Please test and feedback if they are working to they can be linked to a channel.
Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | +| MOVA Z500 Robot Vacuum and Mop Cleaner | miio:basic | [dreame.vacuum.p2156o](#dreame-vacuum-p2156o) | Yes | Identified manual actions for execution
`action{"did":"vacuum-start-sweep","siid":2,"aiid":1,"in":[]}`
`action{"did":"vacuum-stop-sweeping","siid":2,"aiid":2,"in":[]}`
`action{"did":"battery-start-charge","siid":3,"aiid":1,"in":[]}`
`action{"did":"brush-cleaner-reset-brush-life","siid":9,"aiid":1,"in":[]}`
`action{"did":"brush-cleaner-reset-brush-life","siid":10,"aiid":1,"in":[]}`
`action{"did":"filter-reset-filter-life","siid":11,"aiid":1,"in":[]}`
`action{"did":"vacuum-extend-start-clean","siid":4,"aiid":1,"in":[10.0]}`
`action{"did":"vacuum-extend-stop-clean","siid":4,"aiid":2,"in":[]}`
`action{"did":"map-map-req","siid":6,"aiid":1,"in":[2.0]}`
`action{"did":"map-update-map","siid":6,"aiid":2,"in":[4.0]}`
`action{"did":"audio-position","siid":7,"aiid":1,"in":[]}`
`action{"did":"audio-play-sound","siid":7,"aiid":2,"in":[]}`
`action{"did":"time-delete-timer","siid":8,"aiid":1,"in":[3.0]}`
Please test and feedback if they are working to they can be linked to a channel.
Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | +| MOVA L600 Robot Vacuum and Mop Cleaner | miio:basic | [dreame.vacuum.p2157](#dreame-vacuum-p2157) | Yes | Identified manual actions for execution not linked in the database >`action{"did":"vacuum-extend-start-clean","siid":4,"aiid":1,"in":[10.0]}`
`action{"did":"vacuum-extend-stop-clean","siid":4,"aiid":2,"in":[]}`
`action{"did":"map-map-req","siid":6,"aiid":1,"in":[2.0]}`
`action{"did":"map-update-map","siid":6,"aiid":2,"in":[4.0]}`
`action{"did":"audio-position","siid":7,"aiid":1,"in":[]}`
`action{"did":"audio-play-sound","siid":7,"aiid":2,"in":[]}`
`action{"did":"time-delete-timer","siid":8,"aiid":1,"in":[3.0]}`
| | HUIZUO ARIES For Bedroom | miio:basic | [huayi.light.ari013](#huayi-light-ari013) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | | HUIZUO ARIES For Living Room | miio:basic | [huayi.light.aries](#huayi-light-aries) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | | HUIZUO Fan Light | miio:basic | [huayi.light.fanwy](#huayi-light-fanwy) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | @@ -454,6 +461,7 @@ Currently the miio binding supports more than 260 different models. | Mi Air Purifier v5 | miio:basic | [zhimi.airpurifier.v5](#zhimi-airpurifier-v5) | Yes | | | Mi Air Purifier Pro v6 | miio:basic | [zhimi.airpurifier.v6](#zhimi-airpurifier-v6) | Yes | | | Mi Air Purifier Pro v7 | miio:basic | [zhimi.airpurifier.v7](#zhimi-airpurifier-v7) | Yes | | +| Mi Air Purifier Pro H | miio:basic | [zhimi.airpurifier.vb2](#zhimi-airpurifier-vb2) | Yes | | | Mi Air Purifier virtual | miio:unsupported | zhimi.airpurifier.virtual | No | | | Mi Air Purifier 2(Virtual) | miio:unsupported | zhimi.airpurifier.vtl_m1 | No | | | Mi Standing Fan | miio:basic | [zhimi.fan.sa1](#zhimi-fan-sa1) | Yes | | @@ -463,6 +471,12 @@ Currently the miio binding supports more than 260 different models. | Smartmi Inverter Pedestal Fan | miio:basic | [zhimi.fan.za1](#zhimi-fan-za1) | Yes | | | Smartmi Standing Fan 2 | miio:basic | [zhimi.fan.za3](#zhimi-fan-za3) | Yes | | | Smartmi Standing Fan 2S | miio:basic | [zhimi.fan.za4](#zhimi-fan-za4) | Yes | | +| Smartmi Standing Fan 3 | miio:basic | [zhimi.fan.za5](#zhimi-fan-za5) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | +| Mi Smart Space Heater S | miio:basic | [zhimi.heater.ma2](#zhimi-heater-ma2) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | +| Mi Smart Baseboard Heater E | miio:basic | [zhimi.heater.ma3](#zhimi-heater-ma3) | Yes | Identified manual actions for execution
`action{"did":"private-service-toggle-switch","siid":8,"aiid":1,"in":[]}`
Please test and feedback if they are working to they can be linked to a channel.
Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | +| Mi Smart Space Heater S | miio:basic | [zhimi.heater.mc2](#zhimi-heater-mc2) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | +| Smartmi Smart Fan | miio:basic | [zhimi.heater.na1](#zhimi-heater-na1) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | +| Smartmi Smart Fan Heater | miio:basic | [zhimi.heater.nb1](#zhimi-heater-nb1) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | | Smartmi Radiant Heater Smart Version | miio:basic | [zhimi.heater.za1](#zhimi-heater-za1) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | | Smartmi Smart Convector Heater 1S | miio:basic | [zhimi.heater.za2](#zhimi-heater-za2) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | | Smartmi Smart Convector Heater 1S | miio:basic | [zhimi.heater.zb1](#zhimi-heater-zb1) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses | @@ -494,6 +508,25 @@ note: the ADVANCED `actions#commands` and `actions#rpc` channels can be used to e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enable a pre-configured timer. See https://github.com/marcelrv/XiaomiRobotVacuumProtocol for all known available commands. +### Qingping Air Monitor Lite (cgllc.airm.cgdn1) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| actions | String | Actions | Value mapping ["settings-set-start-time"="Set Start Time","settings-set-end-time"="Set End Time","settings-set-frequency"="Set Frequency","settings-set-screen-off"="Set Screen Off","settings-set-device-off"="Set Device Off","settings-set-temp-unit"="Set Temp Unit"] | +| relative_humidity | Number:Dimensionless | Environment - Relative Humidity | | +| pm2_5_density | Number:Density | Environment - PM2 5 Density | | +| pm10_density | Number:Density | Environment - PM10 Density | | +| temperature | Number:Temperature | Environment - Temperature | | +| co2_density | Number:Density | Environment - CO2 Density | | +| battery_level | Number:Dimensionless | Battery - Battery Level | | +| charging_state | Number | Battery - Charging State | Value mapping ["1"="Charging","2"="Not charging","3"="Not chargeable"] | +| voltage | Number:ElectricPotential | Battery - Voltage | | +| mac | String | Mac - Mac | | +| monitoring_frequency | Number:Time | Settings - Monitoring Frequency | Value mapping ["1"="Second","60"="Second","300"="Second","600"="Second","0"="Null"] | +| screen_off | Number:Time | Settings - Screen Off | Value mapping ["15"="Second","30"="Second","60"="Second","300"="Second","0"="Null"] | +| device_off | Number:Time | Settings - Device Off | Value mapping ["15"="Minute","30"="Minute","60"="Minute","0"="Null"] | +| tempature_unit | String | Settings - Tempature Unit | | + ### Mi Multifunction Air Monitor (cgllc.airmonitor.b1) Channels | Channel | Type | Description | Comment | @@ -522,14 +555,14 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl |----------------------|----------------------|------------------------------------------|------------| | on | Switch | Power | | | temperature | Number:Temperature | Temperature | | -| working-time | Number:Duration | Working Time | | +| working-time | Number:Time | Working Time | | | on1 | Switch | Indicator Light - Switch Status | | | power-consumption | Number:Energy | Daily Power Consumption | | | electric-current | Number:Current | Power Consumption - Electric Current | | | voltage | Number:ElectricPotential | Power Consumption - Voltage | | | electric-power | Number:Power | Current Power Consumption - Electric Power | | -| on-duration | Number:Duration | Imilab Timer - On Duration | | -| off-duration | Number:Duration | Imilab Timer - Off Duration | | +| on-duration | Number:Time | Imilab Timer - On Duration | | +| off-duration | Number:Time | Imilab Timer - Off Duration | | | countdown | Number:Time | Imilab Timer - Countdown | | | task-switch | Switch | Imilab Timer - Task Switch | | | countdown-info | Switch | Imilab Timer - Countdown Info | | @@ -546,7 +579,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| -| power | Switch | Power | If this channel does not respond to on/off replace the model with chuangmi.plug.v3old in the config or upgrade firmware | +| power | Switch | Power | If this channel does not respond to on/off upgrade firmware | | usb | Switch | USB | | | temperature | Number:Temperature | Temperature | | | led | Switch | Wifi LED | | @@ -555,7 +588,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| -| power | Switch | Power | If this channel does not respond to on/off replace the model with chuangmi.plug.v3old in the config or upgrade firmware | +| power | Switch | Power | If this channel does not respond to on/off upgrade firmware | | usb | Switch | USB | | | temperature | Number:Temperature | Temperature | | | led | Switch | Wifi LED | | @@ -595,7 +628,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| -| power | Switch | Power | If this channel does not respond to on/off replace the model with chuangmi.plug.v3old in the config or upgrade firmware | +| power | Switch | Power | If this channel does not respond to on/off upgrade firmware | | usb | Switch | USB | | | temperature | Number:Temperature | Temperature | | | led | Switch | Wifi LED | | @@ -610,6 +643,43 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | SerialNumber | String | Device Information-Device Serial Number | | | On | Switch | Switch-Switch Status | | +### Mi Smart Antibacterial Humidifier (deerma.humidifier.jsq) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| power | Switch | Power | | +| mode | Number | Mode | | +| humidity | Number:Dimensionless | Humidity | | +| humidity_set | Number:Dimensionless | Humidity Setting | | +| led | Switch | LED indicator Light | | +| sound | Switch | Notification Sounds | | +| watertankstatus | Number | Watertank Status | | + +### Mi S Smart humidifer (deerma.humidifier.jsq1) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| power | Switch | Power | | +| mode | Number | Mode | | +| humidity | Number:Dimensionless | Humidity | | +| humidity_set | Number:Dimensionless | Humidity Setting | | +| led | Switch | LED indicator Light | | +| sound | Switch | Notification Sounds | | +| watertankstatus | Number | Watertank Status | | +| wet_and_protect | Switch | Wet and Protect | | + +### Mi Smart Humidifier (deerma.humidifier.mjjsq) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| power | Switch | Power | | +| mode | Number | Mode | | +| humidity | Number:Dimensionless | Humidity | | +| humidity_set | Number:Dimensionless | Humidity Setting | | +| led | Switch | LED indicator Light | | +| sound | Switch | Notification Sounds | | +| watertankstatus | Number | Watertank Status | | + ### Mi Fresh Air Ventilator A1-150 (dmaker.airfresh.a1) Channels | Channel | Type | Description | Comment | @@ -837,7 +907,175 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | cleaning-mode | Number | Vacuum Extend - Cleaning Mode | Value mapping ["0"="mode 0","1"="mode 1","2"="mode 2","3"="mode 3"] | | mop-mode | Number | Vacuum Extend - Mop Mode | Value mapping ["1"="low water","2"="medium water","3"="high water"] | | waterbox-status | Number | Vacuum Extend - Waterbox Status | Value mapping ["0"="Status 0","1"="Status 1"] | -| task-status | Number | Vacuum Extend - Task Status | | +| task-status | Number | Vacuum Extend - Task Status | Value mapping ["0"="Notask","1"="AutoClean","2"="CustomClean","3"="SelectAreanClean","4"="SpotArea"] | +| break-point-restart | Number | Vacuum Extend - Break Point Restart | Value mapping ["0"="Off","1"="On"] | +| carpet-press | Number | Vacuum Extend - Carpet Press | Value mapping ["0"="Off","1"="On"] | +| serial-number1 | String | Vacuum Extend - Serial Number | | +| clean-rags-tip | Number:Time | Vacuum Extend - Clean Rags Tip | | +| keep-sweeper-time | Number:Time | Vacuum Extend - Keep Sweeper Time | | +| faults | String | Vacuum Extend - Faults | | +| enable | Switch | Do Not Disturb - Enable | | +| start-time | String | Do Not Disturb - Start Time | | +| end-time | String | Do Not Disturb - End Time | | +| volume | Number:Dimensionless | Audio - Volume | | +| voice-packet-id | String | Audio - Voice Packet Id | | +| voice-change-state | String | Audio - Voice Change State | | +| time-zone | String | Time - Time Zone | | +| timer-clean | String | Time - Timer Clean | | +| first-clean-time | Number | Clean Logs - First Clean Time | | +| total-clean-time | Number:Time | Clean Logs - Total Clean Time | | +| total-clean-times | Number | Clean Logs - Total Clean Times | | +| total-clean-area | Number | Clean Logs - Total Clean Area | | + +### Trouver Robot LDS Vacuum-Mop Finder (dreame.vacuum.p2036) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| vacuumaction | String | Vacuum Action | Value mapping ["sweep"="Sweep","stopsweep"="Stop Sweep","dock"="Goto Dock"] | +| status | Number | Robot Cleaner - Status | Value mapping ["1"="Sweeping","2"="Idle","3"="Paused","4"="Error","5"="Go Charging","6"="Charging","7"="Mopping"] | +| fault | Number | Robot Cleaner - Device Fault | | +| battery-level | Number:Dimensionless | Battery - Battery Level | | +| charging-state | Number | Battery - Charging State | Value mapping ["1"="Charging","2"="Not Charging","5"="Go Charging"] | +| resetConsumable | String | Consumables Reset | Value mapping ["mainbrush-cleaner-reset-brush-life"="Reset Main Brush","sidebrush-cleaner-reset-brush-life"="Reset Side Brush","filter-reset-filter-life"="Reset Filter"] | +| brush-left-time | Number:Time | Main Cleaning Brush - Brush Left Time | | +| brush-life-level | Number:Dimensionless | Main Cleaning Brush - Brush Life Level | | +| brush-left-time1 | Number:Time | Side Cleaning Brush - Brush Left Time | | +| brush-life-level1 | Number:Dimensionless | Side Cleaning Brush - Brush Life Level | | +| filter-life-level | Number:Dimensionless | Filter - Filter Life Level | | +| filter-left-time | Number:Time | Filter - Filter Left Time | | +| work-mode | Number | Vacuum Extend - Work Mode | | +| cleaning-time | Number:Time | Vacuum Extend - Cleaning Time | | +| cleaning-area | Number:Area | Vacuum Extend - Cleaning Area | | +| cleaning-mode | Number | Vacuum Extend - Cleaning Mode | Value mapping ["0"="mode 0","1"="mode 1","2"="mode 2","3"="mode 3"] | +| mop-mode | Number | Vacuum Extend - Mop Mode | Value mapping ["1"="low water","2"="medium water","3"="high water"] | +| waterbox-status | Number | Vacuum Extend - Waterbox Status | Value mapping ["0"="Status 0","1"="Status 1"] | +| task-status | Number | Vacuum Extend - Task Status | Value mapping ["0"="Notask","1"="AutoClean","2"="CustomClean","3"="SelectAreanClean","4"="SpotArea"] | +| break-point-restart | Number | Vacuum Extend - Break Point Restart | Value mapping ["0"="Off","1"="On"] | +| carpet-press | Number | Vacuum Extend - Carpet Press | Value mapping ["0"="Off","1"="On"] | +| serial-number1 | String | Vacuum Extend - Serial Number | | +| clean-rags-tip | Number:Time | Vacuum Extend - Clean Rags Tip | | +| keep-sweeper-time | Number:Time | Vacuum Extend - Keep Sweeper Time | | +| faults | String | Vacuum Extend - Faults | | +| enable | Switch | Do Not Disturb - Enable | | +| start-time | String | Do Not Disturb - Start Time | | +| end-time | String | Do Not Disturb - End Time | | +| volume | Number:Dimensionless | Audio - Volume | | +| voice-packet-id | String | Audio - Voice Packet Id | | +| voice-change-state | String | Audio - Voice Change State | | +| time-zone | String | Time - Time Zone | | +| timer-clean | String | Time - Timer Clean | | +| first-clean-time | Number | Clean Logs - First Clean Time | | +| total-clean-time | Number:Time | Clean Logs - Total Clean Time | | +| total-clean-times | Number | Clean Logs - Total Clean Times | | +| total-clean-area | Number | Clean Logs - Total Clean Area | | + +### Mi Robot Vacuum-Mop 2 Pro+ (dreame.vacuum.p2041o) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| actions | String | Actions | Value mapping ["vacuum-start-sweep"="Start Sweep","vacuum-stop-sweeping"="Stop Sweeping","battery-start-charge"="Start Charge","brush-cleaner-reset-brush-life"="Brush Cleaner Reset Brush Life","brush-cleaner-reset-brush-life"="Brush Cleaner Reset Brush Life","filter-reset-filter-life"="Filter Reset Filter Life","vacuum-extend-start-clean"="Vacuum Extend Start Clean","vacuum-extend-stop-clean"="Vacuum Extend Stop Clean","map-map-req"="Map Map Req","map-update-map"="Map Update Map","audio-position"="Audio Position","audio-play-sound"="Audio Play Sound","time-delete-timer"="Time Delete Timer"] | +| status | Number | Robot Cleaner - Status | Value mapping ["1"="Sweeping","2"="Idle","3"="Paused","4"="Error","5"="Go Charging","6"="Charging","7"="Mopping"] | +| fault | Number | Robot Cleaner - Device Fault | | +| mode | Number | Robot Cleaner - Mode | Value mapping ["0"="Silent","1"="Basic","2"="Strong","3"="Full Speed"] | +| battery_level | Number:Dimensionless | Battery - Battery Level | | +| charging_state | Number | Battery - Charging State | Value mapping ["1"="Charging","2"="Not Charging","5"="Go Charging"] | +| brush_left_time | Number:Time | Main Cleaning Brush - Brush Left Time | | +| brush_life_level | Number:Dimensionless | Main Cleaning Brush - Brush Life Level | | +| brush_left_time1 | Number:Time | Side Cleaning Brush - Brush Left Time | | +| brush_life_level1 | Number:Dimensionless | Side Cleaning Brush - Brush Life Level | | +| filter_life_level | Number:Dimensionless | Filter - Filter Life Level | | +| filter_left_time | Number:Time | Filter - Filter Left Time | | +| work_mode | Number | Vacuum Extend - Work Mode | | +| cleaning_time | Number:Time | Vacuum Extend - Cleaning Time | | +| cleaning-area | Number:Area | Vacuum Extend - Cleaning Area | | +| cleaning_mode | Number | Vacuum Extend - Cleaning Mode | Value mapping ["0"="mode 0","1"="mode 1","2"="mode 2","3"="mode 3"] | +| mop_mode | Number | Vacuum Extend - Mop Mode | Value mapping ["1"="low water","2"="medium water","3"="high water"] | +| waterbox_status | Number | Vacuum Extend - Waterbox Status | Value mapping ["0"="Status 0","1"="Status 1"] | +| task_status | Number | Vacuum Extend - Task Status | Value mapping ["0"="Notask","1"="AutoClean","2"="CustomClean","3"="SelectAreanClean","4"="SpotArea"] | +| break_point_restart | Number | Vacuum Extend - Break Point Restart | Value mapping ["0"="Off","1"="On"] | +| carpet_press | Number | Vacuum Extend - Carpet Press | Value mapping ["0"="Off","1"="On"] | +| serial_number | String | Vacuum Extend - Serial Number | | +| keep_sweeper_time | Number:Time | Vacuum Extend - Keep Sweeper Time | | +| faults | String | Vacuum Extend - Faults | | +| enable | Switch | Do Not Disturb - Enable | | +| start_time | String | Do Not Disturb - Start Time | | +| end_time | String | Do Not Disturb - End Time | | +| volume | Number:Dimensionless | Audio - Volume | | +| voice_packet_id | String | Audio - Voice Packet Id | | +| voice_change_state | String | Audio - Voice Change State | | +| time_zone | String | Time - Time Zone | | +| timer_clean | String | Time - Timer Clean | | +| first_clean_time | Number | Clean Logs - First Clean Time | | +| total_clean_time | Number:Time | Clean Logs - Total Clean Time | | +| total_clean_times | Number | Clean Logs - Total Clean Times | | +| total_clean_area | Number | Clean Logs - Total Clean Area | | +| save_map_status | Number | Vslam Extend - Save Map Status | Value mapping ["0"="Off","1"="On"] | + +### MOVA Z500 Robot Vacuum and Mop Cleaner (dreame.vacuum.p2156o) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| actions | String | Actions | Value mapping ["vacuum-start-sweep"="Start Sweep","vacuum-stop-sweeping"="Stop Sweeping","battery-start-charge"="Start Charge","brush-cleaner-reset-brush-life"="Brush Cleaner Reset Brush Life","brush-cleaner-reset-brush-life"="Brush Cleaner Reset Brush Life","filter-reset-filter-life"="Filter Reset Filter Life","vacuum-extend-start-clean"="Vacuum Extend Start Clean","vacuum-extend-stop-clean"="Vacuum Extend Stop Clean","map-map-req"="Map Map Req","map-update-map"="Map Update Map","audio-position"="Audio Position","audio-play-sound"="Audio Play Sound","time-delete-timer"="Time Delete Timer"] | +| status | Number | Robot Cleaner - Status | Value mapping ["1"="Sweeping","2"="Idle","3"="Paused","4"="Error","5"="Go Charging","6"="Charging","7"="Mopping"] | +| fault | Number | Robot Cleaner - Device Fault | | +| mode | Number | Robot Cleaner - Mode | Value mapping ["0"="Silent","1"="Basic","2"="Strong","3"="Full Speed"] | +| battery_level | Number:Dimensionless | Battery - Battery Level | | +| charging_state | Number | Battery - Charging State | Value mapping ["1"="Charging","2"="Not Charging","5"="Go Charging"] | +| brush_left_time | Number:Time | Main Cleaning Brush - Brush Left Time | | +| brush_life_level | Number:Dimensionless | Main Cleaning Brush - Brush Life Level | | +| brush_left_time1 | Number:Time | Side Cleaning Brush - Brush Left Time | | +| brush_life_level1 | Number:Dimensionless | Side Cleaning Brush - Brush Life Level | | +| filter_life_level | Number:Dimensionless | Filter - Filter Life Level | | +| filter_left_time | Number:Time | Filter - Filter Left Time | | +| work_mode | Number | Vacuum Extend - Work Mode | | +| cleaning_time | Number:Time | Vacuum Extend - Cleaning Time | | +| cleaning-area | Number:Area | Vacuum Extend - Cleaning Area | | +| cleaning_mode | Number | Vacuum Extend - Cleaning Mode | Value mapping ["0"="mode 0","1"="mode 1","2"="mode 2","3"="mode 3"] | +| mop_mode | Number | Vacuum Extend - Mop Mode | Value mapping ["1"="low water","2"="medium water","3"="high water"] | +| waterbox_status | Number | Vacuum Extend - Waterbox Status | Value mapping ["0"="Status 0","1"="Status 1"] | +| task_status | Number | Vacuum Extend - Task Status | Value mapping ["0"="Notask","1"="AutoClean","2"="CustomClean","3"="SelectAreanClean","4"="SpotArea"] | +| break_point_restart | Number | Vacuum Extend - Break Point Restart | Value mapping ["0"="Off","1"="On"] | +| carpet_press | Number | Vacuum Extend - Carpet Press | Value mapping ["0"="Off","1"="On"] | +| serial_number | String | Vacuum Extend - Serial Number | | +| keep_sweeper_time | Number:Time | Vacuum Extend - Keep Sweeper Time | | +| faults | String | Vacuum Extend - Faults | | +| enable | Switch | Do Not Disturb - Enable | | +| start_time | String | Do Not Disturb - Start Time | | +| end_time | String | Do Not Disturb - End Time | | +| volume | Number:Dimensionless | Audio - Volume | | +| voice_packet_id | String | Audio - Voice Packet Id | | +| voice_change_state | String | Audio - Voice Change State | | +| time_zone | String | Time - Time Zone | | +| timer_clean | String | Time - Timer Clean | | +| first_clean_time | Number | Clean Logs - First Clean Time | | +| total_clean_time | Number:Time | Clean Logs - Total Clean Time | | +| total_clean_times | Number | Clean Logs - Total Clean Times | | +| total_clean_area | Number | Clean Logs - Total Clean Area | | +| save_map_status | Number | Vslam Extend - Save Map Status | Value mapping ["0"="Off","1"="On"] | + +### MOVA L600 Robot Vacuum and Mop Cleaner (dreame.vacuum.p2157) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| vacuumaction | String | Vacuum Action | Value mapping ["sweep"="Sweep","stopsweep"="Stop Sweep","dock"="Goto Dock"] | +| status | Number | Robot Cleaner - Status | Value mapping ["1"="Sweeping","2"="Idle","3"="Paused","4"="Error","5"="Go Charging","6"="Charging","7"="Mopping"] | +| fault | Number | Robot Cleaner - Device Fault | | +| battery-level | Number:Dimensionless | Battery - Battery Level | | +| charging-state | Number | Battery - Charging State | Value mapping ["1"="Charging","2"="Not Charging","5"="Go Charging"] | +| resetConsumable | String | Consumables Reset | Value mapping ["mainbrush-cleaner-reset-brush-life"="Reset Main Brush","sidebrush-cleaner-reset-brush-life"="Reset Side Brush","filter-reset-filter-life"="Reset Filter"] | +| brush-left-time | Number:Time | Main Cleaning Brush - Brush Left Time | | +| brush-life-level | Number:Dimensionless | Main Cleaning Brush - Brush Life Level | | +| brush-left-time1 | Number:Time | Side Cleaning Brush - Brush Left Time | | +| brush-life-level1 | Number:Dimensionless | Side Cleaning Brush - Brush Life Level | | +| filter-life-level | Number:Dimensionless | Filter - Filter Life Level | | +| filter-left-time | Number:Time | Filter - Filter Left Time | | +| work-mode | Number | Vacuum Extend - Work Mode | | +| cleaning-time | Number:Time | Vacuum Extend - Cleaning Time | | +| cleaning-area | Number:Area | Vacuum Extend - Cleaning Area | | +| cleaning-mode | Number | Vacuum Extend - Cleaning Mode | Value mapping ["0"="mode 0","1"="mode 1","2"="mode 2","3"="mode 3"] | +| mop-mode | Number | Vacuum Extend - Mop Mode | Value mapping ["1"="low water","2"="medium water","3"="high water"] | +| waterbox-status | Number | Vacuum Extend - Waterbox Status | Value mapping ["0"="Status 0","1"="Status 1"] | +| task-status | Number | Vacuum Extend - Task Status | Value mapping ["0"="Notask","1"="AutoClean","2"="CustomClean","3"="SelectAreanClean","4"="SpotArea"] | | break-point-restart | Number | Vacuum Extend - Break Point Restart | Value mapping ["0"="Off","1"="On"] | | carpet-press | Number | Vacuum Extend - Carpet Press | Value mapping ["0"="Off","1"="On"] | | serial-number1 | String | Vacuum Extend - Serial Number | | @@ -2060,7 +2298,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2084,7 +2322,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2108,7 +2346,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2132,7 +2370,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2156,7 +2394,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2180,7 +2418,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2204,7 +2442,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2228,7 +2466,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2252,7 +2490,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2276,7 +2514,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2300,7 +2538,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2324,7 +2562,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2348,7 +2586,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2372,7 +2610,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2396,7 +2634,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2420,7 +2658,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2444,7 +2682,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2468,7 +2706,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2492,7 +2730,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2516,7 +2754,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | elec-count | Number | Electricity - Count | | | clean | String | Maintenance - Clean | | | examine | String | Maintenance - Examine | | -| running-duration | Number:Duration | Maintenance - Running Duration | | +| running-duration | Number:Time | Maintenance - Running Duration | | | fan-percent | Number:Dimentionless | Fan Speed % | | | timer | String | Enhance - Timer | | @@ -2663,7 +2901,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl |----------------------|----------------------|------------------------------------------|------------| | power | Switch | Power | | | brightness | Dimmer | Brightness | | -| ambientBrightness | Number | Ambient Brightness | | +| ambientBrightness | Dimmer | Ambient Brightness | | | delayoff | Number:Time | Shutdown Timer | | | colorTemperature | Number | Color Temperature | | | colorMode | Number | Color Mode | | @@ -2759,7 +2997,7 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl |----------------------|----------------------|------------------------------------------|------------| | power | Switch | Power | | | brightness | Dimmer | Brightness | | -| ambientBrightness | Number | Ambient Brightness | | +| ambientBrightness | Dimmer | Ambient Brightness | | | delayoff | Number:Time | Shutdown Timer | | | colorTemperature | Number | Color Temperature | | | colorMode | Number | Color Mode | | @@ -4203,6 +4441,62 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | temperature | Number:Temperature | Temperature | | | childlock | Switch | Child Lock | | +### Mi Air Purifier Pro H (zhimi.airpurifier.vb2) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| actions | String | Actions | Value mapping ["button-toggle"="Toggle","button-toggle-mode"="Toggle Mode"] | +| fault | Number | Air Purifier - Device Fault | Value mapping ["0"="No faults","1"="m1_run","2"="m1_stuck","3"="no_sensor","4"="error_hum","5"="error_temp","6"="timer_error1","7"="timer_error2"] | +| on | Switch | Air Purifier - Power | | +| fan_level | Number | Air Purifier - Fan Level | Value mapping ["1"="Level1","2"="Level2","3"="Level3","0"="Sleep"] | +| mode | Number | Air Purifier - Mode | Value mapping ["0"="Auto","1"="Night","2"="Favourite","3"="Manual"] | +| pm2_5_density | Number | Environment - PM2 5 Density | | +| relative_humidity | Number:Dimensionless | Environment - Relative Humidity | | +| temperature | Number:Temperature | Environment - Temperature | | +| filter_life_level | Number:Dimensionless | Filter - Filter Life Level | | +| filter_used_time | Number:Time | Filter - Filter Used Time | | +| alarm | Switch | Alarm - Alarm | | +| volume | Number:Dimensionless | Alarm - Volume | | +| brightness | Number | Indicator Light - Brightness | Value mapping ["0"="brightest","1"="glimmer","2"="not bright"] | +| on1 | Switch | Indicator Light - Switch Status | | +| physical_controls_locked | Switch | Physical Control Locked - Physical Control Locked | | +| button_pressed | String | Button - Button_pressed | | +| filter_max_time | Number:Time | Filter Time - Filter Max Time | | +| filter_hour_used_debug | Number:Time | Filter Time - Filter Hour Used Debug | | +| m1_strong | Number | Motor Speed - M1 Strong | | +| m1_high | Number | Motor Speed - M1 High | | +| m1_med | Number | Motor Speed - M1 Med | | +| m1_med_l | Number | Motor Speed - M1 Med L | | +| m1_low | Number | Motor Speed - M1 Low | | +| m1_silent | Number | Motor Speed - M1 Silent | | +| m1_favorite | Number | Motor Speed - M1 Favorite | | +| motor1_speed | Number | Motor Speed - Motor1 Speed | | +| motor1_set_speed | Number | Motor Speed - Motor1 Set Speed | | +| favorite_level | Number | Motor Speed - Favorite Level | | +| use_time | Number:Time | Use Time - Use Time | | +| purify_volume | Number | Aqi - Purify Volume | | +| average_aqi | Number | Aqi - Average Aqi | | +| average_aqi_cnt | Number | Aqi - Average_aqi Read Times | | +| aqi_zone | String | Aqi - Aqi Zone | | +| sensor_state | Number | Aqi - Sensor State | Value mapping ["0"="waiting","1"="ready"] | +| aqi_goodh | Number | Aqi - Aqi Goodh | | +| aqi_runstate | Number | Aqi - Runstate | Value mapping ["0"="continue","1"="hold","2"="sleep"] | +| aqi_state | Number | Aqi - Aqi State | Value mapping ["0"="AQI_GOOD_L","1"="AQI_GOOD_H","2"="AQI_MID_L","3"="AQI_MID_H","4"="AQI_BAD_L","5"="AQI_BAD_H"] | +| rfid_tag | String | Rfid - Rfid Tag | | +| rfid_factory_id | String | Rfid - Rfid Factory Id | | +| rfid_product_id | String | Rfid - Rfid Product Id | | +| rfid_time | String | Rfid - Rfid Time | | +| rfid_serial_num | String | Rfid - Rfid Serial Num | | +| app_extra | Number | Others - App Extra | | +| main_channel | Number | Others - Main Channel | | +| slave_channel | Number | Others - Slave Channel | | +| cola | String | Others - Cola | | +| buttom_door | String | Others - Buttom Door | | +| reboot_cause | Number | Others - Reboot_cause | Value mapping ["0"="REASON_HW_BOOT","1"="REASON_USER_REBOOT","2"="REASON_UPDATE","3"="REASON_WDT"] | +| manual_level | Number | Others - Manual Level | Value mapping ["1"="level1","2"="level2","3"="level3"] | +| powertime | Number:duration | Others - Powertime | | +| country_code | Number | Others - Country Code | Value mapping ["91"="India","44"="UK","852"="Hong Kong","886"="Taiwan","82"="Korea"] | + ### Mi Standing Fan (zhimi.fan.sa1) Channels | Channel | Type | Description | Comment | @@ -4339,6 +4633,107 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | naturalLevel | Number | Natural Level | | | move | String | Move Direction | | +### Smartmi Standing Fan 3 (zhimi.fan.za5) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| on | Switch | Fan - Power | | +| fan_level | Number | Fan - Fan Level | Value mapping ["1"="Level 1","2"="Level 2","3"="Level 3","4"="Level 4"] | +| horizontal_swing | Switch | Fan - Horizontal Swing | | +| horizontal_angle | Number | Fan - Horizontal Angle | | +| mode | Number | Fan - Mode | Value mapping ["0"="Natural Wind","1"="Straight Wind"] | +| off_delay | Number | Fan - Power Off Delay | | +| anion | Switch | Fan - Anion | | +| physical_controls_locked | Switch | Physical Control Locked - Physical Control Locked | | +| brightness | Number:Dimensionless | Indicator Light - Brightness | | +| alarm | Switch | Alarm - Alarm | | +| relative_humidity | Number:Dimensionless | Environment - Relative Humidity | | +| temperature | Number:Temperature | Environment - Temperature | | +| button_press | Number | Custom Service - Button Press | Value mapping ["1"="power","2"="swing","0"="No Button Pressed"] | +| battery_state | Switch | Custom Service - Battery State | | +| speed_now | Number | Custom Service - Speed Now | | +| ac_state | Switch | Custom Service - Ac State | | +| speed_level | Number:Dimensionless | Custom Service - Speed Level | | + +### Mi Smart Space Heater S (zhimi.heater.ma2) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| on | Switch | Heater - Switch Status | | +| fault | Number | Heater - Fault | Value mapping ["0"="No Error","1"="NTC Connect Error","2"="High Temperature Alarm","3"="EEPROM Error","4"="Multi Errors"] | +| target_temperature | Number:Temperature | Heater - Target Temperature | | +| countdown_time | Number:Time | Countdown - Countdown Time | | +| temperature | Number:Temperature | Environment - Temperature | | +| physical_controls_locked | Switch | Physical Control Locked - Physical Control Locked | | +| alarm | Switch | Alarm - Alarm | | +| brightness | Number:Dimensionless | Indicator Light - Brightness | Value mapping ["0"="Bright","1"="Dark","2"="Extinguished"] | +| hw_enable | Switch | Private Service - Hw Enable | | +| use_time | Number:Time | Private Service - Use Time | | + +### Mi Smart Baseboard Heater E (zhimi.heater.ma3) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| actions | String | Actions | | +| on | Switch | Heater - Switch Status | | +| fault | Number | Heater - Fault | Value mapping ["0"="No Error","1"="NTC Connect Error","2"="High Temperature Alarm","3"="EEPROM Error","4"="Multi Errors"] | +| target_temperature | Number:Temperature | Heater - Target Temperature | | +| mode | Number | Heater - Mode | Value mapping ["0"="Auto","1"="LL Mode","2"="HH Mode"] | +| countdown_time | Number:Time | Countdown - Countdown Time | | +| temperature | Number:Temperature | Environment - Temperature | | +| physical_controls_locked | Switch | Physical Control Locked - Physical Control Locked | | +| alarm | Switch | Alarm - Alarm | | +| brightness | Number:Dimensionless | Indicator Light - Brightness | Value mapping ["0"="Bright","1"="Dark","2"="Extinguished"] | +| use_time | Number:Time | Private Service - Use Time | | + +### Mi Smart Space Heater S (zhimi.heater.mc2) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| on | Switch | Heater - Power | | +| fault | Number | Heater - Device Fault | Value mapping ["0"="No Error","1"="NTC Connect Error","2"="High Temperature Alarm","3"="EEPROM Error","4"="Multi Errors"] | +| target_temperature | Number:Temperature | Heater - Target Temperature | | +| countdown_time | Number:Time | Countdown - Countdown Time | | +| temperature | Number:Temperature | Environment - Temperature | | +| physical_controls_locked | Switch | Physical Control Locked - Physical Control Locked | | +| alarm | Switch | Alarm - Alarm | | +| brightness | Number | Indicator Light - Brightness | Value mapping ["0"="Bright","1"="Dark","2"="Extinguished"] | +| hw_enable | Switch | Private Service - Hw Enable | | +| use_time | Number:Time | Private Service - Use Time | | +| country_code | Number | Private Service - Country Code | Value mapping ["0"="Unknown","1"="US","82"="KR","44"="EU","81"="JP","7"="RU","86"="CN","852"="HK","886"="TW","33"="FR"] | + +### Smartmi Smart Fan (zhimi.heater.na1) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| on | Switch | Heater - Power | | +| fault | Number | Heater - Device Fault | Value mapping ["0"="No Error","1"="NTC Connect Error","2"="High Temperature Alarm","3"="EEPROM Error","4"="Multi Errors"] | +| heat_level | Number | Heater - Heat Level | Value mapping ["1"="High","2"="Low"] | +| mode | Number | Heater - Mode | Value mapping ["0"="Fan not swing","1"="Fan swing"] | +| alarm | Switch | Alarm - Alarm | | +| countdown_time | Number:Time | Countdown - Countdown Time | | +| brightness | Number | Indicator Light - Brightness | Value mapping ["0"="Bright","1"="Dark","2"="Extinguished"] | +| physical_controls_locked | Switch | Physical Control Locked - Physical Control Locked | | +| return_to_middle | Switch | Private Service - Return To Middle | | + +### Smartmi Smart Fan Heater (zhimi.heater.nb1) Channels + +| Channel | Type | Description | Comment | +|----------------------|----------------------|------------------------------------------|------------| +| on | Switch | Heater - Power | | +| fault | Number | Heater - Device Fault | Value mapping ["0"="No Error","1"="NTC Connect Error","2"="High Temperature Alarm","3"="EEPROM Error","4"="Multi Errors"] | +| heat_level | Number | Heater - Heat Level | Value mapping ["1"="High","2"="Low"] | +| mode | Number | Heater - Mode | Value mapping ["0"="Fan not swing","1"="Fan swing"] | +| target_temperature | Number:Temperature | Heater - Target Temperature | | +| temperature | Number:Temperature | Environment - Temperature | | +| alarm | Switch | Alarm - Alarm | | +| countdown_time | Number:Time | Countdown - Countdown Time | | +| brightness | Number | Indicator Light - Brightness | Value mapping ["0"="Bright","1"="Dark","2"="Extinguished"] | +| physical_controls_locked | Switch | Physical Control Locked - Physical Control Locked | | +| return_to_middle | Switch | Private Service - Return To Middle | | +| country_code | Number | Private Service - Country Code | Value mapping ["0"="Unknown","1"="US","82"="KR","44"="EU","81"="JP","7"="RU","86"="CN","852"="HK","886"="TW","33"="FR"] | +| hw_en | Switch | Private Service - Hw En | | + ### Smartmi Radiant Heater Smart Version (zhimi.heater.za1) Channels | Channel | Type | Description | Comment | @@ -4357,14 +4752,14 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| -| fault | Number | Heater - Device Fault | | +| fault | Number | Heater - Device Fault | Value mapping ["0"="No Error","1"="NTC Connect Error","2"="High Temperature Alarm","3"="EEPROM Error","4"="Multi Errors"] | | on | Switch | Heater - Power | | | target-temperature | Number:Temperature | Heater - Target Temperature | | | alarm | Switch | Alarm - Alarm | | | countdown-time | Number:Time | Countdown - Countdown Time | | | relative-humidity | Number:Dimensionless | Environment - Relative Humidity | | | temperature | Number:Temperature | Environment - Temperature | | -| brightness | Dimmer | Indicator Light - Brightness | | +| brightness | Number | Indicator Light - Brightness | Value mapping ["0"="Bright","1"="Dark","2"="Extinguished"] | | physical-controls-locked | Switch | Physical Control Locked - Physical Controls Locked | | | use-time | Number:Time | Private-Service - Use Time | | @@ -4372,14 +4767,14 @@ e.g. `openhab:send actionCommand 'upd_timer["1498595904821", "on"]'` would enabl | Channel | Type | Description | Comment | |----------------------|----------------------|------------------------------------------|------------| -| fault | Number | Heater - Device Fault | | | on | Switch | Heater - Power | | +| fault | Number | Heater - Device Fault | Value mapping ["0"="No Error","1"="NTC Connect Error","2"="High Temperature Alarm","3"="EEPROM Error","4"="Multi Errors"] | | target-temperature | Number:Temperature | Heater - Target Temperature | | | alarm | Switch | Alarm - Alarm | | | countdown-time | Number:Time | Countdown - Countdown Time | | | relative-humidity | Number:Dimensionless | Environment - Relative Humidity | | | temperature | Number:Temperature | Environment - Temperature | | -| brightness | Dimmer | Indicator Light - Brightness | | +| brightness | Number | Indicator Light - Brightness | Value mapping ["0"="Bright","1"="Dark","2"="Extinguished"] | | physical-controls-locked | Switch | Physical Control Locked - Physical Controls Locked | | | use-time | Number:Time | Private-Service - Use Time | | | country-code | Number | Private-Service - Country-Code | Value mapping ["0"="Unknown","1"="US","82"="KR","44"="EU","81"="JP","7"="RU","86"="CN","852"="HK","886"="TW","33"="FR"] | @@ -4543,8 +4938,20 @@ Image map "Cleaning Map" (gVacLast) {channel="miio:vacuum:034F0E45:cleaning#map" Note: cleaning map is only available with cloud access. -Additionally depending on the capabilities of your robot vacuum other channels may be enabled at runtime +There are several advanced channels, which may be useful in rules (e.g. for individual room cleaning etc) +In case your vacuum does not support one of these commands, it will show "unsupported_method" for string channels or no value for numeric channels. +| Type | Channel | Description | +|---------|-----------------------------------|----------------------------| +| Number | status#segment_status | Segment Status | +| Number | status#map_status | Map Box Status | +| Number | status#led_status | Led Box Status | +| String | info#carpet_mode | Carpet Mode details | +| String | info#fw_features | Firmware Features | +| String | info#room_mapping | Room Mapping details | +| String | info#multi_maps_list | Maps Listing details | + +Additionally depending on the capabilities of your robot vacuum other channels may be enabled at runtime | Type | Channel | Description | |---------|-----------------------------------|----------------------------| @@ -4558,6 +4965,28 @@ Additionally depending on the capabilities of your robot vacuum other channels m +### Qingping Air Monitor Lite (cgllc.airm.cgdn1) item file lines + +note: Autogenerated example. Replace the id (airm) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered. + +``` +Group G_airm "Qingping Air Monitor Lite"
+
In the above picture there are two graphs
@@ -368,6 +368,6 @@ Items {
Having these values in the timeline you're able to cross check how the forecast influences the Photovoltaic Production.
-
+
I personally would like to have more steering control of the E3DC to react on such forecast e.g. "stop charging the car if it gets too cloudy"
diff --git a/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/i18n/e3dc_de.properties b/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/i18n/e3dc_de.properties
index 2fc6bb963ceb0..ff76bc4546159 100644
--- a/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/i18n/e3dc_de.properties
+++ b/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/i18n/e3dc_de.properties
@@ -59,8 +59,8 @@ channel-type.modbus.pv-power-supply-channel.label = Photovoltaik Leistung
channel-type.modbus.battery-power-supply-channel.label = Batterie Entladen
channel-type.modbus.battery-power-consumption-channel.label = Batterie Laden
channel-type.modbus.household-power-consumption-channel.label = Haushalt Verbrauch
-channel-type.modbus.grid-power-consumption-channel.label = Stromnetz Verbrauch
-channel-type.modbus.grid-power-supply-channel.label = Stromnetz Einspeisung
+channel-type.modbus.grid-power-consumption-channel.label = Stromnetz Einspeisung
+channel-type.modbus.grid-power-supply-channel.label = Stromnetz Verbrauch
channel-type.modbus.external-power-supply-channel.label = Externer Stromproduzent
channel-type.modbus.wallbox-power-consumption-channel.label = Wallbox Ladestrom
channel-type.modbus.wallbox-pv-power-consumption-channel.label = Wallbox Photovoltaik Ladestrom
diff --git a/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/thing/power-channel-types.xml b/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/thing/power-channel-types.xml
index 2c607b1138b87..57035ee7b0702 100644
--- a/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/thing/power-channel-types.xml
+++ b/bundles/org.openhab.binding.modbus.e3dc/src/main/resources/OH-INF/thing/power-channel-types.xml
@@ -26,12 +26,12 @@