Move last_property index out of CBOREncoder::encode function and fix unit tests

Author: pennam

extras/test/src/util/CBORTestUtil.cpp

@@ -27,9 +27,10 @@ namespace cbor
 std::vector<uint8_t> encode(PropertyContainer & property_container, bool lightPayload)
 {
   int bytes_encoded = 0;
+  unsigned int starting_property_index = 0;
   uint8_t buf[200] = {0};
 
-  if (CBOREncoder::encode(property_container, buf, 200, bytes_encoded, lightPayload) == CborNoError)
+  if (CBOREncoder::encode(property_container, buf, 200, bytes_encoded, starting_property_index, lightPayload) == CborNoError)
     return std::vector<uint8_t>(buf, buf + bytes_encoded);
   else
     return std::vector<uint8_t>();

src/ArduinoIoTCloudLPWAN.cpp

@@ -149,8 +149,9 @@ void ArduinoIoTCloudLPWAN::sendPropertiesToCloud()
 {
   int bytes_encoded = 0;
   uint8_t data[CBOR_LORA_MSG_MAX_SIZE];
+  static unsigned int last_checked_property_index = 0;
 
-  if (CBOREncoder::encode(_property_container, data, sizeof(data), bytes_encoded, true) == CborNoError)
+  if (CBOREncoder::encode(_property_container, data, sizeof(data), bytes_encoded, last_checked_property_index, true) == CborNoError)
     if (bytes_encoded > 0)
       writeProperties(data, bytes_encoded);
 }

src/ArduinoIoTCloudTCP.cpp

@@ -576,12 +576,12 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
   }
 }
 
-void ArduinoIoTCloudTCP::sendPropertyContainerToCloud(PropertyContainer & property_container)
+void ArduinoIoTCloudTCP::sendPropertyContainerToCloud(PropertyContainer & property_container, unsigned int & current_property_index)
 {
   int bytes_encoded = 0;
   uint8_t data[MQTT_TRANSMIT_BUFFER_SIZE];
 
-  if (CBOREncoder::encode(property_container, data, sizeof(data), bytes_encoded, false) == CborNoError)
+  if (CBOREncoder::encode(property_container, data, sizeof(data), bytes_encoded, current_property_index, false) == CborNoError)
     if (bytes_encoded > 0)
     {
       /* If properties have been encoded store them in the back-up buffer
@@ -596,13 +596,15 @@ void ArduinoIoTCloudTCP::sendPropertyContainerToCloud(PropertyContainer & proper
 
 void ArduinoIoTCloudTCP::sendPropertiesToCloud()
 {
-  sendPropertyContainerToCloud(_property_container);
+  static unsigned int last_checked_property_index = 0;
+  sendPropertyContainerToCloud(_property_container, last_checked_property_index);
 }
 
 #if OTA_ENABLED
 void ArduinoIoTCloudTCP::sendOTAPropertiesToCloud()
 {
   PropertyContainer ota_property_container;
+  unsigned int last_ota_property_index = 0;
 
   std::list<String> const ota_property_list {"OTA_CAP", "OTA_ERROR", "OTA_SHA256", "OTA_URL", "OTA_REQ"};
   std::for_each(ota_property_list.cbegin(),
@@ -615,7 +617,7 @@ void ArduinoIoTCloudTCP::sendOTAPropertiesToCloud()
                 }
                 );
 
-  sendPropertyContainerToCloud(ota_property_container);
+  sendPropertyContainerToCloud(ota_property_container, last_ota_property_index);
 }
 #endif
 

src/ArduinoIoTCloudTCP.h

@@ -164,7 +164,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
 
     static void onMessage(int length);
     void handleMessage(int length);
-    void sendPropertyContainerToCloud(PropertyContainer & property_container);
+    void sendPropertyContainerToCloud(PropertyContainer & property_container, unsigned int & current_property_index);
     void sendPropertiesToCloud();
     void requestLastValue();
     int write(String const topic, byte const data[], int const length);

src/cbor/CBOREncoder.cpp

@@ -32,7 +32,7 @@
  * PUBLIC MEMBER FUNCTIONS
  ******************************************************************************/
 
-CborError CBOREncoder::encode(PropertyContainer & property_container, uint8_t * data, size_t const size, int & bytes_encoded, bool lightPayload)
+CborError CBOREncoder::encode(PropertyContainer & property_container, uint8_t * data, size_t const size, int & bytes_encoded, unsigned int & current_property_index, bool lightPayload)
 {
   CborEncoder encoder, arrayEncoder;
 
@@ -47,13 +47,12 @@ CborError CBOREncoder::encode(PropertyContainer & property_container, uint8_t *
   CborError error = CborNoError;
   int num_encoded_properties = 0;
   int num_checked_properties = 0;
-  static unsigned int last_property_index = 0;
 
-  if(last_property_index >= property_container.size())
-    last_property_index = 0;
+  if(current_property_index >= property_container.size())
+    current_property_index = 0;
 
   PropertyContainer::iterator iter = property_container.begin();
-  std::advance(iter, last_property_index);
+  std::advance(iter, current_property_index);
 
   std::for_each(iter,
                 property_container.end(),
@@ -73,7 +72,7 @@ CborError CBOREncoder::encode(PropertyContainer & property_container, uint8_t *
                   }
                 });
 
-  last_property_index += num_checked_properties;
+  current_property_index += num_checked_properties;
 
   if ((CborNoError != error) && 
       (CborErrorOutOfMemory != error))

src/cbor/CBOREncoder.h

@@ -45,7 +45,7 @@ class CBOREncoder
 
     /* encode return > 0 if a property has changed and encodes the changed properties in CBOR format into the provided buffer */
     /* if lightPayload is true the integer identifier of the property will be encoded in the message instead of the property name in order to reduce the size of the message payload*/
-    static CborError encode(PropertyContainer & property_container, uint8_t * data, size_t const size, int & bytes_encoded, bool lightPayload = false);
+    static CborError encode(PropertyContainer & property_container, uint8_t * data, size_t const size, int & bytes_encoded, unsigned int & current_property_index, bool lightPayload = false);
 
 private: