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 two CHIP_ERROR values overlapping. #12630

Merged
merged 1 commit into from
Dec 6, 2021
Merged

Fix two CHIP_ERROR values overlapping. #12630

merged 1 commit into from
Dec 6, 2021

Conversation

bzbarsky-apple
Copy link
Contributor

CHIP_ERROR_ANOTHER_COMMISSIONING_IN_PROGRESS and
CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB have the same value,
probably due to undetected merge conflict.

Problem

See above.

Change overview

See above.

Testing

Run:

/out/debug/standalone/chip-tool pairing open-commissioning-window 17 1 500 1000 3840

twice. Before this change I get:

[1638815127962] [79120:11404766] CHIP: [-] ../../../examples/chip-tool/third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:424: CHIP Error 0x000000CB: Malformed Interaction Model Command Status IB at ../../../examples/chip-tool/commands/pa

which is very much the wrong error message. After this change I get:

[1638815233427] [79773:11408303] CHIP: [-] ../../../examples/chip-tool/third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:424: CHIP Error 0x000000D6 at ../../../examples/chip-tool/commands/pairing/OpenCommissioningWindowCommand.cpp:46

@bzbarsky-apple
Fix two CHIP_ERROR values overlapping.
3c0fca8 
CHIP_ERROR_ANOTHER_COMMISSIONING_IN_PROGRESS and
CHIP_ERROR_IM_MALFORMED_COMMAND_STATUS_IB have the same value,
probably due to undetected merge conflict.
@boring-cyborg boring-cyborg bot added the lib label Dec 6, 2021
@github-actions
Copy link

github-actions bot commented Dec 6, 2021 •
edited
Loading

PR #12630: Size comparison from 299393b to 3c0fca8

Full report (39 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 299393b 3c0fca8 change % change
efr32 lighting-app BRD4161A (read only) 795576 795576 0 0.0
(read/write) 120648 120648 0 0.0
.bss 118816 118816 0 0.0
.data 1828 1828 0 0.0
.text 795568 795568 0 0.0
BRD4161A+rpc (read only) 823552 823552 0 0.0
(read/write) 138952 138952 0 0.0
.bss 137016 137016 0 0.0
.data 1936 1936 0 0.0
.text 823544 823544 0 0.0
lock-app BRD4161A (read only) 770620 770620 0 0.0
(read/write) 118580 118580 0 0.0
.bss 116792 116792 0 0.0
.data 1788 1788 0 0.0
.text 770612 770612 0 0.0
window-app BRD4161A (read only) 772908 772908 0 0.0
(read/write) 118784 118784 0 0.0
.bss 116992 116992 0 0.0
.data 1792 1792 0 0.0
.text 772900 772900 0 0.0
esp32 all-clusters-app c3devkit (read only) 851636 851636 0 0.0
(read/write) 1225298 1225298 0 0.0
.dram0.bss 56352 56352 0 0.0
.dram0.data 14052 14052 0 0.0
.flash.rodata 169440 169440 0 0.0
.flash.text 851636 851636 0 0.0
.iram0.text 61394 61394 0 0.0
m5stack (read only) 921367 921367 0 0.0
(read/write) 424276 424276 0 0.0
.dram0.bss 61736 61736 0 0.0
.dram0.data 34016 34016 0 0.0
.flash.rodata 197244 197244 0 0.0
.flash.text 915983 915983 0 0.0
.iram0.text 122943 122943 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 731188 731188 0 0.0
.bss 79312 79312 0 0.0
.data 1860 1860 0 0.0
.text 644216 644216 0 0.0
lock-app k32w061+debug (read/write) 621408 621408 0 0.0
.bss 69976 69976 0 0.0
.data 1828 1828 0 0.0
.text 543804 543804 0 0.0
shell k32w061+debug (read/write) 687300 687300 0 0.0
.bss 81624 81624 0 0.0
.data 1800 1800 0 0.0
.text 598076 598076 0 0.0
linux all-clusters-app debug (read only) 1868729 1868729 0 0.0
(read/write) 124336 124336 0 0.0
.bss 50672 50672 0 0.0
.data 1120 1120 0 0.0
.data.rel.ro 67104 67104 0 0.0
.dynamic 592 592 0 0.0
.got 4120 4120 0 0.0
.init 27 27 0 0.0
.init_array 696 696 0 0.0
.rodata 152245 152245 0 0.0
.text 1573378 1573378 0 0.0
bridge-app debug+rpc (read only) 1440725 1440725 0 0.0
(read/write) 74648 74648 0 0.0
.bss 36272 36272 0 0.0
.data 1728 1728 0 0.0
.data.rel.ro 31560 31560 0 0.0
.dynamic 592 592 0 0.0
.got 3992 3992 0 0.0
.init 27 27 0 0.0
.init_array 480 480 0 0.0
.rodata 121628 121628 0 0.0
.text 1214197 1214197 0 0.0
chip-tool debug (read only) 6636133 6636133 0 0.0
(read/write) 199752 199752 0 0.0
.bss 34536 34536 0 0.0
.data 1024 1024 0 0.0
.data.rel.ro 158520 158520 0 0.0
.dynamic 592 592 0 0.0
.got 4496 4496 0 0.0
.init 27 27 0 0.0
.init_array 568 568 0 0.0
.rodata 311512 311512 0 0.0
.text 5919893 5919893 0 0.0
lighting-app debug+rpc (read only) 1725825 1725825 0 0.0
(read/write) 107680 107680 0 0.0
.bss 41968 41968 0 0.0
.data 1280 1280 0 0.0
.data.rel.ro 59056 59056 0 0.0
.dynamic 608 608 0 0.0
.got 4144 4144 0 0.0
.init 27 27 0 0.0
.init_array 616 616 0 0.0
.rodata 142257 142257 0 0.0
.text 1440898 1440898 0 0.0
ota-provider-app debug (read only) 1398281 1398281 0 0.0
(read/write) 72848 72848 0 0.0
.bss 38848 38848 0 0.0
.data 928 928 0 0.0
.data.rel.ro 27880 27880 0 0.0
.dynamic 592 592 0 0.0
.got 4056 4056 0 0.0
.init 27 27 0 0.0
.init_array 520 520 0 0.0
.rodata 122984 122984 0 0.0
.text 1170610 1170610 0 0.0
ota-requestor-app debug (read only) 1507521 1507521 0 0.0
(read/write) 77896 77896 0 0.0
.bss 42016 42016 0 0.0
.data 992 992 0 0.0
.data.rel.ro 29656 29656 0 0.0
.dynamic 592 592 0 0.0
.got 4064 4064 0 0.0
.init 27 27 0 0.0
.init_array 544 544 0 0.0
.rodata 135728 135728 0 0.0
.text 1263154 1263154 0 0.0
shell debug (read only) 823449 823449 0 0.0
(read/write) 60616 60616 0 0.0
.bss 16936 16936 0 0.0
.data 256 256 0 0.0
.data.rel.ro 38936 38936 0 0.0
.dynamic 592 592 0 0.0
.got 3520 3520 0 0.0
.init 27 27 0 0.0
.init_array 344 344 0 0.0
.rodata 84658 84658 0 0.0
.text 631954 631954 0 0.0
tv-app debug (read only) 2042569 2042569 0 0.0
(read/write) 320032 320032 0 0.0
.bss 247288 247288 0 0.0
.data 2768 2768 0 0.0
.data.rel.ro 64168 64168 0 0.0
.dynamic 592 592 0 0.0
.got 4456 4456 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 174480 174480 0 0.0
.text 1713346 1713346 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2312064 2312064 0 0.0
.bss 179404 179404 0 0.0
.data 5184 5184 0 0.0
.heap 851856 851856 0 0.0
.text 1274640 1274640 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2298200 2298200 0 0.0
.bss 173304 173304 0 0.0
.data 5496 5496 0 0.0
.heap 857648 857648 0 0.0
.text 1260800 1260800 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2272264 2272264 0 0.0
.bss 172344 172344 0 0.0
.data 5496 5496 0 0.0
.heap 858608 858608 0 0.0
.text 1234864 1234864 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1140008 1140008 0 0.0
.bss 11756 11756 0 0.0
.data 4376 4376 0 0.0
.heap 1020312 1020312 0 0.0
.text 103392 103392 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2047472 2047472 0 0.0
.bss 156732 156732 0 0.0
.data 4872 4872 0 0.0
.heap 874840 874840 0 0.0
.text 1010072 1010072 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 894175 894175 0 0.0
bss 113756 113756 0 0.0
rodata 99632 99632 0 0.0
text 605244 605244 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 857551 857551 0 0.0
bss 110104 110104 0 0.0
rodata 90992 90992 0 0.0
text 580240 580240 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 820090 820090 0 0.0
bss 115128 115128 0 0.0
rodata 94892 94892 0 0.0
text 535576 535576 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 866263 866263 0 0.0
bss 111016 111016 0 0.0
rodata 95752 95752 0 0.0
text 584116 584116 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 792414 792414 0 0.0
bss 112428 112428 0 0.0
rodata 91040 91040 0 0.0
text 514540 514540 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497463 497463 0 0.0
bss 51820 51820 0 0.0
rodata 45852 45852 0 0.0
text 339492 339492 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 870999 870999 0 0.0
bss 110928 110928 0 0.0
rodata 97104 97104 0 0.0
text 587512 587512 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 864239 864239 0 0.0
bss 110808 110808 0 0.0
rodata 95240 95240 0 0.0
text 582744 582744 0 0.0
shell nrf52840dk_nrf52840 (read/write) 779939 779939 0 0.0
bss 109696 109696 0 0.0
rodata 73792 73792 0 0.0
text 521948 521948 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 694966 694966 0 0.0
bss 110680 110680 0 0.0
rodata 68432 68432 0 0.0
text 442548 442548 0 0.0
p6 all-clusters-app default (read/write) 2346696 2346696 0 0.0
.bss 107596 107596 0 0.0
.data 2464 2464 0 0.0
.heap 923280 923280 0 0.0
.text 1304960 1304960 0 0.0
light-app default (read/write) 2281872 2281872 0 0.0
.bss 98536 98536 0 0.0
.data 2336 2336 0 0.0
.heap 932472 932472 0 0.0
.text 1240136 1240136 0 0.0
lock-app default (read/write) 2258392 2258392 0 0.0
.bss 97416 97416 0 0.0
.data 2296 2296 0 0.0
.heap 933632 933632 0 0.0
.text 1216656 1216656 0 0.0
qpg lighting-app qpg6100+debug (read only) 513000 513000 0 0.0
(read/write) 122332 122332 0 0.0
.bss 80272 80272 0 0.0
.data 964 964 0 0.0
.text 507680 507680 0 0.0
lock-app qpg6100+debug (read only) 486808 486808 0 0.0
(read/write) 122336 122336 0 0.0
.bss 79408 79408 0 0.0
.data 920 920 0 0.0
.text 481488 481488 0 0.0
persistent-storage-app qpg6100+debug (read only) 108224 108224 0 0.0
(read/write) 122332 122332 0 0.0
.bss 36696 36696 0 0.0
.data 292 292 0 0.0
.text 102904 102904 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 797638 797638 0 0.0
bss 80332 80332 0 0.0
noinit 37160 37160 0 0.0
text 557380 557380 0 0.0

@woody-apple woody-apple added the hotfix urgent fix needed, can bypass review label Dec 6, 2021
@woody-apple woody-apple merged commit f929d1c into project-chip:master Dec 6, 2021
@bzbarsky-apple bzbarsky-apple deleted the fix-overlapping-error-codes branch December 6, 2021 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kpschoedel kpschoedel kpschoedel approved these changes

@woody-apple woody-apple woody-apple approved these changes

@yunhanw-google yunhanw-google yunhanw-google approved these changes

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

@andy31415 andy31415 Awaiting requested review from andy31415

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

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

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

@cecille cecille Awaiting requested review from cecille

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

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

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@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

@LuDuda LuDuda Awaiting requested review from LuDuda

@msandstedt msandstedt Awaiting requested review from msandstedt

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

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

Assignees
No one assigned
Labels
hotfix urgent fix needed, can bypass review lib review - pending
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bzbarsky-apple @yunhanw-google @woody-apple @kpschoedel