Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bridge app test updates #18858

Merged
merged 12 commits into from
Jun 10, 2022

Conversation

jwinder-ca
Copy link
Contributor

Problem

The bridge-app example was updated to support the bridge test plan and to conform to specification changes.

Change overview

Commands were added to the bridge-app to add, remove, rename, and change the state for dynamic endpoints with a Matter aggregator(bridge).
The aggregator(bridge) was changed to use a non-zero endpoint ID to match the specification.
The bridge-app was changed so that it does not use fixed labels. (A function replaced by Action clusters).

Testing

The changes to the bridge-app were tested by running the chip-bridge-app from a Linux terminal and using chip-tool to examine the parts-list, node labels, and on-off state.

  1. Start bridge app and wait for initialization to complete
  2. Run chip-tool pairing
    chip-tool pairing ethernet 12344321 20202021 3840 localhost 5540
  3. Run chip-tool to get parts-list and verify all endpoint IDs are listed
    chip-tool descriptor read parts-list 12344321 0
  4. Run chip-tool to get parts-list for the aggregator(bridge) and verify bridged nodes are listed
    chip-tool descriptor read parts-list 12344321 1
  5. Press 2 in bridge-app to add "light 2"
  6. Run chip-tool to observe a new endpoint in parts-list
    chip-tool descriptor read parts-list 12344321 1
  7. Press 4 in the bridge-app to remove "Light 1"
  8. Run chip-tool to observe "Light 1" was removed from parts-list
    chip-tool descriptor read parts-list 12344321 1
  9. Press 5 in the bridge-app to add "Light 1"
  10. Run chip-tool to observe "Light 1" was added again (it will have a different endpoint number)
    chip-tool descriptor read parts-list 12344321 1
  11. Run chip-tool to observe the node label for "Light 1"
    ./out/host/chip-tool bridgeddevicebasic read node-label 12344321 11
  12. Press b in the bridge-app to rename Light 1
  13. Run chip-tool to observe the node label for "Light 1" changed to "Light 1b"
  14. Run chip-tool to observe on-off state for "Light 1" to see initial on-off state
    chip-tool onoff read on-off 12344321 11
  15. Press c in the bridge-app to change the on-off state of the lights
  16. Run chip-tool to observe the on-off state for "Light 1" has changed
    chip-tool onoff read on-off 12344321 11

Added single character commands to the bridge-app to support the
bridge test plan. The following commands are supported:

2 (TC-BR-2) Light 2 is added
4 (TC-BR-4) Light 1 is removed
5 (TC-BR-5) Light 1 is added back
b (TC-BR-3 step 1b) Present devices are renamed
c (TC-BR-3 step 2c) State  of Light 1 and Light 2 are changed.
Z
… ID.

The example/bridge-app was updated to use a non-zero endpoint-ID.
The bridge/aggregator is now on endpoint 1. All endpoint IDs show on both
endpoint ID 0, and the dynamic deivces added to the bridge show on the
bridge endpoint ID 1 as well.
The funcion of the fixed label is replaced by the actions cluster,
so the fixed label was removed.
@CLAassistant
Copy link

CLAassistant commented May 26, 2022

CLA assistant check
All committers have signed the CLA.

@github-actions
Copy link

github-actions bot commented Jun 9, 2022

PR #18858: Size comparison from 3bec7f6 to 0bb582b

Increases above 0.2%:

platform target config section 3bec7f6 0bb582b change % change
linux bridge-app debug+rpc (read only) 2198001 2232425 34424 1.6
(read/write) 149528 150472 944 0.6
.bss 74496 75040 544 0.7
.data.rel.ro 65400 65960 560 0.9
.init_array 720 736 16 2.2
.rodata 187840 189248 1408 0.7
.text 1851250 1883794 32544 1.8
Increases (2 builds for cc13x2_26x2, linux)
platform target config section 3bec7f6 0bb582b change % change
cc13x2_26x2 lock-ftd LP_CC2652R7 (read/write) 159344 159352 8 0.0
linux bridge-app debug+rpc (read only) 2198001 2232425 34424 1.6
(read/write) 149528 150472 944 0.6
.bss 74496 75040 544 0.7
.data.rel.ro 65400 65960 560 0.9
.got 4392 4400 8 0.2
.init_array 720 736 16 2.2
.rodata 187840 189248 1408 0.7
.text 1851250 1883794 32544 1.8
Decreases (5 builds for cc13x2_26x2, esp32, linux, nrfconnect)
platform target config section 3bec7f6 0bb582b change % change
cc13x2_26x2 lock-ftd LP_CC2652R7 (read only) 683487 683479 -8 -0.0
.text 584812 584804 -8 -0.0
esp32 all-clusters-app c3devkit (read only) 1007746 1007744 -2 -0.0
.flash.text 1007746 1007744 -2 -0.0
linux bridge-app debug+rpc .data 3888 3696 -192 -4.9
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 817132 817128 -4 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 text 789180 789176 -4 -0.0
Full report (41 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 3bec7f6 0bb582b change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 689983 689983 0 0.0
(read/write) 161784 161784 0 0.0
.bss 74660 74660 0 0.0
.data 3392 3392 0 0.0
.rodata 112335 112335 0 0.0
.text 577336 577336 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 640591 640591 0 0.0
(read/write) 158132 158132 0 0.0
.bss 73884 73884 0 0.0
.data 3332 3332 0 0.0
.rodata 89375 89375 0 0.0
.text 550896 550896 0 0.0
lock-ftd LP_CC2652R7 (read only) 683487 683479 -8 -0.0
(read/write) 159344 159352 8 0.0
.bss 72612 72612 0 0.0
.data 3256 3256 0 0.0
.rodata 98191 98191 0 0.0
.text 584812 584804 -8 -0.0
lock-mtd LP_CC2652R7 (read only) 632895 632895 0 0.0
(read/write) 145720 145720 0 0.0
.bss 68348 68348 0 0.0
.data 3256 3256 0 0.0
.rodata 98079 98079 0 0.0
.text 534324 534324 0 0.0
pump-app LP_CC2652R7 (read only) 664931 664931 0 0.0
(read/write) 178812 178812 0 0.0
.bss 72756 72756 0 0.0
.data 3292 3292 0 0.0
.rodata 86371 86371 0 0.0
.text 578076 578076 0 0.0
pump-controller-app LP_CC2652R7 (read only) 655507 655507 0 0.0
(read/write) 188340 188340 0 0.0
.bss 72860 72860 0 0.0
.data 3252 3252 0 0.0
.rodata 84259 84259 0 0.0
.text 570764 570764 0 0.0
shell LP_CC2652R7 (read only) 682262 682262 0 0.0
(read/write) 165000 165000 0 0.0
.bss 76956 76956 0 0.0
.data 3396 3396 0 0.0
.rodata 108934 108934 0 0.0
.text 573016 573016 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 602578 602578 0 0.0
.app_xip_area 461524 461524 0 0.0
.bss 84008 84008 0 0.0
.data 732 732 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 599662 599662 0 0.0
.app_xip_area 458472 458472 0 0.0
.bss 84176 84176 0 0.0
.data 700 700 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 599462 599462 0 0.0
.app_xip_area 459388 459388 0 0.0
.bss 83140 83140 0 0.0
.data 616 616 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 915064 915064 0 0.0
(read/write) 133176 133176 0 0.0
.bss 131088 131088 0 0.0
.data 2088 2088 0 0.0
.text 915056 915056 0 0.0
BRD4161A+rpc (read only) 949268 949268 0 0.0
(read/write) 149868 149868 0 0.0
.bss 147576 147576 0 0.0
.data 2292 2292 0 0.0
.text 949260 949260 0 0.0
BRD4161A+rs911x (read only) 790252 790252 0 0.0
(read/write) 129460 129460 0 0.0
.bss 127364 127364 0 0.0
.data 2096 2096 0 0.0
.text 790244 790244 0 0.0
lock-app BRD4161A+wf200 (read only) 958508 958508 0 0.0
(read/write) 128252 128252 0 0.0
.bss 126188 126188 0 0.0
.data 2064 2064 0 0.0
.text 958500 958500 0 0.0
window-app BRD4161A (read only) 900136 900136 0 0.0
(read/write) 133264 133264 0 0.0
.bss 131176 131176 0 0.0
.data 2084 2084 0 0.0
.text 900128 900128 0 0.0
esp32 all-clusters-app c3devkit (read only) 1007746 1007744 -2 -0.0
(read/write) 1481842 1481842 0 0.0
.dram0.bss 69168 69168 0 0.0
.dram0.data 14656 14656 0 0.0
.flash.rodata 212592 212592 0 0.0
.flash.text 1007746 1007744 -2 -0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1062535 1062535 0 0.0
(read/write) 483976 483976 0 0.0
.dram0.bss 74688 74688 0 0.0
.dram0.data 34200 34200 0 0.0
.flash.rodata 243092 243092 0 0.0
.flash.text 1057151 1057151 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 653792 653792 0 0.0
.bss 70044 70044 0 0.0
.data 2004 2004 0 0.0
.text 575944 575944 0 0.0
lock k32w061+release (read/write) 714900 714900 0 0.0
.bss 70484 70484 0 0.0
.data 1976 1976 0 0.0
.text 636640 636640 0 0.0
linux all-clusters-app debug (read only) 2892457 2892457 0 0.0
(read/write) 180024 180024 0 0.0
.bss 87840 87840 0 0.0
.data 2016 2016 0 0.0
.data.rel.ro 83960 83960 0 0.0
.dynamic 608 608 0 0.0
.got 4544 4544 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 255485 255485 0 0.0
.text 2462450 2462450 0 0.0
all-clusters-minimal-app debug (read only) 2753937 2753937 0 0.0
(read/write) 171640 171640 0 0.0
.bss 87008 87008 0 0.0
.data 1888 1888 0 0.0
.data.rel.ro 76584 76584 0 0.0
.dynamic 608 608 0 0.0
.got 4496 4496 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 256765 256765 0 0.0
.text 2324658 2324658 0 0.0
bridge-app debug+rpc (read only) 2198001 2232425 34424 1.6
(read/write) 149528 150472 944 0.6
.bss 74496 75040 544 0.7
.data 3888 3696 -192 -4.9
.data.rel.ro 65400 65960 560 0.9
.dynamic 608 608 0 0.0
.got 4392 4400 8 0.2
.init 27 27 0 0.0
.init_array 720 736 16 2.2
.rodata 187840 189248 1408 0.7
.text 1851250 1883794 32544 1.8
chip-tool debug (read only) 9754501 9754501 0 0.0
(read/write) 611840 611840 0 0.0
.bss 25408 25408 0 0.0
.data 1088 1088 0 0.0
.data.rel.ro 579032 579032 0 0.0
.dynamic 624 624 0 0.0
.got 5000 5000 0 0.0
.init 27 27 0 0.0
.init_array 664 664 0 0.0
.rodata 505789 505789 0 0.0
.text 7835333 7835333 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 9499564 9499564 0 0.0
(read/write) 678065 678065 0 0.0
.bss 43681 43681 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 614488 614488 0 0.0
.dynamic 528 528 0 0.0
.got 14936 14936 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 467884 467884 0 0.0
.text 7483284 7483284 0 0.0
lighting-app debug+rpc (read only) 2482385 2482385 0 0.0
(read/write) 155136 155136 0 0.0
.bss 76320 76320 0 0.0
.data 2032 2032 0 0.0
.data.rel.ro 70888 70888 0 0.0
.dynamic 608 608 0 0.0
.got 4432 4432 0 0.0
.init 27 27 0 0.0
.init_array 824 824 0 0.0
.rodata 205384 205384 0 0.0
.text 2109410 2109410 0 0.0
lock-app debug (read only) 2428353 2428353 0 0.0
(read/write) 150272 150272 0 0.0
.bss 75040 75040 0 0.0
.data 1520 1520 0 0.0
.data.rel.ro 67848 67848 0 0.0
.dynamic 608 608 0 0.0
.got 4432 4432 0 0.0
.init 27 27 0 0.0
.init_array 792 792 0 0.0
.rodata 219432 219432 0 0.0
.text 2046322 2046322 0 0.0
ota-provider-app debug (read only) 2203785 2203785 0 0.0
(read/write) 143264 143264 0 0.0
.bss 74496 74496 0 0.0
.data 1752 1752 0 0.0
.data.rel.ro 61208 61208 0 0.0
.dynamic 608 608 0 0.0
.got 4496 4496 0 0.0
.init 27 27 0 0.0
.init_array 664 664 0 0.0
.rodata 191960 191960 0 0.0
.text 1852146 1852146 0 0.0
ota-requestor-app debug (read only) 2265417 2265417 0 0.0
(read/write) 146312 146312 0 0.0
.bss 75264 75264 0 0.0
.data 1944 1944 0 0.0
.data.rel.ro 63320 63320 0 0.0
.dynamic 608 608 0 0.0
.got 4456 4456 0 0.0
.init 27 27 0 0.0
.init_array 704 704 0 0.0
.rodata 195296 195296 0 0.0
.text 1906386 1906386 0 0.0
shell debug (read only) 2584081 2584081 0 0.0
(read/write) 203200 203200 0 0.0
.bss 118728 118728 0 0.0
.data 1328 1328 0 0.0
.data.rel.ro 77392 77392 0 0.0
.dynamic 608 608 0 0.0
.got 4176 4176 0 0.0
.init 27 27 0 0.0
.init_array 944 944 0 0.0
.rodata 228050 228050 0 0.0
.text 2197410 2197410 0 0.0
thermostat-no-ble arm64 (read only) 2544028 2544028 0 0.0
(read/write) 183073 183073 0 0.0
.bss 91409 91409 0 0.0
.data 1512 1512 0 0.0
.data.rel.ro 82144 82144 0 0.0
.dynamic 528 528 0 0.0
.got 4992 4992 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 160132 160132 0 0.0
.text 2146960 2146960 0 0.0
tv-app debug (read only) 3035985 3035985 0 0.0
(read/write) 281648 281648 0 0.0
.bss 192296 192296 0 0.0
.data 4656 4656 0 0.0
.data.rel.ro 78232 78232 0 0.0
.dynamic 608 608 0 0.0
.got 4848 4848 0 0.0
.init 27 27 0 0.0
.init_array 960 960 0 0.0
.rodata 241056 241056 0 0.0
.text 2609746 2609746 0 0.0
tv-casting-app debug (read only) 5335041 5335041 0 0.0
(read/write) 224032 224032 0 0.0
.bss 80136 80136 0 0.0
.data 2416 2416 0 0.0
.data.rel.ro 135248 135248 0 0.0
.dynamic 608 608 0 0.0
.got 4712 4712 0 0.0
.init 27 27 0 0.0
.init_array 880 880 0 0.0
.rodata 340512 340512 0 0.0
.text 4643858 4643858 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2429664 2429664 0 0.0
.bss 202692 202692 0 0.0
.data 5872 5872 0 0.0
.text 1392308 1392308 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1192075 1192075 0 0.0
bss 141362 141362 0 0.0
rodata 154652 154652 0 0.0
text 817132 817128 -4 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1139783 1139783 0 0.0
bss 140579 140579 0 0.0
rodata 131144 131144 0 0.0
text 789180 789176 -4 -0.0
p6 all-clusters-app default (read/write) 2544544 2544544 0 0.0
.bss 137120 137120 0 0.0
.data 2808 2808 0 0.0
.text 1502808 1502808 0 0.0
all-clusters-minimal-app default (read/write) 2489416 2489416 0 0.0
.bss 136328 136328 0 0.0
.data 2752 2752 0 0.0
.text 1447680 1447680 0 0.0
light-app default (read/write) 2421336 2421336 0 0.0
.bss 129432 129432 0 0.0
.data 2600 2600 0 0.0
.text 1379600 1379600 0 0.0
lock-app default (read/write) 2441672 2441672 0 0.0
.bss 129256 129256 0 0.0
.data 2576 2576 0 0.0
.text 1399936 1399936 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 781728 781728 0 0.0
bss 70636 70636 0 0.0
noinit 40416 40416 0 0.0
text 552596 552596 0 0.0
lighting-app tlsr9518adk80d (read/write) 801740 801740 0 0.0
bss 70888 70888 0 0.0
noinit 40416 40416 0 0.0
text 569316 569316 0 0.0

@woody-apple
Copy link
Contributor

  - removed fixed label support from esp32 bridge-app
  - added include for identify-server.h
  - added callbacks for bridged-actions
@bzbarsky-apple bzbarsky-apple merged commit 3522f9a into project-chip:master Jun 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants