Add support for money and new electrical data types

Author: hasty

scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py

@@ -104,8 +104,14 @@ def NormalizeDataType(t: str) -> str:
 
 # Handle odd casing and naming
 _CASE_RENAMES_MAPPING = {
+    "amperage_mA": "amperage_ma",
     "power_mW": "power_mw",
-    "energy_mWh": "energy_mwh"
+    "power_mVA": "power_mva",
+    "power_mVAR": "power_mvar",
+    "energy_mWh": "energy_mwh",
+    "energy_mVAh": "energy_mvah",
+    "energy_mVARh": "energy_mvarh",
+    "voltage_mV": "voltage_mv",
 }
 
 

scripts/py_matter_idl/matter_idl/generators/type_definitions.py

@@ -198,6 +198,8 @@ def is_struct(self) -> bool:
     "elapsed_s": BasicInteger(idl_name="elapsed_s", byte_count=4, is_signed=False),
     "endpoint_no": BasicInteger(idl_name="endpoint_no", byte_count=2, is_signed=False),
     "energy_mwh":  BasicInteger(idl_name="energy_mwh", byte_count=8, is_signed=True),
+    "energy_mvah":  BasicInteger(idl_name="energy_mvah", byte_count=8, is_signed=True),
+    "energy_mvarh":  BasicInteger(idl_name="energy_mvarh", byte_count=8, is_signed=True),
     "entry_idx": BasicInteger(idl_name="entry_idx", byte_count=2, is_signed=False),
     "epoch_s": BasicInteger(idl_name="epoch_s", byte_count=4, is_signed=False),
     "epoch_us": BasicInteger(idl_name="epoch_us", byte_count=8, is_signed=False),
@@ -207,12 +209,15 @@ def is_struct(self) -> bool:
     "fabric_idx": BasicInteger(idl_name="fabric_idx", byte_count=1, is_signed=False),
     "field_id": BasicInteger(idl_name="field_id", byte_count=4, is_signed=False),
     "group_id": BasicInteger(idl_name="group_id", byte_count=2, is_signed=False),
+    "money": BasicInteger(idl_name="money", byte_count=8, is_signed=True),
     "namespace": BasicInteger(idl_name="namespace", byte_count=1, is_signed=False),
     "node_id": BasicInteger(idl_name="node_id", byte_count=8, is_signed=False),
     "percent": BasicInteger(idl_name="percent", byte_count=1, is_signed=False),
     "percent100ths": BasicInteger(idl_name="percent100ths", byte_count=2, is_signed=False),
     "posix_ms": BasicInteger(idl_name="posix_ms", byte_count=8, is_signed=False),
     "power_mw": BasicInteger(idl_name="power_mw", byte_count=8, is_signed=True),
+    "power_mva": BasicInteger(idl_name="power_mva", byte_count=8, is_signed=True),
+    "power_mvar": BasicInteger(idl_name="power_mvar", byte_count=8, is_signed=True),
     "priority": BasicInteger(idl_name="priority", byte_count=1, is_signed=False),
     "semtag": BasicInteger(idl_name="semtag", byte_count=4, is_signed=False),
     "status": BasicInteger(idl_name="status", byte_count=1, is_signed=False),

src/app/util/basic-types.h

@@ -33,8 +33,13 @@ namespace chip {
 typedef uint8_t Percent;
 typedef uint16_t Percent100ths;
 typedef int64_t Energy_mWh;
+typedef int64_t Energy_mVAh;
+typedef int64_t Energy_mVARh;
 typedef int64_t Amperage_mA;
 typedef int64_t Power_mW;
+typedef int64_t Power_mVA;
+typedef int64_t Power_mVAR;
 typedef int64_t Voltage_mV;
+typedef int64_t Money;
 
 } // namespace chip

src/app/util/ember-io-storage.cpp

@@ -90,10 +90,15 @@ EmberAfAttributeType AttributeBaseType(EmberAfAttributeType type)
                       "chip::DataVersion is expected to be uint32_t, change this when necessary");
         return ZCL_INT32U_ATTRIBUTE_TYPE;
 
-    case ZCL_AMPERAGE_MA_ATTRIBUTE_TYPE: // Amperage milliamps
-    case ZCL_ENERGY_MWH_ATTRIBUTE_TYPE:  // Energy milliwatt-hours
-    case ZCL_POWER_MW_ATTRIBUTE_TYPE:    // Power milliwatts
-    case ZCL_VOLTAGE_MV_ATTRIBUTE_TYPE:  // Voltage millivolts
+    case ZCL_AMPERAGE_MA_ATTRIBUTE_TYPE:  // Amperage milliamps
+    case ZCL_ENERGY_MWH_ATTRIBUTE_TYPE:   // Energy milliwatt-hours
+    case ZCL_ENERGY_MVAH_ATTRIBUTE_TYPE:  // Energy millivolt-amp-hours
+    case ZCL_ENERGY_MVARH_ATTRIBUTE_TYPE: // Energy millivolt-amp-hours reactive
+    case ZCL_POWER_MW_ATTRIBUTE_TYPE:     // Power milliwatts
+    case ZCL_POWER_MVA_ATTRIBUTE_TYPE:    // Power millivolt-amps
+    case ZCL_POWER_MVAR_ATTRIBUTE_TYPE:   // Power millivolt-amps reactive
+    case ZCL_VOLTAGE_MV_ATTRIBUTE_TYPE:   // Voltage millivolts
+    case ZCL_MONEY_ATTRIBUTE_TYPE:        // Money
         return ZCL_INT64S_ATTRIBUTE_TYPE;
 
     case ZCL_EVENT_NO_ATTRIBUTE_TYPE:   // Event Number

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

@@ -75,9 +75,14 @@ function atomicType(arg)
   case 'percent100ths':
     return 'chip::Percent100ths';
   case 'power_mw':
+  case 'power_mva':
+  case 'power_mvar':
   case 'amperage_ma':
   case 'voltage_mv':
   case 'energy_mwh':
+  case 'energy_mvah':
+  case 'energy_mvarh':
+  case 'money':
     return 'int64_t';
   case 'epoch_us':
   case 'systime_us':

src/data-model-providers/codegen/tests/TestCodegenModelViaMocks.cpp

@@ -539,9 +539,13 @@ const MockNodeConfig gTestNodeConfig({
             MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_ELAPSED_S_ATTRIBUTE_TYPE),
             MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_TEMPERATURE_ATTRIBUTE_TYPE),
             MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_POWER_MW_ATTRIBUTE_TYPE),
+            MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_POWER_MVA_ATTRIBUTE_TYPE),
+            MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_POWER_MVAR_ATTRIBUTE_TYPE),
             MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_AMPERAGE_MA_ATTRIBUTE_TYPE),
             MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_VOLTAGE_MV_ATTRIBUTE_TYPE),
             MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_ENERGY_MWH_ATTRIBUTE_TYPE),
+            MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_ENERGY_MVAH_ATTRIBUTE_TYPE),
+            MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_ENERGY_MVARH_ATTRIBUTE_TYPE),
             MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_TOD_ATTRIBUTE_TYPE),
             MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_DATE_ATTRIBUTE_TYPE),
             MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_EPOCH_US_ATTRIBUTE_TYPE),