public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[homekit] fix issue with some hue lights, e.g. xiaomi (#12931)

Browse Source 
* fix for hue

Signed-off-by: Eugen Freiter <freiter@gmx.de>
This commit is contained in:
eugen 2022-06-13 19:16:13 +02:00 committed by GitHub
parent eb97ba2ec7
commit cddd2daae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitOHItemProxy.java
View File

@ -103,30 +103,39 @@ public class HomekitOHItemProxy {
// if hue or saturation present, send an HSBType state update. no filter applied for HUE & Saturation // if hue or saturation present, send an HSBType state update. no filter applied for HUE & Saturation
if ((hue != null) || (saturation != null)) { if ((hue != null) || (saturation != null)) {
if (item instanceof ColorItem) { if (item instanceof ColorItem) {
// logic for ColorItem = combine hue, saturation and brightness update to one command sendHSBCommand((ColorItem) item, hue, saturation, brightness);
final HSBType currentState = item.getState() instanceof UnDefType ? HSBType.BLACK
: (HSBType) item.getState();
((ColorItem) item).send(new HSBType(hue != null ? hue : currentState.getHue(),
saturation != null ? saturation : currentState.getSaturation(),
brightness != null ? brightness : currentState.getBrightness()));
logger.trace("send HSB command for item {} with following values hue={} saturation={} brightness={}",
item, hue, saturation, brightness);
} }
} else if ((brightness != null) && (item instanceof DimmerItem)) { } else if ((brightness != null) && (item instanceof DimmerItem)) {
// sends brightness: // sends brightness:
// - DIMMER_MODE_NONE // - DIMMER_MODE_NORMAL
// - DIMMER_MODE_FILTER_ON // - DIMMER_MODE_FILTER_ON
// - other modes (DIMMER_MODE_FILTER_BRIGHTNESS_100 or DIMMER_MODE_FILTER_ON_EXCEPT_BRIGHTNESS_100) and // - other modes (DIMMER_MODE_FILTER_BRIGHTNESS_100 or DIMMER_MODE_FILTER_ON_EXCEPT_BRIGHTNESS_100) and
// <100%. // <100%.
if ((dimmerMode == DIMMER_MODE_NORMAL) || (dimmerMode == DIMMER_MODE_FILTER_ON) if ((dimmerMode == DIMMER_MODE_NORMAL) || (dimmerMode == DIMMER_MODE_FILTER_ON)
|| (brightness.intValue() < 100) || (currentOnState == OnOffType.ON)) { || (brightness.intValue() < 100) || (currentOnState == OnOffType.ON)) {
logger.trace("send Brightness command for item {} with value {}", item, brightness); logger.trace("send Brightness command for item {} with value {}", item, brightness);
((DimmerItem) item).send(brightness); if (item instanceof ColorItem) {
sendHSBCommand((ColorItem) item, hue, saturation, brightness);
} else {
((DimmerItem) item).send(brightness);
}
} }
} }
commandCache.clear(); commandCache.clear();
} }
private void sendHSBCommand(ColorItem item, @Nullable DecimalType hue, @Nullable PercentType saturation,
@Nullable PercentType brightness) {
final HSBType currentState = item.getState() instanceof UnDefType ? HSBType.BLACK : (HSBType) item.getState();
// logic for ColorItem = combine hue, saturation and brightness update to one command
final DecimalType targetHue = hue != null ? hue : currentState.getHue();
final PercentType targetSaturation = saturation != null ? saturation : currentState.getSaturation();
final PercentType targetBrightness = brightness != null ? brightness : currentState.getBrightness();
item.send(new HSBType(targetHue, targetSaturation, targetBrightness));
logger.trace("send HSB command for item {} with following values hue={} saturation={} brightness={}", item,
targetHue, targetSaturation, targetBrightness);
}
public synchronized void sendCommandProxy(HomekitCommandType commandType, State state) { public synchronized void sendCommandProxy(HomekitCommandType commandType, State state) {
commandCache.put(commandType, state); commandCache.put(commandType, state);
logger.trace("add command to command cache: item {}, command type {}, command state {}. cache state after: {}", logger.trace("add command to command cache: item {}, command type {}, command state {}. cache state after: {}",