Fixed DimmeredLight

Author: ilcato

types/automation/CloudColoredLight.h

@@ -47,7 +47,7 @@ class ColoredLight : public Color {
 };
 
 class CloudColoredLight : public CloudColor {
-  protected:
+  private:
     ColoredLight _value,
                  _cloud_value;
   public:

types/automation/CloudDimmeredLight.h

@@ -24,20 +24,81 @@
 
 #include <math.h>
 #include <Arduino.h>
-#include "CloudColoredLight.h"
+#include "../../ArduinoCloudProperty.h"
 
 /******************************************************************************
    CLASS DECLARATION
  ******************************************************************************/
+class DimmeredLight {
+  public:
+    bool swi;
+    float bri;
+    DimmeredLight(bool swi, float bri): swi(swi), bri(bri) {
+    }
+
+    bool operator==(DimmeredLight & aLight) {
+      return aLight.swi == swi && aLight.bri == bri;
+    }
+
+    bool operator!=(DimmeredLight & aLight) {
+      return !(operator==(aLight));
+    }
+
+};
 
-class CloudDimmeredLight : public CloudColoredLight {
+class CloudDimmeredLight : public ArduinoCloudProperty {
   private:
+    DimmeredLight _value,
+          _cloud_value;
+
   public:
-    float getBrightness() {
-      return _value.bri;
+    CloudDimmeredLight() : _value(false, 0), _cloud_value(false, 0) {}
+    CloudDimmeredLight(bool swi, float brightness) : _value(swi, brightness), _cloud_value(swi, brightness) {}
+
+    virtual bool isDifferentFromCloud() {
+
+      return _value != _cloud_value;
+    }
+
+    CloudDimmeredLight& operator=(DimmeredLight aLight) {
+      _value.swi = aLight.swi;
+      _value.bri = aLight.bri;
+      updateLocalTimestamp();
+      return *this;
+    }
+
+    DimmeredLight getCloudValue() {
+      return _cloud_value;
     }
-    bool getSwitch() {
-      return _value.swi;
+
+    DimmeredLight getValue() {
+      return _value;
+    }
+    
+    virtual void fromCloudToLocal() {
+      _value = _cloud_value;
+    }
+    virtual void fromLocalToCloud() {
+      _cloud_value = _value;
+    }
+
+    virtual void appendAttributesToCloud() {
+      appendAttribute(_value.swi);
+      // To allow visualization through color widget
+      // Start
+      float hue = 0;
+      float sat = 0;
+      appendAttributeReal(hue, getAttributeName(".hue", '.'), encoder);
+      appendAttributeReal(sat, getAttributeName(".sat", '.'), encoder);
+      if (_value.swi) {
+        appendAttribute(_value.bri);
+      } else {
+        float bri = 0;
+        appendAttributeReal(bri, getAttributeName(".bri", '.'), encoder);
+      }
+      // should be only:
+      // appendAttribute(_value.bri);
+      // end
     }
 
     virtual void setAttributesFromCloud() {