public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add virtual flag handling. (#11751) 

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>
This commit is contained in:
Mark Herwege 2021-12-11 19:39:40 +01:00 committed by GitHub
parent adecb53042
commit cafed142e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/protocol/NikoHomeControlConstants.java
View File

@ -35,6 +35,9 @@ public class NikoHomeControlConstants {
public static final String NHCON = "On"; public static final String NHCON = "On";
public static final String NHCOFF = "Off"; public static final String NHCOFF = "Off";
public static final String NHCTRUE = "True";
public static final String NHCFALSE = "False";
public static final String NHCTRIGGERED = "Triggered"; public static final String NHCTRIGGERED = "Triggered";
// rollershutter constants in the Nhc layer // rollershutter constants in the Nhc layer

11
bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/protocol/nhc2/NhcAction2.java
View File

@ -12,6 +12,8 @@
*/ */
package org.openhab.binding.nikohomecontrol.internal.protocol.nhc2; package org.openhab.binding.nikohomecontrol.internal.protocol.nhc2;
import static org.openhab.binding.nikohomecontrol.internal.protocol.NikoHomeControlConstants.*;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.nikohomecontrol.internal.protocol.NhcAction; import org.openhab.binding.nikohomecontrol.internal.protocol.NhcAction;
@ -117,7 +119,14 @@ public class NhcAction2 extends NhcAction {
public void execute(String command) { public void execute(String command) {
logger.debug("execute action {} of type {} for {}", command, type, id); logger.debug("execute action {} of type {} for {}", command, type, id);
nhcComm.executeAction(id, command); String cmd;
if ("flag".equals(model)) {
cmd = NHCON.equals(command) ? NHCTRUE : NHCFALSE;
} else {
cmd = command;
}
nhcComm.executeAction(id, cmd);
} }
/** /**

7
bundles/org.openhab.binding.nikohomecontrol/src/main/java/org/openhab/binding/nikohomecontrol/internal/protocol/nhc2/NikoHomeControlCommunication2.java
View File

@ -362,7 +362,7 @@ public class NikoHomeControlCommunication2 extends NikoHomeControlCommunication
.orElse(null); .orElse(null);
} }
if ("action".equals(device.type)) { if ("action".equals(device.type) || "virtual".equals(device.type)) {
if (!actions.containsKey(device.uuid)) { if (!actions.containsKey(device.uuid)) {
logger.debug("adding action device {}, {}", device.uuid, device.name); logger.debug("adding action device {}, {}", device.uuid, device.name);
@ -382,6 +382,7 @@ public class NikoHomeControlCommunication2 extends NikoHomeControlCommunication
case "socket": case "socket":
case "switched-generic": case "switched-generic":
case "switched-fan": case "switched-fan":
case "flag":
actionType = ActionType.RELAY; actionType = ActionType.RELAY;
break; break;
case "dimmer": case "dimmer":
@ -480,7 +481,7 @@ public class NikoHomeControlCommunication2 extends NikoHomeControlCommunication
booleanState = basicStateProperty.get().basicState; booleanState = basicStateProperty.get().basicState;
} }
if (NHCOFF.equals(booleanState)) { if (NHCOFF.equals(booleanState) || NHCFALSE.equals(booleanState)) {
action.setBooleanState(false); action.setBooleanState(false);
logger.debug("setting action {} internally to OFF", action.getId()); logger.debug("setting action {} internally to OFF", action.getId());
} }
@ -497,7 +498,7 @@ public class NikoHomeControlCommunication2 extends NikoHomeControlCommunication
} }
} }
if (NHCON.equals(booleanState)) { if (NHCON.equals(booleanState) || NHCTRUE.equals(booleanState)) {
action.setBooleanState(true); action.setBooleanState(true);
logger.debug("setting action {} internally to ON", action.getId()); logger.debug("setting action {} internally to ON", action.getId());
} }