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

Disallow opening commissioning windows when fail-safe is not fully disarmed. #21474

Merged
merged 1 commit into from
Aug 1, 2022
Merged

Disallow opening commissioning windows when fail-safe is not fully disarmed. #21474

merged 1 commit into from
Aug 1, 2022

Conversation

bzbarsky-apple
Copy link
Contributor

We were allowing opening commissioning windows in the "fail-safe is
busy" state. We should probably not allow that.

Problem

Possible to open a commissioning window while an async fail-safe disarm is in progress.

Change overview

Disallow that, just list we disallow doing it while a fail-safe is fully armed.

This is needed in order to be able to cherry-pick #21442.

@bzbarsky-apple
Disallow opening commissioning windows when fail-safe is not fully di…
ac0c573 
…sarmed. (project-chip#21111)

We were allowing opening commissioning windows in the "fail-safe is
busy" state.  We should probably not allow that.
@woody-apple woody-apple enabled auto-merge (squash) July 31, 2022 23:28
@github-actions
Copy link

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

PR #21474: Size comparison from 7c6e9b1 to ac0c573

Increases (29 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6)
platform target config section 7c6e9b1 ac0c573 change % change
bl602 lighting-app bl602 (read/write) 1382018 1382082 64 0.0
.text 1052132 1052196 64 0.0
bl602+rpc (read/write) 1427450 1427514 64 0.0
.text 1083824 1083892 68 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668915 668939 24 0.0
.text 580316 580340 24 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 634459 634483 24 0.0
.text 556628 556652 24 0.0
lock-ftd LP_CC2652R7 (read only) 671783 671807 24 0.0
.text 594952 594976 24 0.0
lock-mtd LP_CC2652R7 (read only) 654059 654083 24 0.0
.text 552472 552496 24 0.0
pump-app LP_CC2652R7 (read only) 680839 680863 24 0.0
.text 591436 591460 24 0.0
pump-controller-app LP_CC2652R7 (read only) 666415 666439 24 0.0
.text 581192 581216 24 0.0
shell LP_CC2652R7 (read only) 661622 661646 24 0.0
.text 576044 576068 24 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 583542 583558 16 0.0
.app_xip_area 460496 460512 16 0.0
lock cyw930739m2evb_01 (read/write) 589446 589462 16 0.0
.app_xip_area 461672 461688 16 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 589242 589266 24 0.0
.app_xip_area 467012 467036 24 0.0
efr32 lighting-app BRD4161A (read/write) 1088688 1088736 48 0.0
.text 953336 953384 48 0.0
BRD4161A+rpc (read/write) 1143044 1143092 48 0.0
.text 990800 990848 48 0.0
BRD4161A+rs911x (read/write) 973984 974016 32 0.0
.text 810172 810204 32 0.0
lock-app BRD4161A+wf200 (read/write) 1129008 1129024 16 0.0
.text 982556 982572 16 0.0
window-app BRD4161A (read/write) 1081988 1082020 32 0.0
.text 945132 945164 32 0.0
esp32 all-clusters-app c3devkit (read only) 1023628 1023652 24 0.0
.flash.text 1023628 1023652 24 0.0
m5stack (read only) 1076967 1076987 20 0.0
.flash.text 1071583 1071603 20 0.0
k32w light k32w0+release (read/write) 643128 643144 16 0.0
.text 568636 568652 16 0.0
lock k32w0+release (read/write) 700368 700384 16 0.0
.text 625428 625444 16 0.0
linux thermostat-no-ble arm64 (read only) 2345324 2345516 192 0.0
.text 1968688 1968880 192 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read/write) 2451544 2451608 64 0.0
.text 1414188 1414252 64 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1179831 1179863 32 0.0
text 814832 814852 20 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1159767 1159783 16 0.0
text 804028 804044 16 0.0
p6 all-clusters-app default (read/write) 1688004 1688052 48 0.0
.text 1527824 1527872 48 0.0
all-clusters-minimal-app default (read/write) 1632084 1632116 32 0.0
.text 1472624 1472656 32 0.0
light-app default (read/write) 1553052 1553100 48 0.0
.text 1401896 1401944 48 0.0
lock-app default (read/write) 1590732 1590764 32 0.0
.text 1435104 1435136 32 0.0
Decreases (6 builds for cc13x2_26x2)
platform target config section 7c6e9b1 ac0c573 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 182436 182412 -24 -0.0
lock-ftd LP_CC2652R7 (read/write) 169760 169736 -24 -0.0
lock-mtd LP_CC2652R7 (read/write) 183172 183148 -24 -0.0
pump-app LP_CC2652R7 (read/write) 161528 161504 -24 -0.0
pump-controller-app LP_CC2652R7 (read/write) 176088 176064 -24 -0.0
shell LP_CC2652R7 (read/write) 185248 185224 -24 -0.0
Full report (30 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6)
platform target config section 7c6e9b1 ac0c573 change % change
bl602 lighting-app bl602 (read/write) 1382018 1382082 64 0.0
.bss 117626 117626 0 0.0
.data 4480 4480 0 0.0
.text 1052132 1052196 64 0.0
bl602+rpc (read/write) 1427450 1427514 64 0.0
.bss 125066 125066 0 0.0
.data 4600 4600 0 0.0
.text 1083824 1083892 68 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668915 668939 24 0.0
(read/write) 182436 182412 -24 -0.0
.bss 74244 74244 0 0.0
.data 3372 3372 0 0.0
.rodata 88283 88283 0 0.0
.text 580316 580340 24 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 634459 634483 24 0.0
(read/write) 157828 157828 0 0.0
.bss 73540 73540 0 0.0
.data 3372 3372 0 0.0
.rodata 77507 77507 0 0.0
.text 556628 556652 24 0.0
lock-ftd LP_CC2652R7 (read only) 671783 671807 24 0.0
(read/write) 169760 169736 -24 -0.0
.bss 71324 71324 0 0.0
.data 3296 3296 0 0.0
.rodata 76351 76351 0 0.0
.text 594952 594976 24 0.0
lock-mtd LP_CC2652R7 (read only) 654059 654083 24 0.0
(read/write) 183172 183148 -24 -0.0
.bss 67012 67012 0 0.0
.data 3296 3296 0 0.0
.rodata 101107 101107 0 0.0
.text 552472 552496 24 0.0
pump-app LP_CC2652R7 (read only) 680839 680863 24 0.0
(read/write) 161528 161504 -24 -0.0
.bss 71380 71380 0 0.0
.data 3296 3296 0 0.0
.rodata 88919 88919 0 0.0
.text 591436 591460 24 0.0
pump-controller-app LP_CC2652R7 (read only) 666415 666439 24 0.0
(read/write) 176088 176064 -24 -0.0
.bss 71516 71516 0 0.0
.data 3292 3292 0 0.0
.rodata 84743 84743 0 0.0
.text 581192 581216 24 0.0
shell LP_CC2652R7 (read only) 661622 661646 24 0.0
(read/write) 185248 185224 -24 -0.0
.bss 76564 76564 0 0.0
.data 3376 3376 0 0.0
.rodata 85262 85262 0 0.0
.text 576044 576068 24 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 583542 583558 16 0.0
.app_xip_area 460496 460512 16 0.0
.bss 65632 65632 0 0.0
.data 744 744 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 589446 589462 16 0.0
.app_xip_area 461672 461688 16 0.0
.bss 70360 70360 0 0.0
.data 748 748 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 589242 589266 24 0.0
.app_xip_area 467012 467036 24 0.0
.bss 64872 64872 0 0.0
.data 688 688 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1088688 1088736 48 0.0
.bss 133268 133268 0 0.0
.data 2064 2064 0 0.0
.text 953336 953384 48 0.0
BRD4161A+rpc (read/write) 1143044 1143092 48 0.0
.bss 149948 149948 0 0.0
.data 2276 2276 0 0.0
.text 990800 990848 48 0.0
BRD4161A+rs911x (read/write) 973984 974016 32 0.0
.bss 161744 161744 0 0.0
.data 2048 2048 0 0.0
.text 810172 810204 32 0.0
lock-app BRD4161A+wf200 (read/write) 1129008 1129024 16 0.0
.bss 144376 144376 0 0.0
.data 2056 2056 0 0.0
.text 982556 982572 16 0.0
window-app BRD4161A (read/write) 1081988 1082020 32 0.0
.bss 134740 134740 0 0.0
.data 2092 2092 0 0.0
.text 945132 945164 32 0.0
esp32 all-clusters-app c3devkit (read only) 1023628 1023652 24 0.0
(read/write) 1486586 1486586 0 0.0
.dram0.bss 70304 70304 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 216248 216248 0 0.0
.flash.text 1023628 1023652 24 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1076967 1076987 20 0.0
(read/write) 488616 488616 0 0.0
.dram0.bss 75816 75816 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246660 246660 0 0.0
.flash.text 1071583 1071603 20 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w0+release (read/write) 643128 643144 16 0.0
.bss 69720 69720 0 0.0
.data 2044 2044 0 0.0
.text 568636 568652 16 0.0
lock k32w0+release (read/write) 700368 700384 16 0.0
.bss 70160 70160 0 0.0
.data 2052 2052 0 0.0
.text 625428 625444 16 0.0
linux chip-tool-ipv6only arm64 (read only) 9836564 9836564 0 0.0
(read/write) 675905 675905 0 0.0
.bss 32897 32897 0 0.0
.data 3272 3272 0 0.0
.data.rel.ro 621248 621248 0 0.0
.dynamic 560 560 0 0.0
.got 13528 13528 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 468004 468004 0 0.0
.text 7792804 7792804 0 0.0
thermostat-no-ble arm64 (read only) 2345324 2345516 192 0.0
(read/write) 141761 141761 0 0.0
.bss 55329 55329 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 75976 75976 0 0.0
.dynamic 560 560 0 0.0
.got 5016 5016 0 0.0
.init 24 24 0 0.0
.init_array 408 408 0 0.0
.rodata 139124 139124 0 0.0
.text 1968688 1968880 192 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2451544 2451608 64 0.0
.bss 214524 214524 0 0.0
.data 5872 5872 0 0.0
.text 1414188 1414252 64 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1179831 1179863 32 0.0
bss 143200 143200 0 0.0
rodata 142928 142928 0 0.0
text 814832 814852 20 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1159767 1159783 16 0.0
bss 142436 142436 0 0.0
rodata 134456 134456 0 0.0
text 804028 804044 16 0.0
p6 all-clusters-app default (read only) 881552 881552 0 0.0
(read/write) 1688004 1688052 48 0.0
.bss 149144 149144 0 0.0
.data 2648 2648 0 0.0
.text 1527824 1527872 48 0.0
all-clusters-minimal-app default (read only) 882272 882272 0 0.0
(read/write) 1632084 1632116 32 0.0
.bss 148424 148424 0 0.0
.data 2648 2648 0 0.0
.text 1472624 1472656 32 0.0
light-app default (read only) 890576 890576 0 0.0
(read/write) 1553052 1553100 48 0.0
.bss 140328 140328 0 0.0
.data 2440 2440 0 0.0
.text 1401896 1401944 48 0.0
lock-app default (read only) 886104 886104 0 0.0
(read/write) 1590732 1590764 32 0.0
.bss 144784 144784 0 0.0
.data 2456 2456 0 0.0
.text 1435104 1435136 32 0.0

@woody-apple woody-apple disabled auto-merge August 1, 2022 03:17
@woody-apple woody-apple merged commit a14c225 into project-chip:sve Aug 1, 2022
@bzbarsky-apple bzbarsky-apple deleted the cherry-pick-82742653641f4ffbb652e8ed30752644c9170923 branch August 1, 2022 13:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bzbarsky-apple @woody-apple