Skip to content
This repository has been archived by the owner on May 7, 2020. It is now read-only.

[Hue] Add support for TransitionTime #1722 #6872

Closed
wants to merge 1 commit into from
Closed

[Hue] Add support for TransitionTime #1722 #6872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions ...src/test/java/org/eclipse/smarthome/binding/hue/internal/handler/HueLightHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,43 +97,43 @@ public void assertCommandForOsramPar16_50ForBrightnessChannelOff() {

@Test
public void assertCommandForColorChannelOn() {
String expectedReply = "{\"on\" : true}";
String expectedReply = "{\"on\" : true, \"transitiontime\" : 3}";
assertSendCommandForColor(OnOffType.ON, new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorTemperatureChannelOn() {
String expectedReply = "{\"on\" : true}";
String expectedReply = "{\"on\" : true, \"transitiontime\" : 3}";
assertSendCommandForColorTemp(OnOffType.ON, new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorChannelOff() {
String expectedReply = "{\"on\" : false}";
String expectedReply = "{\"on\" : false, \"transitiontime\" : 3}";
assertSendCommandForColor(OnOffType.OFF, new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorTemperatureChannelOff() {
String expectedReply = "{\"on\" : false}";
String expectedReply = "{\"on\" : false, \"transitiontime\" : 3}";
assertSendCommandForColorTemp(OnOffType.OFF, new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorTemperatureChannel0Percent() {
String expectedReply = "{\"ct\" : 153}";
String expectedReply = "{\"ct\" : 153, \"transitiontime\" : 3}";
assertSendCommandForColorTemp(new PercentType(0), new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorTemperatureChannel50Percent() {
String expectedReply = "{\"ct\" : 327}";
String expectedReply = "{\"ct\" : 327, \"transitiontime\" : 3}";
assertSendCommandForColorTemp(new PercentType(50), new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorTemperatureChannel1000Percent() {
String expectedReply = "{\"ct\" : 500}";
String expectedReply = "{\"ct\" : 500, \"transitiontime\" : 3}";
assertSendCommandForColorTemp(new PercentType(100), new HueLightState(), expectedReply);
}

Expand All @@ -157,140 +157,140 @@ public void assertPercentageValueOfColorTemperatureWhenCt500() {

@Test
public void assertCommandForColorChannel0Percent() {
String expectedReply = "{\"on\" : false}";
String expectedReply = "{\"on\" : false, \"transitiontime\" : 3}";
assertSendCommandForColor(new PercentType(0), new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorChannel50Percent() {
String expectedReply = "{\"bri\" : 127, \"on\" : true}";
String expectedReply = "{\"bri\" : 127, \"on\" : true, \"transitiontime\" : 3}";
assertSendCommandForColor(new PercentType(50), new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorChannel100Percent() {
String expectedReply = "{\"bri\" : 254, \"on\" : true}";
String expectedReply = "{\"bri\" : 254, \"on\" : true, \"transitiontime\" : 3}";
assertSendCommandForColor(new PercentType(100), new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorChannelBlack() {
String expectedReply = "{\"on\" : false}";
String expectedReply = "{\"on\" : false, \"transitiontime\" : 3}";
assertSendCommandForColor(HSBType.BLACK, new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorChannelRed() {
String expectedReply = "{\"bri\" : 254, \"sat\" : 254, \"hue\" : 0}";
String expectedReply = "{\"bri\" : 254, \"sat\" : 254, \"hue\" : 0, \"transitiontime\" : 3}";
assertSendCommandForColor(HSBType.RED, new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorChannelGreen() {
String expectedReply = "{\"bri\" : 254, \"sat\" : 254, \"hue\" : 21845}";
String expectedReply = "{\"bri\" : 254, \"sat\" : 254, \"hue\" : 21845, \"transitiontime\" : 3}";
assertSendCommandForColor(HSBType.GREEN, new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorChannelBlue() {
String expectedReply = "{\"bri\" : 254, \"sat\" : 254, \"hue\" : 43690}";
String expectedReply = "{\"bri\" : 254, \"sat\" : 254, \"hue\" : 43690, \"transitiontime\" : 3}";
assertSendCommandForColor(HSBType.BLUE, new HueLightState(), expectedReply);
}

@Test
public void assertCommandForColorChannelWhite() {
String expectedReply = "{\"bri\" : 254, \"sat\" : 0, \"hue\" : 0}";
String expectedReply = "{\"bri\" : 254, \"sat\" : 0, \"hue\" : 0, \"transitiontime\" : 3}";
assertSendCommandForColor(HSBType.WHITE, new HueLightState(), expectedReply);
}

@Test
public void assertXYCommandForColorChannelBlack() {
String expectedReply = "{\"on\" : false}";
String expectedReply = "{\"on\" : false, \"transitiontime\" : 3}";
assertSendCommandForColor(HSBType.BLACK, new HueLightState().colormode(ColorMode.XY), expectedReply);
}

@Test
public void assertXYCommandForColorChannelWhite() {
String expectedReply = "{\"xy\" : [ 0.31271592 , 0.32900152 ], \"bri\" : 254}";
String expectedReply = "{\"xy\" : [ 0.31271592 , 0.32900152 ], \"bri\" : 254, \"transitiontime\" : 3}";
assertSendCommandForColor(HSBType.WHITE, new HueLightState().colormode(ColorMode.XY), expectedReply);
}

@Test
public void assertXYCommandForColorChannelColorful() {
String expectedReply = "{\"xy\" : [ 0.16969365 , 0.12379659 ], \"bri\" : 127}";
String expectedReply = "{\"xy\" : [ 0.16969365 , 0.12379659 ], \"bri\" : 127, \"transitiontime\" : 3}";
assertSendCommandForColor(new HSBType("220,90,50"), new HueLightState().colormode(ColorMode.XY), expectedReply);
}

@Test
public void asserCommandForColorChannelIncrease() {
HueLightState currentState = new HueLightState().bri(1).on(false);
String expectedReply = "{\"bri\" : 30, \"on\" : true}";
String expectedReply = "{\"bri\" : 30, \"on\" : true, \"transitiontime\" : 3}";
assertSendCommandForColor(IncreaseDecreaseType.INCREASE, currentState, expectedReply);

currentState.bri(200).on(true);
expectedReply = "{\"bri\" : 230}";
expectedReply = "{\"bri\" : 230, \"transitiontime\" : 3}";
assertSendCommandForColor(IncreaseDecreaseType.INCREASE, currentState, expectedReply);

currentState.bri(230);
expectedReply = "{\"bri\" : 254}";
expectedReply = "{\"bri\" : 254, \"transitiontime\" : 3}";
assertSendCommandForColor(IncreaseDecreaseType.INCREASE, currentState, expectedReply);
}

@Test
public void asserCommandForColorChannelDecrease() {
HueLightState currentState = new HueLightState().bri(200);
String expectedReply = "{\"bri\" : 170}";
String expectedReply = "{\"bri\" : 170, \"transitiontime\" : 3}";
assertSendCommandForColor(IncreaseDecreaseType.DECREASE, currentState, expectedReply);

currentState.bri(20);
expectedReply = "{\"on\" : false}";
expectedReply = "{\"on\" : false, \"transitiontime\" : 3}";
assertSendCommandForColor(IncreaseDecreaseType.DECREASE, currentState, expectedReply);
}

@Test
public void assertCommandForBrightnessChannel50Percent() {
HueLightState currentState = new HueLightState();
String expectedReply = "{\"bri\" : 127, \"on\" : true}";
String expectedReply = "{\"bri\" : 127, \"on\" : true, \"transitiontime\" : 3}";
assertSendCommandForBrightness(new PercentType(50), currentState, expectedReply);
}

@Test
public void assertCommandForBrightnessChannelIncrease() {
HueLightState currentState = new HueLightState().bri(1).on(false);
String expectedReply = "{\"bri\" : 30, \"on\" : true}";
String expectedReply = "{\"bri\" : 30, \"on\" : true, \"transitiontime\" : 3}";
assertSendCommandForBrightness(IncreaseDecreaseType.INCREASE, currentState, expectedReply);

currentState.bri(200).on(true);
expectedReply = "{\"bri\" : 230}";
expectedReply = "{\"bri\" : 230, \"transitiontime\" : 3}";
assertSendCommandForBrightness(IncreaseDecreaseType.INCREASE, currentState, expectedReply);

currentState.bri(230);
expectedReply = "{\"bri\" : 254}";
expectedReply = "{\"bri\" : 254, \"transitiontime\" : 3}";
assertSendCommandForBrightness(IncreaseDecreaseType.INCREASE, currentState, expectedReply);
}

@Test
public void assertCommandForBrightnessChannelDecrease() {
HueLightState currentState = new HueLightState().bri(200);
String expectedReply = "{\"bri\" : 170}";
String expectedReply = "{\"bri\" : 170, \"transitiontime\" : 3}";
assertSendCommandForBrightness(IncreaseDecreaseType.DECREASE, currentState, expectedReply);

currentState.bri(20);
expectedReply = "{\"on\" : false}";
expectedReply = "{\"on\" : false, \"transitiontime\" : 3}";
assertSendCommandForBrightness(IncreaseDecreaseType.DECREASE, currentState, expectedReply);
}

@Test
public void assertCommandForBrightnessChannelOff() {
HueLightState currentState = new HueLightState();
String expectedReply = "{\"on\" : false}";
String expectedReply = "{\"on\" : false, \"transitiontime\" : 3}";
assertSendCommandForBrightness(OnOffType.OFF, currentState, expectedReply);
}

@Test
public void assertCommandForBrightnessChannelOn() {
HueLightState currentState = new HueLightState();
String expectedReply = "{\"on\" : true}";
String expectedReply = "{\"on\" : true, \"transitiontime\" : 3}";
assertSendCommandForBrightness(OnOffType.ON, currentState, expectedReply);
}

Expand Down
6 changes: 6 additions & 0 deletions extensions/binding/org.eclipse.smarthome.binding.hue/ESH-INF/thing/ColorLight.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<channel id="color" typeId="color" />
<channel id="alert" typeId="alert" />
<channel id="effect" typeId="effect" />
<channel id="fadetime" typeId="fadetime" />
</channels>

<representation-property>uniqueId</representation-property>
Expand All @@ -26,6 +27,11 @@
<description>The light identifier identifies one certain hue light.</description>
<required>true</required>
</parameter>
<parameter name="fadetime" type="integer" min="0">
<label>Fade time</label>
<description>Fade time in ms for changing values</description>
<default>300</default>
</parameter>
</config-description>
</thing-type>
</thing:thing-descriptions>
6 changes: 6 additions & 0 deletions extensions/binding/org.eclipse.smarthome.binding.hue/ESH-INF/thing/ColorTemperatureLight.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<channel id="brightness" typeId="brightness" />
<channel id="alert" typeId="alert" />
<channel id="effect" typeId="effect" />
<channel id="fadetime" typeId="fadetime" />
</channels>

<representation-property>uniqueId</representation-property>
Expand All @@ -27,6 +28,11 @@
<description>The light identifier identifies one certain hue light.</description>
<required>true</required>
</parameter>
<parameter name="fadetime" type="integer" min="0">
<label>Fade time</label>
<description>Fade time in ms for changing values</description>
<default>300</default>
</parameter>
</config-description>
</thing-type>
</thing:thing-descriptions>
6 changes: 6 additions & 0 deletions extensions/binding/org.eclipse.smarthome.binding.hue/ESH-INF/thing/DimmableLight.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<channels>
<channel id="brightness" typeId="brightness" />
<channel id="alert" typeId="alert" />
<channel id="fadetime" typeId="fadetime" />
</channels>

<representation-property>uniqueId</representation-property>
Expand All @@ -25,6 +26,11 @@
<description>The light identifier identifies one certain hue light.</description>
<required>true</required>
</parameter>
<parameter name="fadetime" type="integer" min="0">
<label>Fade time</label>
<description>Fade time in ms for changing values</description>
<default>300</default>
</parameter>
</config-description>
</thing-type>
</thing:thing-descriptions>
5 changes: 5 additions & 0 deletions extensions/binding/org.eclipse.smarthome.binding.hue/ESH-INF/thing/DimmablePlug.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
<description>The identifier that is used within the hue bridge.</description>
<required>true</required>
</parameter>
<parameter name="fadetime" type="integer" min="0">
<label>Fade time</label>
<description>Fade time in ms for changing values</description>
<default>300</default>
</parameter>
</config-description>
</thing-type>
</thing:thing-descriptions>
6 changes: 6 additions & 0 deletions extensions/binding/org.eclipse.smarthome.binding.hue/ESH-INF/thing/ExtendedColorLight.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<channel id="color_temperature" typeId="color_temperature" />
<channel id="alert" typeId="alert" />
<channel id="effect" typeId="effect" />
<channel id="fadetime" typeId="fadetime" />
</channels>

<representation-property>uniqueId</representation-property>
Expand All @@ -27,6 +28,11 @@
<description>The light identifier identifies one certain hue light.</description>
<required>true</required>
</parameter>
<parameter name="fadetime" type="integer" min="0">
<label>Fade time</label>
<description>Fade time in ms for changing values</description>
<default>300</default>
</parameter>
</config-description>
</thing-type>
</thing:thing-descriptions>
8 changes: 8 additions & 0 deletions extensions/binding/org.eclipse.smarthome.binding.hue/ESH-INF/thing/channels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,12 @@
<description>The effect channel allows putting the bulb in a color looping mode.</description>
<category>ColorLight</category>
</channel-type>

<!-- Fade Time Channel -->
<channel-type id="fadetime" advanced="true">
<item-type>Number</item-type>
<label>Fade Time</label>
<description>Current fade time.</description>
</channel-type>

</thing:thing-descriptions>
6 changes: 6 additions & 0 deletions ...thome.binding.hue/src/main/java/org/eclipse/smarthome/binding/hue/internal/FullLight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
package org.eclipse.smarthome.binding.hue.internal;

import java.lang.reflect.Type;
import java.time.Duration;
import java.util.Map;

import com.google.gson.reflect.TypeToken;
Expand All @@ -30,6 +31,7 @@ public class FullLight extends FullHueObject {
}.getType();

private State state;
private final long fadetime = 300; // milliseconds

FullLight() {
}
Expand All @@ -42,4 +44,8 @@ public class FullLight extends FullHueObject {
public State getState() {
return state;
}

public Duration getFadeTime() {
return Duration.ofMillis(fadetime);
}
}
3 changes: 2 additions & 1 deletion ...ing.hue/src/main/java/org/eclipse/smarthome/binding/hue/internal/HueBindingConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public class HueBindingConstants {
public static final String CHANNEL_LIGHT_LEVEL = "light_level";
public static final String CHANNEL_DARK = "dark";
public static final String CHANNEL_DAYLIGHT = "daylight";
public static final String CHANNEL_FADETIME = "fadetime";

// List all triggers
public static final String EVENT_DIMMER_SWITCH = "dimmer_switch_event";
Expand All @@ -81,6 +82,6 @@ public class HueBindingConstants {
public static final String SENSOR_ID = "sensorId";
public static final String PRODUCT_NAME = "productName";
public static final String UNIQUE_ID = "uniqueId";

public static final String NORMALIZE_ID_REGEX = "[^a-zA-Z0-9_]";
public static final String FADETIME = "fadetime";
}
2 changes: 1 addition & 1 deletion ...ome.binding.hue/src/main/java/org/eclipse/smarthome/binding/hue/internal/StateUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public StateUpdate setEffect(Effect effect) {
* @param timeMillis time in milliseconds [0..6553600]
* @return this object for chaining calls
*/
public StateUpdate setTransitionTime(int timeMillis) {
public StateUpdate setTransitionTime(long timeMillis) {
if (timeMillis < 0 || timeMillis > 6553600) {
throw new IllegalArgumentException("Transition time out of range");
}
Expand Down
Loading