This repository has been archived by the owner on May 7, 2020. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Tradfri] Support for new RGB bulbs #4251
Add support for the new TRADFRI full color lamps. Signed-off-by: Holger Reichert <mail@h0lger.de>
- Loading branch information
Showing
9 changed files
with
584 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
139 changes: 139 additions & 0 deletions
139
...i.test/src/test/java/org/eclipse/smarthome/binding/tradfri/internal/TradfriColorTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,139 @@ | ||
/** | ||
* Copyright (c) 2014-2017 by the respective copyright holders. | ||
* All rights reserved. This program and the accompanying materials | ||
* are made available under the terms of the Eclipse Public License v1.0 | ||
* which accompanies this distribution, and is available at | ||
* http://www.eclipse.org/legal/epl-v10.html | ||
*/ | ||
package org.eclipse.smarthome.binding.tradfri.internal; | ||
|
||
import static org.junit.Assert.*; | ||
|
||
import org.eclipse.smarthome.core.library.types.HSBType; | ||
import org.eclipse.smarthome.core.library.types.PercentType; | ||
import org.junit.Test; | ||
|
||
/** | ||
* Tests for {@link TradfriColor}. | ||
* | ||
* @author Holger Reichert - Initial contribution | ||
*/ | ||
public class TradfriColorTest { | ||
|
||
@Test | ||
public void testFromCieKnownGood1() { | ||
TradfriColor color = TradfriColor.fromCie(29577, 12294, 254); | ||
assertNotNull(color); | ||
assertEquals(255, (int) color.rgbR); | ||
assertEquals(21, (int) color.rgbG); | ||
assertEquals(207, (int) color.rgbB); | ||
assertEquals(29577, (int) color.xyX); | ||
assertEquals(12294, (int) color.xyY); | ||
assertEquals(254, (int) color.brightness); | ||
} | ||
|
||
@Test | ||
public void testFromCieKnownGood2() { | ||
TradfriColor color = TradfriColor.fromCie(19983, 37417, 84); | ||
assertNotNull(color); | ||
assertEquals(110, (int) color.rgbR); | ||
assertEquals(174, (int) color.rgbG); | ||
assertEquals(58, (int) color.rgbB); | ||
assertEquals(19983, (int) color.xyX); | ||
assertEquals(37417, (int) color.xyY); | ||
assertEquals(84, (int) color.brightness); | ||
} | ||
|
||
@Test | ||
public void testFromHSBTypeKnownGood1() { | ||
TradfriColor color = TradfriColor.fromHSBType(HSBType.RED); | ||
assertNotNull(color); | ||
assertEquals(254, (int) color.rgbR); | ||
assertEquals(0, (int) color.rgbG); | ||
assertEquals(0, (int) color.rgbB); | ||
assertEquals(45914, (int) color.xyX); | ||
assertEquals(19615, (int) color.xyY); | ||
assertEquals(254, (int) color.brightness); | ||
} | ||
|
||
@Test | ||
public void testConversionReverse() { | ||
// convert from HSBType | ||
TradfriColor color = TradfriColor.fromHSBType(HSBType.GREEN); | ||
assertNotNull(color); | ||
assertEquals(0, (int) color.rgbR); | ||
assertEquals(254, (int) color.rgbG); // 254 instead of 255 - only approximated calculation | ||
assertEquals(0, (int) color.rgbB); | ||
assertEquals(11299, (int) color.xyX); | ||
assertEquals(48941, (int) color.xyY); | ||
assertEquals(254, (int) color.brightness); | ||
// convert the result again based on the XY values | ||
TradfriColor reverse = TradfriColor.fromCie(color.xyX, color.xyY, color.brightness); | ||
assertNotNull(reverse); | ||
assertEquals(0, (int) reverse.rgbR); | ||
assertEquals(255, (int) reverse.rgbG); // 255 instead of 254 - only approximated calculation | ||
assertEquals(0, (int) reverse.rgbB); | ||
assertEquals(11299, (int) reverse.xyX); | ||
assertEquals(48941, (int) reverse.xyY); | ||
assertEquals(254, (int) reverse.brightness); | ||
} | ||
|
||
@Test | ||
public void testFromColorTemperatureMinMiddleMax() { | ||
// coldest color temperature -> preset 1 | ||
TradfriColor colorMin = TradfriColor.fromColorTemperature(PercentType.ZERO); | ||
assertNotNull(colorMin); | ||
assertEquals(24933, (int) colorMin.xyX); | ||
assertEquals(24691, (int) colorMin.xyY); | ||
// middle color temperature -> preset 2 | ||
TradfriColor colorMiddle = TradfriColor.fromColorTemperature(new PercentType(50)); | ||
assertNotNull(colorMiddle); | ||
assertEquals(30138, (int) colorMiddle.xyX); | ||
assertEquals(26909, (int) colorMiddle.xyY); | ||
// warmest color temperature -> preset 3 | ||
TradfriColor colorMax = TradfriColor.fromColorTemperature(PercentType.HUNDRED); | ||
assertNotNull(colorMax); | ||
assertEquals(33137, (int) colorMax.xyX); | ||
assertEquals(27211, (int) colorMax.xyY); | ||
} | ||
|
||
@Test | ||
public void testFromColorTemperatureInbetween() { | ||
// 30 percent must be between preset 1 and 2 | ||
TradfriColor color2 = TradfriColor.fromColorTemperature(new PercentType(30)); | ||
assertNotNull(color2); | ||
assertEquals(28056, (int) color2.xyX); | ||
assertEquals(26022, (int) color2.xyY); | ||
// 70 percent must be between preset 2 and 3 | ||
TradfriColor color3 = TradfriColor.fromColorTemperature(new PercentType(70)); | ||
assertNotNull(color3); | ||
assertEquals(31338, (int) color3.xyX); | ||
assertEquals(27030, (int) color3.xyY); | ||
} | ||
|
||
@Test | ||
public void testCalculateColorTemperature() { | ||
// preset 1 -> coldest -> 0 percent | ||
PercentType preset1 = TradfriColor.calculateColorTemperature(24933, 24691); | ||
assertEquals(0, preset1.intValue()); | ||
// preset 2 -> middle -> 50 percent | ||
PercentType preset2 = TradfriColor.calculateColorTemperature(30138, 26909); | ||
assertEquals(50, preset2.intValue()); | ||
// preset 3 -> warmest -> 100 percent | ||
PercentType preset3 = TradfriColor.calculateColorTemperature(33137, 27211); | ||
assertEquals(100, preset3.intValue()); | ||
// preset 3 -> warmest -> 100 percent | ||
PercentType colder = TradfriColor.calculateColorTemperature(22222, 23333); | ||
assertEquals(0, colder.intValue()); | ||
// preset 3 -> warmest -> 100 percent | ||
PercentType temp3 = TradfriColor.calculateColorTemperature(34000, 34000); | ||
assertEquals(100, temp3.intValue()); | ||
// mixed case 1 | ||
PercentType mixed1 = TradfriColor.calculateColorTemperature(0, 1000000); | ||
assertEquals(0, mixed1.intValue()); | ||
// mixed case 1 | ||
PercentType mixed2 = TradfriColor.calculateColorTemperature(1000000, 0); | ||
assertEquals(100, mixed2.intValue()); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.