From f56b4c3aa58f0954c870056c9d492d4ecd5783b9 Mon Sep 17 00:00:00 2001
From: yunhanw <yunhanw@google.com>
Date: Tue, 5 Oct 2021 11:35:48 -0700
Subject: [PATCH 1/2] update enum type decode in cluster object

---
 .../zap-templates/templates/app/cluster-objects-src.zapt   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/app/zap-templates/templates/app/cluster-objects-src.zapt b/src/app/zap-templates/templates/app/cluster-objects-src.zapt
index 92f991d388eab1..86723c8ac06bad 100644
--- a/src/app/zap-templates/templates/app/cluster-objects-src.zapt
+++ b/src/app/zap-templates/templates/app/cluster-objects-src.zapt
@@ -31,15 +31,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader &reader) {
         {
             {{#zcl_struct_items}}
             case k{{asUpperCamelCase label}}FieldId:
-                {{#if_is_enum type}}
-                uint8_t v;
-                ReturnErrorOnFailure(DataModel::Decode(reader, v));
-                {{asLowerCamelCase label}} = static_cast<{{type}}>(v);
-                break;
-                {{else}}
                 ReturnErrorOnFailure(DataModel::Decode(reader, {{asLowerCamelCase label}}));
                 break;
-                {{/if_is_enum}}
             {{/zcl_struct_items}}
             default:
                 break;

From cbd264a2bd530efbd4a653ac7cfe98d09ad7e857 Mon Sep 17 00:00:00 2001
From: yunhanw <yunhanw@google.com>
Date: Tue, 5 Oct 2021 11:40:01 -0700
Subject: [PATCH 2/2] run codegen

---
 .../zap-generated/cluster-objects.cpp         | 32 +++++--------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index d0842828119d57..f3f3da9fd278d3 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -286,9 +286,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
             ReturnErrorOnFailure(DataModel::Decode(reader, hardwareAddress));
             break;
         case kTypeFieldId:
-            uint8_t v;
-            ReturnErrorOnFailure(DataModel::Decode(reader, v));
-            type = static_cast<InterfaceType>(v);
+            ReturnErrorOnFailure(DataModel::Decode(reader, type));
             break;
         default:
             break;
@@ -1012,9 +1010,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
             ReturnErrorOnFailure(DataModel::Decode(reader, postalCode));
             break;
         case kLineupInfoTypeFieldId:
-            uint8_t v;
-            ReturnErrorOnFailure(DataModel::Decode(reader, v));
-            lineupInfoType = static_cast<TvChannelLineupInfoType>(v);
+            ReturnErrorOnFailure(DataModel::Decode(reader, lineupInfoType));
             break;
         default:
             break;
@@ -1136,9 +1132,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
             ReturnErrorOnFailure(DataModel::Decode(reader, index));
             break;
         case kInputTypeFieldId:
-            uint8_t v;
-            ReturnErrorOnFailure(DataModel::Decode(reader, v));
-            inputType = static_cast<MediaInputType>(v);
+            ReturnErrorOnFailure(DataModel::Decode(reader, inputType));
             break;
         case kNameFieldId:
             ReturnErrorOnFailure(DataModel::Decode(reader, name));
@@ -1225,9 +1219,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         switch (chip::TLV::TagNumFromTag(reader.GetTag()))
         {
         case kTypeFieldId:
-            uint8_t v;
-            ReturnErrorOnFailure(DataModel::Decode(reader, v));
-            type = static_cast<ContentLaunchParameterEnum>(v);
+            ReturnErrorOnFailure(DataModel::Decode(reader, type));
             break;
         case kValueFieldId:
             ReturnErrorOnFailure(DataModel::Decode(reader, value));
@@ -1327,9 +1319,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
             ReturnErrorOnFailure(DataModel::Decode(reader, height));
             break;
         case kMetricFieldId:
-            uint8_t v;
-            ReturnErrorOnFailure(DataModel::Decode(reader, v));
-            metric = static_cast<ContentLaunchMetricType>(v);
+            ReturnErrorOnFailure(DataModel::Decode(reader, metric));
             break;
         default:
             break;
@@ -1411,9 +1401,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
             ReturnErrorOnFailure(DataModel::Decode(reader, index));
             break;
         case kOutputTypeFieldId:
-            uint8_t v;
-            ReturnErrorOnFailure(DataModel::Decode(reader, v));
-            outputType = static_cast<AudioOutputType>(v);
+            ReturnErrorOnFailure(DataModel::Decode(reader, outputType));
             break;
         case kNameFieldId:
             ReturnErrorOnFailure(DataModel::Decode(reader, name));
@@ -1508,9 +1496,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
             ReturnErrorOnFailure(DataModel::Decode(reader, b));
             break;
         case kCFieldId:
-            uint8_t v;
-            ReturnErrorOnFailure(DataModel::Decode(reader, v));
-            c = static_cast<SimpleEnum>(v);
+            ReturnErrorOnFailure(DataModel::Decode(reader, c));
             break;
         case kDFieldId:
             ReturnErrorOnFailure(DataModel::Decode(reader, d));
@@ -1757,9 +1743,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
             ReturnErrorOnFailure(DataModel::Decode(reader, groupKeyEpochStartTime));
             break;
         case kGroupKeySecurityPolicyFieldId:
-            uint8_t v;
-            ReturnErrorOnFailure(DataModel::Decode(reader, v));
-            groupKeySecurityPolicy = static_cast<GroupKeySecurityPolicy>(v);
+            ReturnErrorOnFailure(DataModel::Decode(reader, groupKeySecurityPolicy));
             break;
         default:
             break;