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

Use renamed Units class (#9267)

Browse Source 
Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-12-07 10:34:02 +01:00
committed by GitHub
parent d0480d0f2e
commit ac6f08908f
208 changed files with 1087 additions and 1169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
bundles/org.openhab.binding.modbus.helioseasycontrols/src/main/java/org/openhab/binding/modbus/helioseasycontrols/internal/HeliosEasyControlsHandler.java
View File

@@ -37,7 +37,7 @@ import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.types.StringType;
import org.openhab.core.library.unit.SIUnits;
import org.openhab.core.library.unit.SmartHomeUnits;
import org.openhab.core.library.unit.Units;
import org.openhab.core.thing.Bridge;
import org.openhab.core.thing.Channel;
import org.openhab.core.thing.ChannelUID;
@@ -332,25 +332,25 @@ public class HeliosEasyControlsHandler extends BaseThingHandler {
if (unit != null) {
switch (unit) {
case HeliosVariable.UNIT_DAY:
val = val.toUnit(SmartHomeUnits.DAY);
val = val.toUnit(Units.DAY);
break;
case HeliosVariable.UNIT_HOUR:
val = val.toUnit(SmartHomeUnits.HOUR);
val = val.toUnit(Units.HOUR);
break;
case HeliosVariable.UNIT_MIN:
val = val.toUnit(SmartHomeUnits.MINUTE);
val = val.toUnit(Units.MINUTE);
break;
case HeliosVariable.UNIT_SEC:
val = val.toUnit(SmartHomeUnits.SECOND);
val = val.toUnit(Units.SECOND);
break;
case HeliosVariable.UNIT_VOLT:
val = val.toUnit(SmartHomeUnits.VOLT);
val = val.toUnit(Units.VOLT);
break;
case HeliosVariable.UNIT_PERCENT:
val = val.toUnit(SmartHomeUnits.PERCENT);
val = val.toUnit(Units.PERCENT);
break;
case HeliosVariable.UNIT_PPM:
val = val.toUnit(SmartHomeUnits.PARTS_PER_MILLION);
val = val.toUnit(Units.PARTS_PER_MILLION);
break;
case HeliosVariable.UNIT_TEMP:
val = val.toUnit(SIUnits.CELSIUS);
@@ -661,19 +661,19 @@ public class HeliosEasyControlsHandler extends BaseThingHandler {
if (unit == null) {
return null;
} else if (unit.equals(HeliosVariable.UNIT_DAY)) {
return new QuantityType<>(Integer.parseInt(value), SmartHomeUnits.DAY);
return new QuantityType<>(Integer.parseInt(value), Units.DAY);
} else if (unit.equals(HeliosVariable.UNIT_HOUR)) {
return new QuantityType<>(Integer.parseInt(value), SmartHomeUnits.HOUR);
return new QuantityType<>(Integer.parseInt(value), Units.HOUR);
} else if (unit.equals(HeliosVariable.UNIT_MIN)) {
return new QuantityType<>(Integer.parseInt(value), SmartHomeUnits.MINUTE);
return new QuantityType<>(Integer.parseInt(value), Units.MINUTE);
} else if (unit.equals(HeliosVariable.UNIT_SEC)) {
return new QuantityType<>(Integer.parseInt(value), SmartHomeUnits.SECOND);
return new QuantityType<>(Integer.parseInt(value), Units.SECOND);
} else if (unit.equals(HeliosVariable.UNIT_VOLT)) {
return new QuantityType<>(Float.parseFloat(value), SmartHomeUnits.VOLT);
return new QuantityType<>(Float.parseFloat(value), Units.VOLT);
} else if (unit.equals(HeliosVariable.UNIT_PERCENT)) {
return new QuantityType<>(Float.parseFloat(value), SmartHomeUnits.PERCENT);
return new QuantityType<>(Float.parseFloat(value), Units.PERCENT);
} else if (unit.equals(HeliosVariable.UNIT_PPM)) {
return new QuantityType<>(Float.parseFloat(value), SmartHomeUnits.PARTS_PER_MILLION);
return new QuantityType<>(Float.parseFloat(value), Units.PARTS_PER_MILLION);
} else if (unit.equals(HeliosVariable.UNIT_TEMP)) {
return new QuantityType<>(Float.parseFloat(value), SIUnits.CELSIUS);
} else {