Skip to content

Commit 19cbe1d

Browse files
Michail-AntropovMichail-Antropov
committed
Add XMLs and generated files only
1 parent 58536ba commit 19cbe1d

39 files changed

+4791
-121
lines changed

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ jobs:
121121
src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml \
122122
src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml \
123123
src/app/zap-templates/zcl/data-model/chip/measurement-and-sensing.xml \
124+
src/app/zap-templates/zcl/data-model/chip/meter-identification-cluster.xml \
124125
src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml \
125126
src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml \
126127
src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml \

‎docs/zap_clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ Generally regenerate using one of:
130130
| 1295 | 0x50F | ContentControl |
131131
| 1296 | 0x510 | ContentAppObserver |
132132
| 2820 | 0xB04 | ElectricalMeasurement |
133+
| 2822 | 0xB06 | MeterIdentification |
133134
| 4294048773 | 0xFFF1FC05 | UnitTesting |
134135
| 4294048774 | 0xFFF1FC06 | FaultInjection |
135136
| 4294048800 | 0xFFF1FC20 | SampleMei |

‎scripts/rules.matterlint

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml";
3030
load "../src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml";
3131
load "../src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml";
3232
load "../src/app/zap-templates/zcl/data-model/chip/measurement-and-sensing.xml";
33+
load "../src/app/zap-templates/zcl/data-model/chip/meter-identification-cluster.xml";
3334
load "../src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml";
3435
load "../src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml";
3536
load "../src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml";

‎src/app/zap-templates/zcl/zcl-with-test-extensions.json

+77-20
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"dishwasher-alarm-cluster.xml",
4545
"dishwasher-mode-cluster.xml",
4646
"drlc-cluster.xml",
47+
"meter-identification-cluster.xml",
4748
"microwave-oven-mode-cluster.xml",
4849
"microwave-oven-control-cluster.xml",
4950
"door-lock-cluster.xml",
@@ -138,9 +139,15 @@
138139
"manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
139140
"options": {
140141
"text": {
141-
"defaultResponsePolicy": ["Always", "Conditional", "Never"]
142+
"defaultResponsePolicy": [
143+
"Always",
144+
"Conditional",
145+
"Never"
146+
]
142147
},
143-
"bool": ["commandDiscovery"]
148+
"bool": [
149+
"commandDiscovery"
150+
]
144151
},
145152
"defaults": {
146153
"text": {
@@ -186,8 +193,13 @@
186193
"SpecificationVersion",
187194
"MaxPathsPerInvoke"
188195
],
189-
"Bridged Device Basic Information": ["ProductAppearance"],
190-
"Descriptor": ["ClusterRevision", "FeatureMap"],
196+
"Bridged Device Basic Information": [
197+
"ProductAppearance"
198+
],
199+
"Descriptor": [
200+
"ClusterRevision",
201+
"FeatureMap"
202+
],
191203
"Device Energy Management": [
192204
"ESAType",
193205
"ESACanGenerate",
@@ -230,7 +242,11 @@
230242
"SessionEnergyDischarged",
231243
"FeatureMap"
232244
],
233-
"Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
245+
"Energy EVSE Mode": [
246+
"SupportedModes",
247+
"CurrentMode",
248+
"FeatureMap"
249+
],
234250
"Ethernet Network Diagnostics": [
235251
"PHYRate",
236252
"FullDuplex",
@@ -369,14 +385,21 @@
369385
"CurrentMaxRate",
370386
"OverrunCount"
371387
],
372-
"Channel": ["Lineup", "CurrentChannel"],
388+
"Channel": [
389+
"Lineup",
390+
"CurrentChannel"
391+
],
373392
"Media Playback": [
374393
"SampledPosition",
375394
"ActiveAudioTrack",
376395
"ActiveTextTrack"
377396
],
378-
"Application Launcher": ["CurrentApp"],
379-
"Application Basic": ["Application"],
397+
"Application Launcher": [
398+
"CurrentApp"
399+
],
400+
"Application Basic": [
401+
"Application"
402+
],
380403
"Time Synchronization": [
381404
"TrustedTimeSource",
382405
"DefaultNTP",
@@ -388,15 +411,21 @@
388411
"TimeZoneListMaxSize",
389412
"DSTOffsetListMaxSize"
390413
],
391-
"Temperature Control": ["SupportedTemperatureLevels"],
414+
"Temperature Control": [
415+
"SupportedTemperatureLevels"
416+
],
392417
"Dishwasher Mode": [
393418
"SupportedModes",
394419
"CurrentMode",
395420
"StartUpMode",
396421
"OnMode",
397422
"FeatureMap"
398423
],
399-
"Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
424+
"Microwave Oven Mode": [
425+
"SupportedModes",
426+
"CurrentMode",
427+
"FeatureMap"
428+
],
400429
"Microwave Oven Control": [
401430
"CookTime",
402431
"MaxCookTime",
@@ -423,8 +452,16 @@
423452
"OnMode",
424453
"FeatureMap"
425454
],
426-
"RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
427-
"RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
455+
"RVC Clean Mode": [
456+
"SupportedModes",
457+
"CurrentMode",
458+
"FeatureMap"
459+
],
460+
"RVC Run Mode": [
461+
"SupportedModes",
462+
"CurrentMode",
463+
"FeatureMap"
464+
],
428465
"Operational State": [
429466
"OperationalState",
430467
"OperationalError",
@@ -601,8 +638,13 @@
601638
"LevelValue",
602639
"FeatureMap"
603640
],
604-
"Air Quality": ["AirQuality", "FeatureMap"],
605-
"Thermostat": ["QueuedPreset"],
641+
"Air Quality": [
642+
"AirQuality",
643+
"FeatureMap"
644+
],
645+
"Thermostat": [
646+
"QueuedPreset"
647+
],
606648
"Electrical Energy Measurement": [
607649
"Accuracy",
608650
"CumulativeEnergyImported",
@@ -634,13 +676,28 @@
634676
"NeutralCurrent",
635677
"FeatureMap"
636678
],
637-
"Power Topology": ["FeatureMap"],
638-
"Valve Configuration and Control": ["RemainingDuration"],
639-
"Boolean State Configuration": ["CurrentSensitivityLevel"],
640-
"Wi-Fi Network Management": ["SSID"]
679+
"Power Topology": [
680+
"FeatureMap"
681+
],
682+
"Valve Configuration and Control": [
683+
"RemainingDuration"
684+
],
685+
"Boolean State Configuration": [
686+
"CurrentSensitivityLevel"
687+
],
688+
"Wi-Fi Network Management": [
689+
"SSID"
690+
]
641691
},
642692
"defaultReportingPolicy": "mandatory",
643-
"ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
693+
"ZCLDataTypes": [
694+
"ARRAY",
695+
"BITMAP",
696+
"ENUM",
697+
"NUMBER",
698+
"STRING",
699+
"STRUCT"
700+
],
644701
"fabricHandling": {
645702
"automaticallyCreateFields": true,
646703
"indexFieldId": 254,
@@ -650,4 +707,4 @@
650707
"uiOptions": {
651708
"showProfileId": false
652709
}
653-
}
710+
}

‎src/app/zap-templates/zcl/zcl.json

+77-20
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"diagnostic-logs-cluster.xml",
4343
"dishwasher-alarm-cluster.xml",
4444
"dishwasher-mode-cluster.xml",
45+
"meter-identification-cluster.xml",
4546
"microwave-oven-mode-cluster.xml",
4647
"door-lock-cluster.xml",
4748
"drlc-cluster.xml",
@@ -136,9 +137,15 @@
136137
"manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
137138
"options": {
138139
"text": {
139-
"defaultResponsePolicy": ["Always", "Conditional", "Never"]
140+
"defaultResponsePolicy": [
141+
"Always",
142+
"Conditional",
143+
"Never"
144+
]
140145
},
141-
"bool": ["commandDiscovery"]
146+
"bool": [
147+
"commandDiscovery"
148+
]
142149
},
143150
"defaults": {
144151
"text": {
@@ -184,8 +191,13 @@
184191
"SpecificationVersion",
185192
"MaxPathsPerInvoke"
186193
],
187-
"Bridged Device Basic Information": ["ProductAppearance"],
188-
"Descriptor": ["ClusterRevision", "FeatureMap"],
194+
"Bridged Device Basic Information": [
195+
"ProductAppearance"
196+
],
197+
"Descriptor": [
198+
"ClusterRevision",
199+
"FeatureMap"
200+
],
189201
"Device Energy Management": [
190202
"ESAType",
191203
"ESACanGenerate",
@@ -228,7 +240,11 @@
228240
"SessionEnergyDischarged",
229241
"FeatureMap"
230242
],
231-
"Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
243+
"Energy EVSE Mode": [
244+
"SupportedModes",
245+
"CurrentMode",
246+
"FeatureMap"
247+
],
232248
"Ethernet Network Diagnostics": [
233249
"PHYRate",
234250
"FullDuplex",
@@ -367,14 +383,21 @@
367383
"CurrentMaxRate",
368384
"OverrunCount"
369385
],
370-
"Channel": ["Lineup", "CurrentChannel"],
386+
"Channel": [
387+
"Lineup",
388+
"CurrentChannel"
389+
],
371390
"Media Playback": [
372391
"SampledPosition",
373392
"ActiveAudioTrack",
374393
"ActiveTextTrack"
375394
],
376-
"Application Launcher": ["CurrentApp"],
377-
"Application Basic": ["Application"],
395+
"Application Launcher": [
396+
"CurrentApp"
397+
],
398+
"Application Basic": [
399+
"Application"
400+
],
378401
"Time Synchronization": [
379402
"TrustedTimeSource",
380403
"DefaultNTP",
@@ -386,15 +409,21 @@
386409
"TimeZoneListMaxSize",
387410
"DSTOffsetListMaxSize"
388411
],
389-
"Temperature Control": ["SupportedTemperatureLevels"],
412+
"Temperature Control": [
413+
"SupportedTemperatureLevels"
414+
],
390415
"Dishwasher Mode": [
391416
"SupportedModes",
392417
"CurrentMode",
393418
"StartUpMode",
394419
"OnMode",
395420
"FeatureMap"
396421
],
397-
"Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
422+
"Microwave Oven Mode": [
423+
"SupportedModes",
424+
"CurrentMode",
425+
"FeatureMap"
426+
],
398427
"Microwave Oven Control": [
399428
"CookTime",
400429
"MaxCookTime",
@@ -421,8 +450,16 @@
421450
"OnMode",
422451
"FeatureMap"
423452
],
424-
"RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
425-
"RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
453+
"RVC Clean Mode": [
454+
"SupportedModes",
455+
"CurrentMode",
456+
"FeatureMap"
457+
],
458+
"RVC Run Mode": [
459+
"SupportedModes",
460+
"CurrentMode",
461+
"FeatureMap"
462+
],
426463
"Operational State": [
427464
"OperationalState",
428465
"OperationalError",
@@ -599,8 +636,13 @@
599636
"LevelValue",
600637
"FeatureMap"
601638
],
602-
"Air Quality": ["AirQuality", "FeatureMap"],
603-
"Thermostat": ["QueuedPreset"],
639+
"Air Quality": [
640+
"AirQuality",
641+
"FeatureMap"
642+
],
643+
"Thermostat": [
644+
"QueuedPreset"
645+
],
604646
"Electrical Energy Measurement": [
605647
"Accuracy",
606648
"CumulativeEnergyImported",
@@ -632,13 +674,28 @@
632674
"NeutralCurrent",
633675
"FeatureMap"
634676
],
635-
"Power Topology": ["FeatureMap"],
636-
"Valve Configuration and Control": ["RemainingDuration"],
637-
"Boolean State Configuration": ["CurrentSensitivityLevel"],
638-
"Wi-Fi Network Management": ["SSID"]
677+
"Power Topology": [
678+
"FeatureMap"
679+
],
680+
"Valve Configuration and Control": [
681+
"RemainingDuration"
682+
],
683+
"Boolean State Configuration": [
684+
"CurrentSensitivityLevel"
685+
],
686+
"Wi-Fi Network Management": [
687+
"SSID"
688+
]
639689
},
640690
"defaultReportingPolicy": "mandatory",
641-
"ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
691+
"ZCLDataTypes": [
692+
"ARRAY",
693+
"BITMAP",
694+
"ENUM",
695+
"NUMBER",
696+
"STRING",
697+
"STRUCT"
698+
],
642699
"fabricHandling": {
643700
"automaticallyCreateFields": true,
644701
"indexFieldId": 254,
@@ -648,4 +705,4 @@
648705
"uiOptions": {
649706
"showProfileId": false
650707
}
651-
}
708+
}

0 commit comments

Comments
 (0)