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

[OTA] QueryImageResponse status reflects command line input #13565

Merged

Conversation

carol-apple
Copy link
Contributor

Problem

Currently, when UpdateNotAvailable is specified as the command line input to ota-provider-app, the status for UpdateAvailable is still sent as part of QueryImageResponse
Fixes: #13387

Change overview

Send NotAvailable status as part of QueryImageResponse when the command line specifies UpdateNotAvailable

Testing

chip-ota-provider-app -f test.bin -q UpdateNotAvailable
chip-tool pairing onnetwork 0xBEEFFEEB 20202021
chip-ota-requestor-app -d 30 -u 5550
chip-tool pairing onnetwork-long 0x1234567890 20202021 30
chip-tool otasoftwareupdaterequestor announce-ota-provider 0x00000000BEEFFEEB 0 0 0 0x0000001234567890 0

Verified that the QueryImageResponse on the Requestor side received the correct status of 2 for NotAvailable:

[1642134593781] [30502:3780102] CHIP: [SWU] QueryImageResponse:
[1642134593781] [30502:3780102] CHIP: [SWU]   status: 2
[1642134593781] [30502:3780102] CHIP: [SWU]   delayedActionTime: 0 seconds
[1642134593781] [30502:3780102] CHIP: [SWU]   imageURI: bdx://00000000BEEFFEEB/test.bin
[1642134593781] [30502:3780102] CHIP: [SWU]   softwareVersion: 1
[1642134593781] [30502:3780102] CHIP: [SWU]   softwareVersionString: Example-Image-V0.1
[1642134593781] [30502:3780102] CHIP: [SWU]   updateToken: 32
[1642134593781] [30502:3780102] CHIP: [SWU]   userConsentNeeded: 0
[1642134593781] [30502:3780102] CHIP: [SWU]   metadataForRequestor: 0

@github-actions
Copy link

github-actions bot commented Jan 14, 2022

PR #13565: Size comparison from 5e61ce9 to 48a0143

Full report (32 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 5e61ce9 48a0143 change % change
efr32 lighting-app BRD4161A (read only) 832764 832764 0 0.0
(read/write) 127628 127628 0 0.0
.bss 125744 125744 0 0.0
.data 1884 1884 0 0.0
.text 832756 832756 0 0.0
BRD4161A+rpc (read only) 820168 820168 0 0.0
(read/write) 144288 144288 0 0.0
.bss 142304 142304 0 0.0
.data 1984 1984 0 0.0
.text 820160 820160 0 0.0
window-app BRD4161A (read only) 805424 805424 0 0.0
(read/write) 126320 126320 0 0.0
.bss 124480 124480 0 0.0
.data 1836 1836 0 0.0
.text 805416 805416 0 0.0
esp32 all-clusters-app c3devkit (read only) 910034 910034 0 0.0
(read/write) 1316506 1316506 0 0.0
.dram0.bss 70504 70504 0 0.0
.dram0.data 14284 14284 0 0.0
.flash.rodata 178224 178224 0 0.0
.flash.text 910034 910034 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 959027 959027 0 0.0
(read/write) 448672 448672 0 0.0
.dram0.bss 74976 74976 0 0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 207504 207504 0 0.0
.flash.text 953643 953643 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 657920 657920 0 0.0
.bss 77136 77136 0 0.0
.data 1852 1852 0 0.0
.text 573132 573132 0 0.0
lock k32w061+release (read/write) 661604 661604 0 0.0
.bss 77432 77432 0 0.0
.data 1872 1872 0 0.0
.text 576500 576500 0 0.0
linux chip-tool-ipv6only arm64 (read only) 8024820 8024820 0 0.0
(read/write) 370241 370241 0 0.0
.bss 55217 55217 0 0.0
.data 1096 1096 0 0.0
.data.rel.ro 245760 245760 0 0.0
.dynamic 560 560 0 0.0
.got 64472 64472 0 0.0
.init 24 24 0 0.0
.init_array 168 168 0 0.0
.rodata 417788 417788 0 0.0
.text 6819140 6819140 0 0.0
thermostat-no-ble arm64 (read only) 2041980 2041980 0 0.0
(read/write) 145969 145969 0 0.0
.bss 65089 65089 0 0.0
.data 880 880 0 0.0
.data.rel.ro 73016 73016 0 0.0
.dynamic 560 560 0 0.0
.got 4048 4048 0 0.0
.init 24 24 0 0.0
.init_array 304 304 0 0.0
.rodata 129884 129884 0 0.0
.text 1697504 1697504 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2347832 2347832 0 0.0
.bss 189204 189204 0 0.0
.data 5320 5320 0 0.0
.text 1310408 1310408 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2332416 2332416 0 0.0
.bss 180752 180752 0 0.0
.data 5560 5560 0 0.0
.text 1295016 1295016 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2304536 2304536 0 0.0
.bss 179768 179768 0 0.0
.data 5544 5544 0 0.0
.text 1267136 1267136 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139712 1139712 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103096 103096 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2054464 2054464 0 0.0
.bss 156876 156876 0 0.0
.data 4864 4864 0 0.0
.text 1017064 1017064 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 941447 941447 0 0.0
bss 119624 119624 0 0.0
rodata 108660 108660 0 0.0
text 635576 635576 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 926911 926911 0 0.0
bss 116668 116668 0 0.0
rodata 101108 101108 0 0.0
text 630968 630968 0 0.0
nrf52840dongle_nrf52840 (read/write) 992091 992091 0 0.0
bss 122464 122464 0 0.0
rodata 113412 113412 0 0.0
text 667772 667772 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 851270 851270 0 0.0
bss 116412 116412 0 0.0
rodata 101832 101832 0 0.0
text 552492 552492 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 912619 912619 0 0.0
bss 118784 118784 0 0.0
rodata 103792 103792 0 0.0
text 612672 612672 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 822686 822686 0 0.0
bss 115600 115600 0 0.0
rodata 97016 97016 0 0.0
text 529632 529632 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 541835 541835 0 0.0
bss 52588 52588 0 0.0
rodata 50104 50104 0 0.0
text 376940 376940 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 913991 913991 0 0.0
bss 118544 118544 0 0.0
rodata 104004 104004 0 0.0
text 613996 613996 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 910747 910747 0 0.0
bss 118572 118572 0 0.0
rodata 103264 103264 0 0.0
text 611448 611448 0 0.0
shell nrf52840dk_nrf52840 (read/write) 798655 798655 0 0.0
bss 109776 109776 0 0.0
rodata 78388 78388 0 0.0
text 533992 533992 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 711470 711470 0 0.0
bss 107664 107664 0 0.0
rodata 72688 72688 0 0.0
text 451672 451672 0 0.0
p6 all-clusters-app default (read/write) 2402304 2402304 0 0.0
.bss 117484 117484 0 0.0
.data 2592 2592 0 0.0
.text 1360568 1360568 0 0.0
light-app default (read/write) 2327544 2327544 0 0.0
.bss 106064 106064 0 0.0
.data 2392 2392 0 0.0
.text 1285808 1285808 0 0.0
lock-app default (read/write) 2298456 2298456 0 0.0
.bss 104920 104920 0 0.0
.data 2344 2344 0 0.0
.text 1256720 1256720 0 0.0
qpg lighting-app qpg6105+debug (read only) 561976 561976 0 0.0
(read/write) 146936 146936 0 0.0
.bss 89952 89952 0 0.0
.data 1044 1044 0 0.0
.text 556656 556656 0 0.0
lock-app qpg6105+debug (read only) 515292 515292 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88584 88584 0 0.0
.data 972 972 0 0.0
.text 509972 509972 0 0.0
persistent-storage-app qpg6105+debug (read only) 106848 106848 0 0.0
(read/write) 146940 146940 0 0.0
.bss 38512 38512 0 0.0
.data 288 288 0 0.0
.text 101528 101528 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 838462 838462 0 0.0
bss 87312 87312 0 0.0
noinit 37160 37160 0 0.0
text 585618 585618 0 0.0

@andy31415 andy31415 merged commit 251d99a into project-chip:master Jan 14, 2022
selissia pushed a commit to selissia/connectedhomeip that referenced this pull request Jan 28, 2022
step0035 pushed a commit to hank820/connectedhomeip that referenced this pull request Feb 8, 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.

OTA reference app needs updates for QueryStatus and DelayedActionTime
5 participants