demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 07:02:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[knx] Allow color temperatures specified in mired (#18004)

Browse Source 
This allows other bindings or scripts to send commands
which specify the color temperature in mired.

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich 2025-01-01 11:40:10 +01:00 committed by GitHub
parent 36802db90e
commit 6978b9978b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/ValueEncoder.java
View File

@ -228,7 +228,14 @@ public class ValueEncoder {
} }
if (unit != null) { if (unit != null) {
QuantityType<?> converted = ((QuantityType<?>) value).toUnit(unit); QuantityType<?> converted = null;
if ("K".equals(unit) || "°C".equals(unit)) {
// workaround for color temperatures given in MIRED, required as long as toUnit does
// not convert MIRED to Kelvin
converted = ((QuantityType<?>) value).toInvertibleUnit(unit);
} else {
converted = ((QuantityType<?>) value).toUnit(unit);
}
if (converted == null) { if (converted == null) {
LOGGER.warn("Could not convert {} to unit {}, stripping unit only. Check your configuration.", LOGGER.warn("Could not convert {} to unit {}, stripping unit only. Check your configuration.",
value, unit); value, unit);

18
bundles/org.openhab.binding.knx/src/test/java/org/openhab/binding/knx/internal/dpt/DPTTest.java
View File

@ -123,6 +123,10 @@ class DPTTest {
assertEquals("1000", ValueEncoder.encode(new QuantityType<>("1000 lx"), "7.013")); assertEquals("1000", ValueEncoder.encode(new QuantityType<>("1000 lx"), "7.013"));
assertEquals("3000", ValueEncoder.encode(new QuantityType<>("3000 K"), "7.600")); assertEquals("3000", ValueEncoder.encode(new QuantityType<>("3000 K"), "7.600"));
// unit for 7.600 is K; special handling for color temperature: make sure °C and mired work as well
assertEquals("3273.15", ValueEncoder.encode(new QuantityType<>("3000 °C"), "7.600"));
assertEquals("4000", ValueEncoder.encode(new QuantityType<>("250 mired"), "7.600"));
assertEquals("4000", ValueEncoder.encode(new QuantityType<>("250 mirek"), "7.600"));
} }
@Test @Test
@ -316,7 +320,15 @@ class DPTTest {
assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 Pa"), "14.066")); assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 Pa"), "14.066"));
assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 N/m"), "14.067")); assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 N/m"), "14.067"));
assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 °C"), "14.068")); assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 °C"), "14.068"));
// unit for 14.068 is °C; special handling for color temperature: make sure °C and mired work as well
assertEquals("-272.15", ValueEncoder.encode(new QuantityType<>("1 K"), "14.068"));
assertEquals("3726.85", ValueEncoder.encode(new QuantityType<>("250 mired"), "14.068"));
assertEquals("3726.85", ValueEncoder.encode(new QuantityType<>("250 mirek"), "14.068"));
assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 K"), "14.069")); assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 K"), "14.069"));
// unit for 14.069 is K; special handling for color temperature: make sure °C and mired work as well
assertEquals("274.15", ValueEncoder.encode(new QuantityType<>("1 °C"), "14.069"));
assertEquals("4000", ValueEncoder.encode(new QuantityType<>("250 mired"), "14.069"));
assertEquals("4000", ValueEncoder.encode(new QuantityType<>("250 mirek"), "14.069"));
assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 K"), "14.070")); assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 K"), "14.070"));
assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 J/K"), "14.071")); assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 J/K"), "14.071"));
assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 W/m/K"), "14.072")); assertEquals("1", ValueEncoder.encode(new QuantityType<>("1 W/m/K"), "14.072"));
@ -526,6 +538,12 @@ class DPTTest {
// 64-bit signed (DPT 29) // 64-bit signed (DPT 29)
assertNotEquals(DPTXlator64BitSigned.DPT_REACTIVE_ENERGY.getUnit(), Units.VAR_HOUR.toString()); assertNotEquals(DPTXlator64BitSigned.DPT_REACTIVE_ENERGY.getUnit(), Units.VAR_HOUR.toString());
// workaround for color temperatures given in MIRED, required as long as toUnit does
// not convert MIRED to Kelvin
// -> if this test fails, workaround in ValueEncoder can be removed
assertNull((new QuantityType<>("1 mired")).toUnit("K"));
assertNotNull((new QuantityType<>("1 mired")).toInvertibleUnit("K"));
} }
private static Stream<Map.Entry<String, String>> unitProvider() { private static Stream<Map.Entry<String, String>> unitProvider() {