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.

Sign up for GitHub

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

Jump to bottom

[v1.3] [ESP32] Cherry-picking extended advertisement support and ble deinit crash fix #33159

Merged
merged 2 commits into from
Apr 25, 2024
Merged

[v1.3] [ESP32] Cherry-picking extended advertisement support and ble deinit crash fix #33159

merged 2 commits into from
Apr 25, 2024

Conversation

shubhamdp
Copy link
Contributor

Cherry-picking BLE Manger changes on v1.3-branch

sayondeep and others added 2 commits April 25, 2024 11:58
@sayondeep @shubhamdp
[ESP32] Enable extended ble announcement for esp32 platform (project-…
36f991b 
…chip#32389)

* enable extended ble advertisement for esp32 platform

* changed extended advertisement to extended announcement

* restlyed

* made discoverty timeout range and default dependent on extended announcement.

* help section for extended ble announcement

* fixed eliding of extended data during extended announcement.

* fixed setting of Additional data flag
@shubhamdp @restyled-commits
[ESP32] Implement BLE Manager Shutdown for nimble host (project-chip#…
9d42ca9 
…33109)

* [ESP32] Implement BLE Manager Shutdown for nimble host

- Replace ble deinit imple in Esp32AppServer with BLEMgr().Shutdown()
- Replace few ESP_LOG with ChipLog in Esp32AppServer
- Move ble deinit kCommissioningComplete switch case
- Make USE_BLE_ONLY_FOR_COMMISSIONING depends on BT_ENABLED

* Restyled by clang-format

* address reviews

* Add checks for timer handler

---------

Co-authored-by: Restyled.io <commits@restyled.io>
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 25, 2024 •
edited
Loading

PR #33159: Size comparison from 5b0afc7 to 9d42ca9

Increases (2 builds for esp32)
platform target config section 5b0afc7 9d42ca9 change % change
esp32 all-clusters-app c3devkit (read only) 1212770 1213212 442 0.0
(read/write) 1750168 1750232 64 0.0
.flash.rodata 252648 252728 80 0.0
.flash.text 1212770 1213212 442 0.0
.iram0.text 75530 75570 40 0.1
m5stack (read/write) 536744 536800 56 0.0
.flash.rodata 284364 284428 64 0.0
Decreases (6 builds for efr32, esp32)
platform target config section 5b0afc7 9d42ca9 change % change
efr32 lighting-app BRD4161A+rs9116 (read/write) 934984 934976 -8 -0.0
.text 735556 735548 -8 -0.0
BRD4187C (read/write) 1112408 1112400 -8 -0.0
.text 913748 913740 -8 -0.0
lock-app BRD4161A+wf200 (read/write) 1124492 1124484 -8 -0.0
.text 934836 934828 -8 -0.0
window-app BRD4187C (read/write) 1160344 1160336 -8 -0.0
.text 989364 989356 -8 -0.0
esp32 all-clusters-app c3devkit .dram0.bss 74344 74336 -8 -0.0
m5stack (read only) 1254823 1254155 -668 -0.1
.dram0.bss 81280 81272 -8 -0.0
.flash.text 1248659 1247991 -668 -0.1
Full report (72 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, stm32, telink)
platform target config section 5b0afc7 9d42ca9 change % change
bl602 lighting-app bl602 (read/write) 1438842 1438842 0 0.0
.bss 85368 85368 0 0.0
.data 9512 9512 0 0.0
.rodata 158444 158444 0 0.0
.text 1104868 1104868 0 0.0
bl602+mfd (read/write) 1453266 1453266 0 0.0
.bss 85536 85536 0 0.0
.data 9488 9488 0 0.0
.rodata 157404 157404 0 0.0
.text 1120186 1120186 0 0.0
bl602+rpc (read/write) 1486506 1486506 0 0.0
.bss 93416 93416 0 0.0
.data 9888 9888 0 0.0
.rodata 166012 166012 0 0.0
.text 1136514 1136514 0 0.0
bl702 lighting-app bl702 (read only) 3478 3478 0 0.0
(read/write) 1204483 1204483 0 0.0
.bss 11133 11133 0 0.0
.data 3696 3696 0 0.0
.rodata 108132 108132 0 0.0
.text 974598 974598 0 0.0
bl702+mfd (read only) 3478 3478 0 0.0
(read/write) 1215559 1215559 0 0.0
.bss 11309 11309 0 0.0
.data 3680 3680 0 0.0
.rodata 107072 107072 0 0.0
.text 986608 986608 0 0.0
bl702+rpc (read only) 3478 3478 0 0.0
(read/write) 1296223 1296223 0 0.0
.bss 19613 19613 0 0.0
.data 4240 4240 0 0.0
.rodata 123504 123504 0 0.0
.text 1049562 1049562 0 0.0
bl706-eth (read/write) 1021005 1021005 0 0.0
.bss 23708 23708 0 0.0
.data 3264 3264 0 0.0
.rodata 101128 101128 0 0.0
.text 764896 764896 0 0.0
bl706-wifi (read/write) 1255658 1255658 0 0.0
.bss 10577 10577 0 0.0
.data 3704 3704 0 0.0
.rodata 122128 122128 0 0.0
.text 996802 996802 0 0.0
bl702l lighting-app bl702l (read only) 512 512 0 0.0
(read/write) 1174048 1174048 0 0.0
.bss 16328 16328 0 0.0
.data 5064 5064 0 0.0
.rodata 102136 102136 0 0.0
.text 967696 967696 0 0.0
bl702l+mfd (read only) 512 512 0 0.0
(read/write) 1185448 1185448 0 0.0
.bss 16504 16504 0 0.0
.data 5040 5040 0 0.0
.rodata 101076 101076 0 0.0
.text 980018 980018 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 (read only) 775348 775348 0 0.0
(read/write) 168692 168692 0 0.0
.bss 90656 90656 0 0.0
.data 3580 3580 0 0.0
.rodata 82148 82148 0 0.0
.text 692932 692932 0 0.0
lock-ftd LP_EM_CC1354P10_6 (read only) 791572 791572 0 0.0
(read/write) 178924 178924 0 0.0
.bss 100904 100904 0 0.0
.data 3572 3572 0 0.0
.rodata 76220 76220 0 0.0
.text 715088 715088 0 0.0
lock-mtd LP_EM_CC1354P10_6 (read only) 780388 780388 0 0.0
(read/write) 173364 173364 0 0.0
.bss 95344 95344 0 0.0
.data 3572 3572 0 0.0
.rodata 103076 103076 0 0.0
.text 677044 677044 0 0.0
pump-app LP_EM_CC1354P10_6 (read only) 732588 732588 0 0.0
(read/write) 167652 167652 0 0.0
.bss 89388 89388 0 0.0
.data 3564 3564 0 0.0
.rodata 77804 77804 0 0.0
.text 654516 654516 0 0.0
pump-controller-app LP_EM_CC1354P10_6 (read only) 718196 718196 0 0.0
(read/write) 167876 167876 0 0.0
.bss 89612 89612 0 0.0
.data 3564 3564 0 0.0
.rodata 73580 73580 0 0.0
.text 644348 644348 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL (read only) 584234 584234 0 0.0
(read/write) 208020 208020 0 0.0
.bss 201244 201244 0 0.0
.data 1652 1652 0 0.0
.rodata 86626 86626 0 0.0
.text 495488 495488 0 0.0
lock CC3235SF_LAUNCHXL (read only) 630858 630858 0 0.0
(read/write) 208372 208372 0 0.0
.bss 201736 201736 0 0.0
.data 1516 1516 0 0.0
.rodata 107410 107410 0 0.0
.text 521328 521328 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 570239 570239 0 0.0
.app_xip_area 459949 459949 0 0.0
.bss 65108 65108 0 0.0
.data 760 760 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 552895 552895 0 0.0
.app_xip_area 437845 437845 0 0.0
.bss 69860 69860 0 0.0
.data 768 768 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 572471 572471 0 0.0
.app_xip_area 463685 463685 0 0.0
.bss 63644 63644 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
switch cyw930739m2evb_01 (read/write) 565959 565959 0 0.0
.app_xip_area 453893 453893 0 0.0
.bss 66844 66844 0 0.0
.data 800 800 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A+rs9116 (read/write) 934984 934976 -8 -0.0
.bss 197992 197992 0 0.0
.data 1412 1412 0 0.0
.text 735556 735548 -8 -0.0
BRD4187C (read/write) 1112408 1112400 -8 -0.0
.bss 195208 195208 0 0.0
.data 3432 3432 0 0.0
.text 913748 913740 -8 -0.0
lock-app BRD4161A+wf200 (read/write) 1124492 1124484 -8 -0.0
.bss 186820 186820 0 0.0
.data 2816 2816 0 0.0
.text 934836 934828 -8 -0.0
window-app BRD4187C (read/write) 1160344 1160336 -8 -0.0
.bss 167616 167616 0 0.0
.data 3344 3344 0 0.0
.text 989364 989356 -8 -0.0
esp32 all-clusters-app c3devkit (read only) 1212770 1213212 442 0.0
(read/write) 1750168 1750232 64 0.0
.dram0.bss 74344 74336 -8 -0.0
.dram0.data 13636 13636 0 0.0
.flash.rodata 252648 252728 80 0.0
.flash.text 1212770 1213212 442 0.0
.iram0.text 75530 75570 40 0.1
m5stack (read only) 1254823 1254155 -668 -0.1
(read/write) 536744 536800 56 0.0
.dram0.bss 81280 81272 -8 -0.0
.dram0.data 35180 35180 0 0.0
.flash.rodata 284364 284428 64 0.0
.flash.text 1248659 1247991 -668 -0.1
.iram0.text 125403 125403 0 0.0
k32w contact k32w0+release (read only) 606000 606000 0 0.0
(read/write) 79516 79516 0 0.0
.bss 67336 67336 0 0.0
.data 2196 2196 0 0.0
.text 605464 605464 0 0.0
k32w1+release (read only) 1024 1024 0 0.0
(read/write) 700956 700956 0 0.0
.bss 71184 71184 0 0.0
.data 2864 2864 0 0.0
.text 587528 587528 0 0.0
light k32w0+release (read only) 607960 607960 0 0.0
(read/write) 79368 79368 0 0.0
.bss 67184 67184 0 0.0
.data 2200 2200 0 0.0
.text 607424 607424 0 0.0
k32w1+release (read only) 1024 1024 0 0.0
(read/write) 792560 792560 0 0.0
.bss 80664 80664 0 0.0
.data 2064 2064 0 0.0
.text 670472 670472 0 0.0
linux air-purifier-app debug (read only) 2624861 2624861 0 0.0
(read/write) 129048 129048 0 0.0
.bss 46544 46544 0 0.0
.data 2272 2272 0 0.0
.data.rel.ro 74312 74312 0 0.0
.dynamic 608 608 0 0.0
.got 4536 4536 0 0.0
.init 27 27 0 0.0
.init_array 768 768 0 0.0
.rodata 184688 184688 0 0.0
.text 2262597 2262597 0 0.0
all-clusters-app debug (read only) 5936121 5936121 0 0.0
(read/write) 480680 480680 0 0.0
.bss 134848 134848 0 0.0
.data 4560 4560 0 0.0
.data.rel.ro 333848 333848 0 0.0
.dynamic 624 624 0 0.0
.got 5352 5352 0 0.0
.init 27 27 0 0.0
.init_array 1408 1408 0 0.0
.rodata 349904 349904 0 0.0
.text 5152371 5152371 0 0.0
all-clusters-minimal-app debug (read only) 5217017 5217017 0 0.0
(read/write) 236632 236632 0 0.0
.bss 127680 127680 0 0.0
.data 4464 4464 0 0.0
.data.rel.ro 97432 97432 0 0.0
.dynamic 624 624 0 0.0
.got 5272 5272 0 0.0
.init 27 27 0 0.0
.init_array 1136 1136 0 0.0
.rodata 288938 288938 0 0.0
.text 4692899 4692899 0 0.0
bridge-app debug (read only) 4611481 4611481 0 0.0
(read/write) 217576 217576 0 0.0
.bss 118208 118208 0 0.0
.data 6240 6240 0 0.0
.data.rel.ro 86400 86400 0 0.0
.dynamic 624 624 0 0.0
.got 5240 5240 0 0.0
.init 27 27 0 0.0
.init_array 832 832 0 0.0
.rodata 229514 229514 0 0.0
.text 4161203 4161203 0 0.0
chip-tool debug (read only) 12055793 12055793 0 0.0
(read/write) 522048 522048 0 0.0
.bss 94456 94456 0 0.0
.data 5122 5122 0 0.0
.data.rel.ro 415240 415240 0 0.0
.dynamic 624 624 0 0.0
.got 5760 5760 0 0.0
.init 27 27 0 0.0
.init_array 800 800 0 0.0
.rodata 449401 449401 0 0.0
.text 10899331 10899331 0 0.0
chip-tool-ipv6only arm64 (read only) 11374532 11374532 0 0.0
(read/write) 587880 587880 0 0.0
.bss 103544 103544 0 0.0
.data 4520 4520 0 0.0
.data.rel.ro 455128 455128 0 0.0
.dynamic 512 512 0 0.0
.got 17016 17016 0 0.0
.init 24 24 0 0.0
.init_array 264 264 0 0.0
.rodata 354836 354836 0 0.0
.text 10139832 10139832 0 0.0
lighting-app debug+rpc+ui (read only) 5535025 5535025 0 0.0
(read/write) 226304 226304 0 0.0
.bss 119144 119144 0 0.0
.data 4896 4896 0 0.0
.data.rel.ro 94736 94736 0 0.0
.dynamic 672 672 0 0.0
.got 5880 5880 0 0.0
.init 27 27 0 0.0
.init_array 944 944 0 0.0
.rodata 354516 354516 0 0.0
.text 4933363 4933363 0 0.0
lock-app debug (read only) 4678745 4678745 0 0.0
(read/write) 205128 205128 0 0.0
.bss 113632 113632 0 0.0
.data 4192 4192 0 0.0
.data.rel.ro 80616 80616 0 0.0
.dynamic 624 624 0 0.0
.got 5192 5192 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 255434 255434 0 0.0
.text 4211187 4211187 0 0.0
ota-provider-app debug (read only) 4301089 4301089 0 0.0
(read/write) 193464 193464 0 0.0
.bss 113344 113344 0 0.0
.data 4368 4368 0 0.0
.data.rel.ro 69840 69840 0 0.0
.dynamic 624 624 0 0.0
.got 4536 4536 0 0.0
.init 27 27 0 0.0
.init_array 720 720 0 0.0
.rodata 208138 208138 0 0.0
.text 3899763 3899763 0 0.0
ota-requestor-app debug (read only) 4430529 4430529 0 0.0
(read/write) 197832 197832 0 0.0
.bss 114240 114240 0 0.0
.data 4768 4768 0 0.0
.data.rel.ro 72944 72944 0 0.0
.dynamic 624 624 0 0.0
.got 4472 4472 0 0.0
.init 27 27 0 0.0
.init_array 768 768 0 0.0
.rodata 214250 214250 0 0.0
.text 4018547 4018547 0 0.0
shell debug (read only) 2904241 2904241 0 0.0
(read/write) 156632 156632 0 0.0
.bss 62768 62768 0 0.0
.data 1424 1424 0 0.0
.data.rel.ro 86656 86656 0 0.0
.dynamic 592 592 0 0.0
.got 4064 4064 0 0.0
.init 27 27 0 0.0
.init_array 1088 1088 0 0.0
.rodata 185824 185824 0 0.0
.text 2544626 2544626 0 0.0
thermostat-no-ble arm64 (read only) 4424020 4424020 0 0.0
(read/write) 243072 243072 0 0.0
.bss 121848 121848 0 0.0
.data 3408 3408 0 0.0
.data.rel.ro 103808 103808 0 0.0
.dynamic 512 512 0 0.0
.got 8656 8656 0 0.0
.init 24 24 0 0.0
.init_array 432 432 0 0.0
.rodata 159724 159724 0 0.0
.text 3929080 3929080 0 0.0
tv-app debug (read only) 5743673 5743673 0 0.0
(read/write) 352992 352992 0 0.0
.bss 244400 244400 0 0.0
.data 6560 6560 0 0.0
.data.rel.ro 94744 94744 0 0.0
.dynamic 624 624 0 0.0
.got 5488 5488 0 0.0
.init 27 27 0 0.0
.init_array 1160 1160 0 0.0
.rodata 292330 292330 0 0.0
.text 5208595 5208595 0 0.0
tv-casting-app debug (read only) 9873625 9873625 0 0.0
(read/write) 340448 340448 0 0.0
.bss 156304 156304 0 0.0
.data 3008 3008 0 0.0
.data.rel.ro 174240 174240 0 0.0
.dynamic 624 624 0 0.0
.got 5064 5064 0 0.0
.init 27 27 0 0.0
.init_array 1192 1192 0 0.0
.rodata 382680 382680 0 0.0
.text 9025091 9025091 0 0.0
mbed lock-app-release cy8cproto_062_4343w (read only) 6224 6224 0 0.0
(read/write) 2533872 2533872 0 0.0
.bss 220496 220496 0 0.0
.data 5216 5216 0 0.0
.text 1496556 1496556 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1064156 1064156 0 0.0
bss 133135 133135 0 0.0
rodata 102948 102948 0 0.0
text 780748 780748 0 0.0
nrf7002dk_nrf5340_cpuapp (read only) 4 4 0 0.0
(read/write) 1225364 1225364 0 0.0
bss 127191 127191 0 0.0
rodata 151236 151236 0 0.0
text 796916 796916 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1011596 1011596 0 0.0
bss 131993 131993 0 0.0
rodata 90212 90212 0 0.0
text 742084 742084 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 832344 832344 0 0.0
(read/write) 1801140 1801140 0 0.0
.bss 198316 198316 0 0.0
.data 2680 2680 0 0.0
.text 1591756 1591756 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 835496 835496 0 0.0
(read/write) 1723188 1723188 0 0.0
.bss 195196 195196 0 0.0
.data 2648 2648 0 0.0
.text 1516956 1516956 0 0.0
light cy8ckit_062s2_43012 (read only) 842216 842216 0 0.0
(read/write) 1642332 1642332 0 0.0
.bss 188660 188660 0 0.0
.data 2464 2464 0 0.0
.text 1442820 1442820 0 0.0
lock cy8ckit_062s2_43012 (read only) 815056 815056 0 0.0
(read/write) 1671916 1671916 0 0.0
.bss 215820 215820 0 0.0
.data 2464 2464 0 0.0
.text 1445244 1445244 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1131332 1131332 0 0.0
.bss 102508 102508 0 0.0
.data 848 848 0 0.0
.text 643712 643712 0 0.0
lock-app qpg6105+debug (read/write) 1091276 1091276 0 0.0
.bss 97252 97252 0 0.0
.data 860 860 0 0.0
.text 603660 603660 0 0.0
stm32 light STM32WB5MM-DK (read/write) 602601 602601 0 0.0
.bss 128380 128380 0 0.0
.data 688 688 0 0.0
.rodata 80020 80020 0 0.0
.text 383776 383776 0 0.0
telink air-quality-sensor-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 825466 825466 0 0.0
bss 49720 49720 0 0.0
text 617888 617888 0 0.0
all-clusters-app tlsr9518adk80d (read only) 29042 29042 0 0.0
(read/write) 1094328 1094328 0 0.0
bss 101840 101840 0 0.0
text 795006 795006 0 0.0
all-clusters-minimal-app tlsr9528a (read only) 47960 47960 0 0.0
(read/write) 1051784 1051784 0 0.0
bss 110136 110136 0 0.0
text 766324 766324 0 0.0
bridge-app tlsr9518adk80d (read only) 29042 29042 0 0.0
(read/write) 912496 912496 0 0.0
bss 93176 93176 0 0.0
text 653804 653804 0 0.0
contact-sensor-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 827082 827082 0 0.0
bss 49760 49760 0 0.0
text 619578 619578 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a (read only) 51584 51584 0 0.0
(read/write) 932808 932808 0 0.0
bss 77760 77760 0 0.0
text 699732 699732 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d (read only) 29122 29122 0 0.0
(read/write) 1075676 1075676 0 0.0
bss 100248 100248 0 0.0
text 779188 779188 0 0.0
lock-app-dfu tlsr9528a (read only) 51584 51584 0 0.0
(read/write) 905208 905208 0 0.0
bss 69232 69232 0 0.0
text 654986 654986 0 0.0
ota-requestor-app tlsr9518adk80d (read only) 29042 29042 0 0.0
(read/write) 930532 930532 0 0.0
bss 92748 92748 0 0.0
text 672264 672264 0 0.0
pump-app tlsr9258a_retention (read only) 51774 51774 0 0.0
(read/write) 829822 829822 0 0.0
bss 49868 49868 0 0.0
text 622640 622640 0 0.0
pump-controller-app tlsr9518adk80d (read only) 31872 31872 0 0.0
(read/write) 793388 793388 0 0.0
bss 56068 56068 0 0.0
text 593318 593318 0 0.0
shell tlsr9518adk80d (read only) 29042 29042 0 0.0
(read/write) 677488 677488 0 0.0
bss 73684 73684 0 0.0
text 462734 462734 0 0.0
smoke_co_alarm-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 834634 834634 0 0.0
bss 51400 51400 0 0.0
text 625952 625952 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d (read only) 32220 32220 0 0.0
(read/write) 852421 852421 0 0.0
bss 59544 59544 0 0.0
text 637410 637410 0 0.0
thermostat tlsr9518adk80d (read only) 31872 31872 0 0.0
(read/write) 819052 819052 0 0.0
bss 56364 56364 0 0.0
text 613006 613006 0 0.0
window-covering tlsr9258a (read only) 51584 51584 0 0.0
(read/write) 837144 837144 0 0.0
bss 68140 68140 0 0.0
text 628264 628264 0 0.0

@andy31415 andy31415 merged commit 7cdf4e8 into project-chip:v1.3-branch Apr 25, 2024
55 of 68 checks passed
@shubhamdp shubhamdp deleted the cherrypick_33109 branch April 25, 2024 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
config esp32 examples platform
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@shubhamdp @andy31415 @sayondeep