Directly integrate function for property encoding into CBOREncoder::encode

Author: aentinger

src/cbor/CBOREncoder.cpp

@@ -21,6 +21,10 @@
 
 #include "CBOREncoder.h"
 
+#undef max
+#undef min
+#include <algorithm>
+
 #include "lib/tinycbor/cbor-lib.h"
 
 /******************************************************************************
@@ -40,10 +44,22 @@ int CBOREncoder::encode(PropertyContainer & property_container, uint8_t * data,
    * time interval may be elapsed or property may be changed
    * and if that's the case encode the property into the CBOR.
    */
-  CborError err = appendChangedProperties(property_container, &arrayEncoder, lightPayload);
+  CborError err = CborNoError;
+  std::for_each(property_container.begin(),
+                property_container.end(),
+                [lightPayload, &arrayEncoder, &err](Property * p)
+                {
+                  if (p->shouldBeUpdated() && p->isReadableByCloud())
+                  {
+                    err = p->append(&arrayEncoder, lightPayload);
+                    if(err != CborNoError)
+                      return;
+                  }
+                });
   if ((err != CborNoError) && (err != CborErrorOutOfMemory))
     return -1;
 
+
   if (cbor_encoder_close_container(&encoder, &arrayEncoder) != CborNoError)
     return -1;
 

src/property/PropertyContainer.cpp

@@ -83,23 +83,6 @@ Property * getProperty(PropertyContainer & prop_cont, int const identifier)
     return (*iter);
 }
 
-CborError appendChangedProperties(PropertyContainer & prop_cont, CborEncoder * arrayEncoder, bool lightPayload)
-{
-  CborError err = CborNoError;
-  std::for_each(prop_cont.begin(),
-                prop_cont.end(),
-                [arrayEncoder, lightPayload, &err](Property * p)
-                {
-                  if (p->shouldBeUpdated() && p->isReadableByCloud())
-                  {
-                    err = p->append(arrayEncoder, lightPayload);
-                    if(err != CborNoError)
-                      return;
-                  }
-                });
-  return err;
-}
-
 void requestUpdateForAllProperties(PropertyContainer & prop_cont)
 {
   std::for_each(prop_cont.begin(),

src/property/PropertyContainer.h

@@ -78,7 +78,6 @@ Property * getProperty(PropertyContainer & prop_cont, String const & name);
 Property * getProperty(PropertyContainer & prop_cont, int const identifier);
 
 
-CborError appendChangedProperties(PropertyContainer & prop_cont, CborEncoder * arrayEncoder, bool lightPayload);
 void updateTimestampOnLocallyChangedProperties(PropertyContainer & prop_cont);
 void requestUpdateForAllProperties(PropertyContainer & prop_cont);
 void updateProperty(PropertyContainer & prop_cont, String propertyName, unsigned long cloudChangeEventTime, bool const is_sync_message, std::list<CborMapData> * map_data_list);