Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Velbus protocol updates

Rich Turner1be6cf5f141e
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/AnalogOutputProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/AnalogOutputProcessor.java
index c38e9e401..822ca6760 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/AnalogOutputProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/AnalogOutputProcessor.java
@@ -81,6 +81,8 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
new Pair<>("_LOCKED", ValueType.BOOLEAN),
// RW - True/False
new Pair<>("_INHIBITED", ValueType.BOOLEAN),
+ // RW - True/False
+ new Pair<>("_FORCED", ValueType.BOOLEAN),
// W - Dim level and speed (LEVEL:SPEED)
new Pair<>("_LEVEL_AND_SPEED", ValueType.TEXT),
// RW - Dim level 0-100% (-1 to stop current dimming)
@@ -164,7 +166,7 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
})
.orElse(null);
break;
- case "LOCKED":
+ case "_LOCKED":
command = Values.getBoolean(value)
.map(locked -> {
params[2] = 0xFFFFFF;
@@ -172,7 +174,15 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
})
.orElse(null);
break;
- case "INHIBITED":
+ case "_FORCED":
+ command = Values.getBoolean(value)
+ .map(locked -> {
+ params[2] = 0xFFFFFF;
+ return locked ? FORCE_ON : FORCE_ON_CANCEL;
+ })
+ .orElse(null);
+ break;
+ case "_INHIBITED":
command = Values.getBoolean(value)
.map(inhibited -> {
params[2] = 0xFFFFFF;
@@ -200,6 +210,7 @@ public class AnalogOutputProcessor extends OutputChannelProcessor {
.orElse(null);
break;
case "_LOCK":
+ case "_FORCE_OFF":
command = Values.getIntegerCoerced(value)
.map(duration -> {
params[2] = duration;
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/BlindProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/BlindProcessor.java
index 01abff3d7..f23dba299 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/BlindProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/BlindProcessor.java
@@ -29,6 +29,7 @@ import org.openremote.model.value.Values;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
+import java.util.stream.Stream;
import static org.openremote.agent.protocol.velbus.VelbusPacket.OutboundCommand.*;
import static org.openremote.model.util.TextUtil.toProperCase;
@@ -92,6 +93,10 @@ public class BlindProcessor extends OutputChannelProcessor {
return NORMAL;
}
+
+ public static Optional<ChannelSetting> fromValue(Object value) {
+ return EnumUtil.enumFromValue(ChannelSetting.class, value);
+ }
}
protected final static List<Pair<String, ValueDescriptor<?>>> CHANNEL_PROPERTIES = Arrays.asList(
@@ -155,6 +160,7 @@ public class BlindProcessor extends OutputChannelProcessor {
.collect(Collectors.toList());
}
+ @SuppressWarnings("ConstantConditions")
@Override
public List<VelbusPacket> getPropertyWritePackets(VelbusDevice device, String property, Object value) {
return getChannelNumberAndPropertySuffix(device, CHANNEL_REGEX, property)
@@ -181,7 +187,46 @@ public class BlindProcessor extends OutputChannelProcessor {
})
.orElse(null);
break;
- case "LOCKED":
+ case "_SETTING":
+ Optional<ChannelSetting> setting = ChannelSetting.fromValue(value);
+ if (!setting.isPresent()) {
+ return null;
+ }
+ switch (setting.get()) {
+ case NORMAL:
+ return Stream.of(
+ getPackets(device, channelNumber, INHIBIT_CANCEL, 0xFFFFFF, 0),
+ getPackets(device, channelNumber, BLIND_FORCE_DOWN_CANCEL, 0xFFFFFF, 0),
+ getPackets(device, channelNumber, BLIND_FORCE_UP_CANCEL, 0xFFFFFF, 0),
+ getPackets(device, channelNumber, LOCK_CANCEL, 0xFFFFFF, 0)
+ ).flatMap(List::stream).collect(Collectors.toList());
+ case INHIBITED:
+ params[0] = 0xFFFFFF;
+ command = INHIBIT;
+ break;
+ case INHIBITED_DOWN:
+ params[0] = 0xFFFFFF;
+ command = BLIND_INHIBIT_DOWN;
+ break;
+ case INHIBITED_UP:
+ params[0] = 0xFFFFFF;
+ command = BLIND_INHIBIT_UP;
+ break;
+ case FORCED_DOWN:
+ params[0] = 0xFFFFFF;
+ command = BLIND_FORCE_DOWN;
+ break;
+ case FORCED_UP:
+ params[0] = 0xFFFFFF;
+ command = BLIND_FORCE_UP;
+ break;
+ case LOCKED:
+ params[0] = 0xFFFFFF;
+ command = LOCK;
+ break;
+ }
+ break;
+ case "_LOCKED":
command = Values.getBoolean(value)
.map(locked -> {
params[0] = 0xFFFFFF;
@@ -189,7 +234,7 @@ public class BlindProcessor extends OutputChannelProcessor {
})
.orElse(null);
break;
- case "INHIBITED":
+ case "_INHIBITED":
command = Values.getBoolean(value)
.map(inhibited -> {
params[0] = 0xFFFFFF;
@@ -197,6 +242,39 @@ public class BlindProcessor extends OutputChannelProcessor {
})
.orElse(null);
break;
+ case "_INHIBITED_UP":
+ command = Values.getBoolean(value)
+ .map(inhibited -> {
+ params[0] = 0xFFFFFF;
+ return inhibited ? BLIND_INHIBIT_UP : INHIBIT_CANCEL;
+ })
+ .orElse(null);
+ break;
+
+ case "_INHIBITED_DOWN":
+ command = Values.getBoolean(value)
+ .map(inhibited -> {
+ params[0] = 0xFFFFFF;
+ return inhibited ? BLIND_INHIBIT_DOWN : INHIBIT_CANCEL;
+ })
+ .orElse(null);
+ break;
+ case "_FORCED_DOWN":
+ command = Values.getBoolean(value)
+ .map(inhibited -> {
+ params[0] = 0xFFFFFF;
+ return inhibited ? BLIND_FORCE_DOWN : BLIND_FORCE_DOWN_CANCEL;
+ })
+ .orElse(null);
+ break;
+ case "_FORCED_UP":
+ command = Values.getBoolean(value)
+ .map(inhibited -> {
+ params[0] = 0xFFFFFF;
+ return inhibited ? BLIND_FORCE_UP : BLIND_FORCE_UP_CANCEL;
+ })
+ .orElse(null);
+ break;
case "_POSITION":
command = Values.getIntegerCoerced(value)
.map(position -> {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/CounterProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/CounterProcessor.java
index fd43df7b8..c33dacfc4 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/CounterProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/CounterProcessor.java
@@ -20,7 +20,9 @@
package org.openremote.agent.protocol.velbus.device;
import org.openremote.agent.protocol.velbus.VelbusPacket;
+import org.openremote.model.attribute.AttributeExecuteStatus;
import org.openremote.model.value.ValueType;
+import org.openremote.model.value.Values;
import java.util.Arrays;
import java.util.Collections;
@@ -106,26 +108,37 @@ public class CounterProcessor extends FeatureProcessor {
@Override
public List<VelbusPacket> getPropertyWritePackets(VelbusDevice device, String property, Object value) {
- Integer counter = null;
-
- if ("COUNTER1".equals(property)) {
- counter = 1;
- } else if ("COUNTER2".equals(property)) {
- counter = 2;
- } else if ("COUNTER3".equals(property)) {
- counter = 3;
- } else if ("COUNTER4".equals(property)) {
- counter = 4;
- }
- if (counter != null) {
- // Reset the counter
- return Collections.singletonList(
- new VelbusPacket(device.getBaseAddress(), VelbusPacket.OutboundCommand.COUNTER_RESET.getCode(), (byte)(counter-1))
- );
+ if (!property.endsWith("_RESET")) {
+ return null;
}
- return null;
+ return Values.getValueCoerced(value, AttributeExecuteStatus.class).map(attributeExecuteStatus -> {
+
+ if (attributeExecuteStatus != AttributeExecuteStatus.REQUEST_START) {
+ return null;
+ }
+ Integer counter = null;
+
+ if ("COUNTER1_RESET".equals(property)) {
+ counter = 1;
+ } else if ("COUNTER2_RESET".equals(property)) {
+ counter = 2;
+ } else if ("COUNTER3_RESET".equals(property)) {
+ counter = 3;
+ } else if ("COUNTER4_RESET".equals(property)) {
+ counter = 4;
+ }
+
+ if (counter != null) {
+ // Reset the counter
+ return Collections.singletonList(
+ new VelbusPacket(device.getBaseAddress(), VelbusPacket.OutboundCommand.COUNTER_RESET.getCode(), (byte) (counter - 1))
+ );
+ }
+
+ return null;
+ }).orElse(null);
}
@SuppressWarnings("unchecked")
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/OutputChannelProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/OutputChannelProcessor.java
index 000f15d2b..86be7fcc3 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/OutputChannelProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/OutputChannelProcessor.java
@@ -19,6 +19,11 @@
*/
package org.openremote.agent.protocol.velbus.device;
+import org.openremote.model.util.EnumUtil;
+import org.openremote.model.value.Values;
+
+import java.util.Optional;
+
/**
* Abstract processor for channel related operations
*/
@@ -55,6 +60,14 @@ public abstract class OutputChannelProcessor extends ChannelProcessor {
return NORMAL;
}
+
+ public static Optional<ChannelSetting> fromValue(Object value) {
+ if (value == null) {
+ return Optional.empty();
+ }
+
+ return EnumUtil.enumFromValue(ChannelSetting.class, value);
+ }
}
protected OutputChannelProcessor() {}
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/RelayProcessor.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/RelayProcessor.java
index af5d124e7..6e54aeab0 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/device/RelayProcessor.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/device/RelayProcessor.java
@@ -28,6 +28,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static org.openremote.agent.protocol.velbus.VelbusPacket.OutboundCommand.*;
@@ -97,6 +99,11 @@ public class RelayProcessor extends OutputChannelProcessor {
new PropertyDescriptor("ch3Locked", "CH3 Locked", "CH3_LOCKED", ValueType.BOOLEAN),
new PropertyDescriptor("ch4Locked", "CH4 Locked", "CH4_LOCKED", ValueType.BOOLEAN),
new PropertyDescriptor("ch5Locked", "CH5 Locked", "CH5_LOCKED", ValueType.BOOLEAN),
+ new PropertyDescriptor("ch1Forced", "CH1 Forced", "CH1_FORCED", ValueType.BOOLEAN),
+ new PropertyDescriptor("ch2Forced", "CH2 Forced", "CH2_FORCED", ValueType.BOOLEAN),
+ new PropertyDescriptor("ch3Forced", "CH3 Forced", "CH3_FORCED", ValueType.BOOLEAN),
+ new PropertyDescriptor("ch4Forced", "CH4 Forced", "CH4_FORCED", ValueType.BOOLEAN),
+ new PropertyDescriptor("ch5Forced", "CH5 Forced", "CH5_FORCED", ValueType.BOOLEAN),
new PropertyDescriptor("ch1Inhibited", "CH1 Inhibited", "CH1_INHIBITED", ValueType.BOOLEAN),
new PropertyDescriptor("ch2Inhibited", "CH2 Inhibited", "CH2_INHIBITED", ValueType.BOOLEAN),
new PropertyDescriptor("ch3Inhibited", "CH3 Inhibited", "CH3_INHIBITED", ValueType.BOOLEAN),
@@ -146,6 +153,7 @@ public class RelayProcessor extends OutputChannelProcessor {
return SUPPORTED_PROPERTIES;
}
+ @SuppressWarnings("ConstantConditions")
@Override
public List<VelbusPacket> getPropertyWritePackets(VelbusDevice device, String property, Object value) {
return getChannelNumberAndPropertySuffix(device, CHANNEL_REGEX, property)
@@ -172,6 +180,32 @@ public class RelayProcessor extends OutputChannelProcessor {
})
.orElse(null);
break;
+ case "_SETTING":
+ Optional<ChannelSetting> setting = ChannelSetting.fromValue(value);
+ if (!setting.isPresent()) {
+ return null;
+ }
+ switch (setting.get()) {
+ case NORMAL:
+ return Stream.of(
+ getPackets(device, channelNumber, INHIBIT_CANCEL, 0xFFFFFF),
+ getPackets(device, channelNumber, FORCE_ON_CANCEL, 0xFFFFFF),
+ getPackets(device, channelNumber, LOCK_CANCEL, 0xFFFFFF)
+ ).flatMap(List::stream).collect(Collectors.toList());
+ case INHIBITED:
+ params[0] = 0xFFFFFF;
+ command = INHIBIT;
+ break;
+ case FORCED:
+ params[0] = 0xFFFFFF;
+ command = FORCE_ON;
+ break;
+ case LOCKED:
+ params[0] = 0xFFFFFF;
+ command = LOCK;
+ break;
+ }
+ break;
case "_LOCKED":
command = Values.getBoolean(value)
.map(locked -> {
@@ -188,6 +222,14 @@ public class RelayProcessor extends OutputChannelProcessor {
})
.orElse(null);
break;
+ case "_FORCED":
+ command = Values.getBoolean(value)
+ .map(inhibited -> {
+ params[0] = 0xFFFFFF;
+ return inhibited ? FORCE_ON : FORCE_ON_CANCEL;
+ })
+ .orElse(null);
+ break;
case "_ON":
command = Values.getIntegerCoerced(value)
.map(duration -> {