Update Temperature Measurement gen/ folder from ZAP

examples/temperature-measurement-app/esp32/main/gen/att-storage.h

@@ -1,4 +1,5 @@
-/**
+
+/*
  *
  *    Copyright (c) 2020 Project CHIP Authors
  *
@@ -14,13 +15,12 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-// This file is generated by Simplicity Studio.  Please do not edit manually.
 
-// Enclosing macro to prevent multiple inclusion
-#ifndef SILABS_ATTRIBUTE_STORAGE_GEN
-#define SILABS_ATTRIBUTE_STORAGE_GEN
+// Prevent multiple inclusion
+#pragma once
 
 // Attribute masks modify how attributes are used by the framework
+//
 // Attribute that has this mask is NOT read-only
 #define ATTRIBUTE_MASK_WRITABLE (0x01)
 // Attribute that has this mask is saved to a token
@@ -37,6 +37,7 @@
 #define ATTRIBUTE_MASK_CLIENT (0x40)
 
 // Cluster masks modify how clusters are used by the framework
+//
 // Does this cluster have init function?
 #define CLUSTER_MASK_INIT_FUNCTION (0x01)
 // Does this cluster have attribute changed function?
@@ -45,7 +46,7 @@
 #define CLUSTER_MASK_DEFAULT_RESPONSE_FUNCTION (0x04)
 // Does this cluster have message sent function?
 #define CLUSTER_MASK_MESSAGE_SENT_FUNCTION (0x08)
-// Does this cluster have manufacturer specific attribute changed funciton?
+// Does this cluster have manufacturer specific attribute changed function?
 #define CLUSTER_MASK_MANUFACTURER_SPECIFIC_ATTRIBUTE_CHANGED_FUNCTION (0x10)
 // Does this cluster have pre-attribute changed function?
 #define CLUSTER_MASK_PRE_ATTRIBUTE_CHANGED_FUNCTION (0x20)
@@ -55,6 +56,7 @@
 #define CLUSTER_MASK_CLIENT (0x80)
 
 // Command masks modify meanings of commands
+//
 // Is sending of this client command supported
 #define COMMAND_MASK_OUTGOING_CLIENT (0x01)
 // Is sending of this server command supported
@@ -65,4 +67,3 @@
 #define COMMAND_MASK_INCOMING_SERVER (0x08)
 // Is this command manufacturer specific?
 #define COMMAND_MASK_MANUFACTURER_SPECIFIC (0x10)
-#endif // SILABS_ATTRIBUTE_STORAGE_GEN

examples/temperature-measurement-app/esp32/main/gen/attribute-size.h

@@ -1,4 +1,5 @@
-/**
+
+/*
  *
  *    Copyright (c) 2020 Project CHIP Authors
  *
@@ -14,17 +15,20 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-// This file is generated by Simplicity Studio.  Please do not edit manually.
 
-// Enclosing macro to prevent multiple inclusion
-#ifndef SILABS_ATTRIBUTE_SIZE
-#define SILABS_ATTRIBUTE_SIZE
+// Prevent multiple inclusion
+#pragma once
 
-// Used ZCL attribute type sizes
-ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3, ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP48_ATTRIBUTE_TYPE, 6,
-    ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_DATA8_ATTRIBUTE_TYPE, 1,
-    ZCL_ENUM16_ATTRIBUTE_TYPE, 2, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE,
-    8, ZCL_INT16S_ATTRIBUTE_TYPE, 2, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_INT24S_ATTRIBUTE_TYPE, 3, ZCL_INT24U_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT48U_ATTRIBUTE_TYPE, 6, ZCL_INT56U_ATTRIBUTE_TYPE, 7,
-    ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16, ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4,
-#endif // SILABS_ATTRIBUTE_SIZE
+// ZCL attribute sizes
+ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_TYPE, 3, ZCL_DATA32_ATTRIBUTE_TYPE, 4,
+    ZCL_DATA40_ATTRIBUTE_TYPE, 5, ZCL_DATA48_ATTRIBUTE_TYPE, 6, ZCL_DATA56_ATTRIBUTE_TYPE, 7, ZCL_DATA64_ATTRIBUTE_TYPE, 8,
+    ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
+    ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP40_ATTRIBUTE_TYPE, 5, ZCL_BITMAP48_ATTRIBUTE_TYPE, 6, ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
+    ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_INT24U_ATTRIBUTE_TYPE, 3,
+    ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT40U_ATTRIBUTE_TYPE, 5, ZCL_INT48U_ATTRIBUTE_TYPE, 6, ZCL_INT56U_ATTRIBUTE_TYPE, 7,
+    ZCL_INT64U_ATTRIBUTE_TYPE, 8, ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT16S_ATTRIBUTE_TYPE, 2, ZCL_INT24S_ATTRIBUTE_TYPE, 3,
+    ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT40S_ATTRIBUTE_TYPE, 5, ZCL_INT48S_ATTRIBUTE_TYPE, 6, ZCL_INT56S_ATTRIBUTE_TYPE, 7,
+    ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2, ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
+    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8, ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
+    ZCL_DATE_ATTRIBUTE_TYPE, 4, ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2, ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE,
+    2, ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4, ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8, ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,\

examples/temperature-measurement-app/esp32/main/gen/attribute-type.h

@@ -1,4 +1,5 @@
-/**
+
+/*
  *
  *    Copyright (c) 2020 Project CHIP Authors
  *
@@ -14,11 +15,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-// This file is generated by Simplicity Studio.  Please do not edit manually.
 
-// Enclosing macro to prevent multiple inclusion
-#ifndef SILABS_EMBER_AF_ATTRIBUTE_TYPES
-#define SILABS_EMBER_AF_ATTRIBUTE_TYPES
+// Prevent multiple inclusion
+#pragma once
 
 // ZCL attribute types
 enum
@@ -78,7 +77,5 @@ enum
     ZCL_BACNET_OID_ATTRIBUTE_TYPE        = 0xEA, // BACnet OID
     ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE      = 0xF0, // IEEE address
     ZCL_SECURITY_KEY_ATTRIBUTE_TYPE      = 0xF1, // 128-bit security key
-    ZCL_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF  // Unknown
-
+    ZCL_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
 };
-#endif // SILABS_EMBER_AF_ATTRIBUTE_TYPES

examples/temperature-measurement-app/esp32/main/gen/call-command-handler.cpp

@@ -1,4 +1,5 @@
-/**
+
+/*
  *
  *    Copyright (c) 2020 Project CHIP Authors
  *
@@ -14,23 +15,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-// This file is generated by Simplicity Studio.  Please do not edit manually.
-
-// This is a set of generated functions that parse the
-// the incomming message, and call appropriate command handler.
-
-#ifdef EZSP_HOST
-// Includes needed for ember related functions for the EZSP host
-#include "app/util/ezsp/ezsp-protocol.h"
-#include "app/util/ezsp/ezsp-utils.h"
-#include "app/util/ezsp/ezsp.h"
-#include "app/util/ezsp/serial-interface.h"
-#include "stack/include/ember-types.h"
-#include "stack/include/error.h"
-#else
-// Includes needed for ember related functions for the EM250
-// #include "stack/include/ember.h"
-#endif // EZSP_HOST
 
 #include <stdint.h>
 
@@ -42,6 +26,9 @@
 
 using namespace chip;
 
+EmberAfStatus emberAfBasicClusterServerCommandParse(EmberAfClusterCommand * cmd);
+EmberAfStatus emberAfTemperatureMeasurementClusterServerCommandParse(EmberAfClusterCommand * cmd);
+
 static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecific)
 {
     if (wasHandled)
@@ -54,7 +41,7 @@ static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecifi
     }
     else if (clusterExists)
     {
-        return EMBER_ZCL_STATUS_UNSUP_CLUSTER_COMMAND;
+        return EMBER_ZCL_STATUS_UNSUP_COMMAND;
     }
     else
     {
@@ -71,12 +58,6 @@ EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
     {
         switch (cmd->apsFrame->clusterId)
         {
-        case ZCL_BASIC_CLUSTER_ID:
-            result = status(false, true, cmd->mfgSpecific);
-            break;
-        case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
-            result = status(false, true, cmd->mfgSpecific);
-            break;
         default:
             // Unrecognized cluster ID, error status will apply.
             break;
@@ -91,7 +72,7 @@ EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
             result = emberAfBasicClusterServerCommandParse(cmd);
             break;
         case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
-            result = status(false, true, cmd->mfgSpecific);
+            result = emberAfTemperatureMeasurementClusterServerCommandParse(cmd);
             break;
         default:
             // Unrecognized cluster ID, error status will apply.
@@ -101,16 +82,17 @@ EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
     return result;
 }
 
-// Cluster: Basic, server
+// Cluster specific command parsing
+
 EmberAfStatus emberAfBasicClusterServerCommandParse(EmberAfClusterCommand * cmd)
 {
     bool wasHandled = false;
+
     if (!cmd->mfgSpecific)
     {
         switch (cmd->commandId)
         {
         case ZCL_RESET_TO_FACTORY_DEFAULTS_COMMAND_ID: {
-            // Command is fixed length: 0
             wasHandled = emberAfBasicClusterResetToFactoryDefaultsCallback();
             break;
         }
@@ -122,3 +104,19 @@ EmberAfStatus emberAfBasicClusterServerCommandParse(EmberAfClusterCommand * cmd)
     }
     return status(wasHandled, true, cmd->mfgSpecific);
 }
+EmberAfStatus emberAfTemperatureMeasurementClusterServerCommandParse(EmberAfClusterCommand * cmd)
+{
+    bool wasHandled = false;
+
+    if (!cmd->mfgSpecific)
+    {
+        switch (cmd->commandId)
+        {
+        default: {
+            // Unrecognized command ID, error status will apply.
+            break;
+        }
+        }
+    }
+    return status(wasHandled, true, cmd->mfgSpecific);
+}

examples/temperature-measurement-app/esp32/main/gen/call-command-handler.h

@@ -1,4 +1,5 @@
-/**
+
+/*
  *
  *    Copyright (c) 2020 Project CHIP Authors
  *
@@ -14,18 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-// This file is generated by Simplicity Studio.  Please do not edit manually.
 
-// Enclosing macro to prevent multiple inclusion
-#ifndef SILABS_EMBER_AF_COMMAND_PARSE_HEADER
-#define SILABS_EMBER_AF_COMMAND_PARSE_HEADER
+// Prevent multiple inclusion
+#pragma once
 
 #include "af-types.h"
-
-// This is a set of generated prototype for functions that parse the
-// the incomming message, and call appropriate command handler.
-
-// Cluster: Basic, server
-EmberAfStatus emberAfBasicClusterServerCommandParse(EmberAfClusterCommand * cmd);
-
-#endif // SILABS_EMBER_AF_COMMAND_PARSE_HEADER