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

28
bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/firstgeneration/WebscrapeHandler.java
View File

@@ -27,7 +27,7 @@ import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
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.Channel;
import org.openhab.core.thing.ChannelUID;
import org.openhab.core.thing.Thing;
@@ -52,20 +52,20 @@ public class WebscrapeHandler extends BaseThingHandler {
public WebscrapeHandler(Thing thing) {
super(thing);
channelConfigs.add(new ChannelConfig("acPower", "td", 4, SmartHomeUnits.WATT));
channelConfigs.add(new ChannelConfig("totalEnergy", "td", 7, SmartHomeUnits.KILOWATT_HOUR));
channelConfigs.add(new ChannelConfig("dayEnergy", "td", 10, SmartHomeUnits.KILOWATT_HOUR));
channelConfigs.add(new ChannelConfig("acPower", "td", 4, Units.WATT));
channelConfigs.add(new ChannelConfig("totalEnergy", "td", 7, Units.KILOWATT_HOUR));
channelConfigs.add(new ChannelConfig("dayEnergy", "td", 10, Units.KILOWATT_HOUR));
channelConfigs.add(new ChannelConfig("status", "td", 13, null));
channelConfigs.add(new ChannelConfig("str1Voltage", "td", 19, SmartHomeUnits.VOLT));
channelConfigs.add(new ChannelConfig("str1Current", "td", 25, SmartHomeUnits.AMPERE));
channelConfigs.add(new ChannelConfig("str2Voltage", "td", 33, SmartHomeUnits.VOLT));
channelConfigs.add(new ChannelConfig("str2Current", "td", 39, SmartHomeUnits.AMPERE));
channelConfigs.add(new ChannelConfig("l1Voltage", "td", 22, SmartHomeUnits.VOLT));
channelConfigs.add(new ChannelConfig("l1Power", "td", 28, SmartHomeUnits.WATT));
channelConfigs.add(new ChannelConfig("l2Voltage", "td", 36, SmartHomeUnits.VOLT));
channelConfigs.add(new ChannelConfig("l2Power", "td", 42, SmartHomeUnits.WATT));
channelConfigs.add(new ChannelConfig("l3Voltage", "td", 46, SmartHomeUnits.VOLT));
channelConfigs.add(new ChannelConfig("l3Power", "td", 49, SmartHomeUnits.WATT));
channelConfigs.add(new ChannelConfig("str1Voltage", "td", 19, Units.VOLT));
channelConfigs.add(new ChannelConfig("str1Current", "td", 25, Units.AMPERE));
channelConfigs.add(new ChannelConfig("str2Voltage", "td", 33, Units.VOLT));
channelConfigs.add(new ChannelConfig("str2Current", "td", 39, Units.AMPERE));
channelConfigs.add(new ChannelConfig("l1Voltage", "td", 22, Units.VOLT));
channelConfigs.add(new ChannelConfig("l1Power", "td", 28, Units.WATT));
channelConfigs.add(new ChannelConfig("l2Voltage", "td", 36, Units.VOLT));
channelConfigs.add(new ChannelConfig("l2Power", "td", 42, Units.WATT));
channelConfigs.add(new ChannelConfig("l3Voltage", "td", 46, Units.VOLT));
channelConfigs.add(new ChannelConfig("l3Power", "td", 49, Units.WATT));
}
@Override

16
bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/internal/kostal/inverter/thirdgeneration/ThirdGenerationHandler.java
View File

@@ -44,7 +44,7 @@ import org.eclipse.jetty.client.api.ContentResponse;
import org.openhab.core.library.types.DecimalType;
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.ChannelUID;
import org.openhab.core.thing.Thing;
import org.openhab.core.thing.ThingStatus;
@@ -220,7 +220,7 @@ public class ThirdGenerationHandler extends BaseThingHandler {
break;
}
case PERCEMTAGE: {
updateState(channeluid, new QuantityType<>(value, SmartHomeUnits.PERCENT));
updateState(channeluid, new QuantityType<>(value, Units.PERCENT));
break;
}
case KILOGRAM: {
@@ -228,28 +228,28 @@ public class ThirdGenerationHandler extends BaseThingHandler {
break;
}
case SECONDS: {
updateState(channeluid, new QuantityType<>(value, SmartHomeUnits.SECOND));
updateState(channeluid, new QuantityType<>(value, Units.SECOND));
break;
}
case KILOWATT_HOUR: {
updateState(channeluid, new QuantityType<>(value / 1000, SmartHomeUnits.KILOWATT_HOUR));
updateState(channeluid, new QuantityType<>(value / 1000, Units.KILOWATT_HOUR));
break;
}
case WATT: {
updateState(channeluid, new QuantityType<>(value, SmartHomeUnits.WATT));
updateState(channeluid, new QuantityType<>(value, Units.WATT));
break;
}
case AMPERE: {
updateState(channeluid, new QuantityType<>(value, SmartHomeUnits.AMPERE));
updateState(channeluid, new QuantityType<>(value, Units.AMPERE));
break;
}
case AMPERE_HOUR: {
// Ampere hours are not supported by ESH, but 1 AH is equal tp 3600 coulomb...
updateState(channeluid, new QuantityType<>(value * 3600, SmartHomeUnits.COULOMB));
updateState(channeluid, new QuantityType<>(value * 3600, Units.COULOMB));
break;
}
case VOLT: {
updateState(channeluid, new QuantityType<>(value, SmartHomeUnits.VOLT));
updateState(channeluid, new QuantityType<>(value, Units.VOLT));
break;
}
default: {