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

Remove light switch from lighting-app #15118

Merged
merged 1 commit into from
Feb 17, 2022
Merged

Remove light switch from lighting-app #15118

merged 1 commit into from
Feb 17, 2022

Conversation

mspang
Copy link
Contributor

@mspang mspang commented Feb 12, 2022

Problem

Endpoint 2 in lighting-app.zap is missing the descriptor cluster which
is mandatory.

Change overview

Since the "light switch" sample is now available, presumably we don't
need a switch endpoint on the "light" samples, so remove it rather than
add the missing cluster.

Testing

Regen ZAP, compile, commission the app.

@mspang
Remove light switch from lighting-app
04dd398 
Endpoint 2 in lighting-app.zap is missing the descriptor cluster which
is mandatory.

Since the "light switch" sample is now available, presumably we don't
need a switch endpoint on the "light" samples, so remove it rather than
add the missing cluster.
@mspang
Copy link
Contributor Author

mspang commented Feb 12, 2022

@selissia Seem OK to you ?

@github-actions
Copy link

github-actions bot commented Feb 12, 2022 •
edited
Loading

PR #15118: Size comparison from 6a291ca to 04dd398

Decreases (12 builds for cyw30739, efr32, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 6a291ca 04dd398 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 592342 592142 -200 -0.0
.app_xip_area 497820 497644 -176 -0.0
.bss 77220 77196 -24 -0.0
efr32 lighting-app BRD4161A (read only) 908400 908240 -160 -0.0
(read/write) 127384 127360 -24 -0.0
.bss 125352 125328 -24 -0.0
.text 908392 908232 -160 -0.0
BRD4161A+rpc (read only) 937112 936936 -176 -0.0
(read/write) 144304 144280 -24 -0.0
.bss 142128 142104 -24 -0.0
.text 937104 936928 -176 -0.0
linux lighting-app debug+rpc (read only) 2053257 2053049 -208 -0.0
(read/write) 115736 115480 -256 -0.2
.bss 43008 42976 -32 -0.1
.data.rel.ro 65816 65592 -224 -0.3
.rodata 165361 165329 -32 -0.0
.text 1733154 1733074 -80 -0.0
mbed lighting-app CY8CPROTO_062_4343W+release (read/write) 2359984 2359792 -192 -0.0
.bss 181088 181064 -24 -0.0
.text 1322584 1322392 -192 -0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 1015291 1015103 -188 -0.0
bss 121412 121388 -24 -0.0
rodata 120056 119916 -140 -0.1
text 694872 694816 -56 -0.0
nrf52840dk_nrf52840+rpc (read/write) 984567 984395 -172 -0.0
bss 118600 118576 -24 -0.0
rodata 111580 111456 -124 -0.1
text 674760 674708 -52 -0.0
nrf52840dongle_nrf52840 (read/write) 1031183 1030995 -188 -0.0
bss 122800 122776 -24 -0.0
rodata 118936 118812 -124 -0.1
text 699508 699452 -56 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 921950 921746 -204 -0.0
bss 117976 117948 -28 -0.0
rodata 113296 113172 -124 -0.1
text 609896 609844 -52 -0.0
p6 light-app default (read/write) 2389192 2389016 -176 -0.0
.bss 107392 107368 -24 -0.0
.text 1347456 1347280 -176 -0.0
qpg lighting-app qpg6105+debug (read only) 594580 594408 -172 -0.0
.bss 88936 88912 -24 -0.0
.text 589260 589088 -172 -0.0
telink lighting-app tlsr9518adk80d (read/write) 874282 874102 -180 -0.0
bss 88736 88712 -24 -0.0
text 614044 614004 -40 -0.0
Full report (43 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 6a291ca 04dd398 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 592342 592142 -200 -0.0
.app_xip_area 497820 497644 -176 -0.0
.bss 77220 77196 -24 -0.0
.data 644 644 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 550398 550398 0 0.0
.app_xip_area 457444 457444 0 0.0
.bss 75692 75692 0 0.0
.data 608 608 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 569034 569034 0 0.0
.app_xip_area 466824 466824 0 0.0
.bss 84620 84620 0 0.0
.data 552 552 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 908400 908240 -160 -0.0
(read/write) 127384 127360 -24 -0.0
.bss 125352 125328 -24 -0.0
.data 2032 2032 0 0.0
.text 908392 908232 -160 -0.0
BRD4161A+rpc (read only) 937112 936936 -176 -0.0
(read/write) 144304 144280 -24 -0.0
.bss 142128 142104 -24 -0.0
.data 2172 2172 0 0.0
.text 937104 936928 -176 -0.0
window-app BRD4161A (read only) 843620 843620 0 0.0
(read/write) 125444 125444 0 0.0
.bss 123544 123544 0 0.0
.data 1900 1900 0 0.0
.text 843612 843612 0 0.0
esp32 all-clusters-app c3devkit (read only) 944546 944546 0 0.0
(read/write) 1398578 1398578 0 0.0
.dram0.bss 66408 66408 0 0.0
.dram0.data 14268 14268 0 0.0
.flash.rodata 199000 199000 0 0.0
.flash.text 944546 944546 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 994467 994467 0 0.0
(read/write) 463856 463856 0 0.0
.dram0.bss 71552 71552 0 0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 226112 226112 0 0.0
.flash.text 989083 989083 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 682940 682940 0 0.0
.bss 76656 76656 0 0.0
.data 1904 1904 0 0.0
.text 598580 598580 0 0.0
lock k32w061+release (read/write) 688380 688380 0 0.0
.bss 77048 77048 0 0.0
.data 1948 1948 0 0.0
.text 603584 603584 0 0.0
linux all-clusters-app debug (read only) 2355369 2355369 0 0.0
(read/write) 140000 140000 0 0.0
.bss 54528 54528 0 0.0
.data 1296 1296 0 0.0
.data.rel.ro 78504 78504 0 0.0
.dynamic 592 592 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 205765 205765 0 0.0
.text 1987330 1987330 0 0.0
bridge-app debug+rpc (read only) 1724453 1724453 0 0.0
(read/write) 84200 84200 0 0.0
.bss 38928 38928 0 0.0
.data 2034 2034 0 0.0
.data.rel.ro 38064 38064 0 0.0
.dynamic 592 592 0 0.0
.got 3976 3976 0 0.0
.init 27 27 0 0.0
.init_array 560 560 0 0.0
.rodata 141644 141644 0 0.0
.text 1466261 1466261 0 0.0
chip-tool debug (read only) 8434093 8434093 0 0.0
(read/write) 245696 245696 0 0.0
.bss 32200 32200 0 0.0
.data 1184 1184 0 0.0
.data.rel.ro 206280 206280 0 0.0
.dynamic 608 608 0 0.0
.got 4784 4784 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 459573 459573 0 0.0
.text 7459125 7459125 0 0.0
chip-tool-ipv6only arm64 (read only) 8237764 8237764 0 0.0
(read/write) 353233 353233 0 0.0
.bss 50497 50497 0 0.0
.data 1216 1216 0 0.0
.data.rel.ro 248720 248720 0 0.0
.dynamic 560 560 0 0.0
.got 49008 49008 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 435740 435740 0 0.0
.text 7041124 7041124 0 0.0
door-lock-app debug (read only) 1929609 1929609 0 0.0
(read/write) 110488 110488 0 0.0
.bss 42000 42000 0 0.0
.data 1010 1010 0 0.0
.data.rel.ro 62064 62064 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 173042 173042 0 0.0
.text 1608050 1608050 0 0.0
lighting-app debug+rpc (read only) 2053257 2053049 -208 -0.0
(read/write) 115736 115480 -256 -0.2
.bss 43008 42976 -32 -0.1
.data 1400 1400 0 0.0
.data.rel.ro 65816 65592 -224 -0.3
.dynamic 608 608 0 0.0
.got 4144 4144 0 0.0
.init 27 27 0 0.0
.init_array 720 720 0 0.0
.rodata 165361 165329 -32 -0.0
.text 1733154 1733074 -80 -0.0
ota-provider-app debug (read only) 1863097 1863097 0 0.0
(read/write) 106200 106200 0 0.0
.bss 41856 41856 0 0.0
.data 1224 1224 0 0.0
.data.rel.ro 57464 57464 0 0.0
.dynamic 608 608 0 0.0
.got 4368 4368 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 157451 157451 0 0.0
.text 1555058 1555058 0 0.0
ota-requestor-app debug (read only) 1858585 1858585 0 0.0
(read/write) 107256 107256 0 0.0
.bss 42144 42144 0 0.0
.data 1160 1160 0 0.0
.data.rel.ro 58520 58520 0 0.0
.dynamic 592 592 0 0.0
.got 4176 4176 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 151164 151164 0 0.0
.text 1558578 1558578 0 0.0
shell debug (read only) 2339729 2339729 0 0.0
(read/write) 141488 141488 0 0.0
.bss 61792 61792 0 0.0
.data 832 832 0 0.0
.data.rel.ro 73184 73184 0 0.0
.dynamic 592 592 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 904 904 0 0.0
.rodata 206642 206642 0 0.0
.text 1976306 1976306 0 0.0
thermostat-no-ble arm64 (read only) 2149292 2149292 0 0.0
(read/write) 140657 140657 0 0.0
.bss 57521 57521 0 0.0
.data 1032 1032 0 0.0
.data.rel.ro 75000 75000 0 0.0
.dynamic 560 560 0 0.0
.got 4144 4144 0 0.0
.init 24 24 0 0.0
.init_array 328 328 0 0.0
.rodata 132892 132892 0 0.0
.text 1798208 1798208 0 0.0
tv-app debug (read only) 2527361 2527361 0 0.0
(read/write) 139424 139424 0 0.0
.bss 57184 57184 0 0.0
.data 3200 3200 0 0.0
.data.rel.ro 73008 73008 0 0.0
.dynamic 592 592 0 0.0
.got 4528 4528 0 0.0
.init 27 27 0 0.0
.init_array 888 888 0 0.0
.rodata 197669 197669 0 0.0
.text 2156722 2156722 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2397696 2397696 0 0.0
.bss 188476 188476 0 0.0
.data 5320 5320 0 0.0
.text 1360296 1360296 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2359984 2359792 -192 -0.0
.bss 181088 181064 -24 -0.0
.data 5624 5624 0 0.0
.text 1322584 1322392 -192 -0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2323520 2323520 0 0.0
.bss 180976 180976 0 0.0
.data 5600 5600 0 0.0
.text 1286120 1286120 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139648 1139648 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103032 103032 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2308668 2308668 0 0.0
.bss 178228 178228 0 0.0
.data 5424 5424 0 0.0
.text 1271240 1271240 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 1015291 1015103 -188 -0.0
bss 121412 121388 -24 -0.0
rodata 120056 119916 -140 -0.1
text 694872 694816 -56 -0.0
nrf52840dk_nrf52840+rpc (read/write) 984567 984395 -172 -0.0
bss 118600 118576 -24 -0.0
rodata 111580 111456 -124 -0.1
text 674760 674708 -52 -0.0
nrf52840dongle_nrf52840 (read/write) 1031183 1030995 -188 -0.0
bss 122800 122776 -24 -0.0
rodata 118936 118812 -124 -0.1
text 699508 699452 -56 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 921950 921746 -204 -0.0
bss 117976 117948 -28 -0.0
rodata 113296 113172 -124 -0.1
text 609896 609844 -52 -0.0
lock-app nrf52840dk_nrf52840 (read/write) 945051 945051 0 0.0
bss 119784 119784 0 0.0
rodata 108816 108816 0 0.0
text 637920 637920 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 852578 852578 0 0.0
bss 116376 116376 0 0.0
rodata 101988 101988 0 0.0
text 553720 553720 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 527595 527595 0 0.0
bss 53632 53632 0 0.0
rodata 49976 49976 0 0.0
text 361016 361016 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 943855 943855 0 0.0
bss 119504 119504 0 0.0
rodata 107772 107772 0 0.0
text 637976 637976 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 939815 939815 0 0.0
bss 119508 119508 0 0.0
rodata 107468 107468 0 0.0
text 634216 634216 0 0.0
shell nrf52840dk_nrf52840 (read/write) 806767 806767 0 0.0
bss 111216 111216 0 0.0
rodata 79092 79092 0 0.0
text 538872 538872 0 0.0
p6 all-clusters-app default (read/write) 2482360 2482360 0 0.0
.bss 117744 117744 0 0.0
.data 2672 2672 0 0.0
.text 1440624 1440624 0 0.0
light-app default (read/write) 2389192 2389016 -176 -0.0
.bss 107392 107368 -24 -0.0
.data 2520 2520 0 0.0
.text 1347456 1347280 -176 -0.0
lock-app default (read/write) 2352672 2352672 0 0.0
.bss 107112 107112 0 0.0
.data 2480 2480 0 0.0
.text 1310936 1310936 0 0.0
qpg lighting-app qpg6105+debug (read only) 594580 594408 -172 -0.0
(read/write) 146936 146936 0 0.0
.bss 88936 88912 -24 -0.0
.data 1108 1108 0 0.0
.text 589260 589088 -172 -0.0
lock-app qpg6105+debug (read only) 560324 560324 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88920 88920 0 0.0
.data 1060 1060 0 0.0
.text 555004 555004 0 0.0
persistent-storage-app qpg6105+debug (read only) 99520 99520 0 0.0
(read/write) 146940 146940 0 0.0
.bss 24004 24004 0 0.0
.data 176 176 0 0.0
.text 94200 94200 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 874282 874102 -180 -0.0
bss 88736 88712 -24 -0.0
noinit 37160 37160 0 0.0
text 614044 614004 -40 -0.0

@selissia
Copy link
Contributor

selissia commented Feb 15, 2022 •
edited
Loading

@selissia Seem OK to you ?

Yes, this is OK. My change to this was only to add the On/Off Switch Configuration cluster -- which has since been removed from the spec.

@mspang
Copy link
Contributor Author

mspang commented Feb 15, 2022

@bzbarsky-apple @andy31415

@andy31415
Copy link
Contributor

/rebase

@andy31415 andy31415 merged commit 8be86c5 into project-chip:master Feb 17, 2022
@mspang mspang deleted the for-chip/delete-switch branch February 18, 2022 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andy31415 andy31415 andy31415 approved these changes

@bzbarsky-apple bzbarsky-apple bzbarsky-apple approved these changes

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

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

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

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

@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

@emargolis emargolis Awaiting requested review from emargolis

@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

@hawk248 hawk248 Awaiting requested review from hawk248

@holbrookt holbrookt Awaiting requested review from holbrookt

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

@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

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@lzgrablic02 lzgrablic02 Awaiting requested review from lzgrablic02

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@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

@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

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

Successfully merging this pull request may close these issues.
5 participants
@mspang @selissia @andy31415 @bzbarsky-apple @Damian-Nordic