Rename appendAttributeReal to appendAttribute

pennam · pennam · commit de7e25c939b4 · 2022-12-01T11:43:42.000+01:00
diff --git a/src/property/Property.cpp b/src/property/Property.cpp
@@ -181,7 +181,7 @@ CborError Property::append(CborEncoder *encoder, bool lightPayload) {
   return CborNoError;
 }
 
-CborError Property::appendAttributeReal(bool value, String attributeName, CborEncoder *encoder) {
+CborError Property::appendAttribute(bool value, String attributeName, CborEncoder *encoder) {
   return appendAttributeName(attributeName, [value](CborEncoder & mapEncoder)
   {
     CHECK_CBOR(cbor_encode_int(&mapEncoder, static_cast<int>(CborIntegerMapKey::BooleanValue)));
@@ -190,7 +190,7 @@ CborError Property::appendAttributeReal(bool value, String attributeName, CborEn
   }, encoder);
 }
 
-CborError Property::appendAttributeReal(int value, String attributeName, CborEncoder *encoder) {
+CborError Property::appendAttribute(int value, String attributeName, CborEncoder *encoder) {
   return appendAttributeName(attributeName, [value](CborEncoder & mapEncoder)
   {
     CHECK_CBOR(cbor_encode_int(&mapEncoder, static_cast<int>(CborIntegerMapKey::Value)));
@@ -199,7 +199,7 @@ CborError Property::appendAttributeReal(int value, String attributeName, CborEnc
   }, encoder);
 }
 
-CborError Property::appendAttributeReal(unsigned int value, String attributeName, CborEncoder *encoder) {
+CborError Property::appendAttribute(unsigned int value, String attributeName, CborEncoder *encoder) {
   return appendAttributeName(attributeName, [value](CborEncoder & mapEncoder)
   {
     CHECK_CBOR(cbor_encode_int(&mapEncoder, static_cast<int>(CborIntegerMapKey::Value)));
@@ -208,7 +208,7 @@ CborError Property::appendAttributeReal(unsigned int value, String attributeName
   }, encoder);
 }
 
-CborError Property::appendAttributeReal(float value, String attributeName, CborEncoder *encoder) {
+CborError Property::appendAttribute(float value, String attributeName, CborEncoder *encoder) {
   return appendAttributeName(attributeName, [value](CborEncoder & mapEncoder)
   {
     CHECK_CBOR(cbor_encode_int(&mapEncoder, static_cast<int>(CborIntegerMapKey::Value)));
@@ -217,7 +217,7 @@ CborError Property::appendAttributeReal(float value, String attributeName, CborE
   }, encoder);
 }
 
-CborError Property::appendAttributeReal(String value, String attributeName, CborEncoder *encoder) {
+CborError Property::appendAttribute(String value, String attributeName, CborEncoder *encoder) {
   return appendAttributeName(attributeName, [value](CborEncoder & mapEncoder)
   {
     CHECK_CBOR(cbor_encode_int(&mapEncoder, static_cast<int>(CborIntegerMapKey::StringValue)));
diff --git a/src/property/Property.h b/src/property/Property.h
@@ -186,11 +186,11 @@ class Property
 
     void updateLocalTimestamp();
     CborError append(CborEncoder * encoder, bool lightPayload);
-    CborError appendAttributeReal(bool value, String attributeName = "", CborEncoder *encoder = nullptr);
-    CborError appendAttributeReal(int value, String attributeName = "", CborEncoder *encoder = nullptr);
-    CborError appendAttributeReal(unsigned int value, String attributeName = "", CborEncoder *encoder = nullptr);
-    CborError appendAttributeReal(float value, String attributeName = "", CborEncoder *encoder = nullptr);
-    CborError appendAttributeReal(String value, String attributeName = "", CborEncoder *encoder = nullptr);
+    CborError appendAttribute(bool value, String attributeName = "", CborEncoder *encoder = nullptr);
+    CborError appendAttribute(int value, String attributeName = "", CborEncoder *encoder = nullptr);
+    CborError appendAttribute(unsigned int value, String attributeName = "", CborEncoder *encoder = nullptr);
+    CborError appendAttribute(float value, String attributeName = "", CborEncoder *encoder = nullptr);
+    CborError appendAttribute(String value, String attributeName = "", CborEncoder *encoder = nullptr);
 #ifndef __AVR__
     CborError appendAttributeName(String attributeName, std::function<CborError (CborEncoder& mapEncoder)>f, CborEncoder *encoder);
     void setAttributeReal(String attributeName, std::function<void (CborMapData & md)>setValue);
diff --git a/src/property/types/CloudBool.h b/src/property/types/CloudBool.h
@@ -53,7 +53,7 @@ class CloudBool : public Property {
       _cloud_value = _value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      return appendAttributeReal(_value, "", encoder);
+      return appendAttribute(_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
       setAttributeReal(_cloud_value, "");
diff --git a/src/property/types/CloudColor.h b/src/property/types/CloudColor.h
@@ -189,9 +189,9 @@ class CloudColor : public Property {
       _cloud_value = _value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.hue, "hue", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.sat, "sat", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.bri, "bri", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.hue, "hue", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.sat, "sat", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.bri, "bri", encoder));
       return CborNoError;
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/CloudFloat.h b/src/property/types/CloudFloat.h
@@ -55,7 +55,7 @@ class CloudFloat : public Property {
       _cloud_value = _value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      return appendAttributeReal(_value, "", encoder);
+      return appendAttribute(_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
       setAttributeReal(_cloud_value, "");
diff --git a/src/property/types/CloudInt.h b/src/property/types/CloudInt.h
@@ -53,7 +53,7 @@ class CloudInt : public Property {
       _cloud_value = _value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      return appendAttributeReal(_value, "", encoder);
+      return appendAttribute(_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
       setAttributeReal(_cloud_value, "");
diff --git a/src/property/types/CloudLocation.h b/src/property/types/CloudLocation.h
@@ -90,8 +90,8 @@ class CloudLocation : public Property {
       _cloud_value = _value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.lat, "lat", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.lon, "lon", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.lat, "lat", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.lon, "lon", encoder));
       return CborNoError;
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/CloudSchedule.h b/src/property/types/CloudSchedule.h
@@ -418,10 +418,10 @@ class CloudSchedule : public Property {
       _cloud_value = _value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.frm, "frm", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.to, "to", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.len, "len", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.msk, "msk", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.frm, "frm", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.to, "to", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.len, "len", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.msk, "msk", encoder));
       return CborNoError;
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/CloudString.h b/src/property/types/CloudString.h
@@ -59,7 +59,7 @@ class CloudString : public Property {
       _cloud_value = _value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      return appendAttributeReal(_value, "", encoder);
+      return appendAttribute(_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
       setAttributeReal(_cloud_value, "");
diff --git a/src/property/types/CloudUnsignedInt.h b/src/property/types/CloudUnsignedInt.h
@@ -53,7 +53,7 @@ class CloudUnsignedInt : public Property {
       _cloud_value = _value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      return appendAttributeReal(_value, "", encoder);
+      return appendAttribute(_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
       setAttributeReal(_cloud_value, "");
diff --git a/src/property/types/CloudWrapperBool.h b/src/property/types/CloudWrapperBool.h
@@ -46,7 +46,7 @@ class CloudWrapperBool : public CloudWrapperBase {
       _cloud_value = _primitive_value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      return appendAttributeReal(_primitive_value, "", encoder);
+      return appendAttribute(_primitive_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
       setAttributeReal(_cloud_value, "");
diff --git a/src/property/types/CloudWrapperFloat.h b/src/property/types/CloudWrapperFloat.h
@@ -48,7 +48,7 @@ class CloudWrapperFloat : public CloudWrapperBase {
       _cloud_value = _primitive_value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      return appendAttributeReal(_primitive_value, "", encoder);
+      return appendAttribute(_primitive_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
       setAttributeReal(_cloud_value, "");
diff --git a/src/property/types/CloudWrapperInt.h b/src/property/types/CloudWrapperInt.h
@@ -46,7 +46,7 @@ class CloudWrapperInt : public CloudWrapperBase {
       _cloud_value = _primitive_value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      return appendAttributeReal(_primitive_value, "", encoder);
+      return appendAttribute(_primitive_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
       setAttributeReal(_cloud_value, "");
diff --git a/src/property/types/CloudWrapperString.h b/src/property/types/CloudWrapperString.h
@@ -50,7 +50,7 @@ class CloudWrapperString : public CloudWrapperBase {
       _cloud_value = _primitive_value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      return appendAttributeReal(_primitive_value, "", encoder);
+      return appendAttribute(_primitive_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
       setAttributeReal(_cloud_value, "");
diff --git a/src/property/types/CloudWrapperUnsignedInt.h b/src/property/types/CloudWrapperUnsignedInt.h
@@ -46,7 +46,7 @@ class CloudWrapperUnsignedInt : public CloudWrapperBase {
       _cloud_value = _primitive_value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      return appendAttributeReal(_primitive_value, "", encoder);
+      return appendAttribute(_primitive_value, "", encoder);
     }
     virtual void setAttributesFromCloud() {
       setAttributeReal(_cloud_value, "");
diff --git a/src/property/types/automation/CloudColoredLight.h b/src/property/types/automation/CloudColoredLight.h
@@ -119,10 +119,10 @@ class CloudColoredLight : public CloudColor {
       _cloud_value = _value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.swi, "swi", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.hue, "hue", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.sat, "sat", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.bri, "bri", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.swi, "swi", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.hue, "hue", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.sat, "sat", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.bri, "bri", encoder));
       return CborNoError;
     }
     virtual void setAttributesFromCloud() {
diff --git a/src/property/types/automation/CloudDimmedLight.h b/src/property/types/automation/CloudDimmedLight.h
@@ -99,14 +99,14 @@ class CloudDimmedLight : public Property {
     }
 
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.swi, "swi", 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(appendAttributeReal(hue, "hue", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(sat, "sat", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.bri, "bri", encoder));
+      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
diff --git a/src/property/types/automation/CloudTelevision.h b/src/property/types/automation/CloudTelevision.h
@@ -214,12 +214,12 @@ class CloudTelevision : public Property {
       _cloud_value = _value;
     }
     virtual CborError appendAttributesToCloud(CborEncoder *encoder) {
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.swi, "swi", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.vol, "vol", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.mut, "mut", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal((int)_value.pbc, "pbc", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal((int)_value.inp, "inp", encoder));
-      CHECK_CBOR_MULTI(appendAttributeReal(_value.cha, "cha", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.swi, "swi", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.vol, "vol", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.mut, "mut", encoder));
+      CHECK_CBOR_MULTI(appendAttribute((int)_value.pbc, "pbc", encoder));
+      CHECK_CBOR_MULTI(appendAttribute((int)_value.inp, "inp", encoder));
+      CHECK_CBOR_MULTI(appendAttribute(_value.cha, "cha", encoder));
       return CborNoError;
     }
     virtual void setAttributesFromCloud() {

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ CborError Property::append(CborEncoder *encoder, bool lightPayload) {`
`181`	`181`	`return CborNoError;`
`182`	`182`	`}`
`183`	`183`
`184`		`-CborError Property::appendAttributeReal(bool value, String attributeName, CborEncoder *encoder) {`
	`184`	`+CborError Property::appendAttribute(bool value, String attributeName, CborEncoder *encoder) {`
`185`	`185`	`return appendAttributeName(attributeName, [value](CborEncoder & mapEncoder)`
`186`	`186`	`{`
`187`	`187`	`CHECK_CBOR(cbor_encode_int(&mapEncoder, static_cast<int>(CborIntegerMapKey::BooleanValue)));`
`@@ -190,7 +190,7 @@ CborError Property::appendAttributeReal(bool value, String attributeName, CborEn`
`190`	`190`	`}, encoder);`
`191`	`191`	`}`
`192`	`192`
`193`		`-CborError Property::appendAttributeReal(int value, String attributeName, CborEncoder *encoder) {`
	`193`	`+CborError Property::appendAttribute(int value, String attributeName, CborEncoder *encoder) {`
`194`	`194`	`return appendAttributeName(attributeName, [value](CborEncoder & mapEncoder)`
`195`	`195`	`{`
`196`	`196`	`CHECK_CBOR(cbor_encode_int(&mapEncoder, static_cast<int>(CborIntegerMapKey::Value)));`
`@@ -199,7 +199,7 @@ CborError Property::appendAttributeReal(int value, String attributeName, CborEnc`
`199`	`199`	`}, encoder);`
`200`	`200`	`}`
`201`	`201`
`202`		`-CborError Property::appendAttributeReal(unsigned int value, String attributeName, CborEncoder *encoder) {`
	`202`	`+CborError Property::appendAttribute(unsigned int value, String attributeName, CborEncoder *encoder) {`
`203`	`203`	`return appendAttributeName(attributeName, [value](CborEncoder & mapEncoder)`
`204`	`204`	`{`
`205`	`205`	`CHECK_CBOR(cbor_encode_int(&mapEncoder, static_cast<int>(CborIntegerMapKey::Value)));`
`@@ -208,7 +208,7 @@ CborError Property::appendAttributeReal(unsigned int value, String attributeName`
`208`	`208`	`}, encoder);`
`209`	`209`	`}`
`210`	`210`
`211`		`-CborError Property::appendAttributeReal(float value, String attributeName, CborEncoder *encoder) {`
	`211`	`+CborError Property::appendAttribute(float value, String attributeName, CborEncoder *encoder) {`
`212`	`212`	`return appendAttributeName(attributeName, [value](CborEncoder & mapEncoder)`
`213`	`213`	`{`
`214`	`214`	`CHECK_CBOR(cbor_encode_int(&mapEncoder, static_cast<int>(CborIntegerMapKey::Value)));`
`@@ -217,7 +217,7 @@ CborError Property::appendAttributeReal(float value, String attributeName, CborE`
`217`	`217`	`}, encoder);`
`218`	`218`	`}`
`219`	`219`
`220`		`-CborError Property::appendAttributeReal(String value, String attributeName, CborEncoder *encoder) {`
	`220`	`+CborError Property::appendAttribute(String value, String attributeName, CborEncoder *encoder) {`
`221`	`221`	`return appendAttributeName(attributeName, [value](CborEncoder & mapEncoder)`
`222`	`222`	`{`
`223`	`223`	`CHECK_CBOR(cbor_encode_int(&mapEncoder, static_cast<int>(CborIntegerMapKey::StringValue)));`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class CloudBool : public Property {`
`53`	`53`	`_cloud_value = _value;`
`54`	`54`	`}`
`55`	`55`	`virtual CborError appendAttributesToCloud(CborEncoder *encoder) {`
`56`		`- return appendAttributeReal(_value, "", encoder);`
	`56`	`+ return appendAttribute(_value, "", encoder);`
`57`	`57`	`}`
`58`	`58`	`virtual void setAttributesFromCloud() {`
`59`	`59`	`setAttributeReal(_cloud_value, "");`
Original file line number	Diff line number	Diff line change
`@@ -189,9 +189,9 @@ class CloudColor : public Property {`
`189`	`189`	`_cloud_value = _value;`
`190`	`190`	`}`
`191`	`191`	`virtual CborError appendAttributesToCloud(CborEncoder *encoder) {`
`192`		`- CHECK_CBOR_MULTI(appendAttributeReal(_value.hue, "hue", encoder));`
`193`		`- CHECK_CBOR_MULTI(appendAttributeReal(_value.sat, "sat", encoder));`
`194`		`- CHECK_CBOR_MULTI(appendAttributeReal(_value.bri, "bri", encoder));`
	`192`	`+ CHECK_CBOR_MULTI(appendAttribute(_value.hue, "hue", encoder));`
	`193`	`+ CHECK_CBOR_MULTI(appendAttribute(_value.sat, "sat", encoder));`
	`194`	`+ CHECK_CBOR_MULTI(appendAttribute(_value.bri, "bri", encoder));`
`195`	`195`	`return CborNoError;`
`196`	`196`	`}`
`197`	`197`	`virtual void setAttributesFromCloud() {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class CloudFloat : public Property {`
`55`	`55`	`_cloud_value = _value;`
`56`	`56`	`}`
`57`	`57`	`virtual CborError appendAttributesToCloud(CborEncoder *encoder) {`
`58`		`- return appendAttributeReal(_value, "", encoder);`
	`58`	`+ return appendAttribute(_value, "", encoder);`
`59`	`59`	`}`
`60`	`60`	`virtual void setAttributesFromCloud() {`
`61`	`61`	`setAttributeReal(_cloud_value, "");`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class CloudInt : public Property {`
`53`	`53`	`_cloud_value = _value;`
`54`	`54`	`}`
`55`	`55`	`virtual CborError appendAttributesToCloud(CborEncoder *encoder) {`
`56`		`- return appendAttributeReal(_value, "", encoder);`
	`56`	`+ return appendAttribute(_value, "", encoder);`
`57`	`57`	`}`
`58`	`58`	`virtual void setAttributesFromCloud() {`
`59`	`59`	`setAttributeReal(_cloud_value, "");`
Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,8 @@ class CloudLocation : public Property {`
`90`	`90`	`_cloud_value = _value;`
`91`	`91`	`}`
`92`	`92`	`virtual CborError appendAttributesToCloud(CborEncoder *encoder) {`
`93`		`- CHECK_CBOR_MULTI(appendAttributeReal(_value.lat, "lat", encoder));`
`94`		`- CHECK_CBOR_MULTI(appendAttributeReal(_value.lon, "lon", encoder));`
	`93`	`+ CHECK_CBOR_MULTI(appendAttribute(_value.lat, "lat", encoder));`
	`94`	`+ CHECK_CBOR_MULTI(appendAttribute(_value.lon, "lon", encoder));`
`95`	`95`	`return CborNoError;`
`96`	`96`	`}`
`97`	`97`	`virtual void setAttributesFromCloud() {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class CloudString : public Property {`
`59`	`59`	`_cloud_value = _value;`
`60`	`60`	`}`
`61`	`61`	`virtual CborError appendAttributesToCloud(CborEncoder *encoder) {`
`62`		`- return appendAttributeReal(_value, "", encoder);`
	`62`	`+ return appendAttribute(_value, "", encoder);`
`63`	`63`	`}`
`64`	`64`	`virtual void setAttributesFromCloud() {`
`65`	`65`	`setAttributeReal(_cloud_value, "");`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class CloudUnsignedInt : public Property {`
`53`	`53`	`_cloud_value = _value;`
`54`	`54`	`}`
`55`	`55`	`virtual CborError appendAttributesToCloud(CborEncoder *encoder) {`
`56`		`- return appendAttributeReal(_value, "", encoder);`
	`56`	`+ return appendAttribute(_value, "", encoder);`
`57`	`57`	`}`
`58`	`58`	`virtual void setAttributesFromCloud() {`
`59`	`59`	`setAttributeReal(_cloud_value, "");`