Skip to content

Commit d4aaef5

Browse files
splatchsplatch
committed
Update to openHAB 3.4 release.
Signed-off-by: Łukasz Dywicki <luke@code-house.org>
1 parent 742028c commit d4aaef5

File tree

34 files changed

+244
-95
lines changed

34 files changed

+244
-95
lines changed

‎bundles/org.connectorio.addons.binding.askoheat/src/main/java/org/connectorio/addons/binding/askoheat/internal/handler/AskoheatBridgeHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ public void run() {
108108
ValueBlock params = client.getValueBlock();
109109
getCallback().stateUpdated(new ChannelUID(getThing().getUID(), "status"), new DecimalType(params.getStatus()));
110110
getCallback().stateUpdated(new ChannelUID(getThing().getUID(), "load"), QuantityType.valueOf(params.getLoad(), Units.WATT));
111-
getCallback().stateUpdated(new ChannelUID(getThing().getUID(), "temperatureLimit"), QuantityType.valueOf(params.getTemperatureLimit(), tec.uom.se.unit.Units.CELSIUS));
112-
getCallback().stateUpdated(new ChannelUID(getThing().getUID(), "temperatureSensor0"), QuantityType.valueOf(params.getTemperatureSensor0(), tec.uom.se.unit.Units.CELSIUS));
113-
getCallback().stateUpdated(new ChannelUID(getThing().getUID(), "maximumTemperature"), QuantityType.valueOf(params.getMaximumTemperature(), tec.uom.se.unit.Units.CELSIUS));
111+
getCallback().stateUpdated(new ChannelUID(getThing().getUID(), "temperatureLimit"), QuantityType.valueOf(params.getTemperatureLimit(), tech.units.indriya.unit.Units.CELSIUS));
112+
getCallback().stateUpdated(new ChannelUID(getThing().getUID(), "temperatureSensor0"), QuantityType.valueOf(params.getTemperatureSensor0(), tech.units.indriya.unit.Units.CELSIUS));
113+
getCallback().stateUpdated(new ChannelUID(getThing().getUID(), "maximumTemperature"), QuantityType.valueOf(params.getMaximumTemperature(), tech.units.indriya.unit.Units.CELSIUS));
114114
}
115115
}, 1000L, getRefreshInterval(), TimeUnit.MILLISECONDS));
116116
tasks.add(scheduler.scheduleAtFixedRate(new Runnable() {

‎bundles/org.connectorio.addons.binding.canopen.ta/src/main/java/org/connectorio/addons/binding/canopen/ta/TAUnits.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import javax.measure.quantity.Length;
2323
import org.openhab.core.library.unit.MetricPrefix;
2424
import org.openhab.core.library.unit.SIUnits;
25-
import tec.uom.se.AbstractConverter;
26-
import tec.uom.se.AbstractUnit;
27-
import tec.uom.se.format.SimpleUnitFormat;
28-
import tec.uom.se.unit.TransformedUnit;
25+
import tech.units.indriya.AbstractUnit;
26+
import tech.units.indriya.format.SimpleUnitFormat;
27+
import tech.units.indriya.function.AbstractConverter;
28+
import tech.units.indriya.unit.TransformedUnit;
2929

3030
public class TAUnits {
3131

‎bundles/org.connectorio.addons.binding.canopen.ta/src/main/java/org/connectorio/addons/binding/canopen/ta/internal/config/AnalogUnit.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.openhab.core.library.unit.MetricPrefix;
3131
import org.openhab.core.library.unit.SIUnits;
3232
import org.openhab.core.library.unit.Units;
33-
import tec.uom.se.AbstractUnit;
33+
import tech.units.indriya.AbstractUnit;
3434

3535
public enum AnalogUnit implements TAUnit {
3636

@@ -58,14 +58,14 @@ public enum AnalogUnit implements TAUnit {
5858
/* 22 analog */ LITRE_PER_MINUTE (22, Units.LITRE_PER_MINUTE, 1),
5959
/* 23 analog */ BAR (23, Units.BAR, 0.01),
6060
/* 24 analog */ POWER_FACTOR(24, AbstractUnit.ONE, 0.01),
61-
/* 25 analog */ KILO_METRE (25, MetricPrefix.KILO(tec.uom.se.unit.Units.METRE), 1),
62-
/* 26 analog */ METRE (26, tec.uom.se.unit.Units.METRE, 1),
63-
/* 27 analog */ MILLIMETER (27, MetricPrefix.MILLI(tec.uom.se.unit.Units.METRE), 1),
64-
/* 28 analog */ CUBIC_METRE (28, tec.uom.se.unit.Units.CUBIC_METRE, 1),
65-
/* 29 analog */ HERTZ_KM_HOUR (29, Units.HERTZ.divide(MetricPrefix.KILO(tec.uom.se.unit.Units.METRE).divide(Units.HOUR)), 1),
66-
/* 30 analog */ HERTZ_M_SECOND (30, Units.HERTZ.divide(tec.uom.se.unit.Units.METRE.divide(Units.SECOND)), 1),
61+
/* 25 analog */ KILO_METRE (25, MetricPrefix.KILO(SIUnits.METRE), 1),
62+
/* 26 analog */ METRE (26, SIUnits.METRE, 1),
63+
/* 27 analog */ MILLIMETER (27, MetricPrefix.MILLI(SIUnits.METRE), 1),
64+
/* 28 analog */ CUBIC_METRE (28, SIUnits.CUBIC_METRE, 1),
65+
/* 29 analog */ HERTZ_KM_HOUR (29, Units.HERTZ.divide(MetricPrefix.KILO(SIUnits.METRE).divide(Units.HOUR)), 1),
66+
/* 30 analog */ HERTZ_M_SECOND (30, Units.HERTZ.divide(SIUnits.METRE.divide(Units.SECOND)), 1),
6767
/* 31 analog */ KILOWATT_PER_IMPULSE (31, Units.KILOWATT_HOUR.divide(TAUnits.IMPULSE), 1),
68-
/* 32 analog */ CUBICMETRE_PER_IMPULSE (32, tec.uom.se.unit.Units.CUBIC_METRE.divide(TAUnits.IMPULSE), 1),
68+
/* 32 analog */ CUBICMETRE_PER_IMPULSE (32, SIUnits.CUBIC_METRE.divide(TAUnits.IMPULSE), 1),
6969
/* 33 analog */ MILLIMETRE_PER_IMPULSE(33, TAUnits.MILLIMETRE.divide(TAUnits.IMPULSE), 1),
7070
/* 34 analog */ LITER_PER_IMPULSE (34, Units.LITRE.divide(TAUnits.IMPULSE), 1),
7171
/* 35 analog */ LITER_PER_DAY (35, Units.LITRE.divide(Units.DAY), 1),

‎bundles/org.connectorio.addons.binding.canopen.ta/src/main/java/org/connectorio/addons/binding/canopen/ta/internal/config/ComplexUnit.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import java.util.stream.Collectors;
2525

2626
import org.connectorio.addons.binding.canopen.ta.internal.type.TAUnit;
27-
import tec.uom.se.quantity.Quantities;
28-
import tec.uom.se.unit.Units;
27+
import org.openhab.core.library.unit.SIUnits;
28+
import tech.units.indriya.quantity.Quantities;
2929

3030
/**
3131
* Compound units whcih require additional parsing. Result of computation is list and not single value.
@@ -38,7 +38,7 @@ public enum ComplexUnit implements TAUnit {
3838

3939
double value = 0.1 * (raw & 0x1FF) * (negative ? -1 : 1);
4040
return Arrays.asList(
41-
Quantities.getQuantity(value, Units.CELSIUS),
41+
Quantities.getQuantity(value, SIUnits.CELSIUS),
4242
(raw & 0x600) >> 9
4343
);
4444
});

‎bundles/org.connectorio.addons.binding.canopen.ta/src/main/java/org/connectorio/addons/binding/canopen/ta/internal/handler/channel/AnalogChannelHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.openhab.core.thing.binding.ThingHandlerCallback;
3333
import org.openhab.core.types.Command;
3434
import org.openhab.core.types.State;
35-
import tec.uom.se.quantity.Quantities;
35+
import tech.units.indriya.quantity.Quantities;
3636

3737
public class AnalogChannelHandler extends BaseChannelHandler<AnalogValue, AnalogUnit, AnalogObjectConfig> {
3838

‎bundles/org.connectorio.addons.binding.canopen.ta/src/main/java/org/connectorio/addons/binding/canopen/ta/internal/handler/channel/RASChannelHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.openhab.core.types.State;
3737
import org.slf4j.Logger;
3838
import org.slf4j.LoggerFactory;
39-
import tec.uom.se.quantity.Quantities;
39+
import tech.units.indriya.quantity.Quantities;
4040

4141
public class RASChannelHandler extends BaseChannelHandler<RASValue, AnalogUnit, AnalogObjectConfig> {
4242

‎bundles/org.connectorio.addons.binding.canopen.ta/src/main/java/org/connectorio/addons/binding/canopen/ta/internal/type/TAValue.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.connectorio.addons.binding.canopen.ta.internal.config.AnalogUnit;
2121
import org.connectorio.addons.binding.canopen.ta.internal.config.ComplexUnit;
2222
import org.connectorio.addons.binding.canopen.ta.internal.config.DigitalUnit;
23-
import tec.uom.se.quantity.Quantities;
23+
import tech.units.indriya.quantity.Quantities;
2424

2525
public class TAValue {
2626

‎bundles/org.connectorio.addons.binding.canopen.ta/src/main/java/org/connectorio/addons/binding/canopen/ta/tapi/val/BaseAnalogValue.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import javax.measure.Quantity;
2222
import org.connectorio.addons.binding.canopen.ta.internal.config.AnalogUnit;
2323
import org.connectorio.addons.binding.canopen.ta.internal.type.TAUnit;
24-
import tec.uom.se.quantity.Quantities;
24+
import tech.units.indriya.quantity.Quantities;
2525

2626
public abstract class BaseAnalogValue<T extends Number> implements AnalogValue {
2727

‎bundles/org.connectorio.addons.binding.canopen.ta/src/main/java/org/connectorio/addons/binding/canopen/ta/tapi/val/RASValue.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.plc4x.java.spi.generation.WriteBuffer;
2525
import org.connectorio.addons.binding.canopen.ta.internal.config.AnalogUnit;
2626
import org.connectorio.addons.binding.canopen.ta.internal.type.TAUnit;
27-
import tec.uom.se.quantity.Quantities;
27+
import tech.units.indriya.quantity.Quantities;
2828

2929
public class RASValue extends ShortAnalogValue {
3030

‎bundles/org.connectorio.addons.binding.canopen.ta/src/main/java/org/connectorio/addons/binding/canopen/ta/tapi/val/ShortAnalogValue.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import javax.measure.Quantity;
2121
import org.connectorio.addons.binding.canopen.ta.internal.config.AnalogUnit;
2222
import org.connectorio.addons.binding.canopen.ta.internal.type.TAUnit;
23-
import tec.uom.se.quantity.Quantities;
2423

2524
public class ShortAnalogValue extends BaseAnalogValue<Short> {
2625

0 commit comments

Comments
 (0)