Merge pull request #3202 from tobiaswegner/master

Add support for 'On/Off plug-in unit' in hue binding
openhab · Oct 8, 2015 · 8bc758d · 8bc758d
2 parents a1504a0 + 730d241
commit 8bc758d
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/....openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/data/HueSettings.java b/....openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/data/HueSettings.java
@@ -182,9 +182,13 @@ public int getBrightness(String deviceId) {
 			logger.error("Hue bridge settings not initialized correctly.");
 			return 0;
 		}
-		return (Integer) settingsData.node("lights")
-				.node(deviceId).node("state")
-				.value("bri");
+		Object bri = settingsData.node("lights").node(deviceId).node("state").value("bri");
+		if(bri instanceof Integer) {
+			return (Integer) bri;
+		} else {
+			//probably not dimmable, return on state
+			return isBulbOn(deviceId)?254:0;
+		}
 	}
 
 	/**