#4 Support inverted logic when finding state

SUPLA · Apr 10, 2019 · 266bbf4 · 266bbf4
1 parent 39b5a35
commit 266bbf4
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/...java/org/openhab/binding/supla/internal/cloud/functionswitch/FindStateFunctionSwitch.java b/...java/org/openhab/binding/supla/internal/cloud/functionswitch/FindStateFunctionSwitch.java
@@ -14,7 +14,6 @@
 import java.math.BigDecimal;
 import java.util.Optional;
 
-import static java.util.Optional.empty;
 import static java.util.Optional.of;
 import static org.eclipse.smarthome.core.library.types.OnOffType.OFF;
 import static org.eclipse.smarthome.core.library.types.OnOffType.ON;
@@ -202,11 +201,11 @@ public Optional<State> onDefault(Channel channel) {
     }
 
     private Optional<State> hiType(Channel channel) {
-        boolean param2Present = channel.getParam2() != null && channel.getParam2() > 0;
-        if (param2Present || !channel.getType().isOutput()) {
-            return of(channel).map(Channel::getState).map(ChannelState::getHi).map(hi -> hi ? ON : OFF);
-        } else {
-            return empty();
-        }
+        boolean invertedLogic = channel.getParam3() != null && channel.getParam3() > 1;
+        return of(channel)
+                       .map(Channel::getState)
+                       .map(ChannelState::getHi)
+                       .map(hi -> invertedLogic ? !hi : hi)
+                       .map(hi -> hi ? ON : OFF);
     }
 }