Skip to content

Commit

Permalink
[hue] Fixed ColorTemperature set to UNDEF (openhab#10609)
Browse files Browse the repository at this point in the history 
* Fixed ColorTemperature set to UNDEF

Signed-off-by: Christoph Weitkamp <[email protected]>

* Fixed SAT findings

Signed-off-by: Christoph Weitkamp <[email protected]>

* Fixed warning during unit tests

Signed-off-by: Christoph Weitkamp <[email protected]>

* Changed color temperature handling in GroupHandler

Signed-off-by: Christoph Weitkamp <[email protected]>
  • Loading branch information
@cweitkamp
cweitkamp authored May 9, 2021
1 parent ea4315a commit 22eebc7
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 78 deletions.
5 changes: 1 addition & 4 deletions ...es/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/ApiVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,7 @@ public boolean equals(Object obj) {
if (micro != other.micro) {
return false;
}
if (minor != other.minor) {
return false;
}
return true;
return minor == other.minor;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/Config.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public String getGateway() {
* @return ip address of proxy or null
*/
public String getProxyAddress() {
return proxyaddress.equals("none") ? null : proxyaddress;
return "none".equals(proxyaddress) ? null : proxyaddress;
}

/**
Expand All @@ -141,7 +141,7 @@ public String getProxyAddress() {
* @return port of proxy or null
*/
public Integer getProxyPort() {
return proxyaddress.equals("none") ? null : proxyport;
return "none".equals(proxyaddress) ? null : proxyport;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/Group.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void setType(String type) {
* @return modifiability of group
*/
public boolean isModifiable() {
return !id.equals("0");
return !"0".equals(id);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...les/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/HueBridge.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ public interface ScheduleCallback {
@Override
protected Result doNetwork(String address, String requestMethod, @Nullable String body) throws IOException {
// GET requests cannot be scheduled, so will continue working normally for convenience
if (requestMethod.equals("GET")) {
if ("GET".equals(requestMethod)) {
return super.doNetwork(address, requestMethod, body);
} else {
String extractedAddress = Util.quickMatch("^http://[^/]+(.+)$", address);
Expand Down
7 changes: 2 additions & 5 deletions bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/State.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public enum ColorMode {
HS,

/**
* Color temperature in mirek
* Color temperature in mired
*/
CT
}
Expand Down Expand Up @@ -287,9 +287,6 @@ public boolean equals(Object obj) {
if (sat != other.sat) {
return false;
}
if (!Arrays.equals(xy, other.xy)) {
return false;
}
return true;
return Arrays.equals(xy, other.xy);
}
}
14 changes: 6 additions & 8 deletions ....binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueBridgeHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,12 @@ private boolean isReachable(String ipAddress) {
} catch (IOException e) {
return false;
} catch (ApiException e) {
if (e.getMessage().contains("SocketTimeout") || e.getMessage().contains("ConnectException")
|| e.getMessage().contains("SocketException")
|| e.getMessage().contains("NoRouteToHostException")) {
return false;
} else {
// this seems to be only an authentication issue
return true;
}
String message = e.getMessage();
return message != null && //
!message.contains("SocketTimeout") && //
!message.contains("ConnectException") && //
!message.contains("SocketException") && //
!message.contains("NoRouteToHostException");
}
return true;
}
Expand Down
38 changes: 12 additions & 26 deletions ...b.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueGroupHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.openhab.binding.hue.internal.FullGroup;
import org.openhab.binding.hue.internal.Scene;
import org.openhab.binding.hue.internal.State;
import org.openhab.binding.hue.internal.State.ColorMode;
import org.openhab.binding.hue.internal.StateUpdate;
import org.openhab.binding.hue.internal.dto.ColorTemperature;
import org.openhab.core.library.types.DecimalType;
Expand All @@ -48,7 +47,6 @@
import org.openhab.core.thing.binding.ThingHandler;
import org.openhab.core.types.Command;
import org.openhab.core.types.StateOption;
import org.openhab.core.types.UnDefType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -325,29 +323,25 @@ private void cacheNewState(StateUpdate newState) {
private @Nullable Integer getCurrentColorTemp(@Nullable State groupState) {
Integer colorTemp = lastSentColorTemp;
if (colorTemp == null && groupState != null) {
colorTemp = groupState.getColorTemperature();
return groupState.getColorTemperature();
}
return colorTemp;
}

private @Nullable StateUpdate convertBrightnessChangeToStateUpdate(IncreaseDecreaseType command, FullGroup group) {
Integer currentBrightness = getCurrentBrightness(group);
Integer currentBrightness = getCurrentBrightness(group.getState());
if (currentBrightness == null) {
return null;
}
int newBrightness = LightStateConverter.toAdjustedBrightness(command, currentBrightness);
return createBrightnessStateUpdate(currentBrightness, newBrightness);
}

private @Nullable Integer getCurrentBrightness(FullGroup group) {
if (lastSentBrightness != null) {
return lastSentBrightness;
private @Nullable Integer getCurrentBrightness(@Nullable State groupState) {
if (lastSentBrightness == null && groupState != null) {
return groupState.isOn() ? groupState.getBrightness() : 0;
}
State currentState = group.getState();
if (currentState == null) {
return null;
}
return currentState.isOn() ? currentState.getBrightness() : 0;
return lastSentBrightness;
}

private StateUpdate createBrightnessStateUpdate(int currentBrightness, int newBrightness) {
Expand Down Expand Up @@ -406,24 +400,16 @@ public boolean onGroupStateChanged(FullGroup group) {
}
updateState(CHANNEL_COLOR, hsbType);

ColorMode colorMode = state.getColorMode();
if (ColorMode.CT.equals(colorMode)) {
updateState(CHANNEL_COLORTEMPERATURE,
LightStateConverter.toColorTemperaturePercentType(state, colorTemperatureCapabilties));
updateState(CHANNEL_COLORTEMPERATURE_ABS, LightStateConverter.toColorTemperature(state));
} else {
updateState(CHANNEL_COLORTEMPERATURE, UnDefType.UNDEF);
updateState(CHANNEL_COLORTEMPERATURE_ABS, UnDefType.UNDEF);
}

PercentType brightnessPercentType = LightStateConverter.toBrightnessPercentType(state);
if (!state.isOn()) {
brightnessPercentType = PercentType.ZERO;
}
PercentType brightnessPercentType = state.isOn() ? LightStateConverter.toBrightnessPercentType(state)
: PercentType.ZERO;
updateState(CHANNEL_BRIGHTNESS, brightnessPercentType);

updateState(CHANNEL_SWITCH, OnOffType.from(state.isOn()));

updateState(CHANNEL_COLORTEMPERATURE,
LightStateConverter.toColorTemperaturePercentType(state, colorTemperatureCapabilties));
updateState(CHANNEL_COLORTEMPERATURE_ABS, LightStateConverter.toColorTemperature(state));

return true;
}

Expand Down
45 changes: 14 additions & 31 deletions ...b.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueLightHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.hue.internal.FullLight;
import org.openhab.binding.hue.internal.State;
import org.openhab.binding.hue.internal.State.ColorMode;
import org.openhab.binding.hue.internal.StateUpdate;
import org.openhab.binding.hue.internal.action.LightActions;
import org.openhab.binding.hue.internal.dto.Capabilities;
Expand All @@ -52,7 +51,6 @@
import org.openhab.core.types.Command;
import org.openhab.core.types.StateDescription;
import org.openhab.core.types.StateDescriptionFragmentBuilder;
import org.openhab.core.types.UnDefType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -290,7 +288,6 @@ public void handleCommand(String channel, Command command, long fadeTime) {
}
break;
case CHANNEL_SWITCH:
logger.trace("CHANNEL_SWITCH handling command {}", command);
if (command instanceof OnOffType) {
lightState = LightStateConverter.toOnOffLightState((OnOffType) command);
if (isOsramPar16) {
Expand Down Expand Up @@ -391,31 +388,25 @@ private StateUpdate addOsramSpecificCommands(StateUpdate lightState, OnOffType a
private @Nullable Integer getCurrentColorTemp(@Nullable State lightState) {
Integer colorTemp = lastSentColorTemp;
if (colorTemp == null && lightState != null) {
colorTemp = lightState.getColorTemperature();
return lightState.getColorTemperature();
}
return colorTemp;
}

private @Nullable StateUpdate convertBrightnessChangeToStateUpdate(IncreaseDecreaseType command, FullLight light) {
StateUpdate stateUpdate = null;
Integer currentBrightness = getCurrentBrightness(light.getState());
if (currentBrightness != null) {
int newBrightness = LightStateConverter.toAdjustedBrightness(command, currentBrightness);
stateUpdate = createBrightnessStateUpdate(currentBrightness, newBrightness);
if (currentBrightness == null) {
return null;
}
return stateUpdate;
int newBrightness = LightStateConverter.toAdjustedBrightness(command, currentBrightness);
return createBrightnessStateUpdate(currentBrightness, newBrightness);
}

private @Nullable Integer getCurrentBrightness(@Nullable State lightState) {
Integer brightness = lastSentBrightness;
if (brightness == null && lightState != null) {
if (!lightState.isOn()) {
brightness = 0;
} else {
brightness = lightState.getBrightness();
}
if (lastSentBrightness == null && lightState != null) {
return lightState.isOn() ? lightState.getBrightness() : 0;
}
return brightness;
return lastSentBrightness;
}

private StateUpdate createBrightnessStateUpdate(int currentBrightness, int newBrightness) {
Expand Down Expand Up @@ -503,24 +494,16 @@ public boolean onLightStateChanged(FullLight fullLight) {
}
updateState(CHANNEL_COLOR, hsbType);

ColorMode colorMode = state.getColorMode();
if (ColorMode.CT.equals(colorMode)) {
updateState(CHANNEL_COLORTEMPERATURE,
LightStateConverter.toColorTemperaturePercentType(state, colorTemperatureCapabilties));
updateState(CHANNEL_COLORTEMPERATURE_ABS, LightStateConverter.toColorTemperature(state));
} else {
updateState(CHANNEL_COLORTEMPERATURE, UnDefType.UNDEF);
updateState(CHANNEL_COLORTEMPERATURE_ABS, UnDefType.UNDEF);
}

PercentType brightnessPercentType = LightStateConverter.toBrightnessPercentType(state);
if (!state.isOn()) {
brightnessPercentType = PercentType.ZERO;
}
PercentType brightnessPercentType = state.isOn() ? LightStateConverter.toBrightnessPercentType(state)
: PercentType.ZERO;
updateState(CHANNEL_BRIGHTNESS, brightnessPercentType);

updateState(CHANNEL_SWITCH, OnOffType.from(state.isOn()));

updateState(CHANNEL_COLORTEMPERATURE,
LightStateConverter.toColorTemperaturePercentType(state, colorTemperatureCapabilties));
updateState(CHANNEL_COLORTEMPERATURE_ABS, LightStateConverter.toColorTemperature(state));

StringType stringType = LightStateConverter.toAlertStringType(state);
if (!"NULL".equals(stringType.toString())) {
updateState(CHANNEL_ALERT, stringType);
Expand Down
2 changes: 2 additions & 0 deletions ...nding.hue/src/test/java/org/openhab/binding/hue/internal/handler/HueLightHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.openhab.core.thing.Thing;
import org.openhab.core.thing.ThingStatus;
import org.openhab.core.thing.ThingUID;
import org.openhab.core.thing.binding.ThingHandlerCallback;
import org.openhab.core.thing.i18n.ChannelTypeI18nLocalizationService;
import org.openhab.core.types.Command;

Expand Down Expand Up @@ -411,6 +412,7 @@ protected Bridge getBridge() {
return mockBridge;
}
};
hueLightHandler.setCallback(mock(ThingHandlerCallback.class));
hueLightHandler.initialize();

verify(mockThing).setProperty(eq(Thing.PROPERTY_MODEL_ID), eq(expectedModel));
Expand Down

0 comments on commit 22eebc7

Please sign in to comment.