Switch the zpro encoder/decoder to using BufBound project-chip#2073

examples/chip-tool/main.cpp

@@ -435,6 +435,7 @@ void DoOnOff(DeviceController::ChipDeviceController * controller, Command comman
         fprintf(stderr, "Unknown command: %d\n", int(command));
         return;
     }
+    ChipLogProgress(Zcl, "Encoded data of length %d", dataLength);
     buffer->SetDataLength(dataLength);
 
 #ifdef DEBUG

examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp

@@ -106,7 +106,7 @@ void EchoDeviceCallbacks::PostAttributeChangeCallback(uint8_t endpoint, EmberAfC
         ESP_LOGI(TAG, "Unknown attribute ID: %d", attributeId);
         return;
     }
-    ESP_LOGI(TAG, "Got the post attribute callback");
+    ESP_LOGI(TAG, "Got the post attribute callback with value %d", *value);
     // At this point we can assume that value points to a bool value.
     statusLED.Set(*value);
     ESP_LOGI(TAG, "Current free heap: %d\n", heap_caps_get_free_size(MALLOC_CAP_8BIT));

src/app/BUILD.gn

@@ -27,8 +27,8 @@ static_library("app") {
   output_name = "libCHIPDataModel"
 
   sources = [
-    "decoder.c",
-    "encoder.c",
+    "decoder.cpp",
+    "encoder.cpp",
   ]
 
   public_deps = [

src/app/DataModel.am

@@ -25,6 +25,6 @@
 #
 
 CHIP_BUILD_DATA_MODEL_SOURCE_FILES                    = \
-    @top_builddir@/src/app/encoder.c                    \
-    @top_builddir@/src/app/decoder.c                    \
+    @top_builddir@/src/app/encoder.cpp                    \
+    @top_builddir@/src/app/decoder.cpp                    \
     $(NULL)

src/app/decoder.c → src/app/decoder.cpp

@@ -25,68 +25,80 @@
 #include <app/chip-zcl-zpro-codec.h>
 #include <stdio.h>
 #include <string.h>
+#include <support/logging/CHIPLogging.h>
+
+extern "C" {
 
 uint16_t extractApsFrame(uint8_t * buffer, uint32_t buf_length, EmberApsFrame * outApsFrame)
 {
 
     if (buffer == NULL || buf_length == 0 || outApsFrame == NULL)
     {
+        ChipLogError(Zcl, "Error extracting APS frame. invalid inputs");
         return 0;
     }
     // Skip first byte, because that's the always-0 frame control.
     uint8_t nextByteToRead = 1;
 
     if (nextByteToRead >= buf_length)
     {
+        ChipLogError(Zcl, "Error extracting APS frame after reading first byte");
         return 0;
     }
     memcpy(&outApsFrame->profileId, buffer + nextByteToRead, sizeof(outApsFrame->profileId));
     nextByteToRead += sizeof(outApsFrame->profileId);
 
     if (nextByteToRead >= buf_length)
     {
+        ChipLogError(Zcl, "Error extracting APS frame after reading profileId");
         return 0;
     }
     memcpy(&outApsFrame->clusterId, buffer + nextByteToRead, sizeof(outApsFrame->clusterId));
     nextByteToRead += sizeof(outApsFrame->clusterId);
 
     if (nextByteToRead >= buf_length)
     {
+        ChipLogError(Zcl, "Error extracting APS frame after reading clusterId");
         return 0;
     }
     memcpy(&outApsFrame->sourceEndpoint, buffer + nextByteToRead, sizeof(outApsFrame->sourceEndpoint));
     nextByteToRead += sizeof(outApsFrame->sourceEndpoint);
 
     if (nextByteToRead >= buf_length)
     {
+        ChipLogError(Zcl, "Error extracting APS frame after reading sourceEndpoint");
         return 0;
     }
     memcpy(&outApsFrame->destinationEndpoint, buffer + nextByteToRead, sizeof(outApsFrame->destinationEndpoint));
     nextByteToRead += sizeof(outApsFrame->destinationEndpoint);
 
     if (nextByteToRead >= buf_length)
     {
+        ChipLogError(Zcl, "Error extracting APS frame after reading destinationEndpoint");
         return 0;
     }
     memcpy(&outApsFrame->options, buffer + nextByteToRead, sizeof(outApsFrame->options));
     nextByteToRead += sizeof(outApsFrame->options);
 
     if (nextByteToRead >= buf_length)
     {
+        ChipLogError(Zcl, "Error extracting APS frame after reading options");
         return 0;
     }
     memcpy(&outApsFrame->groupId, buffer + nextByteToRead, sizeof(outApsFrame->groupId));
     nextByteToRead += sizeof(outApsFrame->groupId);
 
     if (nextByteToRead >= buf_length)
     {
+        ChipLogError(Zcl, "Error extracting APS frame after reading groupId");
         return 0;
     }
     memcpy(&outApsFrame->sequence, buffer + nextByteToRead, sizeof(outApsFrame->sequence));
     nextByteToRead += sizeof(outApsFrame->sequence);
 
     if (nextByteToRead >= buf_length)
     {
+        ChipLogError(Zcl, "Error extracting APS frame after reading sequence");
         return 0;
     }
     memcpy(&outApsFrame->radius, buffer + nextByteToRead, sizeof(outApsFrame->radius));
@@ -120,3 +132,5 @@ uint16_t extractMessage(uint8_t * buffer, uint16_t buffer_length, uint8_t ** msg
     }
     return result;
 }
+
+} // extern C