- Minor cleanup on min/max values when they are not resolved correctly (#1618)

- Reverting the changes made to typecase the attribute values based on size and sign and sticking to uint16_t as before
- Github: ZAP #1615

Author: brdandu

src-electron/generator/helper-endpointconfig.js

@@ -612,8 +612,28 @@ function endpoint_attribute_min_max_list(options) {
     let max = parseInt(mm.max)
 
     if (isNaN(def)) def = 0
-    if (isNaN(min)) min = 0
-    if (isNaN(max)) max = '0x' + 'FF'.repeat(mm.typeSize)
+    if (isNaN(min)) {
+      if (mm.typeSize < 1)
+        throw new Error(
+          'Invalid type size for min value: ' + JSON.stringify(mm)
+        )
+      if (mm.isTypeSigned) {
+        min = '0x80' + '00'.repeat(mm.typeSize - 1)
+      } else {
+        min = 0
+      }
+    }
+    if (isNaN(max)) {
+      if (mm.typeSize < 1)
+        throw new Error(
+          'Invalid type size for max value: ' + JSON.stringify(mm)
+        )
+      if (mm.isTypeSigned) {
+        max = '0x7F' + 'FF'.repeat(mm.typeSize - 1)
+      } else {
+        max = '0x' + 'FF'.repeat(mm.typeSize)
+      }
+    }
 
     let defS =
       (def >= 0 ? '' : '-') + '0x' + Math.abs(def).toString(16).toUpperCase()
@@ -628,19 +648,13 @@ function endpoint_attribute_min_max_list(options) {
       .forEach((tok) => {
         switch (tok) {
           case 'def':
-            defMinMaxItems.push(
-              `(${mm.isTypeSigned ? '' : 'u'}int${mm.typeSize * 8}_t)${defS}`
-            )
+            defMinMaxItems.push(`(uint16_t)${defS}`)
             break
           case 'min':
-            defMinMaxItems.push(
-              `(${mm.isTypeSigned ? '' : 'u'}int${mm.typeSize * 8}_t)${minS}`
-            )
+            defMinMaxItems.push(`(uint16_t)${minS}`)
             break
           case 'max':
-            defMinMaxItems.push(
-              `(${mm.isTypeSigned ? '' : 'u'}int${mm.typeSize * 8}_t)${maxS}`
-            )
+            defMinMaxItems.push(`(uint16_t)${maxS}`)
             break
         }
       })

test/custom-matter-xml.test.js

@@ -443,7 +443,7 @@ test(
       ' /* Endpoint: 1, Cluster: Sample Custom Cluster (server) */ \\'
     )
     expect(endpointConfig).toContain(
-      '{ (uint8_t)0x0, (uint8_t)0x0, (uint8_t)0xFF }, /* Sample Mfg Specific Attribute 2 */ \\'
+      '{ (uint16_t)0x0, (uint16_t)0x0, (uint16_t)0xFF }, /* Sample Mfg Specific Attribute 2 */ \\'
     )
 
     let endpointOut = genResult.content['endpoints.out']
@@ -490,7 +490,7 @@ test(
       ' /* Endpoint: 1, Cluster: Sample Custom Cluster (server) */ \\'
     )
     expect(endpointConfig).not.toContain(
-      '{ (uint8_t)0x0, (uint8_t)0x0, (uint8_t)0xFF }, /* Sample Mfg Specific Attribute 2 */ \\'
+      '{ (uint16_t)0x0, (uint16_t)0x0, (uint16_t)0xFF  }, /* Sample Mfg Specific Attribute 2 */ \\'
     )
 
     // create state from database and session to verify contents of .zap file

test/gen-matter-3-1.test.js

@@ -126,10 +126,12 @@ test(
       `{ 0x00000005, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* LastNetworkingStatus */`
     )
     expect(ept).toContain(
-      '{ (uint8_t)0xFF, (uint8_t)0x64, (uint8_t)0xFF }, /* BallastFactorAdjustment */'
+      '{ (uint16_t)0xFF, (uint16_t)0x64, (uint16_t)0xFF }, /* BallastFactorAdjustment */'
     )
     expect(ept).toContain(`6, 'C', 'o', 'f', 'f', 'e', 'e', \\`)
-    expect(ept).toContain('{ (int16_t)-0x64, (int16_t)-0x96, (int16_t)0xC8 }')
+    expect(ept).toContain(
+      '{ (uint16_t)-0x64, (uint16_t)-0x96, (uint16_t)0xC8 }'
+    )
     expect(ept).toContain('#define GENERATED_MIN_MAX_DEFAULT_COUNT 51')
     expect(ept).toContain('#define GENERATED_ATTRIBUTE_COUNT 739')
     expect(ept).toContain(`/* EventList (index=8) */ \\
@@ -236,10 +238,12 @@ test(
       '  { 0x00000000, ZAP_TYPE(TEMPERATURE), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_SIMPLE_DEFAULT(0x8000) },'
     )
     expect(ept).toContain(
-      '{ (uint8_t)0xFF, (uint8_t)0x64, (uint8_t)0xFF }, /* BallastFactorAdjustment */'
+      '{ (uint16_t)0xFF, (uint16_t)0x64, (uint16_t)0xFF }, /* BallastFactorAdjustment */'
     )
     expect(ept).toContain(`6, 'C', 'o', 'f', 'f', 'e', 'e', \\`)
-    expect(ept).toContain('{ (int16_t)-0x64, (int16_t)-0x96, (int16_t)0xC8 }')
+    expect(ept).toContain(
+      '{ (uint16_t)-0x64, (uint16_t)-0x96, (uint16_t)0xC8 }'
+    )
     expect(ept).toContain('#define GENERATED_MIN_MAX_DEFAULT_COUNT 51')
     expect(ept).toContain('#define GENERATED_ATTRIBUTE_COUNT 739')
     expect(ept).toContain(`/* EventList (index=8) */ \\