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

34
bundles/org.openhab.binding.modbus.e3dc/src/main/java/org/openhab/binding/modbus/e3dc/internal/dto/PowerBlock.java
View File

@@ -18,7 +18,7 @@ import javax.measure.quantity.Power;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.binding.modbus.e3dc.internal.modbus.Data;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.unit.SmartHomeUnits;
import org.openhab.core.library.unit.Units;
import org.openhab.io.transport.modbus.ValueBuffer;
/**
@@ -58,21 +58,21 @@ public class PowerBlock implements Data {
* Positive value - Battery is charging = Power consumer
* Negative value - Battery is discharging = Power supplier
*/
pvPowerSupply = QuantityType.valueOf(pvPowerSupplyL, SmartHomeUnits.WATT);
pvPowerSupply = QuantityType.valueOf(pvPowerSupplyL, Units.WATT);
long batteryPower = wrap.getSInt32Swap();
if (batteryPower > 0) {
// Battery is charging so Power is consumed by Battery
batteryPowerSupply = QuantityType.valueOf(0, SmartHomeUnits.WATT);
batteryPowerConsumption = QuantityType.valueOf(batteryPower, SmartHomeUnits.WATT);
batteryPowerSupply = QuantityType.valueOf(0, Units.WATT);
batteryPowerConsumption = QuantityType.valueOf(batteryPower, Units.WATT);
} else {
// Battery is discharging so Power is provided by Battery
batteryPowerSupply = QuantityType.valueOf(batteryPower * -1, SmartHomeUnits.WATT);
batteryPowerConsumption = QuantityType.valueOf(0, SmartHomeUnits.WATT);
batteryPowerSupply = QuantityType.valueOf(batteryPower * -1, Units.WATT);
batteryPowerConsumption = QuantityType.valueOf(0, Units.WATT);
}
// int32_swap value = 4 byte
long householdPowerConsumptionL = wrap.getSInt32Swap();
householdPowerConsumption = QuantityType.valueOf(householdPowerConsumptionL, SmartHomeUnits.WATT);
householdPowerConsumption = QuantityType.valueOf(householdPowerConsumptionL, Units.WATT);
/*
* int32_swap value don't provide negative values!
@@ -82,28 +82,28 @@ public class PowerBlock implements Data {
long gridPower = wrap.getSInt32Swap();
if (gridPower > 0) {
// Power is provided by Grid
gridPowerSupply = QuantityType.valueOf(gridPower, SmartHomeUnits.WATT);
gridPowerConsumpition = QuantityType.valueOf(0, SmartHomeUnits.WATT);
gridPowerSupply = QuantityType.valueOf(gridPower, Units.WATT);
gridPowerConsumpition = QuantityType.valueOf(0, Units.WATT);
} else {
// Power is consumed by Grid
gridPowerConsumpition = QuantityType.valueOf(gridPower * -1, SmartHomeUnits.WATT);
gridPowerSupply = QuantityType.valueOf(0, SmartHomeUnits.WATT);
gridPowerConsumpition = QuantityType.valueOf(gridPower * -1, Units.WATT);
gridPowerSupply = QuantityType.valueOf(0, Units.WATT);
}
// int32_swap value = 4 byte
externalPowerSupply = QuantityType.valueOf(wrap.getSInt32Swap(), SmartHomeUnits.WATT);
externalPowerSupply = QuantityType.valueOf(wrap.getSInt32Swap(), Units.WATT);
// int32_swap value = 4 byte
wallboxPowerConsumption = QuantityType.valueOf(wrap.getSInt32Swap(), SmartHomeUnits.WATT);
wallboxPowerConsumption = QuantityType.valueOf(wrap.getSInt32Swap(), Units.WATT);
// int32_swap value = 4 byte
wallboxPVPowerConsumption = QuantityType.valueOf(wrap.getSInt32Swap(), SmartHomeUnits.WATT);
wallboxPVPowerConsumption = QuantityType.valueOf(wrap.getSInt32Swap(), Units.WATT);
// unit8 + uint8 - one register with split value for Autarky & Self Consumption
autarky = QuantityType.valueOf(wrap.getSInt8(), SmartHomeUnits.PERCENT);
selfConsumption = QuantityType.valueOf(wrap.getSInt8(), SmartHomeUnits.PERCENT);
autarky = QuantityType.valueOf(wrap.getSInt8(), Units.PERCENT);
selfConsumption = QuantityType.valueOf(wrap.getSInt8(), Units.PERCENT);
// uint16 for Battery State of Charge
batterySOC = QuantityType.valueOf(wrap.getSInt16(), SmartHomeUnits.PERCENT);
batterySOC = QuantityType.valueOf(wrap.getSInt16(), Units.PERCENT);
}
}

20
bundles/org.openhab.binding.modbus.e3dc/src/main/java/org/openhab/binding/modbus/e3dc/internal/dto/StringBlock.java
View File

@@ -19,7 +19,7 @@ import javax.measure.quantity.Power;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.binding.modbus.e3dc.internal.modbus.Data;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.unit.SmartHomeUnits;
import org.openhab.core.library.unit.Units;
import org.openhab.io.transport.modbus.ValueBuffer;
/**
@@ -47,15 +47,15 @@ public class StringBlock implements Data {
public StringBlock(byte[] bArray) {
ValueBuffer wrap = ValueBuffer.wrap(bArray);
// straight forward - for each String the values Volt, Ampere and then Watt. All unt16 = 2 bytes values
string1Volt = QuantityType.valueOf(wrap.getUInt16(), SmartHomeUnits.VOLT);
string2Volt = QuantityType.valueOf(wrap.getUInt16(), SmartHomeUnits.VOLT);
string3Volt = QuantityType.valueOf(wrap.getUInt16(), SmartHomeUnits.VOLT);
string1Volt = QuantityType.valueOf(wrap.getUInt16(), Units.VOLT);
string2Volt = QuantityType.valueOf(wrap.getUInt16(), Units.VOLT);
string3Volt = QuantityType.valueOf(wrap.getUInt16(), Units.VOLT);
// E3DC Modbus Spec chapter 3.1.2, page 16 - Ampere values shall be handled with factor 0.01
string1Ampere = QuantityType.valueOf(DataConverter.getUDoubleValue(wrap, 0.01), SmartHomeUnits.AMPERE);
string2Ampere = QuantityType.valueOf(DataConverter.getUDoubleValue(wrap, 0.01), SmartHomeUnits.AMPERE);
string3Ampere = QuantityType.valueOf(DataConverter.getUDoubleValue(wrap, 0.01), SmartHomeUnits.AMPERE);
string1Watt = QuantityType.valueOf(wrap.getUInt16(), SmartHomeUnits.WATT);
string2Watt = QuantityType.valueOf(wrap.getUInt16(), SmartHomeUnits.WATT);
string3Watt = QuantityType.valueOf(wrap.getUInt16(), SmartHomeUnits.WATT);
string1Ampere = QuantityType.valueOf(DataConverter.getUDoubleValue(wrap, 0.01), Units.AMPERE);
string2Ampere = QuantityType.valueOf(DataConverter.getUDoubleValue(wrap, 0.01), Units.AMPERE);
string3Ampere = QuantityType.valueOf(DataConverter.getUDoubleValue(wrap, 0.01), Units.AMPERE);
string1Watt = QuantityType.valueOf(wrap.getUInt16(), Units.WATT);
string2Watt = QuantityType.valueOf(wrap.getUInt16(), Units.WATT);
string3Watt = QuantityType.valueOf(wrap.getUInt16(), Units.WATT);
}
}