[hue] Keep compatibility with hue emulation for groups (openhab#7809)

Signed-off-by: Laurent Garnier <lg.hc@free.fr> Signed-off-by: Daan Meijer <daan@studioseptember.nl>
DaanMeijer · Sep 1, 2020 · 27455ed · 27455ed
1 parent 8ac519c
commit 27455ed
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/...les/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/FullGroup.java b/...les/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/FullGroup.java
@@ -31,7 +31,7 @@ public class FullGroup extends Group {
 
  private State action;
  private List<String> lights;
- private State state; // Will not be set by hue API
+ private State groupState; // Will not be set by hue API
 
  FullGroup() {
  }
@@ -61,6 +61,10 @@ public List<String> getLights() {
  * @return current state
  */
  public State getState() {
- return state;
+ return groupState;
+ }
+
+ public void setState(State state) {
+ this.groupState = state;
  }
 }
diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/State.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/State.java
@@ -33,7 +33,7 @@ public class State {
  String colormode;
  private boolean reachable;
 
- State() {
+ public State() {
  }
 
  /**

diff --git a/....binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueBridgeHandler.java b/....binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/HueBridgeHandler.java
@@ -238,7 +238,7 @@ protected void doConnectedRun() throws IOException, ApiException {
  Map<String, FullGroup> lastGroupStateCopy = new HashMap<>(lastGroupStates);
 
  for (final FullGroup fullGroup : hueBridge.getGroups()) {
- State groupState = fullGroup.getState();
+ State groupState = new State();
  boolean on = false;
  int sumBri = 0;
  int nbBri = 0;
@@ -278,6 +278,7 @@ protected void doConnectedRun() throws IOException, ApiException {
  groupState.setColorTemperature(colorRef.getColorTemperature());
  groupState.setXY(colorRef.getXY());
  }
+ fullGroup.setState(groupState);
  logger.trace("Group {} ({}): on {} bri {} hue {} sat {} temp {} mode {} XY {}", fullGroup.getName(),
  fullGroup.getType(), groupState.isOn(), groupState.getBrightness(), groupState.getHue(),
  groupState.getSaturation(), groupState.getColorTemperature(), groupState.getColorMode(),