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

6
bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/ControllerHandler.java
View File

@@ -31,7 +31,7 @@ import org.openhab.core.library.types.DecimalType;
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.SmartHomeUnits;
import org.openhab.core.library.unit.Units;
import org.openhab.core.thing.Thing;
import org.openhab.core.types.Command;
import org.openhab.core.types.State;
@@ -110,13 +110,13 @@ public class ControllerHandler extends DraytonWiserThingHandler<ControllerData>
private State getHeatChannel1Demand() {
return getData().heatingChannels.size() >= 1
? new QuantityType<>(getData().heatingChannels.get(0).getPercentageDemand(), SmartHomeUnits.PERCENT)
? new QuantityType<>(getData().heatingChannels.get(0).getPercentageDemand(), Units.PERCENT)
: UnDefType.UNDEF;
}
private State getHeatChannel2Demand() {
return getData().heatingChannels.size() >= 2
? new QuantityType<>(getData().heatingChannels.get(1).getPercentageDemand(), SmartHomeUnits.PERCENT)
? new QuantityType<>(getData().heatingChannels.get(1).getPercentageDemand(), Units.PERCENT)
: UnDefType.UNDEF;
}

7
bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HotWaterHandler.java
View File

@@ -28,7 +28,7 @@ import org.openhab.binding.draytonwiser.internal.model.SystemDTO;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.unit.SmartHomeUnits;
import org.openhab.core.library.unit.Units;
import org.openhab.core.thing.Thing;
import org.openhab.core.types.Command;
import org.openhab.core.types.State;
@@ -132,11 +132,10 @@ public class HotWaterHandler extends DraytonWiserThingHandler<HotWaterData> {
final Integer overrideTimeout = firstChannel.getOverrideTimeoutUnixTime();
if (overrideTimeout != null && !"NONE".equalsIgnoreCase(firstChannel.getOverrideType())) {
return new QuantityType<Time>(overrideTimeout - (System.currentTimeMillis() / 1000L),
SmartHomeUnits.SECOND);
return new QuantityType<Time>(overrideTimeout - (System.currentTimeMillis() / 1000L), Units.SECOND);
}
}
return new QuantityType<Time>(0, SmartHomeUnits.SECOND);
return new QuantityType<Time>(0, Units.SECOND);
}
static class HotWaterData {

11
bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/RoomHandler.java
View File

@@ -27,7 +27,7 @@ import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.OpenClosedType;
import org.openhab.core.library.types.QuantityType;
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.Thing;
import org.openhab.core.types.Command;
import org.openhab.core.types.State;
@@ -123,7 +123,7 @@ public class RoomHandler extends DraytonWiserThingHandler<RoomDTO> {
if (roomStat != null) {
final Integer humidity = roomStat.getMeasuredHumidity();
return humidity == null ? UnDefType.UNDEF : new QuantityType<>(humidity, SmartHomeUnits.PERCENT);
return humidity == null ? UnDefType.UNDEF : new QuantityType<>(humidity, Units.PERCENT);
}
}
return UnDefType.UNDEF;
@@ -137,7 +137,7 @@ public class RoomHandler extends DraytonWiserThingHandler<RoomDTO> {
}
private State getDemand() {
return new QuantityType<>(getData().getPercentageDemand(), SmartHomeUnits.PERCENT);
return new QuantityType<>(getData().getPercentageDemand(), Units.PERCENT);
}
private State getHeatRequest() {
@@ -167,10 +167,9 @@ public class RoomHandler extends DraytonWiserThingHandler<RoomDTO> {
private State getBoostRemainingState() {
final Integer overrideTimeout = getData().getOverrideTimeoutUnixTime();
if (overrideTimeout != null && !"NONE".equalsIgnoreCase(getData().getOverrideType())) {
return new QuantityType<Time>(overrideTimeout - (System.currentTimeMillis() / 1000L),
SmartHomeUnits.SECOND);
return new QuantityType<Time>(overrideTimeout - (System.currentTimeMillis() / 1000L), Units.SECOND);
}
return new QuantityType<Time>(0, SmartHomeUnits.SECOND);
return new QuantityType<Time>(0, Units.SECOND);
}
private void setBoostDuration(final int durationMinutes) throws DraytonWiserApiException {

6
bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/RoomStatHandler.java
View File

@@ -28,7 +28,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.Thing;
import org.openhab.core.types.Command;
import org.openhab.core.types.State;
@@ -93,7 +93,7 @@ public class RoomStatHandler extends DraytonWiserThingHandler<RoomStatData> {
private State getHumidity() {
final Integer humidity = getData().roomStat.getMeasuredHumidity();
return humidity == null ? UnDefType.UNDEF : new QuantityType<>(humidity, SmartHomeUnits.PERCENT);
return humidity == null ? UnDefType.UNDEF : new QuantityType<>(humidity, Units.PERCENT);
}
private State getTemperature() {
@@ -120,7 +120,7 @@ public class RoomStatHandler extends DraytonWiserThingHandler<RoomStatData> {
}
private State getBatteryVoltage() {
return new QuantityType<>(getData().device.getBatteryVoltage() / 10.0, SmartHomeUnits.VOLT);
return new QuantityType<>(getData().device.getBatteryVoltage() / 10.0, Units.VOLT);
}
private State getWiserBatteryLevel() {

6
bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/TRVHandler.java
View File

@@ -28,7 +28,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.Thing;
import org.openhab.core.types.Command;
import org.openhab.core.types.State;
@@ -93,7 +93,7 @@ public class TRVHandler extends DraytonWiserThingHandler<SmartValveData> {
}
private State getDemand() {
return new QuantityType<>(getData().smartValve.getPercentageDemand(), SmartHomeUnits.PERCENT);
return new QuantityType<>(getData().smartValve.getPercentageDemand(), Units.PERCENT);
}
private State getTemperature() {
@@ -120,7 +120,7 @@ public class TRVHandler extends DraytonWiserThingHandler<SmartValveData> {
}
private State getBatteryVoltage() {
return new QuantityType<>(getData().device.getBatteryVoltage() / 10.0, SmartHomeUnits.VOLT);
return new QuantityType<>(getData().device.getBatteryVoltage() / 10.0, Units.VOLT);
}
private State getWiserBatteryLevel() {