Skip to content

Commit

Permalink
Run zap_convert_all on the tree. (project-chip#34000)
Browse files Browse the repository at this point in the history
We have had XML changes that did not get reflected into .zap files,
unfortunately, including marking things as no longer provisional.

Fixing that by running zap_convert_all.py discovered a problem in the Thread
Border Router Management cluster XML: it was using the wrong define value.  And
apparently the .zap files involved had been hand-edited to not match the XML to
allow code to compile, but regenerating them obviously "broke" that.  The fix is
to use the right value in the XML.
  • Loading branch information
bzbarsky-apple authored and diogopintodsr committed Jun 19, 2024
1 parent 4ddfef9 commit 3e3aa71
Show file tree
Hide file tree
Showing 90 changed files with 367 additions and 341 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
16 changes: 3 additions & 13 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 102,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down Expand Up @@ -8226,7 +8227,6 @@
"define": "OPERATIONAL_STATE_OVEN_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"commands": [
{
"name": "Pause",
Expand Down Expand Up @@ -8487,7 +8487,6 @@
"define": "OVEN_MODE_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"commands": [
{
"name": "ChangeToMode",
Expand Down Expand Up @@ -8644,7 +8643,6 @@
"define": "LAUNDRY_DRYER_CONTROLS_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"attributes": [
{
"name": "SupportedDrynessLevels",
Expand Down Expand Up @@ -10898,7 +10896,6 @@
"define": "MICROWAVE_OVEN_MODE_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"attributes": [
{
"name": "SupportedModes",
Expand Down Expand Up @@ -12202,7 +12199,6 @@
"define": "BOOLEAN_STATE_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"commands": [
{
"name": "SuppressAlarm",
Expand Down Expand Up @@ -12471,7 +12467,6 @@
"define": "VALVE_CONFIGURATION_AND_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"commands": [
{
"name": "Open",
Expand Down Expand Up @@ -12788,7 +12783,6 @@
"define": "ELECTRICAL_POWER_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"attributes": [
{
"name": "PowerMode",
Expand Down Expand Up @@ -13208,7 +13202,6 @@
"define": "ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"attributes": [
{
"name": "Accuracy",
Expand Down Expand Up @@ -13580,7 +13573,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
"type": "array",
"type": "PowerAdjustCapabilityStruct",
"included": 1,
"storageOption": "External",
"singleton": 0,
Expand Down Expand Up @@ -13758,7 +13751,6 @@
"define": "ENERGY_EVSE_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"commands": [
{
"name": "GetTargetsResponse",
Expand Down Expand Up @@ -14434,7 +14426,6 @@
"define": "POWER_TOPOLOGY_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"attributes": [
{
"name": "AvailableEndpoints",
Expand Down Expand Up @@ -14573,7 +14564,6 @@
"define": "ENERGY_EVSE_MODE_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"commands": [
{
"name": "ChangeToMode",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 102,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
3 changes: 2 additions & 1 deletion examples/bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 102,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 102,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
5 changes: 3 additions & 2 deletions examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down Expand Up @@ -3954,4 +3955,4 @@
"parentEndpointIdentifier": null
}
]
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 100,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -29,6 +29,7 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"category": "matter",
"version": "chip-v1"
}
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 102,
"featureLevel": 103,
"creator": "zap",
"keyValuePairs": [
{
Expand Down
Loading

0 comments on commit 3e3aa71

Please sign in to comment.