Merge pull request #347 from pennam/dimmed-light-fake

CloudDimmedLight property cleanup

Author: pennam

extras/test/src/test_encode.cpp

@@ -196,8 +196,8 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]"
     CloudDimmedLight color_test = CloudDimmedLight(true, 2.0);
     addPropertyToContainer(property_container, color_test, "test", Permission::ReadWrite);
 
-    /* [{0: "test:swi", 4: true},{0: "test:hue", 2: 0.0},{0: "test:sat", 2: 0.0},{0: "test:bri", 2: 2.0}] = 9F A2 00 68 74 65 73 74 3A 73 77 69 04 F5 A2 00 68 74 65 73 74 3A 68 75 65 02 FA 00 00 00 00 A2 00 68 74 65 73 74 3A 73 61 74 02 FA 00 00 00 00 A2 00 68 74 65 73 74 3A 62 72 69 02 FA 40 00 00 00 FF*/
-    std::vector<uint8_t> const expected = {0x9F, 0xA2, 0x00, 0x68, 0x74, 0x65, 0x73, 0x74, 0x3A, 0x73, 0x77, 0x69, 0x04, 0xF5, 0xA2, 0x00, 0x68, 0x74, 0x65, 0x73, 0x74, 0x3A, 0x68, 0x75, 0x65, 0x02, 0xFA, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x00, 0x68, 0x74, 0x65, 0x73, 0x74, 0x3A, 0x73, 0x61, 0x74, 0x02, 0xFA, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x00, 0x68, 0x74, 0x65, 0x73, 0x74, 0x3A, 0x62, 0x72, 0x69, 0x02, 0xFA, 0x40, 0x00, 0x00, 0x00, 0xFF };
+    /* [{0: "test:swi", 4: true},{0: "test:bri", 2: 2.0}] = 9F A2 00 68 74 65 73 74 3A 73 77 69 04 F5 A2 00 68 74 65 73 74 3A 62 72 69 02 FA 40 00 00 00 FF*/
+    std::vector<uint8_t> const expected = {0x9F, 0xA2, 0x00, 0x68, 0x74, 0x65, 0x73, 0x74, 0x3A, 0x73, 0x77, 0x69, 0x04, 0xF5, 0xA2, 0x00, 0x68, 0x74, 0x65, 0x73, 0x74, 0x3A, 0x62, 0x72, 0x69, 0x02, 0xFA, 0x40, 0x00, 0x00, 0x00, 0xFF };
     std::vector<uint8_t> const actual = cbor::encode(property_container);
     REQUIRE(actual == expected);
   }

src/property/types/automation/CloudDimmedLight.h

@@ -100,16 +100,7 @@ class CloudDimmedLight : public Property {
 
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
       CHECK_CBOR_MULTI(appendAttribute(_value.swi, "swi", encoder));
-      // To allow visualization through color widget
-      // Start
-      float hue = 0;
-      float sat = 0;
-      CHECK_CBOR_MULTI(appendAttribute(hue, "hue", encoder));
-      CHECK_CBOR_MULTI(appendAttribute(sat, "sat", encoder));
       CHECK_CBOR_MULTI(appendAttribute(_value.bri, "bri", encoder));
-      // should be only:
-      // appendAttribute(_value.bri);
-      // end
       return CborNoError;
     }