[enocean] Improve incoming message handling for Eltako rollershutters (…

…openhab#5703) Fixes openhab#5702 Signed-off-by: Daniel Weber <uni@fruggy.de> Signed-off-by: Maximilian Hess <mail@ne0h.de>
ne0h · Sep 15, 2019 · 99d4fd9 · 99d4fd9
1 parent 1cba9af
commit 99d4fd9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/...n/java/org/openhab/binding/enocean/internal/config/EnOceanChannelRollershutterConfig.java b/...n/java/org/openhab/binding/enocean/internal/config/EnOceanChannelRollershutterConfig.java
@@ -18,7 +18,7 @@
  */
 public class EnOceanChannelRollershutterConfig {
 
- public Integer shutTime;
+ public int shutTime;
 
  public EnOceanChannelRollershutterConfig() {
  shutTime = 255;

diff --git a/...cean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_3F/A5_3F_7F_EltakoFSB.java b/...cean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_3F/A5_3F_7F_EltakoFSB.java
@@ -96,16 +96,24 @@ protected State convertToStateImpl(String channelId, String channelTypeId,
  State currentState = getCurrentStateFunc.apply(channelId);
 
  if (currentState != null) {
- int direction = getDB_1() == MoveUp ? -1 : 1;
  int duration = ((getDB_3Value() << 8) + getDB_2Value()) / 10; // => Time in DB3 and DB2 is given
  // in ms
 
- PercentType current = currentState.as(PercentType.class);
- if (config != null && current != null) {
+ if (config != null) {
  EnOceanChannelRollershutterConfig c = config.as(EnOceanChannelRollershutterConfig.class);
- if (c.shutTime != -1 && c.shutTime != 0) {
- return new PercentType(Math.min(100, (Math.max(0, current.intValue()
- + direction * ((duration * PercentType.HUNDRED.intValue()) / c.shutTime)))));
+ if (duration == c.shutTime) {
+ return getDB_1() == MoveUp ? PercentType.ZERO : PercentType.HUNDRED;
+ } else {
+ PercentType current = PercentType.ZERO;
+ if (currentState instanceof PercentType) {
+ current = currentState.as(PercentType.class);
+ }
+
+ int direction = getDB_1() == MoveUp ? -1 : 1;
+ if (c.shutTime != -1 && c.shutTime != 0) {
+ return new PercentType(Math.min(100, (Math.max(0, current.intValue()
+ + direction * ((duration * PercentType.HUNDRED.intValue()) / c.shutTime)))));
+ }
  }
  }
  }

diff --git a/.../src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseSensorHandler.java b/.../src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseSensorHandler.java
@@ -154,7 +154,7 @@ public void espPacketReceived(ESP3Packet packet) {
 
  EEP eep = EEPFactory.buildEEP(receivingEEPType, (ERP1Message) packet);
  logger.debug("ESP Packet payload {} for {} received", HexUtils.bytesToHex(packet.getPayload()),
- config.enoceanId);
+ HexUtils.bytesToHex(msg.getSenderId()));
 
  if (eep.isValid()) {
  byte[] senderId = msg.getSenderId();

diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/ESH-INF/thing/Rollershutter.xml b/bundles/org.openhab.binding.enocean/src/main/resources/ESH-INF/thing/Rollershutter.xml
@@ -48,6 +48,7 @@
  <option value="A5_3F_7F_EltakoFSB">Eltako FSB14/61/71</option>
  <option value="D2_05_00">D2-05-00 Rollershutter (like SIN-2-RS-01)</option>
  <option value="A5_11_03">A5-11-03 Rollershutter status</option>
+ <option value="F6_00_00">PTM200 Rollershutter status</option>
  </options>
  <multipleLimit>4</multipleLimit>
  <limitToOptions>true</limitToOptions>