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

2
bundles/org.openhab.binding.networkupstools/src/main/java/org/openhab/binding/networkupstools/internal/NUTBindingConstants.java
View File

@@ -18,12 +18,12 @@ import javax.measure.Unit;
import javax.measure.quantity.Power;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.core.library.unit.Units;
import org.openhab.core.thing.ThingTypeUID;
import org.openhab.core.thing.type.ChannelTypeUID;
import tec.uom.se.format.SimpleUnitFormat;
import tec.uom.se.unit.ProductUnit;
import tec.uom.se.unit.Units;
/**
* The {@link NUTBindingConstants} class defines common constants, which are

24
bundles/org.openhab.binding.networkupstools/src/main/java/org/openhab/binding/networkupstools/internal/NutName.java
View File

@@ -25,7 +25,7 @@ import org.openhab.core.library.types.PercentType;
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.types.State;
import org.openhab.core.types.UnDefType;
@@ -38,31 +38,31 @@ import org.openhab.core.types.UnDefType;
enum NutName {
// UPS
UPS_ALARM("upsAlarm", "ups.alarm", StringType.class),
UPS_LOAD("upsLoad", "ups.load", SmartHomeUnits.PERCENT),
UPS_LOAD("upsLoad", "ups.load", Units.PERCENT),
UPS_POWER("upsPower", "ups.power", NUTBindingConstants.VOLT_AMPERE),
UPS_REALPOWER("upsRealpower", "ups.realpower", SmartHomeUnits.WATT),
UPS_REALPOWER("upsRealpower", "ups.realpower", Units.WATT),
UPS_STATUS("upsStatus", "ups.status", StringType.class),
UPS_TEMPERATURE("upsTemperature", "ups.temperature", SIUnits.CELSIUS),
UPS_TEST_RESULT("upsTestResult", "ups.test.result", StringType.class),
// Input
INPUT_CURRENT("inputCurrent", "input.current", SmartHomeUnits.AMPERE),
INPUT_CURRENT("inputCurrent", "input.current", Units.AMPERE),
INPUT_CURRENT_STATUS("inputCurrentStatus", "input.current.status", StringType.class),
INPUT_LOAD("inputLoad", "input.load", SmartHomeUnits.PERCENT),
INPUT_REALPOWER("inputRealpower", "input.realpower", SmartHomeUnits.WATT),
INPUT_LOAD("inputLoad", "input.load", Units.PERCENT),
INPUT_REALPOWER("inputRealpower", "input.realpower", Units.WATT),
INPUT_QUALITY("inputQuality", "input.quality", StringType.class),
INPUT_TRANSFER_REASON("inputTransferReason", "input.transfer.reason", StringType.class),
INPUT_VOLTAGE("inputVoltage", "input.voltage", SmartHomeUnits.VOLT),
INPUT_VOLTAGE("inputVoltage", "input.voltage", Units.VOLT),
INPUT_VOLTAGE_STATUS("inputVoltageStatus", "input.voltage.status", StringType.class),
// Output
OUTPUT_CURRENT("outputCurrent", "output.current", SmartHomeUnits.AMPERE),
OUTPUT_VOLTAGE("outputVoltage", "output.voltage", SmartHomeUnits.VOLT),
OUTPUT_CURRENT("outputCurrent", "output.current", Units.AMPERE),
OUTPUT_VOLTAGE("outputVoltage", "output.voltage", Units.VOLT),
// Battery
BATTERY_CHARGE("batteryCharge", "battery.charge", SmartHomeUnits.PERCENT),
BATTERY_RUNTIME("batteryRuntime", "battery.runtime", SmartHomeUnits.SECOND),
BATTERY_VOLTAGE("batteryVoltage", "battery.voltage", SmartHomeUnits.VOLT);
BATTERY_CHARGE("batteryCharge", "battery.charge", Units.PERCENT),
BATTERY_RUNTIME("batteryRuntime", "battery.runtime", Units.SECOND),
BATTERY_VOLTAGE("batteryVoltage", "battery.voltage", Units.VOLT);
private static final Map<String, NutName> NUT_NAME_MAP = Stream.of(NutName.values())
.collect(Collectors.toMap(NutName::getChannelId, Function.identity()));