Map epoch_us to uint64_t and epoch_s to uint32_t (#9848)

* Map epoch_us to uint64_t and epoch_s to uint32_t * Update generated code
project-chip · Sep 22, 2021 · e9ec676 · e9ec676
1 parent e22c2bb
commit e9ec676
Show file tree

Hide file tree

Showing 22 changed files with 1,568 additions and 57 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -14017,6 +14017,36 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "epoch_us",
+              "code": 32,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "epoch_s",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -17539,4 +17569,4 @@
     }
   ],
   "log": []
-}
+}
diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml
@@ -750,6 +750,70 @@ tests:
                   { fabricIndex: 3, operationalCert: "Test3" },
               ]
 
+    # Tests for Epoch Microseconds
+
+    - label: "Read attribute EPOCH_US Default Value"
+      command: "readAttribute"
+      attribute: "epoch_us"
+      response:
+          value: 0
+
+    - label: "Write attribute EPOCH_US Max Value"
+      command: "writeAttribute"
+      attribute: "epoch_us"
+      arguments:
+          value: "18446744073709551615"
+
+    - label: "Read attribute EPOCH_US Max Value"
+      command: "readAttribute"
+      attribute: "epoch_us"
+      response:
+          value: "18446744073709551615"
+
+    - label: "Write attribute EPOCH_US Min Value"
+      command: "writeAttribute"
+      attribute: "epoch_us"
+      arguments:
+          value: 0
+
+    - label: "Read attribute EPOCH_US Min Value"
+      command: "readAttribute"
+      attribute: "epoch_us"
+      response:
+          value: 0
+
+    # Tests for Epoch Seconds
+
+    - label: "Read attribute EPOCH_S Default Value"
+      command: "readAttribute"
+      attribute: "epoch_s"
+      response:
+          value: 0
+
+    - label: "Write attribute EPOCH_S Max Value"
+      command: "writeAttribute"
+      attribute: "epoch_s"
+      arguments:
+          value: 4294967295
+
+    - label: "Read attribute EPOCH_S Max Value"
+      command: "readAttribute"
+      attribute: "epoch_s"
+      response:
+          value: 4294967295
+
+    - label: "Write attribute EPOCH_S Min Value"
+      command: "writeAttribute"
+      attribute: "epoch_s"
+      arguments:
+          value: 0
+
+    - label: "Read attribute EPOCH_S Min Value"
+      command: "readAttribute"
+      attribute: "epoch_s"
+      response:
+          value: 0
+
     # Tests for Unsupported attribute
 
     - label: "Read attribute UNSUPPORTED"

diff --git a/src/app/util/ember-compatibility-functions.cpp b/src/app/util/ember-compatibility-functions.cpp
@@ -92,6 +92,7 @@ EmberAfAttributeType BaseType(EmberAfAttributeType type)
     case ZCL_STATUS_ATTRIBUTE_TYPE:     // Status Code
     case ZCL_DATA_VER_ATTRIBUTE_TYPE:   // Data Version
     case ZCL_BITMAP32_ATTRIBUTE_TYPE:   // 32-bit bitmap
+    case ZCL_EPOCH_S_ATTRIBUTE_TYPE:    // Epoch Seconds
         static_assert(std::is_same<chip::ClusterId, uint32_t>::value,
                       "chip::Cluster is expected to be uint32_t, change this when necessary");
         static_assert(std::is_same<chip::AttributeId, uint32_t>::value,
@@ -116,6 +117,7 @@ EmberAfAttributeType BaseType(EmberAfAttributeType type)
     case ZCL_FABRIC_ID_ATTRIBUTE_TYPE: // Fabric Id
     case ZCL_NODE_ID_ATTRIBUTE_TYPE:   // Node Id
     case ZCL_BITMAP64_ATTRIBUTE_TYPE:  // 64-bit bitmap
+    case ZCL_EPOCH_US_ATTRIBUTE_TYPE:  // Epoch Microseconds
         static_assert(std::is_same<chip::EventNumber, uint64_t>::value,
                       "chip::EventNumber is expected to be uint64_t, change this when necessary");
         static_assert(std::is_same<chip::FabricId, uint64_t>::value,

diff --git a/src/app/zap-templates/common/override.js b/src/app/zap-templates/common/override.js
@@ -59,6 +59,10 @@ function atomicType(arg)
     return 'chip::Percent';
   case 'percent100ths':
     return 'chip::Percent100ths';
+  case 'epoch_us':
+    return 'uint64_t';
+  case 'epoch_s':
+    return 'uint32_t';
   default:
     throw 'not overriding';
   }

diff --git a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml
@@ -101,6 +101,8 @@ limitations under the License.
     <attribute side="server" code="0x001D" define="LONG_OCTET_STRING" type="LONG_OCTET_STRING" length="1000" writable="true" optional="false">long_octet_string</attribute>
     <attribute side="server" code="0x001E" define="CHAR_STRING" type="CHAR_STRING" length="10" writable="true" optional="false">char_string</attribute>
     <attribute side="server" code="0x001F" define="LONG_CHAR_STRING" type="LONG_CHAR_STRING" length="1000" writable="true" optional="false">long_char_string</attribute>
+    <attribute side="server" code="0x0020" define="EPOCH_US" type="EPOCH_US" writable="true" optional="false">epoch_us</attribute>
+    <attribute side="server" code="0x0021" define="EPOCH_S" type="EPOCH_S" writable="true" optional="false">epoch_s</attribute>
 
     <!-- This attribute should not be enabled on the server side -->
     <attribute side="server" code="0x00FF" define="UNSUPPORTED" type="BOOLEAN" writable="true" optional="false">unsupported</attribute>

diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
@@ -9724,6 +9724,36 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "epoch_us",
+              "code": 32,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "epoch_s",
+              "code": 33,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 0,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "unsupported",
               "code": 255,
@@ -10137,5 +10167,6 @@
       "endpointVersion": null,
       "deviceIdentifier": null
     }
-  ]
+  ],
+  "log": []
 }
diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java