Skip to content

Commit

Permalink
Merge branch 'project-chip:master' into feature/silabs_remove_light_s…
Browse files Browse the repository at this point in the history
…witchNCP
  • Loading branch information
Sarthak-Shaha authored Oct 15, 2023
2 parents 70b46d7 + eac0c7c commit 64aaeb7
Show file tree
Hide file tree
Showing 189 changed files with 5,919 additions and 4,746 deletions.
2 changes: 2 additions & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,8 @@ LightingApp
LightingColor
LightingState
LinkSoftwareAndDocumentationPack
lladdr
LLADDR
LocalConfigDisabled
localedef
localhost
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-efr32:8
image: ghcr.io/project-chip/chip-build-efr32:19
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4
- name: Checkout submodules & Bootstrap
uses: ./.github/actions/checkout-submodules-and-bootstrap
with:
Expand All @@ -58,9 +58,9 @@ jobs:
- name: Test SLC gen
timeout-minutes: 30
run: |
scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4187C --slc_generate --docker
scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4164A --slc_generate --docker
rm -rf ./out/
scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4187C --slc_generate --docker
scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4164A --slc_generate --docker
rm -rf ./out/
- name: Build some BRD4187C variants (1)
run: |
./scripts/run_in_build_env.sh \
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/java-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
--app-args "--discriminator 3840 --interface-id -1" \
--tool-path out/linux-x64-java-matter-controller \
--tool-cluster "im" \
--tool-args "onnetwork-long-im-read --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
--tool-args "onnetwork-long-im-read --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 3000" \
--factoryreset \
'
- name: Run IM Write Test
Expand All @@ -162,7 +162,7 @@ jobs:
--app-args "--discriminator 3840 --interface-id -1" \
--tool-path out/linux-x64-java-matter-controller \
--tool-cluster "im" \
--tool-args "onnetwork-long-im-subscribe --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
--tool-args "onnetwork-long-im-subscribe --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 3000" \
--factoryreset \
'
- name: Run Pairing AlreadyDiscovered Test
Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
--app-args "--discriminator 3840 --interface-id -1" \
--tool-path out/linux-x64-kotlin-matter-controller \
--tool-cluster "im" \
--tool-args "onnetwork-long-im-read --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
--tool-args "onnetwork-long-im-read --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 3000" \
--factoryreset \
'
- name: Run Kotlin IM Write Test
Expand All @@ -251,7 +251,7 @@ jobs:
--app-args "--discriminator 3840 --interface-id -1" \
--tool-path out/linux-x64-kotlin-matter-controller \
--tool-cluster "im" \
--tool-args "onnetwork-long-im-subscribe --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
--tool-args "onnetwork-long-im-subscribe --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 3000" \
--factoryreset \
'
- name: Uploading core files
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1805,7 +1805,7 @@ endpoint 0 {
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster OtaSoftwareUpdateRequestor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -5845,5 +5845,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -23371,5 +23371,6 @@
"endpointId": 65534,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -4059,7 +4059,7 @@ endpoint 0 {
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster OtaSoftwareUpdateRequestor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -12183,5 +12183,6 @@
"endpointId": 65534,
"networkId": 0
}
]
],
"log": []
}
2 changes: 1 addition & 1 deletion examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1674,7 +1674,7 @@ endpoint 0 {
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster LocalizationConfiguration {
Expand Down
5 changes: 3 additions & 2 deletions examples/bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -5705,5 +5705,6 @@
"endpointId": 2,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -1527,7 +1527,7 @@ endpoint 0 {
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster OtaSoftwareUpdateRequestor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -4779,5 +4779,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -1774,7 +1774,7 @@ endpoint 0 {
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster GeneralCommissioning {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -7827,5 +7827,6 @@
"endpointId": 5,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -1720,7 +1720,7 @@ endpoint 0 {
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster OtaSoftwareUpdateRequestor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -6062,5 +6062,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -1489,7 +1489,7 @@ endpoint 0 {
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster OtaSoftwareUpdateRequestor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -3906,5 +3906,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -1556,7 +1556,7 @@ endpoint 0 {
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster OtaSoftwareUpdateRequestor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -3902,5 +3902,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@ endpoint 0 {
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster OtaSoftwareUpdateRequestor {
Expand Down
5 changes: 3 additions & 2 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -3084,5 +3084,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -1393,7 +1393,7 @@ endpoint 0 {
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster OtaSoftwareUpdateRequestor {
Expand Down
5 changes: 3 additions & 2 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -3516,5 +3516,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ endpoint 0 {
callback attribute acceptedCommandList default = 0;
callback attribute attributeList default = 0;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster LocalizationConfiguration {
Expand Down
5 changes: 3 additions & 2 deletions examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -3517,5 +3517,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1689,7 +1689,7 @@ endpoint 0 {
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;
}

server cluster OtaSoftwareUpdateRequestor {
Expand Down
Loading

0 comments on commit 64aaeb7

Please sign in to comment.