Added support for changing brightness

Author: octa22

README.md

@@ -2,7 +2,7 @@
 
 This binding brings Xiaomi Gateway Smart Home devices (Aqara) integration with OpenHAB1.x
 Currently only one gateway is supported and only getting sub device state/reading events confirmed to be working. 
-Controlling of gateway light works too including color change within OpenHAB.
+Controlling of gateway light works too including color and brightness change within OpenHAB.
 Unfortunately I have no switch to test controlling its state using write command, but write key generation based on gateway token seems to be implemented OK.
 
 Based on info found here: https://github.com/louisZL/lumi-gateway-local-api
@@ -55,6 +55,7 @@ Number  RoomTemperature "Temperature  [%.1f °C]" <temperature>	{ xiaomigateway=
 Number  RoomHumidity "Humidity  [%.1f %%]" <humidity>	{ xiaomigateway="158d0001182814.humidity" }
 Switch  XiaomiGatewayLight "Gateway light" { xiaomigateway="f1b5299a55e5.color" }
 Color   XiaomiGatewayLightColor "Gateway light color" { xiaomigateway="f1b5299a55e5.color" }
+Dimmer  XiaomiGatewayBrightness "Gateway brightness" { xiaomigateway="f1b5299a55e5.brightness" }
 ```
 not tested, but should work - ___send ON command to these items to fire an event___
 ```

src/main/java/org/openhab/binding/xiaomigateway/internal/XiaomiGatewayBinding.java

@@ -17,10 +17,7 @@
 import org.openhab.core.binding.AbstractActiveBinding;
 import org.openhab.core.items.ItemNotFoundException;
 import org.openhab.core.items.ItemRegistry;
-import org.openhab.core.library.types.DecimalType;
-import org.openhab.core.library.types.HSBType;
-import org.openhab.core.library.types.OnOffType;
-import org.openhab.core.library.types.OpenClosedType;
+import org.openhab.core.library.types.*;
 import org.openhab.core.types.Command;
 import org.openhab.core.types.State;
 import org.osgi.framework.BundleContext;
@@ -242,6 +239,10 @@ private void processOtherCommands(JsonObject jobject) {
                     logger.debug("XiaomiGateway: processing color event");
                     processColorEvent(itemName, jobject);
                 }
+                if (type.endsWith(".brightness") && getItemSid(type).equals(sid)) {
+                    logger.debug("XiaomiGateway: processing brightness event");
+                    processColorEvent(itemName, jobject);
+                }
                 if (type.endsWith(".virtual_switch") && isButtonEvent(jobject, "click")) {
                     logger.debug("XiaomiGateway: processing virtual switch click event");
                     processVirtualSwitchEvent(itemName);
@@ -280,17 +281,22 @@ private void processColorEvent(String itemName, JsonObject jobject) {
             JsonObject jo = parser.parse(data).getAsJsonObject();
             if (jo == null || jo.get("rgb") == null)
                 return;
-            long rgb = jo.get("rgb").getAsLong();
+            rgb = jo.get("rgb").getAsLong();
             State oldValue = itemRegistry.getItem(itemName).getState();
             State newValue = oldValue;
             if (oldValue instanceof OnOffType) {
                 newValue = rgb > 0 ? OnOffType.ON : OnOffType.OFF;
-            } else {
+            } else if (oldValue instanceof HSBType) {
                 //HSBType
                 long br = rgb / 65536 / 256;
                 Color color = new Color((int) (rgb - (br * 65536 * 256)));
                 newValue = new HSBType(color);
+            } else {
+                //Percent Type
+                long br = rgb / 65536 / 256;
+                newValue = new PercentType((int) br);
             }
+
             if (!newValue.equals(oldValue))
                 eventPublisher.postUpdate(itemName, newValue);
         } catch (Exception ex) {
@@ -670,23 +676,33 @@ protected void internalReceiveCommand(String itemName, Command command) {
         // BindingProviders provide a binding for the given 'itemName'.
         logger.debug("internalReceiveCommand({},{}) is called!", itemName, command);
         String itemType = getItemType(itemName);
-        if (!(command instanceof OnOffType || command instanceof HSBType)) {
-            logger.error("Only OnOff/HSB command types currently supported");
+        if (!(command instanceof PercentType || command instanceof OnOffType || command instanceof HSBType)) {
+            logger.error("Only OnOff/HSB/Percent command types currently supported");
             return;
         }
-        if (!(itemType.contains("channel") || itemType.endsWith(".color"))) {
+        if (!(itemType.contains("channel") || itemType.endsWith(".color") || itemType.endsWith(".brightness"))) {
             //only channel items
             return;
         }
 
-        if (itemType.endsWith(".color") && sid.equals(getItemSid(itemType))) {
+        if ((itemType.endsWith(".color") || itemType.endsWith(".brightness")) && sid.equals(getItemSid(itemType))) {
             if (command instanceof OnOffType) {
                 changeGatewayColor(command.equals(OnOffType.OFF) ? 0 : startColor);
-            } else {
+            } else if (command instanceof HSBType) {
                 HSBType hsb = (HSBType) command;
                 long color = getRGBColor(hsb);
                 changeGatewayColor(color);
+            } else {
+                if( rgb == 0 )
+                    return;
+
+                //Percent type
+                PercentType brightness = (PercentType) command;
+                long currentBrightness = (rgb / 65536 / 256);
+                long color = rgb - (currentBrightness * 65536 * 256) + brightness.longValue() * 65536 * 256;
+                changeGatewayColor(color);
             }
+
             return;
         }
 

src/main/java/org/openhab/binding/xiaomigateway/internal/XiaomiGatewayGenericBindingProvider.java

@@ -10,10 +10,7 @@
 
 import org.openhab.binding.xiaomigateway.XiaomiGatewayBindingProvider;
 import org.openhab.core.items.Item;
-import org.openhab.core.library.items.ColorItem;
-import org.openhab.core.library.items.ContactItem;
-import org.openhab.core.library.items.NumberItem;
-import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.items.*;
 import org.openhab.model.item.binding.AbstractGenericBindingProvider;
 import org.openhab.model.item.binding.BindingConfigParseException;
 
@@ -38,10 +35,10 @@ public String getBindingType() {
 	 */
 	@Override
 	public void validateItemType(Item item, String bindingConfig) throws BindingConfigParseException {
-		if (!(item instanceof ColorItem || item instanceof SwitchItem || item instanceof ContactItem || item instanceof NumberItem)) {
+		if (!(item instanceof DimmerItem || item instanceof ColorItem || item instanceof SwitchItem || item instanceof ContactItem || item instanceof NumberItem)) {
 			throw new BindingConfigParseException("item '" + item.getName()
 					+ "' is of type '" + item.getClass().getSimpleName()
-					+ "', only Switch- Contact- and NumberItems are allowed - please check your *.items configuration");
+					+ "', only Dimmer- Color- Switch- Contact- and NumberItems are allowed - please check your *.items configuration");
 		}
 	}