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

[nrfconnect] Fix window-covering app build after adding EnableKey #20786

Merged
merged 1 commit into from
Jul 15, 2022
Merged

[nrfconnect] Fix window-covering app build after adding EnableKey #20786

merged 1 commit into from
Jul 15, 2022

Conversation

ArekBalysNordic
Copy link
Contributor

Problem

The nRF Connect window-covering app didn't build correctly after recent
changes.

Change overview

The fix is to move using the namespaces into another place in the code.

This change needs to be also applied in the SVE branch. (https://github.com/project-chip/connectedhomeip/tree/sve)

Testing

Tested on nRF52DK

@ArekBalysNordic
[nrfconnect] Fix window-covering app build after adding EnableKey
e24d089 
The nRF Connect window-covering app didn't build correctly after recent
changes.

The fix is to move using the namespaces into another place in the code.

This change needs to be also applied in the SVE branch.
@github-actions
Copy link

github-actions bot commented Jul 15, 2022 •
edited
Loading

PR #20786: Size comparison from 0eaa37c to e24d089

Increases (4 builds for cc13x2_26x2, cyw30739, esp32, nrfconnect)
platform target config section 0eaa37c e24d089 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 183768 183776 8 0.0
cyw30739 ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 584614 584622 8 0.0
.app_xip_area 464168 464176 8 0.0
esp32 all-clusters-app c3devkit (read only) 1020430 1020432 2 0.0
.flash.text 1020430 1020432 2 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 text 819764 819768 4 0.0
Decreases (4 builds for bl602, cc13x2_26x2, telink)
platform target config section 0eaa37c e24d089 change % change
bl602 lighting-app bl602 .text 1059056 1059052 -4 -0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 667471 667463 -8 -0.0
.text 578980 578972 -8 -0.0
telink light-switch-app tlsr9518adk80d text 565998 565994 -4 -0.0
lighting-app tlsr9518adk80d text 582320 582318 -2 -0.0
Full report (51 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 0eaa37c e24d089 change % change
bl602 lighting-app bl602 (read/write) 1398090 1398090 0 0.0
.bss 116978 116978 0 0.0
.data 4480 4480 0 0.0
.text 1059056 1059052 -4 -0.0
bl602+rpc (read/write) 1443522 1443522 0 0.0
.bss 124418 124418 0 0.0
.data 4600 4600 0 0.0
.text 1090740 1090740 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 667471 667463 -8 -0.0
(read/write) 183768 183776 8 0.0
.bss 74132 74132 0 0.0
.data 3356 3356 0 0.0
.rodata 88175 88175 0 0.0
.text 578980 578972 -8 -0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 633255 633255 0 0.0
(read/write) 157700 157700 0 0.0
.bss 73428 73428 0 0.0
.data 3356 3356 0 0.0
.rodata 77415 77415 0 0.0
.text 555516 555516 0 0.0
lock-ftd LP_CC2652R7 (read only) 670827 670827 0 0.0
(read/write) 170588 170588 0 0.0
.bss 71196 71196 0 0.0
.data 3280 3280 0 0.0
.rodata 76315 76315 0 0.0
.text 594032 594032 0 0.0
lock-mtd LP_CC2652R7 (read only) 653087 653087 0 0.0
(read/write) 184016 184016 0 0.0
.bss 66884 66884 0 0.0
.data 3280 3280 0 0.0
.rodata 101047 101047 0 0.0
.text 551560 551560 0 0.0
pump-app LP_CC2652R7 (read only) 679947 679947 0 0.0
(read/write) 162316 162316 0 0.0
.bss 71276 71276 0 0.0
.data 3280 3280 0 0.0
.rodata 88731 88731 0 0.0
.text 590732 590732 0 0.0
pump-controller-app LP_CC2652R7 (read only) 665771 665771 0 0.0
(read/write) 176612 176612 0 0.0
.bss 71396 71396 0 0.0
.data 3276 3276 0 0.0
.rodata 84595 84595 0 0.0
.text 580696 580696 0 0.0
shell LP_CC2652R7 (read only) 659954 659954 0 0.0
(read/write) 186788 186788 0 0.0
.bss 76436 76436 0 0.0
.data 3360 3360 0 0.0
.rodata 84946 84946 0 0.0
.text 574692 574692 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 581286 581286 0 0.0
.app_xip_area 459992 459992 0 0.0
.bss 64232 64232 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 587242 587242 0 0.0
.app_xip_area 461220 461220 0 0.0
.bss 68960 68960 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 584614 584622 8 0.0
.app_xip_area 464168 464176 8 0.0
.bss 63440 63440 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1083528 1083528 0 0.0
.bss 133044 133044 0 0.0
.data 2048 2048 0 0.0
.text 948416 948416 0 0.0
BRD4161A+rpc (read/write) 1137844 1137844 0 0.0
.bss 149724 149724 0 0.0
.data 2260 2260 0 0.0
.text 985836 985836 0 0.0
BRD4161A+rs911x (read/write) 948768 948768 0 0.0
.bss 140768 140768 0 0.0
.data 2048 2048 0 0.0
.text 805932 805932 0 0.0
lock-app BRD4161A+wf200 (read/write) 1129456 1129456 0 0.0
.bss 144184 144184 0 0.0
.data 2060 2060 0 0.0
.text 983192 983192 0 0.0
window-app BRD4161A (read/write) 1077332 1077332 0 0.0
.bss 134516 134516 0 0.0
.data 2076 2076 0 0.0
.text 940720 940720 0 0.0
esp32 all-clusters-app c3devkit (read only) 1020430 1020432 2 0.0
(read/write) 1485874 1485874 0 0.0
.dram0.bss 70080 70080 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 215760 215760 0 0.0
.flash.text 1020430 1020432 2 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1074383 1074383 0 0.0
(read/write) 487928 487928 0 0.0
.dram0.bss 75600 75600 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246188 246188 0 0.0
.flash.text 1068999 1068999 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 660012 660012 0 0.0
.bss 69540 69540 0 0.0
.data 1992 1992 0 0.0
.text 582680 582680 0 0.0
lock k32w061+release (read/write) 686876 686876 0 0.0
.bss 70004 70004 0 0.0
.data 2004 2004 0 0.0
.text 609068 609068 0 0.0
linux all-clusters-app debug (read only) 2965305 2965305 0 0.0
(read/write) 155016 155016 0 0.0
.bss 61664 61664 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 85048 85048 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 1056 1056 0 0.0
.rodata 264541 264541 0 0.0
.text 2523074 2523074 0 0.0
all-clusters-minimal-app debug (read only) 2814473 2814473 0 0.0
(read/write) 146688 146688 0 0.0
.bss 60864 60864 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 77608 77608 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1048 1048 0 0.0
.rodata 265533 265533 0 0.0
.text 2373906 2373906 0 0.0
bridge-app debug+rpc (read only) 2316025 2316025 0 0.0
(read/write) 125504 125504 0 0.0
.bss 48928 48928 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 66984 66984 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 198208 198208 0 0.0
.text 1956082 1956082 0 0.0
chip-tool debug (read only) 10188937 10188937 0 0.0
(read/write) 618080 618080 0 0.0
.bss 24728 24728 0 0.0
.data 3234 3234 0 0.0
.data.rel.ro 583728 583728 0 0.0
.dynamic 608 608 0 0.0
.got 5096 5096 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 511861 511861 0 0.0
.text 8255732 8255732 0 0.0
chip-tool-ipv6only arm64 (read only) 9935292 9935292 0 0.0
(read/write) 683089 683089 0 0.0
.bss 42961 42961 0 0.0
.data 3304 3304 0 0.0
.data.rel.ro 619368 619368 0 0.0
.dynamic 528 528 0 0.0
.got 13528 13528 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 476060 476060 0 0.0
.text 7906324 7906324 0 0.0
lighting-app debug+rpc (read only) 2552249 2552249 0 0.0
(read/write) 129528 129528 0 0.0
.bss 49440 49440 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72136 72136 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 213896 213896 0 0.0
.text 2168386 2168386 0 0.0
lock-app debug (read only) 2516985 2516985 0 0.0
(read/write) 124512 124512 0 0.0
.bss 47840 47840 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69096 69096 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 792 792 0 0.0
.rodata 228936 228936 0 0.0
.text 2122882 2122882 0 0.0
ota-provider-app debug (read only) 2322865 2322865 0 0.0
(read/write) 118312 118312 0 0.0
.bss 47488 47488 0 0.0
.data 1944 1944 0 0.0
.data.rel.ro 63096 63096 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 203704 203704 0 0.0
.text 1956386 1956386 0 0.0
ota-requestor-app debug (read only) 2440233 2440233 0 0.0
(read/write) 125248 125248 0 0.0
.bss 49856 49856 0 0.0
.data 2232 2232 0 0.0
.data.rel.ro 67304 67304 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 207488 207488 0 0.0
.text 2061570 2061570 0 0.0
shell debug (read only) 2552225 2552225 0 0.0
(read/write) 141104 141104 0 0.0
.bss 57448 57448 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 76688 76688 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 227954 227954 0 0.0
.text 2167170 2167170 0 0.0
thermostat-no-ble arm64 (read only) 2596308 2596308 0 0.0
(read/write) 158289 158289 0 0.0
.bss 65249 65249 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 83240 83240 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 165668 165668 0 0.0
.text 2190864 2190864 0 0.0
tv-app debug (read only) 3102833 3102833 0 0.0
(read/write) 257704 257704 0 0.0
.bss 167016 167016 0 0.0
.data 4848 4848 0 0.0
.data.rel.ro 79392 79392 0 0.0
.dynamic 608 608 0 0.0
.got 4848 4848 0 0.0
.init 27 27 0 0.0
.init_array 952 952 0 0.0
.rodata 249216 249216 0 0.0
.text 2665714 2665714 0 0.0
tv-casting-app debug (read only) 5327249 5327249 0 0.0
(read/write) 156848 156848 0 0.0
.bss 50248 50248 0 0.0
.data 2416 2416 0 0.0
.data.rel.ro 97928 97928 0 0.0
.dynamic 608 608 0 0.0
.got 4744 4744 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 331529 331529 0 0.0
.text 4730370 4730370 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2448592 2448592 0 0.0
.bss 213940 213940 0 0.0
.data 5872 5872 0 0.0
.text 1411236 1411236 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1175703 1175703 0 0.0
bss 142900 142900 0 0.0
rodata 142064 142064 0 0.0
text 811828 811828 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1155899 1155899 0 0.0
bss 142136 142136 0 0.0
rodata 133612 133612 0 0.0
text 801272 801272 0 0.0
lighting-app nrf52840dk_nrf52840 (read/write) 1167127 1167127 0 0.0
bss 144463 144463 0 0.0
rodata 124040 124040 0 0.0
text 819764 819768 4 0.0
nrf52840dk_nrf52840+rpc (read/write) 1137399 1137399 0 0.0
bss 144892 144892 0 0.0
rodata 115512 115512 0 0.0
text 797744 797744 0 0.0
nrf52840dongle_nrf52840 (read/write) 1073651 1073651 0 0.0
bss 151694 151694 0 0.0
rodata 93060 93060 0 0.0
text 747768 747768 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 1070682 1070682 0 0.0
bss 140834 140834 0 0.0
rodata 116456 116456 0 0.0
text 732312 732312 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 1127931 1127931 0 0.0
bss 135431 135431 0 0.0
rodata 141884 141884 0 0.0
text 771796 771796 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 1031622 1031622 0 0.0
bss 131834 131834 0 0.0
rodata 134356 134356 0 0.0
text 684408 684408 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 1079851 1079851 0 0.0
bss 134358 134358 0 0.0
rodata 117388 117388 0 0.0
text 749272 749272 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 1067835 1067835 0 0.0
bss 134153 134153 0 0.0
rodata 114172 114172 0 0.0
text 740600 740600 0 0.0
p6 all-clusters-app default (read/write) 2566968 2566968 0 0.0
.bss 149120 149120 0 0.0
.data 2776 2776 0 0.0
.text 1525232 1525232 0 0.0
all-clusters-minimal-app default (read/write) 2512264 2512264 0 0.0
.bss 148400 148400 0 0.0
.data 2776 2776 0 0.0
.text 1470528 1470528 0 0.0
light-app default (read/write) 2442208 2442208 0 0.0
.bss 140456 140456 0 0.0
.data 2592 2592 0 0.0
.text 1400472 1400472 0 0.0
lock-app default (read/write) 2469352 2469352 0 0.0
.bss 140304 140304 0 0.0
.data 2600 2600 0 0.0
.text 1427616 1427616 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 797804 797804 0 0.0
bss 70576 70576 0 0.0
noinit 40416 40416 0 0.0
text 565998 565994 -4 -0.0
lighting-app tlsr9518adk80d (read/write) 817628 817628 0 0.0
bss 71420 71420 0 0.0
noinit 40416 40416 0 0.0
text 582320 582318 -2 -0.0

@andy31415 andy31415 merged commit 1ecc4e6 into project-chip:master Jul 15, 2022
github-actions bot pushed a commit that referenced this pull request Jul 15, 2022
@ArekBalysNordic @web-flow
[nrfconnect] Fix window-covering app build after adding EnableKey (#2…
40fc609 
…0786)

The nRF Connect window-covering app didn't build correctly after recent
changes.

The fix is to move using the namespaces into another place in the code.

This change needs to be also applied in the SVE branch.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@arkq arkq Awaiting requested review from arkq

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@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

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

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

@gjc13 gjc13 Awaiting requested review from gjc13

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

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@hawk248 hawk248 Awaiting requested review from hawk248

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@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

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@kghost kghost Awaiting requested review from kghost

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@andy31415 andy31415 Awaiting requested review from andy31415

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@vijs vijs Awaiting requested review from vijs

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

@wbschiller wbschiller Awaiting requested review from wbschiller

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

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

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

Assignees
No one assigned
Labels
examples review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ArekBalysNordic @andy31415 @Damian-Nordic