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

Fix short code on dnssd advertising and chip-tool #12319

Merged
merged 3 commits into from
Nov 30, 2021
Merged

Fix short code on dnssd advertising and chip-tool #12319

merged 3 commits into from
Nov 30, 2021

Conversation

cecille
Copy link
Contributor

@cecille cecille commented Nov 29, 2021

Problem

Short code is incorrect in chip-tool and in the advertisement.The short discriminator is stored the UPPER four bits of the discriminator when the code is parsed.

Change overview

Uses upper 4 bits of discriminator for short code in chip-tool and dnssd advertisement.

Testing

Manual code pairing chip-tool -> IP lighting app.

@github-actions
Copy link

github-actions bot commented Nov 29, 2021 •
edited
Loading

PR #12319: Size comparison from 7d55d2e to cc4b645

Increases (4 builds for efr32, qpg, telink)
platform target config section 7d55d2e cc4b645 change % change
efr32 lock-app BRD4161A (read only) 736144 736160 16 0.0
.text 736136 736152 16 0.0
qpg lighting-app qpg6100+debug (read only) 503096 503104 8 0.0
.text 497776 497784 8 0.0
lock-app qpg6100+debug (read only) 475804 475812 8 0.0
.text 470484 470492 8 0.0
telink lighting-app tlsr9518adk80d text 540724 540728 4 0.0
Full report (13 builds for efr32, k32w, p6, qpg, telink)
platform target config section 7d55d2e cc4b645 change % change
efr32 lighting-app BRD4161A (read only) 762200 762200 0 0.0
(read/write) 119836 119836 0 0.0
.bss 118012 118012 0 0.0
.data 1820 1820 0 0.0
.text 762192 762192 0 0.0
BRD4161A+rpc (read only) 790632 790632 0 0.0
(read/write) 138132 138132 0 0.0
.bss 136212 136212 0 0.0
.data 1920 1920 0 0.0
.text 790624 790624 0 0.0
lock-app BRD4161A (read only) 736144 736160 16 0.0
(read/write) 117540 117540 0 0.0
.bss 115764 115764 0 0.0
.data 1776 1776 0 0.0
.text 736136 736152 16 0.0
window-app BRD4161A (read only) 739208 739208 0 0.0
(read/write) 117972 117972 0 0.0
.bss 116188 116188 0 0.0
.data 1784 1784 0 0.0
.text 739200 739200 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 723320 723320 0 0.0
.bss 78292 78292 0 0.0
.data 1956 1956 0 0.0
.text 637272 637272 0 0.0
lock-app k32w061+debug (read/write) 612392 612392 0 0.0
.bss 68740 68740 0 0.0
.data 1920 1920 0 0.0
.text 535932 535932 0 0.0
shell k32w061+debug (read/write) 677712 677712 0 0.0
.bss 79892 79892 0 0.0
.data 1892 1892 0 0.0
.text 590128 590128 0 0.0
p6 all-clusters-app default (read/write) 2311304 2311304 0 0.0
.bss 114688 114688 0 0.0
.data 2544 2544 0 0.0
.heap 916112 916112 0 0.0
.text 1269568 1269568 0 0.0
lock-app default (read/write) 2223120 2223120 0 0.0
.bss 100976 100976 0 0.0
.data 2416 2416 0 0.0
.heap 929952 929952 0 0.0
.text 1181384 1181384 0 0.0
qpg lighting-app qpg6100+debug (read only) 503096 503104 8 0.0
(read/write) 114144 114144 0 0.0
.bss 50400 50400 0 0.0
.data 1024 1024 0 0.0
.text 497776 497784 8 0.0
lock-app qpg6100+debug (read only) 475804 475812 8 0.0
(read/write) 114140 114140 0 0.0
.bss 49272 49272 0 0.0
.data 980 980 0 0.0
.text 470484 470492 8 0.0
persistent-storage-app qpg6100+debug (read only) 105424 105424 0 0.0
(read/write) 114138 114138 0 0.0
.bss 12002 12002 0 0.0
.data 276 276 0 0.0
.text 100104 100104 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 777398 777398 0 0.0
bss 79236 79236 0 0.0
noinit 37160 37160 0 0.0
text 540724 540728 4 0.0

@cecille cecille mentioned this pull request Nov 29, 2021
Merged
@cecille
Fix short code on dnssd advertising and chip-tool
8280d48 
The short discriminator is the UPPER four bits of the discriminator.
@github-actions
Copy link

github-actions bot commented Nov 29, 2021 •
edited
Loading

PR #12319: Size comparison from 7d55d2e to 8280d48

Increases (15 builds for efr32, esp32, linux, nrfconnect, qpg, telink)
platform target config section 7d55d2e 8280d48 change % change
efr32 lock-app BRD4161A (read only) 736144 736160 16 0.0
.text 736136 736152 16 0.0
esp32 all-clusters-app c3devkit (read only) 836536 836540 4 0.0
.flash.text 836536 836540 4 0.0
m5stack (read only) 907919 907923 4 0.0
.flash.text 902535 902539 4 0.0
linux all-clusters-app debug (read only) 1775081 1775097 16 0.0
.text 1497746 1497762 16 0.0
chip-tool debug (read only) 6088629 6088645 16 0.0
.text 5406517 5406533 16 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 text 590116 590120 4 0.0
nrf52840dk_nrf52840+rpc text 564432 564436 4 0.0
nrf5340dk_nrf5340_cpuapp text 519580 519584 4 0.0
lock-app nrf52840dk_nrf52840 text 568388 568392 4 0.0
nrf5340dk_nrf5340_cpuapp text 497940 497944 4 0.0
pump-app nrf52840dk_nrf52840 text 572432 572436 4 0.0
pump-controller-app nrf52840dk_nrf52840 text 567512 567516 4 0.0
qpg lighting-app qpg6100+debug (read only) 503096 503104 8 0.0
.text 497776 497784 8 0.0
lock-app qpg6100+debug (read only) 475804 475812 8 0.0
.text 470484 470492 8 0.0
telink lighting-app tlsr9518adk80d text 540724 540728 4 0.0
Full report (38 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 7d55d2e 8280d48 change % change
efr32 lighting-app BRD4161A (read only) 762200 762200 0 0.0
(read/write) 119836 119836 0 0.0
.bss 118012 118012 0 0.0
.data 1820 1820 0 0.0
.text 762192 762192 0 0.0
BRD4161A+rpc (read only) 790632 790632 0 0.0
(read/write) 138132 138132 0 0.0
.bss 136212 136212 0 0.0
.data 1920 1920 0 0.0
.text 790624 790624 0 0.0
lock-app BRD4161A (read only) 736144 736160 16 0.0
(read/write) 117540 117540 0 0.0
.bss 115764 115764 0 0.0
.data 1776 1776 0 0.0
.text 736136 736152 16 0.0
window-app BRD4161A (read only) 739208 739208 0 0.0
(read/write) 117972 117972 0 0.0
.bss 116188 116188 0 0.0
.data 1784 1784 0 0.0
.text 739200 739200 0 0.0
esp32 all-clusters-app c3devkit (read only) 836536 836540 4 0.0
(read/write) 1224474 1224474 0 0.0
.dram0.bss 59144 59144 0 0.0
.dram0.data 14100 14100 0 0.0
.flash.rodata 165968 165968 0 0.0
.flash.text 836536 836540 4 0.0
.iram0.text 61394 61394 0 0.0
m5stack (read only) 907919 907923 4 0.0
(read/write) 423692 423692 0 0.0
.dram0.bss 64536 64536 0 0.0
.dram0.data 34072 34072 0 0.0
.flash.rodata 193804 193804 0 0.0
.flash.text 902535 902539 4 0.0
.iram0.text 122943 122943 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 723320 723320 0 0.0
.bss 78292 78292 0 0.0
.data 1956 1956 0 0.0
.text 637272 637272 0 0.0
lock-app k32w061+debug (read/write) 612392 612392 0 0.0
.bss 68740 68740 0 0.0
.data 1920 1920 0 0.0
.text 535932 535932 0 0.0
shell k32w061+debug (read/write) 677712 677712 0 0.0
.bss 79892 79892 0 0.0
.data 1892 1892 0 0.0
.text 590128 590128 0 0.0
linux all-clusters-app debug (read only) 1775081 1775097 16 0.0
(read/write) 131544 131544 0 0.0
.bss 60144 60144 0 0.0
.data 1170 1170 0 0.0
.data.rel.ro 64928 64928 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 576 576 0 0.0
.rodata 138965 138965 0 0.0
.text 1497746 1497762 16 0.0
bridge-app debug+rpc (read only) 1349405 1349405 0 0.0
(read/write) 77856 77856 0 0.0
.bss 41744 41744 0 0.0
.data 1680 1680 0 0.0
.data.rel.ro 29384 29384 0 0.0
.dynamic 592 592 0 0.0
.got 3984 3984 0 0.0
.init 27 27 0 0.0
.init_array 424 424 0 0.0
.rodata 113596 113596 0 0.0
.text 1135717 1135717 0 0.0
chip-tool debug (read only) 6088629 6088645 16 0.0
(read/write) 198808 198808 0 0.0
.bss 40096 40096 0 0.0
.data 1136 1136 0 0.0
.data.rel.ro 152000 152000 0 0.0
.dynamic 592 592 0 0.0
.got 4456 4456 0 0.0
.init 27 27 0 0.0
.init_array 496 496 0 0.0
.rodata 292840 292840 0 0.0
.text 5406517 5406533 16 0.0
lighting-app debug+rpc (read only) 1629065 1629065 0 0.0
(read/write) 111104 111104 0 0.0
.bss 47440 47440 0 0.0
.data 1362 1362 0 0.0
.data.rel.ro 56976 56976 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 552 552 0 0.0
.rodata 131889 131889 0 0.0
.text 1359458 1359458 0 0.0
ota-provider-app debug (read only) 1310401 1310401 0 0.0
(read/write) 76312 76312 0 0.0
.bss 44320 44320 0 0.0
.data 912 912 0 0.0
.data.rel.ro 25944 25944 0 0.0
.dynamic 592 592 0 0.0
.got 4048 4048 0 0.0
.init 27 27 0 0.0
.init_array 464 464 0 0.0
.rodata 114896 114896 0 0.0
.text 1095154 1095154 0 0.0
ota-requestor-app debug (read only) 1406873 1406873 0 0.0
(read/write) 80144 80144 0 0.0
.bss 46752 46752 0 0.0
.data 976 976 0 0.0
.data.rel.ro 27272 27272 0 0.0
.dynamic 592 592 0 0.0
.got 4032 4032 0 0.0
.init 27 27 0 0.0
.init_array 488 488 0 0.0
.rodata 126400 126400 0 0.0
.text 1177330 1177330 0 0.0
shell debug (read only) 820321 820321 0 0.0
(read/write) 66936 66936 0 0.0
.bss 23496 23496 0 0.0
.data 338 338 0 0.0
.data.rel.ro 38560 38560 0 0.0
.dynamic 592 592 0 0.0
.got 3560 3560 0 0.0
.init 27 27 0 0.0
.init_array 360 360 0 0.0
.rodata 79023 79023 0 0.0
.text 634610 634610 0 0.0
tv-app debug (read only) 1921377 1921377 0 0.0
(read/write) 319072 319072 0 0.0
.bss 250264 250264 0 0.0
.data 1632 1632 0 0.0
.data.rel.ro 61480 61480 0 0.0
.dynamic 592 592 0 0.0
.got 4432 4432 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 160872 160872 0 0.0
.text 1612162 1612162 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2294976 2294976 0 0.0
.bss 181884 181884 0 0.0
.data 5240 5240 0 0.0
.heap 849320 849320 0 0.0
.text 1257576 1257576 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2280256 2280256 0 0.0
.bss 172492 172492 0 0.0
.data 5600 5600 0 0.0
.heap 858352 858352 0 0.0
.text 1242856 1242856 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2253336 2253336 0 0.0
.bss 171308 171308 0 0.0
.data 5584 5584 0 0.0
.heap 859552 859552 0 0.0
.text 1215936 1215936 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) 2050936 2050936 0 0.0
.bss 156496 156496 0 0.0
.data 4984 4984 0 0.0
.heap 874968 874968 0 0.0
.text 1013536 1013536 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 875611 875611 0 0.0
bss 112660 112660 0 0.0
rodata 97188 97188 0 0.0
text 590116 590120 4 0.0
nrf52840dk_nrf52840+rpc (read/write) 838187 838187 0 0.0
bss 109012 109012 0 0.0
rodata 88436 88436 0 0.0
text 564432 564436 4 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 800650 800650 0 0.0
bss 114036 114036 0 0.0
rodata 92444 92444 0 0.0
text 519580 519584 4 0.0
lock-app nrf52840dk_nrf52840 (read/write) 846539 846539 0 0.0
bss 109700 109700 0 0.0
rodata 92972 92972 0 0.0
text 568388 568392 4 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 771810 771810 0 0.0
bss 111108 111108 0 0.0
rodata 88260 88260 0 0.0
text 497940 497944 4 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) 852511 852511 0 0.0
bss 109836 109836 0 0.0
rodata 94680 94680 0 0.0
text 572432 572436 4 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 845619 845619 0 0.0
bss 109712 109712 0 0.0
rodata 92844 92844 0 0.0
text 567512 567516 4 0.0
shell nrf52840dk_nrf52840 (read/write) 778447 778447 0 0.0
bss 109180 109180 0 0.0
rodata 73084 73084 0 0.0
text 521576 521576 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 693482 693482 0 0.0
bss 110164 110164 0 0.0
rodata 67724 67724 0 0.0
text 442184 442184 0 0.0
p6 all-clusters-app default (read/write) 2311304 2311304 0 0.0
.bss 114688 114688 0 0.0
.data 2544 2544 0 0.0
.heap 916112 916112 0 0.0
.text 1269568 1269568 0 0.0
lock-app default (read/write) 2223120 2223120 0 0.0
.bss 100976 100976 0 0.0
.data 2416 2416 0 0.0
.heap 929952 929952 0 0.0
.text 1181384 1181384 0 0.0
qpg lighting-app qpg6100+debug (read only) 503096 503104 8 0.0
(read/write) 114144 114144 0 0.0
.bss 50400 50400 0 0.0
.data 1024 1024 0 0.0
.text 497776 497784 8 0.0
lock-app qpg6100+debug (read only) 475804 475812 8 0.0
(read/write) 114140 114140 0 0.0
.bss 49272 49272 0 0.0
.data 980 980 0 0.0
.text 470484 470492 8 0.0
persistent-storage-app qpg6100+debug (read only) 105424 105424 0 0.0
(read/write) 114138 114138 0 0.0
.bss 12002 12002 0 0.0
.data 276 276 0 0.0
.text 100104 100104 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 777398 777398 0 0.0
bss 79236 79236 0 0.0
noinit 37160 37160 0 0.0
text 540724 540728 4 0.0

@andy31415
Copy link
Contributor

fast track: trivial change with checkmarks.

woody-apple and others added 2 commits November 29, 2021 19:28
@woody-apple @tcarmelveilleux
Update src/controller/SetUpCodePairer.cpp
90ca7bf 
Co-authored-by: Tennessee Carmel-Veilleux <[email protected]>
@woody-apple @tcarmelveilleux
Update src/app/server/Dnssd.cpp
9f72deb 
Co-authored-by: Tennessee Carmel-Veilleux <[email protected]>
@woody-apple woody-apple merged commit e1c501d into project-chip:master Nov 30, 2021
@cecille cecille deleted the short_code branch December 2, 2021 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Damian-Nordic Damian-Nordic Damian-Nordic approved these changes

@vivien-apple vivien-apple vivien-apple approved these changes

@andy31415 andy31415 andy31415 approved these changes

@tcarmelveilleux tcarmelveilleux tcarmelveilleux approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@austinh0 austinh0 Awaiting requested review from austinh0

@balducci-apple balducci-apple Awaiting requested review from balducci-apple

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chulspro chulspro Awaiting requested review from chulspro

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@franck-apple franck-apple Awaiting requested review from franck-apple

@hawk248 hawk248 Awaiting requested review from hawk248

@holbrookt holbrookt Awaiting requested review from holbrookt

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@kghost kghost Awaiting requested review from kghost

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@LuDuda LuDuda Awaiting requested review from LuDuda

@lzgrablic02 lzgrablic02 Awaiting requested review from lzgrablic02

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@pan-apple pan-apple Awaiting requested review from pan-apple

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@turon turon Awaiting requested review from turon

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

Assignees
No one assigned
Labels
app controller fast track review - pending
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@cecille @andy31415 @tcarmelveilleux @vivien-apple @Damian-Nordic @woody-apple