Skip to content

Commit 950ec01

Browse files
bzbarsky-applePeterC1965
bzbarsky-apple
authored and
PeterC1965
committed
Re-run zap_convert_all on the tree. (project-chip#35235)
There have been various XML modifications that have not made it into the relevant .zap files.
1 parent 6be9be4 commit 950ec01

File tree

44 files changed

+326
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+326
-325
lines changed

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -7970,7 +7970,7 @@
79707970
"code": 18,
79717971
"mfgCode": null,
79727972
"side": "server",
7973-
"type": "int16s",
7973+
"type": "temperature",
79747974
"included": 1,
79757975
"storageOption": "RAM",
79767976
"singleton": 0,

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+7-7
Original file line numberDiff line numberDiff line change
@@ -13445,7 +13445,7 @@
1344513445
"code": 0,
1344613446
"mfgCode": null,
1344713447
"side": "server",
13448-
"type": "WaterHeaterTypeBitmap",
13448+
"type": "WaterHeaterHeatSourceBitmap",
1344913449
"included": 1,
1345013450
"storageOption": "External",
1345113451
"singleton": 0,
@@ -13461,7 +13461,7 @@
1346113461
"code": 1,
1346213462
"mfgCode": null,
1346313463
"side": "server",
13464-
"type": "WaterHeaterDemandBitmap",
13464+
"type": "WaterHeaterHeatSourceBitmap",
1346513465
"included": 1,
1346613466
"storageOption": "External",
1346713467
"singleton": 0,
@@ -17507,7 +17507,7 @@
1750717507
"code": 5,
1750817508
"mfgCode": null,
1750917509
"side": "server",
17510-
"type": "enum8",
17510+
"type": "DriftCompensationEnum",
1751117511
"included": 1,
1751217512
"storageOption": "RAM",
1751317513
"singleton": 0,
@@ -17555,7 +17555,7 @@
1755517555
"code": 8,
1755617556
"mfgCode": null,
1755717557
"side": "server",
17558-
"type": "enum8",
17558+
"type": "ColorModeEnum",
1755917559
"included": 1,
1756017560
"storageOption": "RAM",
1756117561
"singleton": 0,
@@ -17571,7 +17571,7 @@
1757117571
"code": 15,
1757217572
"mfgCode": null,
1757317573
"side": "server",
17574-
"type": "bitmap8",
17574+
"type": "OptionsBitmap",
1757517575
"included": 1,
1757617576
"storageOption": "RAM",
1757717577
"singleton": 0,
@@ -18083,7 +18083,7 @@
1808318083
"code": 16385,
1808418084
"mfgCode": null,
1808518085
"side": "server",
18086-
"type": "enum8",
18086+
"type": "EnhancedColorModeEnum",
1808718087
"included": 1,
1808818088
"storageOption": "NVM",
1808918089
"singleton": 0,
@@ -18179,7 +18179,7 @@
1817918179
"code": 16394,
1818018180
"mfgCode": null,
1818118181
"side": "server",
18182-
"type": "bitmap16",
18182+
"type": "ColorCapabilitiesBitmap",
1818318183
"included": 1,
1818418184
"storageOption": "RAM",
1818518185
"singleton": 0,

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap

+11-11
Original file line numberDiff line numberDiff line change
@@ -6932,7 +6932,7 @@
69326932
"code": 18,
69336933
"mfgCode": null,
69346934
"side": "server",
6935-
"type": "int16s",
6935+
"type": "temperature",
69366936
"included": 1,
69376937
"storageOption": "RAM",
69386938
"singleton": 0,
@@ -7202,7 +7202,7 @@
72027202
"code": 8,
72037203
"mfgCode": null,
72047204
"side": "server",
7205-
"type": "enum8",
7205+
"type": "ColorModeEnum",
72067206
"included": 1,
72077207
"storageOption": "RAM",
72087208
"singleton": 0,
@@ -7218,7 +7218,7 @@
72187218
"code": 15,
72197219
"mfgCode": null,
72207220
"side": "server",
7221-
"type": "bitmap8",
7221+
"type": "OptionsBitmap",
72227222
"included": 1,
72237223
"storageOption": "RAM",
72247224
"singleton": 0,
@@ -7250,7 +7250,7 @@
72507250
"code": 16385,
72517251
"mfgCode": null,
72527252
"side": "server",
7253-
"type": "enum8",
7253+
"type": "EnhancedColorModeEnum",
72547254
"included": 1,
72557255
"storageOption": "RAM",
72567256
"singleton": 0,
@@ -7266,7 +7266,7 @@
72667266
"code": 16394,
72677267
"mfgCode": null,
72687268
"side": "server",
7269-
"type": "bitmap16",
7269+
"type": "ColorCapabilitiesBitmap",
72707270
"included": 1,
72717271
"storageOption": "RAM",
72727272
"singleton": 0,
@@ -7995,10 +7995,10 @@
79957995
"side": "server",
79967996
"type": "bitmap32",
79977997
"included": 1,
7998-
"storageOption": "RAM",
7998+
"storageOption": "External",
79997999
"singleton": 0,
80008000
"bounded": 0,
8001-
"defaultValue": "0",
8001+
"defaultValue": null,
80028002
"reportable": 1,
80038003
"minInterval": 1,
80048004
"maxInterval": 65534,
@@ -9965,7 +9965,7 @@
99659965
"storageOption": "External",
99669966
"singleton": 0,
99679967
"bounded": 0,
9968-
"defaultValue": "",
9968+
"defaultValue": null,
99699969
"reportable": 1,
99709970
"minInterval": 1,
99719971
"maxInterval": 65534,
@@ -10541,7 +10541,7 @@
1054110541
"storageOption": "External",
1054210542
"singleton": 0,
1054310543
"bounded": 0,
10544-
"defaultValue": "",
10544+
"defaultValue": null,
1054510545
"reportable": 1,
1054610546
"minInterval": 1,
1054710547
"maxInterval": 65534,
@@ -11917,10 +11917,10 @@
1191711917
"side": "server",
1191811918
"type": "bitmap32",
1191911919
"included": 1,
11920-
"storageOption": "RAM",
11920+
"storageOption": "External",
1192111921
"singleton": 0,
1192211922
"bounded": 0,
11923-
"defaultValue": "0",
11923+
"defaultValue": null,
1192411924
"reportable": 1,
1192511925
"minInterval": 1,
1192611926
"maxInterval": 65534,

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -4783,10 +4783,10 @@
47834783
"side": "client",
47844784
"type": "bitmap32",
47854785
"included": 1,
4786-
"storageOption": "RAM",
4786+
"storageOption": "External",
47874787
"singleton": 0,
47884788
"bounded": 0,
4789-
"defaultValue": "0",
4789+
"defaultValue": null,
47904790
"reportable": 1,
47914791
"minInterval": 1,
47924792
"maxInterval": 65534,

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap

+3-3
Original file line numberDiff line numberDiff line change
@@ -7991,7 +7991,7 @@
79917991
"code": 18,
79927992
"mfgCode": null,
79937993
"side": "server",
7994-
"type": "int16s",
7994+
"type": "temperature",
79957995
"included": 1,
79967996
"storageOption": "RAM",
79977997
"singleton": 0,
@@ -8007,7 +8007,7 @@
80078007
"code": 21,
80088008
"mfgCode": null,
80098009
"side": "server",
8010-
"type": "int16s",
8010+
"type": "temperature",
80118011
"included": 1,
80128012
"storageOption": "RAM",
80138013
"singleton": 0,
@@ -8023,7 +8023,7 @@
80238023
"code": 22,
80248024
"mfgCode": null,
80258025
"side": "server",
8026-
"type": "int16s",
8026+
"type": "temperature",
80278027
"included": 1,
80288028
"storageOption": "RAM",
80298029
"singleton": 0,

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap

+11-11
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
"package": [
2020
{
2121
"pathRelativity": "relativeToZap",
22-
"path": "../../../src/app/zap-templates/zcl/zcl.json",
23-
"type": "zcl-properties",
22+
"path": "../../../src/app/zap-templates/app-templates.json",
23+
"type": "gen-templates-json",
2424
"category": "matter",
25-
"version": 1,
26-
"description": "Matter SDK ZCL data"
25+
"version": "chip-v1"
2726
},
2827
{
2928
"pathRelativity": "relativeToZap",
30-
"path": "../../../src/app/zap-templates/app-templates.json",
31-
"type": "gen-templates-json",
29+
"path": "../../../src/app/zap-templates/zcl/zcl.json",
30+
"type": "zcl-properties",
3231
"category": "matter",
33-
"version": "chip-v1"
32+
"version": 1,
33+
"description": "Matter SDK ZCL data"
3434
}
3535
],
3636
"endpointTypes": [
@@ -3408,7 +3408,7 @@
34083408
"code": 8,
34093409
"mfgCode": null,
34103410
"side": "server",
3411-
"type": "enum8",
3411+
"type": "ColorModeEnum",
34123412
"included": 1,
34133413
"storageOption": "RAM",
34143414
"singleton": 0,
@@ -3424,7 +3424,7 @@
34243424
"code": 15,
34253425
"mfgCode": null,
34263426
"side": "server",
3427-
"type": "bitmap8",
3427+
"type": "OptionsBitmap",
34283428
"included": 1,
34293429
"storageOption": "RAM",
34303430
"singleton": 0,
@@ -3760,7 +3760,7 @@
37603760
"code": 16385,
37613761
"mfgCode": null,
37623762
"side": "server",
3763-
"type": "enum8",
3763+
"type": "EnhancedColorModeEnum",
37643764
"included": 1,
37653765
"storageOption": "RAM",
37663766
"singleton": 0,
@@ -3776,7 +3776,7 @@
37763776
"code": 16394,
37773777
"mfgCode": null,
37783778
"side": "server",
3779-
"type": "bitmap16",
3779+
"type": "ColorCapabilitiesBitmap",
37803780
"included": 1,
37813781
"storageOption": "RAM",
37823782
"singleton": 0,

‎examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -4128,7 +4128,7 @@
41284128
"storageOption": "External",
41294129
"singleton": 0,
41304130
"bounded": 0,
4131-
"defaultValue": "",
4131+
"defaultValue": null,
41324132
"reportable": 1,
41334133
"minInterval": 1,
41344134
"maxInterval": 65534,
@@ -4704,7 +4704,7 @@
47044704
"storageOption": "External",
47054705
"singleton": 0,
47064706
"bounded": 0,
4707-
"defaultValue": "",
4707+
"defaultValue": null,
47084708
"reportable": 1,
47094709
"minInterval": 1,
47104710
"maxInterval": 65534,

‎examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -3520,10 +3520,10 @@
35203520
"side": "client",
35213521
"type": "bitmap32",
35223522
"included": 1,
3523-
"storageOption": "RAM",
3523+
"storageOption": "External",
35243524
"singleton": 0,
35253525
"bounded": 0,
3526-
"defaultValue": "0",
3526+
"defaultValue": null,
35273527
"reportable": 1,
35283528
"minInterval": 1,
35293529
"maxInterval": 65534,

‎examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -3813,10 +3813,10 @@
38133813
"side": "client",
38143814
"type": "bitmap32",
38153815
"included": 1,
3816-
"storageOption": "RAM",
3816+
"storageOption": "External",
38173817
"singleton": 0,
38183818
"bounded": 0,
3819-
"defaultValue": "0",
3819+
"defaultValue": null,
38203820
"reportable": 1,
38213821
"minInterval": 1,
38223822
"maxInterval": 65534,

‎examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap

+4-4
Original file line numberDiff line numberDiff line change
@@ -3720,7 +3720,7 @@
37203720
"code": 8,
37213721
"mfgCode": null,
37223722
"side": "server",
3723-
"type": "enum8",
3723+
"type": "ColorModeEnum",
37243724
"included": 1,
37253725
"storageOption": "RAM",
37263726
"singleton": 0,
@@ -3736,7 +3736,7 @@
37363736
"code": 15,
37373737
"mfgCode": null,
37383738
"side": "server",
3739-
"type": "bitmap8",
3739+
"type": "OptionsBitmap",
37403740
"included": 1,
37413741
"storageOption": "RAM",
37423742
"singleton": 0,
@@ -3784,7 +3784,7 @@
37843784
"code": 16385,
37853785
"mfgCode": null,
37863786
"side": "server",
3787-
"type": "enum8",
3787+
"type": "EnhancedColorModeEnum",
37883788
"included": 1,
37893789
"storageOption": "RAM",
37903790
"singleton": 0,
@@ -3880,7 +3880,7 @@
38803880
"code": 16394,
38813881
"mfgCode": null,
38823882
"side": "server",
3883-
"type": "bitmap16",
3883+
"type": "ColorCapabilitiesBitmap",
38843884
"included": 1,
38853885
"storageOption": "RAM",
38863886
"singleton": 0,

‎examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
}
1818
],
1919
"package": [
20-
{
21-
"pathRelativity": "relativeToZap",
22-
"path": "../../../src/app/zap-templates/app-templates.json",
23-
"type": "gen-templates-json",
24-
"category": "matter",
25-
"version": "chip-v1"
26-
},
2720
{
2821
"pathRelativity": "relativeToZap",
2922
"path": "../../../src/app/zap-templates/zcl/zcl.json",
3023
"type": "zcl-properties",
3124
"category": "matter",
3225
"version": 1,
3326
"description": "Matter SDK ZCL data"
27+
},
28+
{
29+
"pathRelativity": "relativeToZap",
30+
"path": "../../../src/app/zap-templates/app-templates.json",
31+
"type": "gen-templates-json",
32+
"category": "matter",
33+
"version": "chip-v1"
3434
}
3535
],
3636
"endpointTypes": [

‎examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -2974,10 +2974,10 @@
29742974
"side": "server",
29752975
"type": "bitmap32",
29762976
"included": 1,
2977-
"storageOption": "RAM",
2977+
"storageOption": "External",
29782978
"singleton": 0,
29792979
"bounded": 0,
2980-
"defaultValue": "0",
2980+
"defaultValue": null,
29812981
"reportable": 1,
29822982
"minInterval": 1,
29832983
"maxInterval": 65534,

0 commit comments

Comments
 (0)