Skip to content

Commit 7656f63

Browse files
kliffwongkliffwong
authored
Merge branch 'master' into mr/fix-trv-minsetpointdeadband
2 parents 94e3f1f + f23bb25 commit 7656f63

File tree

161 files changed

+153
-6052
lines changed

Some content is hidden

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

161 files changed

+153
-6052
lines changed

‎.github/workflows/build.yaml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@ jobs:
365365
scripts/run_in_build_env.sh 'virtualenv pyenv'
366366
source pyenv/bin/activate
367367
python -m ensurepip --upgrade
368+
python -m pip install coverage
368369
python -m pip install ./out/controller/python/chip_core-0.0-cp37-abi3-linux_x86_64.whl
369370
python -m pip install ./out/controller/python/chip_clusters-0.0-py3-none-any.whl
370371
python -m pip install ./out/controller/python/chip_repl-0.0-py3-none-any.whl
@@ -374,7 +375,8 @@ jobs:
374375
run: |
375376
source pyenv/bin/activate
376377
cd src/controller/python/test/unit_tests/
377-
python3 -m unittest -v
378+
python -m coverage run -m unittest -v
379+
coverage xml
378380
- name: Clean previous outputs
379381
run: rm -rf out pyenv
380382
- name: Run Python Setup Payload Generator Test
@@ -387,7 +389,13 @@ jobs:
387389
python -m pip install -r scripts/setup/requirements.setuppayload.txt
388390
python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
389391
- name: Run revocation set generation tests
390-
run: scripts/run_in_build_env.sh 'python3 -m unittest -v credentials/generate_revocation_set.py'
392+
run: |
393+
scripts/run_in_build_env.sh 'python3 -m coverage run -m unittest -v credentials/generate_revocation_set.py'
394+
coverage xml
395+
- name: Upload coverage reports to Codecov with GitHub Action
396+
uses: codecov/codecov-action@v5
397+
env:
398+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
391399

392400
build_linux_python_lighting_device:
393401
name: Build on Linux (python lighting-app)
@@ -531,7 +539,17 @@ jobs:
531539
uses: ./.github/actions/checkout-submodules-and-bootstrap
532540
with:
533541
platform: linux
534-
bootstrap-log-name: bootstrap-logs-linux-${{ matrix.build_variant }}${{ matrix.chip_tool }}
542+
bootstrap-log-name: bootstrap-logs-linux-${{ matrix.build_variant }}${{ matrix.chip_tool }}
535543

536544
- name: Run Build Coverage
537545
run: ./scripts/build_coverage.sh --yaml
546+
547+
- name: Convert output file
548+
run: |
549+
python -m pip install lcov-cobertura
550+
lcov_cobertura out/coverage/coverage/lcov_final.info
551+
552+
- name: Upload coverage reports to Codecov with GitHub Action
553+
uses: codecov/codecov-action@v5
554+
env:
555+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/examples-telink.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,10 @@ jobs:
356356
BUILD_TYPE: telink
357357

358358
runs-on: ubuntu-latest
359-
if: github.actor != 'restyled-io[bot]'
359+
# TODO: disabled due to flakes. Enable back when flakes are root caused and fixed
360+
# https://github.com/project-chip/connectedhomeip/issues/38882
361+
# if: github.actor != 'restyled-io[bot]'
362+
if: false
360363

361364
container:
362365
image: ghcr.io/project-chip/chip-build-telink-zephyr_3_3:129

‎examples/camera-app/camera-common/camera-app.matter

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2117,24 +2117,6 @@ cluster GroupKeyManagement = 63 {
21172117
fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
21182118
}
21192119

2120-
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
2121-
labels. */
2122-
cluster FixedLabel = 64 {
2123-
revision 1; // NOTE: Default/not specifically set
2124-
2125-
shared struct LabelStruct {
2126-
char_string<16> label = 0;
2127-
char_string<16> value = 1;
2128-
}
2129-
2130-
readonly attribute LabelStruct labelList[] = 0;
2131-
readonly attribute command_id generatedCommandList[] = 65528;
2132-
readonly attribute command_id acceptedCommandList[] = 65529;
2133-
readonly attribute attrib_id attributeList[] = 65531;
2134-
readonly attribute bitmap32 featureMap = 65532;
2135-
readonly attribute int16u clusterRevision = 65533;
2136-
}
2137-
21382120
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
21392121
cluster UserLabel = 65 {
21402122
revision 1; // NOTE: Default/not specifically set
@@ -3168,12 +3150,6 @@ endpoint 0 {
31683150
handle command KeySetReadAllIndicesResponse;
31693151
}
31703152

3171-
server cluster FixedLabel {
3172-
callback attribute labelList;
3173-
ram attribute featureMap default = 0;
3174-
ram attribute clusterRevision default = 1;
3175-
}
3176-
31773153
server cluster UserLabel {
31783154
callback attribute labelList;
31793155
ram attribute featureMap default = 0;

‎examples/camera-app/camera-common/camera-app.zap

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -4516,64 +4516,6 @@
45164516
}
45174517
]
45184518
},
4519-
{
4520-
"name": "Fixed Label",
4521-
"code": 64,
4522-
"mfgCode": null,
4523-
"define": "FIXED_LABEL_CLUSTER",
4524-
"side": "server",
4525-
"enabled": 1,
4526-
"attributes": [
4527-
{
4528-
"name": "LabelList",
4529-
"code": 0,
4530-
"mfgCode": null,
4531-
"side": "server",
4532-
"type": "array",
4533-
"included": 1,
4534-
"storageOption": "External",
4535-
"singleton": 0,
4536-
"bounded": 0,
4537-
"defaultValue": null,
4538-
"reportable": 1,
4539-
"minInterval": 1,
4540-
"maxInterval": 65534,
4541-
"reportableChange": 0
4542-
},
4543-
{
4544-
"name": "FeatureMap",
4545-
"code": 65532,
4546-
"mfgCode": null,
4547-
"side": "server",
4548-
"type": "bitmap32",
4549-
"included": 1,
4550-
"storageOption": "RAM",
4551-
"singleton": 0,
4552-
"bounded": 0,
4553-
"defaultValue": "0",
4554-
"reportable": 1,
4555-
"minInterval": 1,
4556-
"maxInterval": 65534,
4557-
"reportableChange": 0
4558-
},
4559-
{
4560-
"name": "ClusterRevision",
4561-
"code": 65533,
4562-
"mfgCode": null,
4563-
"side": "server",
4564-
"type": "int16u",
4565-
"included": 1,
4566-
"storageOption": "RAM",
4567-
"singleton": 0,
4568-
"bounded": 0,
4569-
"defaultValue": "1",
4570-
"reportable": 1,
4571-
"minInterval": 1,
4572-
"maxInterval": 65534,
4573-
"reportableChange": 0
4574-
}
4575-
]
4576-
},
45774519
{
45784520
"name": "User Label",
45794521
"code": 65,

‎examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.matter

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,24 +1699,6 @@ cluster GroupKeyManagement = 63 {
16991699
fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
17001700
}
17011701

1702-
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
1703-
labels. */
1704-
cluster FixedLabel = 64 {
1705-
revision 1; // NOTE: Default/not specifically set
1706-
1707-
shared struct LabelStruct {
1708-
char_string<16> label = 0;
1709-
char_string<16> value = 1;
1710-
}
1711-
1712-
readonly attribute LabelStruct labelList[] = 0;
1713-
readonly attribute command_id generatedCommandList[] = 65528;
1714-
readonly attribute command_id acceptedCommandList[] = 65529;
1715-
readonly attribute attrib_id attributeList[] = 65531;
1716-
readonly attribute bitmap32 featureMap = 65532;
1717-
readonly attribute int16u clusterRevision = 65533;
1718-
}
1719-
17201702
/** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */
17211703
cluster UserLabel = 65 {
17221704
revision 1; // NOTE: Default/not specifically set
@@ -2109,12 +2091,6 @@ endpoint 0 {
21092091
handle command KeySetReadAllIndicesResponse;
21102092
}
21112093

2112-
server cluster FixedLabel {
2113-
callback attribute labelList;
2114-
ram attribute featureMap default = 0;
2115-
ram attribute clusterRevision default = 1;
2116-
}
2117-
21182094
server cluster UserLabel {
21192095
callback attribute labelList;
21202096
callback attribute generatedCommandList;

‎examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.zap

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3041,64 +3041,6 @@
30413041
}
30423042
]
30433043
},
3044-
{
3045-
"name": "Fixed Label",
3046-
"code": 64,
3047-
"mfgCode": null,
3048-
"define": "FIXED_LABEL_CLUSTER",
3049-
"side": "server",
3050-
"enabled": 1,
3051-
"attributes": [
3052-
{
3053-
"name": "LabelList",
3054-
"code": 0,
3055-
"mfgCode": null,
3056-
"side": "server",
3057-
"type": "array",
3058-
"included": 1,
3059-
"storageOption": "External",
3060-
"singleton": 0,
3061-
"bounded": 0,
3062-
"defaultValue": null,
3063-
"reportable": 1,
3064-
"minInterval": 1,
3065-
"maxInterval": 65534,
3066-
"reportableChange": 0
3067-
},
3068-
{
3069-
"name": "FeatureMap",
3070-
"code": 65532,
3071-
"mfgCode": null,
3072-
"side": "server",
3073-
"type": "bitmap32",
3074-
"included": 1,
3075-
"storageOption": "RAM",
3076-
"singleton": 0,
3077-
"bounded": 0,
3078-
"defaultValue": "0",
3079-
"reportable": 1,
3080-
"minInterval": 1,
3081-
"maxInterval": 65534,
3082-
"reportableChange": 0
3083-
},
3084-
{
3085-
"name": "ClusterRevision",
3086-
"code": 65533,
3087-
"mfgCode": null,
3088-
"side": "server",
3089-
"type": "int16u",
3090-
"included": 1,
3091-
"storageOption": "RAM",
3092-
"singleton": 0,
3093-
"bounded": 0,
3094-
"defaultValue": "1",
3095-
"reportable": 1,
3096-
"minInterval": 1,
3097-
"maxInterval": 65534,
3098-
"reportableChange": 0
3099-
}
3100-
]
3101-
},
31023044
{
31033045
"name": "User Label",
31043046
"code": 65,

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1901,24 +1901,6 @@ cluster GroupKeyManagement = 63 {
19011901
fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
19021902
}
19031903

1904-
/** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only
1905-
labels. */
1906-
cluster FixedLabel = 64 {
1907-
revision 1; // NOTE: Default/not specifically set
1908-
1909-
shared struct LabelStruct {
1910-
char_string<16> label = 0;
1911-
char_string<16> value = 1;
1912-
}
1913-
1914-
readonly attribute LabelStruct labelList[] = 0;
1915-
readonly attribute command_id generatedCommandList[] = 65528;
1916-
readonly attribute command_id acceptedCommandList[] = 65529;
1917-
readonly attribute attrib_id attributeList[] = 65531;
1918-
readonly attribute bitmap32 featureMap = 65532;
1919-
readonly attribute int16u clusterRevision = 65533;
1920-
}
1921-
19221904
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
19231905
cluster OccupancySensing = 1030 {
19241906
revision 5;
@@ -2270,12 +2252,6 @@ endpoint 0 {
22702252
handle command KeySetReadAllIndices;
22712253
handle command KeySetReadAllIndicesResponse;
22722254
}
2273-
2274-
server cluster FixedLabel {
2275-
callback attribute labelList;
2276-
ram attribute featureMap default = 0;
2277-
ram attribute clusterRevision default = 1;
2278-
}
22792255
}
22802256
endpoint 1 {
22812257
device type ma_dimmablelight = 257, version 1;

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3560,64 +3560,6 @@
35603560
"reportableChange": 0
35613561
}
35623562
]
3563-
},
3564-
{
3565-
"name": "Fixed Label",
3566-
"code": 64,
3567-
"mfgCode": null,
3568-
"define": "FIXED_LABEL_CLUSTER",
3569-
"side": "server",
3570-
"enabled": 1,
3571-
"attributes": [
3572-
{
3573-
"name": "LabelList",
3574-
"code": 0,
3575-
"mfgCode": null,
3576-
"side": "server",
3577-
"type": "array",
3578-
"included": 1,
3579-
"storageOption": "External",
3580-
"singleton": 0,
3581-
"bounded": 0,
3582-
"defaultValue": null,
3583-
"reportable": 1,
3584-
"minInterval": 1,
3585-
"maxInterval": 65534,
3586-
"reportableChange": 0
3587-
},
3588-
{
3589-
"name": "FeatureMap",
3590-
"code": 65532,
3591-
"mfgCode": null,
3592-
"side": "server",
3593-
"type": "bitmap32",
3594-
"included": 1,
3595-
"storageOption": "RAM",
3596-
"singleton": 0,
3597-
"bounded": 0,
3598-
"defaultValue": "0",
3599-
"reportable": 1,
3600-
"minInterval": 1,
3601-
"maxInterval": 65534,
3602-
"reportableChange": 0
3603-
},
3604-
{
3605-
"name": "ClusterRevision",
3606-
"code": 65533,
3607-
"mfgCode": null,
3608-
"side": "server",
3609-
"type": "int16u",
3610-
"included": 1,
3611-
"storageOption": "RAM",
3612-
"singleton": 0,
3613-
"bounded": 0,
3614-
"defaultValue": "1",
3615-
"reportable": 1,
3616-
"minInterval": 1,
3617-
"maxInterval": 65534,
3618-
"reportableChange": 0
3619-
}
3620-
]
36213563
}
36223564
]
36233565
},

0 commit comments

Comments
 (0)