address comments

project-chip · Jul 13, 2022 · 73c15dd · 73c15dd
1 parent 340bccd
commit 73c15dd
Show file tree

Hide file tree

Showing 6 changed files with 142 additions and 18 deletions.
diff --git a/src/app/data-model/Decode.h b/src/app/data-model/Decode.h
@@ -57,7 +57,7 @@ template <typename X, typename std::enable_if_t<std::is_enum<X>::value, int> = 0
 CHIP_ERROR Decode(TLV::TLVReader & reader, X & x)
 {
     ReturnErrorOnFailure(reader.Get(x));
-    x = chip::app::Clusters::EnsureKnownEnumValue(x);
+    x = Clusters::EnsureKnownEnumValue(x);
     return CHIP_NO_ERROR;
 }
 

diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml
@@ -2801,8 +2801,8 @@ tests:
       command: "readAttribute"
       attribute: "nullable_enum_attr"
       response:
-          saveAs: nullableEnumAttr4
-          value: 4
+          saveAs: nullableEnumAttr3
+          value: 3
 
     - label: "Write attribute NULLABLE_SIMPLE_ENUM null Value"
       command: "writeAttribute"
@@ -2816,12 +2816,12 @@ tests:
       response:
           value: null
 
-    - label: "Read attribute NULLABLE_SIMPLE_ENUM not 254 Value"
+    - label: "Read attribute NULLABLE_SIMPLE_ENUM not 3 Value"
       command: "readAttribute"
       attribute: "nullable_enum_attr"
       response:
           constraints:
-              notValue: nullableEnumAttr4
+              notValue: nullableEnumAttr3
 
     # Tests for Octet String attribute
 

diff --git a/src/app/zap-templates/templates/app/cluster-enums.zapt b/src/app/zap-templates/templates/app/cluster-enums.zapt
@@ -30,6 +30,7 @@ k{{asUpperCamelCase label}} = {{asHex value 2}},
 using {{asType label}} = EmberAf{{asType label}};
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 {{/if}}
+static {{asType label}} k{{asType label}}FirstUnusedEnumVal = static_cast<{{asType label}}>({{first_unused_enum_value mode="first_unused"}});
 {{/zcl_enums}}
 {{#zcl_bitmaps}}