Skip to content

Commit ff14bd4

Browse files
jamesharrowjamesharrow
committed
regen_all after merging in Hasty's new types PR: project-chip#37980 
1 parent c196917 commit ff14bd4

File tree

39 files changed

+33807
-8939
lines changed

39 files changed

+33807
-8939
lines changed

‎docs/ids_and_codes/zap_clusters.md

+4
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Generally regenerate using one of:
7878
| 144 | 0x90 | ElectricalPowerMeasurement |
7979
| 145 | 0x91 | ElectricalEnergyMeasurement |
8080
| 148 | 0x94 | WaterHeaterManagement |
81+
| 149 | 0x95 | CommodityPrice |
8182
| 150 | 0x96 | DemandResponseLoadControl |
8283
| 151 | 0x97 | Messages |
8384
| 152 | 0x98 | DeviceEnergyManagement |
@@ -137,10 +138,13 @@ Generally regenerate using one of:
137138
| 1364 | 0x554 | WebRTCTransportRequestor |
138139
| 1365 | 0x555 | PushAvStreamTransport |
139140
| 1366 | 0x556 | Chime |
141+
| 1792 | 0x700 | CommodityTariff |
140142
| 1872 | 0x750 | EcosystemInformation |
141143
| 1873 | 0x751 | CommissionerControl |
142144
| 2049 | 0x801 | TlsCertificateManagement |
143145
| 2050 | 0x802 | TlsClientManagement |
146+
| 2822 | 0xB06 | MeterIdentification |
147+
| 2823 | 0xB07 | CommodityMetering |
144148
| 4294048773 | 0xFFF1FC05 | UnitTesting |
145149
| 4294048774 | 0xFFF1FC06 | FaultInjection |
146150
| 4294048800 | 0xFFF1FC20 | SampleMei |

‎examples/energy-gateway-app/energy-gateway-common/energy-gateway-app.matter

+4-4
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ enum TestGlobalEnum : enum8 {
252252
}
253253

254254
enum ThreeLevelAutoEnum : enum8 {
255-
kLow = 0;
256-
kMedium = 1;
257-
kHigh = 2;
258-
kAutomatic = 3;
255+
kAuto = 0;
256+
kLow = 1;
257+
kMedium = 2;
258+
kHigh = 3;
259259
}
260260

261261
bitmap TestGlobalBitmap : bitmap32 {

‎scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h

+8
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
#define MATTER_DM_ELECTRICAL_POWER_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
8888
#define MATTER_DM_ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
8989
#define MATTER_DM_WATER_HEATER_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
90+
#define MATTER_DM_COMMODITY_PRICE_CLUSTER_SERVER_ENDPOINT_COUNT (0)
9091
#define MATTER_DM_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (0)
9192
#define MATTER_DM_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT (0)
9293
#define MATTER_DM_DEVICE_ENERGY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -146,10 +147,13 @@
146147
#define MATTER_DM_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (0)
147148
#define MATTER_DM_PUSH_AV_STREAM_TRANSPORT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
148149
#define MATTER_DM_CHIME_CLUSTER_SERVER_ENDPOINT_COUNT (1)
150+
#define MATTER_DM_COMMODITY_TARIFF_CLUSTER_SERVER_ENDPOINT_COUNT (0)
149151
#define MATTER_DM_ECOSYSTEM_INFORMATION_CLUSTER_SERVER_ENDPOINT_COUNT (0)
150152
#define MATTER_DM_COMMISSIONER_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (0)
151153
#define MATTER_DM_TLS_CERTIFICATE_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
152154
#define MATTER_DM_TLS_CLIENT_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
155+
#define MATTER_DM_METER_IDENTIFICATION_CLUSTER_SERVER_ENDPOINT_COUNT (0)
156+
#define MATTER_DM_COMMODITY_METERING_CLUSTER_SERVER_ENDPOINT_COUNT (0)
153157
#define MATTER_DM_UNIT_TESTING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
154158
#define MATTER_DM_FAULT_INJECTION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
155159
#define MATTER_DM_SAMPLE_MEI_CLUSTER_SERVER_ENDPOINT_COUNT (0)
@@ -220,6 +224,7 @@
220224
#define MATTER_DM_ELECTRICAL_POWER_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
221225
#define MATTER_DM_ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
222226
#define MATTER_DM_WATER_HEATER_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
227+
#define MATTER_DM_COMMODITY_PRICE_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
223228
#define MATTER_DM_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
224229
#define MATTER_DM_MESSAGES_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
225230
#define MATTER_DM_DEVICE_ENERGY_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
@@ -279,10 +284,13 @@
279284
#define MATTER_DM_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
280285
#define MATTER_DM_PUSH_AV_STREAM_TRANSPORT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
281286
#define MATTER_DM_CHIME_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
287+
#define MATTER_DM_COMMODITY_TARIFF_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
282288
#define MATTER_DM_ECOSYSTEM_INFORMATION_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
283289
#define MATTER_DM_COMMISSIONER_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
284290
#define MATTER_DM_TLS_CERTIFICATE_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
285291
#define MATTER_DM_TLS_CLIENT_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
292+
#define MATTER_DM_METER_IDENTIFICATION_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
293+
#define MATTER_DM_COMMODITY_METERING_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
286294
#define MATTER_DM_UNIT_TESTING_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
287295
#define MATTER_DM_FAULT_INJECTION_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
288296
#define MATTER_DM_SAMPLE_MEI_CLUSTER_CLIENT_ENDPOINT_COUNT (0)

‎scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h

+8
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
#define MATTER_DM_ELECTRICAL_POWER_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
8888
#define MATTER_DM_ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
8989
#define MATTER_DM_WATER_HEATER_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
90+
#define MATTER_DM_COMMODITY_PRICE_CLUSTER_SERVER_ENDPOINT_COUNT (0)
9091
#define MATTER_DM_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (0)
9192
#define MATTER_DM_MESSAGES_CLUSTER_SERVER_ENDPOINT_COUNT (0)
9293
#define MATTER_DM_DEVICE_ENERGY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
@@ -146,10 +147,13 @@
146147
#define MATTER_DM_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (0)
147148
#define MATTER_DM_PUSH_AV_STREAM_TRANSPORT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
148149
#define MATTER_DM_CHIME_CLUSTER_SERVER_ENDPOINT_COUNT (0)
150+
#define MATTER_DM_COMMODITY_TARIFF_CLUSTER_SERVER_ENDPOINT_COUNT (0)
149151
#define MATTER_DM_ECOSYSTEM_INFORMATION_CLUSTER_SERVER_ENDPOINT_COUNT (0)
150152
#define MATTER_DM_COMMISSIONER_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (0)
151153
#define MATTER_DM_TLS_CERTIFICATE_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
152154
#define MATTER_DM_TLS_CLIENT_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
155+
#define MATTER_DM_METER_IDENTIFICATION_CLUSTER_SERVER_ENDPOINT_COUNT (0)
156+
#define MATTER_DM_COMMODITY_METERING_CLUSTER_SERVER_ENDPOINT_COUNT (0)
153157
#define MATTER_DM_UNIT_TESTING_CLUSTER_SERVER_ENDPOINT_COUNT (0)
154158
#define MATTER_DM_FAULT_INJECTION_CLUSTER_SERVER_ENDPOINT_COUNT (0)
155159
#define MATTER_DM_SAMPLE_MEI_CLUSTER_SERVER_ENDPOINT_COUNT (0)
@@ -220,6 +224,7 @@
220224
#define MATTER_DM_ELECTRICAL_POWER_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
221225
#define MATTER_DM_ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
222226
#define MATTER_DM_WATER_HEATER_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
227+
#define MATTER_DM_COMMODITY_PRICE_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
223228
#define MATTER_DM_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
224229
#define MATTER_DM_MESSAGES_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
225230
#define MATTER_DM_DEVICE_ENERGY_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
@@ -279,10 +284,13 @@
279284
#define MATTER_DM_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
280285
#define MATTER_DM_PUSH_AV_STREAM_TRANSPORT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
281286
#define MATTER_DM_CHIME_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
287+
#define MATTER_DM_COMMODITY_TARIFF_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
282288
#define MATTER_DM_ECOSYSTEM_INFORMATION_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
283289
#define MATTER_DM_COMMISSIONER_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
284290
#define MATTER_DM_TLS_CERTIFICATE_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
285291
#define MATTER_DM_TLS_CLIENT_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
292+
#define MATTER_DM_METER_IDENTIFICATION_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
293+
#define MATTER_DM_COMMODITY_METERING_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
286294
#define MATTER_DM_UNIT_TESTING_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
287295
#define MATTER_DM_FAULT_INJECTION_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
288296
#define MATTER_DM_SAMPLE_MEI_CLUSTER_CLIENT_ENDPOINT_COUNT (0)

0 commit comments

Comments
 (0)