Skip to content

Commit 73053bc

Browse files
jamesharrowjamesharrow
committed
Merge remote-tracking branch 'Hasty/granbery/new_energy_money_data_type' into energy-price-xml
2 parents bf3f875 + 18d7960 commit 73053bc

File tree

6 files changed

+37
-5
lines changed

6 files changed

+37
-5
lines changed

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,14 @@ def NormalizeDataType(t: str) -> str:
104104

105105
# Handle odd casing and naming
106106
_CASE_RENAMES_MAPPING = {
107+
"amperage_mA": "amperage_ma",
107108
"power_mW": "power_mw",
108-
"energy_mWh": "energy_mwh"
109+
"power_mVA": "power_mva",
110+
"power_mVAR": "power_mvar",
111+
"energy_mWh": "energy_mwh",
112+
"energy_mVAh": "energy_mvah",
113+
"energy_mVARh": "energy_mvarh",
114+
"voltage_mV": "voltage_mv",
109115
}
110116

111117

‎scripts/py_matter_idl/matter_idl/generators/type_definitions.py

+5
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ def is_struct(self) -> bool:
198198
"elapsed_s": BasicInteger(idl_name="elapsed_s", byte_count=4, is_signed=False),
199199
"endpoint_no": BasicInteger(idl_name="endpoint_no", byte_count=2, is_signed=False),
200200
"energy_mwh": BasicInteger(idl_name="energy_mwh", byte_count=8, is_signed=True),
201+
"energy_mvah": BasicInteger(idl_name="energy_mvah", byte_count=8, is_signed=True),
202+
"energy_mvarh": BasicInteger(idl_name="energy_mvarh", byte_count=8, is_signed=True),
201203
"entry_idx": BasicInteger(idl_name="entry_idx", byte_count=2, is_signed=False),
202204
"epoch_s": BasicInteger(idl_name="epoch_s", byte_count=4, is_signed=False),
203205
"epoch_us": BasicInteger(idl_name="epoch_us", byte_count=8, is_signed=False),
@@ -207,12 +209,15 @@ def is_struct(self) -> bool:
207209
"fabric_idx": BasicInteger(idl_name="fabric_idx", byte_count=1, is_signed=False),
208210
"field_id": BasicInteger(idl_name="field_id", byte_count=4, is_signed=False),
209211
"group_id": BasicInteger(idl_name="group_id", byte_count=2, is_signed=False),
212+
"money": BasicInteger(idl_name="money", byte_count=8, is_signed=True),
210213
"namespace": BasicInteger(idl_name="namespace", byte_count=1, is_signed=False),
211214
"node_id": BasicInteger(idl_name="node_id", byte_count=8, is_signed=False),
212215
"percent": BasicInteger(idl_name="percent", byte_count=1, is_signed=False),
213216
"percent100ths": BasicInteger(idl_name="percent100ths", byte_count=2, is_signed=False),
214217
"posix_ms": BasicInteger(idl_name="posix_ms", byte_count=8, is_signed=False),
215218
"power_mw": BasicInteger(idl_name="power_mw", byte_count=8, is_signed=True),
219+
"power_mva": BasicInteger(idl_name="power_mva", byte_count=8, is_signed=True),
220+
"power_mvar": BasicInteger(idl_name="power_mvar", byte_count=8, is_signed=True),
216221
"priority": BasicInteger(idl_name="priority", byte_count=1, is_signed=False),
217222
"semtag": BasicInteger(idl_name="semtag", byte_count=4, is_signed=False),
218223
"status": BasicInteger(idl_name="status", byte_count=1, is_signed=False),

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

+9-4
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,15 @@ EmberAfAttributeType AttributeBaseType(EmberAfAttributeType type)
9090
"chip::DataVersion is expected to be uint32_t, change this when necessary");
9191
return ZCL_INT32U_ATTRIBUTE_TYPE;
9292

93-
case ZCL_AMPERAGE_MA_ATTRIBUTE_TYPE: // Amperage milliamps
94-
case ZCL_ENERGY_MWH_ATTRIBUTE_TYPE: // Energy milliwatt-hours
95-
case ZCL_POWER_MW_ATTRIBUTE_TYPE: // Power milliwatts
96-
case ZCL_VOLTAGE_MV_ATTRIBUTE_TYPE: // Voltage millivolts
93+
case ZCL_AMPERAGE_MA_ATTRIBUTE_TYPE: // Amperage milliamps
94+
case ZCL_ENERGY_MWH_ATTRIBUTE_TYPE: // Energy milliwatt-hours
95+
case ZCL_ENERGY_MVAH_ATTRIBUTE_TYPE: // Energy millivolt-amp-hours
96+
case ZCL_ENERGY_MVARH_ATTRIBUTE_TYPE: // Energy millivolt-amp-hours reactive
97+
case ZCL_POWER_MW_ATTRIBUTE_TYPE: // Power milliwatts
98+
case ZCL_POWER_MVA_ATTRIBUTE_TYPE: // Power millivolt-amps
99+
case ZCL_POWER_MVAR_ATTRIBUTE_TYPE: // Power millivolt-amps reactive
100+
case ZCL_VOLTAGE_MV_ATTRIBUTE_TYPE: // Voltage millivolts
101+
case ZCL_MONEY_ATTRIBUTE_TYPE: // Money
97102
return ZCL_INT64S_ATTRIBUTE_TYPE;
98103

99104
case ZCL_EVENT_NO_ATTRIBUTE_TYPE: // Event Number

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

+5
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,14 @@ function atomicType(arg)
7575
case 'percent100ths':
7676
return 'chip::Percent100ths';
7777
case 'power_mw':
78+
case 'power_mva':
79+
case 'power_mvar':
7880
case 'amperage_ma':
7981
case 'voltage_mv':
8082
case 'energy_mwh':
83+
case 'energy_mvah':
84+
case 'energy_mvarh':
85+
case 'money':
8186
return 'int64_t';
8287
case 'epoch_us':
8388
case 'systime_us':

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

+7
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,16 @@ limitations under the License.
5555
<type id="0x42" description="Character String" name="char_string" composite="true"/>
5656
<type id="0x44" description="Long Character String" name="long_char_string" composite="true"/>
5757

58+
<type id="0xD6" description="Power millivolt-amps" name="power_mva" size="8" analog="true" signed="true"/>
59+
<type id="0xD7" description="Power millivolt-amps reactive" name="power_mvar" size="8" analog="true" signed="true"/>
5860
<type id="0xD9" description="Power milliwatts" name="power_mw" size="8" analog="true" signed="true"/>
61+
5962
<type id="0xDA" description="Amperage milliamps" name="amperage_ma" size="8" analog="true" signed="true"/>
6063
<type id="0xDB" description="Voltage millivolts" name="voltage_mv" size="8" analog="true" signed="true"/>
64+
6165
<type id="0xDC" description="Energy milliwatt-hours" name="energy_mwh" size="8" analog="true" signed="true"/>
66+
<type id="0xDD" description="Energy millivolt-amp-hours" name="energy_mvah" size="8" analog="true" signed="true"/>
67+
<type id="0xDE" description="Energy millivolt-amp-hours reactive" name="energy_mvarh" size="8" analog="true" signed="true"/>
6268

6369
<type id="0xE6" description="Percentage units 1%" name="percent" size="1" analog="true" />
6470
<type id="0xE7" description="Percentage units 0.01%" name="percent100ths" size="2" analog="true" />
@@ -74,6 +80,7 @@ limitations under the License.
7480
<type id="0xD2" description="Elapsed Time Seconds" name="elapsed_s" size="4" analog="true" />
7581

7682
<type id="0xD8" description="Temperature" name="temperature" size="2" analog="true" signed="true" />
83+
<type id="0xF7" description="Money" name="money" size="8" analog="true" signed="true"/>
7784

7885
<type id="0x30" description="8-bit enumeration" name="enum8" size="1" discrete="true" />
7986
<type id="0x31" description="16-bit enumeration" name="enum16" size="2" discrete="true" />

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

+4
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,13 @@ const MockNodeConfig gTestNodeConfig({
542542
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_ELAPSED_S_ATTRIBUTE_TYPE),
543543
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_TEMPERATURE_ATTRIBUTE_TYPE),
544544
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_POWER_MW_ATTRIBUTE_TYPE),
545+
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_POWER_MVA_ATTRIBUTE_TYPE),
546+
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_POWER_MVAR_ATTRIBUTE_TYPE),
545547
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_AMPERAGE_MA_ATTRIBUTE_TYPE),
546548
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_VOLTAGE_MV_ATTRIBUTE_TYPE),
547549
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_ENERGY_MWH_ATTRIBUTE_TYPE),
550+
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_ENERGY_MVAH_ATTRIBUTE_TYPE),
551+
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_ENERGY_MVARH_ATTRIBUTE_TYPE),
548552
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_TOD_ATTRIBUTE_TYPE),
549553
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_DATE_ATTRIBUTE_TYPE),
550554
MOCK_ATTRIBUTE_CONFIG_NULLABLE(ZCL_EPOCH_US_ATTRIBUTE_TYPE),

0 commit comments

Comments
 (0)