Add new time types that got addded to the spec.

src/app/util/ember-compatibility-functions.cpp

@@ -103,6 +103,7 @@ EmberAfAttributeType BaseType(EmberAfAttributeType type)
     case ZCL_DATA_VER_ATTRIBUTE_TYPE:   // Data Version
     case ZCL_BITMAP32_ATTRIBUTE_TYPE:   // 32-bit bitmap
     case ZCL_EPOCH_S_ATTRIBUTE_TYPE:    // Epoch Seconds
+    case ZCL_ELAPSED_S_ATTRIBUTE_TYPE:  // Elapsed 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,
@@ -121,11 +122,14 @@ EmberAfAttributeType BaseType(EmberAfAttributeType type)
                       "chip::DataVersion is expected to be uint32_t, change this when necessary");
         return ZCL_INT32U_ATTRIBUTE_TYPE;
 
-    case ZCL_EVENT_NO_ATTRIBUTE_TYPE:  // Event Number
-    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
+    case ZCL_EVENT_NO_ATTRIBUTE_TYPE:   // Event Number
+    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
+    case ZCL_POSIX_MS_ATTRIBUTE_TYPE:   // POSIX Milliseconds
+    case ZCL_SYSTIME_MS_ATTRIBUTE_TYPE: // System time Milliseconds
+    case ZCL_SYSTIME_US_ATTRIBUTE_TYPE: // System time 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,

src/app/zap-templates/common/override.js

@@ -76,9 +76,12 @@ function atomicType(arg)
     return 'chip::Percent100ths';
   case 'epoch_us':
   case 'systime_us':
+  case 'posix_ms':
+  case 'systime_ms':
     return 'uint64_t';
   case 'epoch_s':
   case 'utc':
+  case 'elapsed_s':
     return 'uint32_t';
   default:
     throw 'not overriding';

src/app/zap-templates/zcl/data-model/chip/chip-types.xml

@@ -16,6 +16,12 @@ limitations under the License.
 -->
 <configurator>
   <atomic>
+    <!--
+        The IDs here do not match the spec, but:
+        (1) They don't really have to (thought it would be nice)
+        (2) The spec is broken and has the same id for different types (so we
+            can't match it even if we wanted to).
+    -->
     <type id="0x00" description="No data"                 name="no_data"            size="0"                  />
     <!-- Base Data Types -->
     <type id="0x10" description="Boolean"                  name="boolean"           size="1"  discrete="true" />
@@ -55,7 +61,10 @@ limitations under the License.
     <type id="0xE1" description="Date"                     name="date"              size="4"  analog="true"   />
     <type id="0xE3" description="Epoch Microseconds"       name="epoch_us"          size="8"  analog="true"   />
     <type id="0xE4" description="Epoch Seconds"            name="epoch_s"           size="4"  analog="true"   />
+    <type id="0xD0" description="Posix Time Milliseconds"  name="posix_ms"          size="8"  analog="true"   />
     <type id="0xE5" description="System Time Microseconds" name="systime_us"        size="8"  analog="true"   />
+    <type id="0xD1" description="System Time Milliseconds" name="systime_ms"        size="8"  analog="true"   />
+    <type id="0xD2" description="Elapsed Time Seconds"     name="elapsed_s"         size="4"  analog="true"   />
     <type id="0xE6" description="Percentage units 1%"      name="percent"           size="1"  analog="true"   />
     <type id="0xE7" description="Percentage units 0.01%"   name="percent100ths"     size="2"  analog="true"   />
     <type id="0xE8" description="Cluster ID"               name="cluster_id"        size="4"  discrete="true" />