[somfytahoma] Improved handling of target temperature command (openha…

…b#10336) Signed-off-by: Laurent Garnier <lg.hc@free.fr>
thinkingstone · Nov 7, 2021 · a2381f4 · a2381f4
1 parent 3d1cda9
commit a2381f4
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 13 deletions.
diff --git a/...in/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBaseThingHandler.java b/...in/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBaseThingHandler.java
@@ -14,9 +14,11 @@
 
 import static org.openhab.binding.somfytahoma.internal.SomfyTahomaBindingConstants.*;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.measure.Unit;
 
@@ -231,6 +233,10 @@ protected void cacheStateType(String stateName, int type) {
  }
  }
 
+ protected Unit<?> getTemperatureUnit() {
+ return Objects.requireNonNull(units.get("Number:Temperature"));
+ }
+
  private void updateUnits(List<SomfyTahomaState> attributes) {
  for (SomfyTahomaState attr : attributes) {
  if ("core:MeasuredValueType".equals(attr.getName()) && attr.getType() == TYPE_STRING) {
@@ -387,12 +393,7 @@ public void updateThingStatus(List<SomfyTahomaState> states) {
  }
 
  private @Nullable SomfyTahomaState getStatusState(List<SomfyTahomaState> states) {
- for (SomfyTahomaState state : states) {
- if (STATUS_STATE.equals(state.getName()) && state.getType() == TYPE_STRING) {
- return state;
- }
- }
- return null;
+ return getState(states, STATUS_STATE, TYPE_STRING);
  }
 
  private void updateThingStatus(@Nullable SomfyTahomaState state) {
@@ -456,4 +457,29 @@ public void updateThingChannels(SomfyTahomaState state) {
  public int toInteger(Command command) {
  return (command instanceof DecimalType) ? ((DecimalType) command).intValue() : 0;
  }
+
+ public @Nullable BigDecimal toTemperature(Command command) {
+ BigDecimal temperature = null;
+ if (command instanceof QuantityType<?>) {
+ QuantityType<?> quantity = (QuantityType<?>) command;
+ QuantityType<?> convertedQuantity = quantity.toUnit(getTemperatureUnit());
+ if (convertedQuantity != null) {
+ quantity = convertedQuantity;
+ }
+ temperature = quantity.toBigDecimal();
+ } else if (command instanceof DecimalType) {
+ temperature = ((DecimalType) command).toBigDecimal();
+ }
+ return temperature;
+ }
+
+ public static @Nullable SomfyTahomaState getState(List<SomfyTahomaState> states, String stateName,
+ @Nullable Integer stateType) {
+ for (SomfyTahomaState state : states) {
+ if (stateName.equals(state.getName()) && (stateType == null || stateType == state.getType())) {
+ return state;
+ }
+ }
+ return null;
+ }
 }
diff --git a/...org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaElectricitySensorHandler.java b/...org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaElectricitySensorHandler.java
@@ -14,6 +14,7 @@
 
 import static org.openhab.binding.somfytahoma.internal.SomfyTahomaBindingConstants.*;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.thing.Thing;
 
 /**
@@ -22,6 +23,7 @@
  *
  * @author Ondrej Pecta - Initial contribution
  */
+@NonNullByDefault
 public class SomfyTahomaElectricitySensorHandler extends SomfyTahomaBaseThingHandler {
 
  public SomfyTahomaElectricitySensorHandler(Thing thing) {

diff --git a/...rg/openhab/binding/somfytahoma/internal/handler/SomfyTahomaValveHeatingSystemHandler.java b/...rg/openhab/binding/somfytahoma/internal/handler/SomfyTahomaValveHeatingSystemHandler.java
@@ -14,8 +14,9 @@
 
 import static org.openhab.binding.somfytahoma.internal.SomfyTahomaBindingConstants.*;
 
+import java.math.BigDecimal;
+
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.thing.ChannelUID;
 import org.openhab.core.thing.Thing;
 import org.openhab.core.types.Command;
@@ -47,10 +48,12 @@ public void handleCommand(ChannelUID channelUID, Command command) {
  if (command instanceof RefreshType) {
  return;
  } else {
- if (DEROGATED_TARGET_TEMPERATURE.equals(channelUID.getId()) && command instanceof QuantityType) {
- QuantityType type = (QuantityType) command;
- String param = "[" + type.doubleValue() + ", \"next_mode\"]";
- sendCommand(COMMAND_SET_DEROGATION, param);
+ if (DEROGATED_TARGET_TEMPERATURE.equals(channelUID.getId())) {
+ BigDecimal temperature = toTemperature(command);
+ if (temperature != null) {
+ String param = "[" + temperature.toPlainString() + ", \"next_mode\"]";
+ sendCommand(COMMAND_SET_DEROGATION, param);
+ }
  } else if (DEROGATION_HEATING_MODE.equals(channelUID.getId())) {
  switch (command.toString()) {
  case "auto":

diff --git a/...rg/openhab/binding/somfytahoma/internal/handler/SomfyTahomaZwaveHeatingSystemHandler.java b/...rg/openhab/binding/somfytahoma/internal/handler/SomfyTahomaZwaveHeatingSystemHandler.java
@@ -14,6 +14,8 @@
 
 import static org.openhab.binding.somfytahoma.internal.SomfyTahomaBindingConstants.*;
 
+import java.math.BigDecimal;
+
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.thing.ChannelUID;
 import org.openhab.core.thing.Thing;
@@ -44,8 +46,11 @@ public void handleCommand(ChannelUID channelUID, Command command) {
  return;
  } else {
  if (TARGET_TEMPERATURE.equals(channelUID.getId())) {
- String param = "[" + command.toString() + "]";
- sendCommand("setTargetTemperature", param);
+ BigDecimal temperature = toTemperature(command);
+ if (temperature != null) {
+ String param = "[" + temperature.toPlainString() + "]";
+ sendCommand("setTargetTemperature", param);
+ }
  }
  }
  }