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

[cc13x2x7_26x2x7] Change to 16Bit UUID for Matter BLE service #11721

Merged

Conversation

andersbangGF
Copy link
Contributor

@andersbangGF andersbangGF commented Nov 12, 2021

Problem

Change overview

  • Changed to 16Bit UUID for the Matter service.
  • Fixed a bug in the name length resulting in wrong name in advertisement/scanresp packages

Testing

  • Service UUID verified by connecting with a generic BLE scanner app
  • Device commissioned with Darwin CHIPTool

@github-actions
Copy link

github-actions bot commented Nov 12, 2021

PR #11721: Size comparison from 3db50b1 to 97d67ea

Full report (38 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 3db50b1 97d67ea change % change
efr32 lighting-app BRD4161A (read only) 747600 747600 0 0.0
(read/write) 115940 115940 0 0.0
.bss 114140 114140 0 0.0
.data 1800 1800 0 0.0
.text 747592 747592 0 0.0
BRD4161A+rpc (read only) 735164 735164 0 0.0
(read/write) 132568 132568 0 0.0
.bss 130644 130644 0 0.0
.data 1924 1924 0 0.0
.text 735156 735156 0 0.0
lock-app BRD4161A (read only) 724440 724440 0 0.0
(read/write) 113724 113724 0 0.0
.bss 111964 111964 0 0.0
.data 1756 1756 0 0.0
.text 724432 724432 0 0.0
window-app BRD4161A (read only) 725352 725352 0 0.0
(read/write) 114044 114044 0 0.0
.bss 112284 112284 0 0.0
.data 1760 1760 0 0.0
.text 725344 725344 0 0.0
esp32 all-clusters-app c3devkit (read only) 822918 822918 0 0.0
(read/write) 1222330 1222330 0 0.0
.dram0.bss 56016 56016 0 0.0
.dram0.data 14092 14092 0 0.0
.flash.rodata 166976 166976 0 0.0
.flash.text 822918 822918 0 0.0
.iram0.text 61394 61394 0 0.0
m5stack (read only) 893891 893891 0 0.0
(read/write) 420504 420504 0 0.0
.dram0.bss 61104 61104 0 0.0
.dram0.data 34056 34056 0 0.0
.flash.rodata 194020 194020 0 0.0
.flash.text 888507 888507 0 0.0
.iram0.text 122987 122987 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 701008 701008 0 0.0
.bss 77508 77508 0 0.0
.data 1908 1908 0 0.0
.text 615792 615792 0 0.0
lock-app k32w061+debug (read/write) 592240 592240 0 0.0
.bss 68028 68028 0 0.0
.data 1876 1876 0 0.0
.text 516536 516536 0 0.0
shell k32w061+debug (read/write) 657908 657908 0 0.0
.bss 78820 78820 0 0.0
.data 1844 1844 0 0.0
.text 571444 571444 0 0.0
linux all-clusters-app debug (read only) 1708081 1708081 0 0.0
(read/write) 126272 126272 0 0.0
.bss 57680 57680 0 0.0
.data 1010 1010 0 0.0
.data.rel.ro 62304 62304 0 0.0
.dynamic 592 592 0 0.0
.got 4088 4088 0 0.0
.init 27 27 0 0.0
.init_array 552 552 0 0.0
.rodata 139829 139829 0 0.0
.text 1434498 1434498 0 0.0
bridge-app debug+rpc (read only) 1302149 1302149 0 0.0
(read/write) 77424 77424 0 0.0
.bss 42896 42896 0 0.0
.data 1568 1568 0 0.0
.data.rel.ro 27992 27992 0 0.0
.dynamic 592 592 0 0.0
.got 3952 3952 0 0.0
.init 27 27 0 0.0
.init_array 408 408 0 0.0
.rodata 111508 111508 0 0.0
.text 1094005 1094005 0 0.0
chip-tool debug (read only) 4580005 4580005 0 0.0
(read/write) 163880 163880 0 0.0
.bss 41192 41192 0 0.0
.data 2272 2272 0 0.0
.data.rel.ro 114976 114976 0 0.0
.dynamic 592 592 0 0.0
.got 4368 4368 0 0.0
.init 27 27 0 0.0
.init_array 472 472 0 0.0
.rodata 258922 258922 0 0.0
.text 4020101 4020101 0 0.0
lighting-app debug+rpc (read only) 1568857 1568857 0 0.0
(read/write) 110128 110128 0 0.0
.bss 48080 48080 0 0.0
.data 1202 1202 0 0.0
.data.rel.ro 55552 55552 0 0.0
.dynamic 608 608 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 536 536 0 0.0
.rodata 129457 129457 0 0.0
.text 1304978 1304978 0 0.0
ota-provider-app debug (read only) 1261625 1261625 0 0.0
(read/write) 75176 75176 0 0.0
.bss 44512 44512 0 0.0
.data 752 752 0 0.0
.data.rel.ro 24808 24808 0 0.0
.dynamic 592 592 0 0.0
.got 4016 4016 0 0.0
.init 27 27 0 0.0
.init_array 448 448 0 0.0
.rodata 112999 112999 0 0.0
.text 1051778 1051778 0 0.0
ota-requestor-app debug (read only) 1346409 1346409 0 0.0
(read/write) 78944 78944 0 0.0
.bss 46976 46976 0 0.0
.data 816 816 0 0.0
.data.rel.ro 26056 26056 0 0.0
.dynamic 592 592 0 0.0
.got 3992 3992 0 0.0
.init 27 27 0 0.0
.init_array 472 472 0 0.0
.rodata 123824 123824 0 0.0
.text 1123186 1123186 0 0.0
shell debug (read only) 788905 788905 0 0.0
(read/write) 65064 65064 0 0.0
.bss 23400 23400 0 0.0
.data 242 242 0 0.0
.data.rel.ro 36928 36928 0 0.0
.dynamic 592 592 0 0.0
.got 3528 3528 0 0.0
.init 27 27 0 0.0
.init_array 344 344 0 0.0
.rodata 77839 77839 0 0.0
.text 609170 609170 0 0.0
tv-app debug (read only) 1846841 1846841 0 0.0
(read/write) 407864 407864 0 0.0
.bss 339752 339752 0 0.0
.data 2736 2736 0 0.0
.data.rel.ro 59728 59728 0 0.0
.dynamic 592 592 0 0.0
.got 4408 4408 0 0.0
.init 27 27 0 0.0
.init_array 616 616 0 0.0
.rodata 156525 156525 0 0.0
.text 1545506 1545506 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2290392 2290392 0 0.0
.bss 179612 179612 0 0.0
.data 5216 5216 0 0.0
.heap 851616 851616 0 0.0
.text 1252992 1252992 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2273200 2273200 0 0.0
.bss 172556 172556 0 0.0
.data 5576 5576 0 0.0
.heap 858312 858312 0 0.0
.text 1235800 1235800 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2248832 2248832 0 0.0
.bss 171436 171436 0 0.0
.data 5568 5568 0 0.0
.heap 859440 859440 0 0.0
.text 1211432 1211432 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139744 1139744 0 0.0
.bss 11752 11752 0 0.0
.data 4368 4368 0 0.0
.heap 1020328 1020328 0 0.0
.text 103128 103128 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2048376 2048376 0 0.0
.bss 155912 155912 0 0.0
.data 4968 4968 0 0.0
.heap 875568 875568 0 0.0
.text 1010976 1010976 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 863515 863515 0 0.0
bss 110964 110964 0 0.0
rodata 97084 97084 0 0.0
text 579844 579844 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 825891 825891 0 0.0
bss 107316 107316 0 0.0
rodata 88276 88276 0 0.0
text 554016 554016 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 788558 788558 0 0.0
bss 112336 112336 0 0.0
rodata 92344 92344 0 0.0
text 509312 509312 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 838751 838751 0 0.0
bss 109988 109988 0 0.0
rodata 93152 93152 0 0.0
text 560148 560148 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 764046 764046 0 0.0
bss 111400 111400 0 0.0
rodata 88456 88456 0 0.0
text 489708 489708 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497327 497327 0 0.0
bss 51824 51824 0 0.0
rodata 45780 45780 0 0.0
text 339436 339436 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 844827 844827 0 0.0
bss 110128 110128 0 0.0
rodata 94860 94860 0 0.0
text 564308 564308 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 838607 838607 0 0.0
bss 110024 110024 0 0.0
rodata 93152 93152 0 0.0
text 559884 559884 0 0.0
shell nrf52840dk_nrf52840 (read/write) 775483 775483 0 0.0
bss 108736 108736 0 0.0
rodata 72160 72160 0 0.0
text 520008 520008 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 690538 690538 0 0.0
bss 109720 109720 0 0.0
rodata 66804 66804 0 0.0
text 440616 440616 0 0.0
p6 all-clusters-app default (read/write) 2298576 2298576 0 0.0
.bss 112608 112608 0 0.0
.data 2520 2520 0 0.0
.heap 918216 918216 0 0.0
.text 1256840 1256840 0 0.0
lock-app default (read/write) 2212408 2212408 0 0.0
.bss 101296 101296 0 0.0
.data 2400 2400 0 0.0
.heap 929648 929648 0 0.0
.text 1170672 1170672 0 0.0
qpg lighting-app qpg6100+debug (read only) 492636 492636 0 0.0
(read/write) 114144 114144 0 0.0
.bss 50640 50640 0 0.0
.data 1008 1008 0 0.0
.text 487316 487316 0 0.0
lock-app qpg6100+debug (read only) 467372 467372 0 0.0
(read/write) 114140 114140 0 0.0
.bss 49576 49576 0 0.0
.data 964 964 0 0.0
.text 462052 462052 0 0.0
persistent-storage-app qpg6100+debug (read only) 105408 105408 0 0.0
(read/write) 114142 114142 0 0.0
.bss 8978 8978 0 0.0
.data 272 272 0 0.0
.text 100088 100088 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 665742 665742 0 0.0
bss 69320 69320 0 0.0
noinit 33216 33216 0 0.0
text 460372 460372 0 0.0

@github-actions
Copy link

github-actions bot commented Nov 15, 2021

PR #11721: Size comparison from cde357f to 206ea34

Full report (38 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section cde357f 206ea34 change % change
efr32 lighting-app BRD4161A (read only) 750128 750128 0 0.0
(read/write) 115940 115940 0 0.0
.bss 114140 114140 0 0.0
.data 1800 1800 0 0.0
.text 750120 750120 0 0.0
BRD4161A+rpc (read only) 737692 737692 0 0.0
(read/write) 132568 132568 0 0.0
.bss 130644 130644 0 0.0
.data 1924 1924 0 0.0
.text 737684 737684 0 0.0
lock-app BRD4161A (read only) 726792 726792 0 0.0
(read/write) 113724 113724 0 0.0
.bss 111964 111964 0 0.0
.data 1756 1756 0 0.0
.text 726784 726784 0 0.0
window-app BRD4161A (read only) 727784 727784 0 0.0
(read/write) 114044 114044 0 0.0
.bss 112284 112284 0 0.0
.data 1760 1760 0 0.0
.text 727776 727776 0 0.0
esp32 all-clusters-app c3devkit (read only) 828266 828266 0 0.0
(read/write) 1226042 1226042 0 0.0
.dram0.bss 57096 57096 0 0.0
.dram0.data 14092 14092 0 0.0
.flash.rodata 169600 169600 0 0.0
.flash.text 828266 828266 0 0.0
.iram0.text 61394 61394 0 0.0
m5stack (read only) 898639 898639 0 0.0
(read/write) 424816 424816 0 0.0
.dram0.bss 62184 62184 0 0.0
.dram0.data 34056 34056 0 0.0
.flash.rodata 197252 197252 0 0.0
.flash.text 893255 893255 0 0.0
.iram0.text 122987 122987 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 702664 702664 0 0.0
.bss 77508 77508 0 0.0
.data 1908 1908 0 0.0
.text 617448 617448 0 0.0
lock-app k32w061+debug (read/write) 593672 593672 0 0.0
.bss 68028 68028 0 0.0
.data 1876 1876 0 0.0
.text 517968 517968 0 0.0
shell k32w061+debug (read/write) 659344 659344 0 0.0
.bss 78820 78820 0 0.0
.data 1844 1844 0 0.0
.text 572880 572880 0 0.0
linux all-clusters-app debug (read only) 1722641 1722641 0 0.0
(read/write) 126944 126944 0 0.0
.bss 57776 57776 0 0.0
.data 1042 1042 0 0.0
.data.rel.ro 62848 62848 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 552 552 0 0.0
.rodata 140277 140277 0 0.0
.text 1447762 1447762 0 0.0
bridge-app debug+rpc (read only) 1313045 1313045 0 0.0
(read/write) 77552 77552 0 0.0
.bss 42896 42896 0 0.0
.data 1568 1568 0 0.0
.data.rel.ro 28088 28088 0 0.0
.dynamic 592 592 0 0.0
.got 3984 3984 0 0.0
.init 27 27 0 0.0
.init_array 408 408 0 0.0
.rodata 111860 111860 0 0.0
.text 1103829 1103829 0 0.0
chip-tool debug (read only) 4921333 4921333 0 0.0
(read/write) 167336 167336 0 0.0
.bss 41192 41192 0 0.0
.data 2272 2272 0 0.0
.data.rel.ro 118384 118384 0 0.0
.dynamic 592 592 0 0.0
.got 4416 4416 0 0.0
.init 27 27 0 0.0
.init_array 472 472 0 0.0
.rodata 268178 268178 0 0.0
.text 4343125 4343125 0 0.0
lighting-app debug+rpc (read only) 1582617 1582617 0 0.0
(read/write) 110320 110320 0 0.0
.bss 48080 48080 0 0.0
.data 1234 1234 0 0.0
.data.rel.ro 55680 55680 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 536 536 0 0.0
.rodata 129873 129873 0 0.0
.text 1317666 1317666 0 0.0
ota-provider-app debug (read only) 1267641 1267641 0 0.0
(read/write) 75304 75304 0 0.0
.bss 44512 44512 0 0.0
.data 784 784 0 0.0
.data.rel.ro 24904 24904 0 0.0
.dynamic 592 592 0 0.0
.got 4016 4016 0 0.0
.init 27 27 0 0.0
.init_array 448 448 0 0.0
.rodata 113383 113383 0 0.0
.text 1057026 1057026 0 0.0
ota-requestor-app debug (read only) 1352313 1352313 0 0.0
(read/write) 79072 79072 0 0.0
.bss 46976 46976 0 0.0
.data 848 848 0 0.0
.data.rel.ro 26168 26168 0 0.0
.dynamic 592 592 0 0.0
.got 3992 3992 0 0.0
.init 27 27 0 0.0
.init_array 472 472 0 0.0
.rodata 124208 124208 0 0.0
.text 1128322 1128322 0 0.0
shell debug (read only) 793417 793417 0 0.0
(read/write) 65512 65512 0 0.0
.bss 23400 23400 0 0.0
.data 242 242 0 0.0
.data.rel.ro 37360 37360 0 0.0
.dynamic 592 592 0 0.0
.got 3528 3528 0 0.0
.init 27 27 0 0.0
.init_array 344 344 0 0.0
.rodata 77903 77903 0 0.0
.text 612434 612434 0 0.0
tv-app debug (read only) 1858457 1858457 0 0.0
(read/write) 407512 407512 0 0.0
.bss 339240 339240 0 0.0
.data 2768 2768 0 0.0
.data.rel.ro 59824 59824 0 0.0
.dynamic 592 592 0 0.0
.got 4432 4432 0 0.0
.init 27 27 0 0.0
.init_array 616 616 0 0.0
.rodata 157037 157037 0 0.0
.text 1555954 1555954 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2292496 2292496 0 0.0
.bss 179692 179692 0 0.0
.data 5216 5216 0 0.0
.heap 851536 851536 0 0.0
.text 1255096 1255096 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2274912 2274912 0 0.0
.bss 172556 172556 0 0.0
.data 5576 5576 0 0.0
.heap 858312 858312 0 0.0
.text 1237512 1237512 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2250352 2250352 0 0.0
.bss 171436 171436 0 0.0
.data 5568 5568 0 0.0
.heap 859440 859440 0 0.0
.text 1212952 1212952 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139744 1139744 0 0.0
.bss 11752 11752 0 0.0
.data 4368 4368 0 0.0
.heap 1020328 1020328 0 0.0
.text 103128 103128 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2049136 2049136 0 0.0
.bss 155912 155912 0 0.0
.data 4968 4968 0 0.0
.heap 875568 875568 0 0.0
.text 1011736 1011736 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 865287 865287 0 0.0
bss 110964 110964 0 0.0
rodata 97112 97112 0 0.0
text 581596 581596 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 827679 827679 0 0.0
bss 107320 107320 0 0.0
rodata 88304 88304 0 0.0
text 555768 555768 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 790346 790346 0 0.0
bss 112340 112340 0 0.0
rodata 92372 92372 0 0.0
text 511064 511064 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 840327 840327 0 0.0
bss 109988 109988 0 0.0
rodata 93176 93176 0 0.0
text 561700 561700 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 765626 765626 0 0.0
bss 111400 111400 0 0.0
rodata 88484 88484 0 0.0
text 491260 491260 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497327 497327 0 0.0
bss 51824 51824 0 0.0
rodata 45780 45780 0 0.0
text 339436 339436 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 846439 846439 0 0.0
bss 110128 110128 0 0.0
rodata 94888 94888 0 0.0
text 565880 565880 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 840031 840031 0 0.0
bss 110024 110024 0 0.0
rodata 93136 93136 0 0.0
text 561320 561320 0 0.0
shell nrf52840dk_nrf52840 (read/write) 775643 775643 0 0.0
bss 108744 108744 0 0.0
rodata 72192 72192 0 0.0
text 520104 520104 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 690666 690666 0 0.0
bss 109728 109728 0 0.0
rodata 66836 66836 0 0.0
text 440712 440712 0 0.0
p6 all-clusters-app default (read/write) 2301248 2301248 0 0.0
.bss 112680 112680 0 0.0
.data 2520 2520 0 0.0
.heap 918144 918144 0 0.0
.text 1259512 1259512 0 0.0
lock-app default (read/write) 2214736 2214736 0 0.0
.bss 101296 101296 0 0.0
.data 2400 2400 0 0.0
.heap 929648 929648 0 0.0
.text 1173000 1173000 0 0.0
qpg lighting-app qpg6100+debug (read only) 494340 494340 0 0.0
(read/write) 114144 114144 0 0.0
.bss 50640 50640 0 0.0
.data 1008 1008 0 0.0
.text 489020 489020 0 0.0
lock-app qpg6100+debug (read only) 468868 468868 0 0.0
(read/write) 114140 114140 0 0.0
.bss 49576 49576 0 0.0
.data 964 964 0 0.0
.text 463548 463548 0 0.0
persistent-storage-app qpg6100+debug (read only) 105408 105408 0 0.0
(read/write) 114142 114142 0 0.0
.bss 8978 8978 0 0.0
.data 272 272 0 0.0
.text 100088 100088 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 667966 667966 0 0.0
bss 69320 69320 0 0.0
noinit 33216 33216 0 0.0
text 462450 462450 0 0.0

@andy31415
Copy link
Contributor

fast track: platform specific change approved by platform maintainer

@andy31415 andy31415 merged commit 5dacd08 into project-chip:master Nov 16, 2021
@tlykkeberg-grundfos tlykkeberg-grundfos deleted the bugfix/Correct_TI_Service_UUID branch March 2, 2022 07:28
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.

[cc13x2x7_26x2x7] BLE Service UUID incorrect
5 participants