Skip to content

[OnOff] Fix OffWaitTime delayed state off #25172

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
Merged
merged 2 commits into from
Feb 19, 2023
Merged

[OnOff] Fix OffWaitTime delayed state off #25172

merged 2 commits into from
Feb 19, 2023

Conversation

jmartinez-silabs
Copy link
Member

Fix #24920

There is a timing window where OnOff::Attributes::OnTime: is set to 0 in offWithEffectCommand or in setOnOffValue and the cluster timer call back -> onOffWaitTimeOffEventHandler -> updateOnOffTimeCommand is run before the Attributes::OnOff::Set off is done in setOnOffValue. This problematic timing window is exacerbated by emberAfOnOffClusterLevelControlEffectCallback delaying the Off state.

Fix entails reseting OnOff::Attributes::OnTime only in setOnOffValue and only after the OnOff state is finally set to off

Tested and validate on EFR32 lighting-app by repeating the sequence

./chip-tool onoff on 1 1
./chip-tool onoff on-with-timed-off 1 300 300 1 1
./chip-tool onoff off-with-effect 0 0 1 1
./chip-tool onoff read off-wait-time 1 1

And confirmed that off-wait-time is never directly set to 0

@jmartinez-silabs
Fix issue where OnTime was set to 0 and the updateOnOffTimeCommand ca…
d64a06e 
…llback was called before OnOff off State was set causing OffWaitTime to wrongly be reseted.
@github-actions github-actions bot added the app label Feb 17, 2023
@github-actions
Copy link

PR #25172: Size comparison from 03fc0b5 to d64a06e

Increases (20 builds for bl602, bl702, cc13x2_26x2, cc32xx, cyw30739, psoc6, qpg, telink)
platform target config section 03fc0b5 d64a06e change % change
bl602 lighting-app bl602 (read/write) 1348706 1348714 8 0.0
bl602+rpc (read/write) 1394130 1394138 8 0.0
.text 1056018 1056020 2 0.0
bl702 lighting-app bl702 (read/write) 1187267 1187283 16 0.0
.debug_loc 3417622 3417633 11 0.0
.rodata 107568 107584 16 0.0
bl702+rpc (read/write) 1280415 1280431 16 0.0
.debug_loc 3614576 3614587 11 0.0
.rodata 122208 122224 16 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 679927 679935 8 0.0
.text 591292 591300 8 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 643271 643279 8 0.0
.text 564720 564728 8 0.0
lock-ftd LP_CC2652R7 (read only) 676447 676463 16 0.0
.text 599288 599304 16 0.0
lock-mtd LP_CC2652R7 (read only) 662947 662955 8 0.0
.rodata 103299 103307 8 0.0
pump-app LP_CC2652R7 (read only) 689379 689427 48 0.0
.rodata 90931 90939 8 0.0
.text 597968 598008 40 0.0
cc32xx lock CC3235SF_LAUNCHXL .debug_loc 2797107 2797120 13 0.0
.rodata 105705 105713 8 0.0
cyw30739 lock cyw930739m2evb_01 (read/write) 590058 590074 16 0.0
.app_xip_area 461628 461644 16 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 550974 550982 8 0.0
.app_xip_area 433352 433360 8 0.0
psoc6 light cy8ckit_062s2_43012 .debug_loc 3351431 3351444 13 0.0
lock cy8ckit_062s2_43012 (read/write) 1648508 1648516 8 0.0
.debug_loc 3376363 3376376 13 0.0
.text 1451864 1451872 8 0.0
qpg lighting-app qpg6105+debug (read/write) 1150636 1150644 8 0.0
.text 597732 597740 8 0.0
lock-app qpg6105+debug (read/write) 1118204 1118212 8 0.0
.text 565304 565312 8 0.0
telink all-clusters-minimal-app tlsr9518adk80d (read/write) 951424 951432 8 0.0
text 648368 648370 2 0.0
light-switch-app tlsr9518adk80d text 592914 592916 2 0.0
ota-requestor-app tlsr9518adk80d (read/write) 883060 883076 16 0.0
text 602720 602726 6 0.0
thermostat tlsr9518adk80d (read/write) 875752 875760 8 0.0
text 594324 594326 2 0.0
Decreases (14 builds for bl602, bl702, cc13x2_26x2, cc32xx, psoc6, telink)
platform target config section 03fc0b5 d64a06e change % change
bl602 lighting-app bl602 .text 1025086 1025084 -2 -0.0
bl702 lighting-app bl702 .debug_info 40701841 40701783 -58 -0.0
.debug_line 5284141 5284120 -21 -0.0
.text 954682 954680 -2 -0.0
bl702+rpc .debug_info 45117268 45117211 -57 -0.0
.debug_line 5683184 5683163 -21 -0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 171168 171160 -8 -0.0
lock-ftd LP_CC2652R7 (read/write) 172016 172000 -16 -0.0
lock-mtd LP_CC2652R7 (read/write) 180772 180764 -8 -0.0
pump-app LP_CC2652R7 (read/write) 159804 159756 -48 -0.0
cc32xx lock CC3235SF_LAUNCHXL (read only) 642217 642209 -8 -0.0
.debug_info 20360345 20360288 -57 -0.0
.debug_line 2661062 2661052 -10 -0.0
.text 534392 534376 -16 -0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read/write) 1760276 1760268 -8 -0.0
.debug_info 28074894 28074836 -58 -0.0
.debug_line 3795435 3795426 -9 -0.0
.debug_loc 3692531 3692518 -13 -0.0
.text 1559496 1559488 -8 -0.0
all-clusters-minimal cy8ckit_062s2_43012 (read/write) 1700836 1700828 -8 -0.0
.debug_info 27621029 27620972 -57 -0.0
.debug_line 3803918 3803909 -9 -0.0
.debug_loc 3675957 3675944 -13 -0.0
.text 1500856 1500848 -8 -0.0
light cy8ckit_062s2_43012 (read/write) 1614324 1614300 -24 -0.0
.debug_info 22964134 22964076 -58 -0.0
.debug_line 3356551 3356545 -6 -0.0
.text 1422664 1422640 -24 -0.0
lock cy8ckit_062s2_43012 .debug_info 23217240 23217182 -58 -0.0
.debug_line 3358988 3358978 -10 -0.0
telink all-clusters-app tlsr9518adk80d text 686848 686840 -8 -0.0
lighting-app tlsr9518adk80d (read/write) 949720 949704 -16 -0.0
text 658980 658956 -24 -0.0
Full report (30 builds for bl602, bl702, cc13x2_26x2, cc32xx, cyw30739, linux, psoc6, qpg, telink)
platform target config section 03fc0b5 d64a06e change % change
bl602 lighting-app bl602 (read/write) 1348706 1348714 8 0.0
.bss 94690 94690 0 0.0
.data 9736 9736 0 0.0
.text 1025086 1025084 -2 -0.0
bl602+rpc (read/write) 1394130 1394138 8 0.0
.bss 102738 102738 0 0.0
.data 10128 10128 0 0.0
.text 1056018 1056020 2 0.0
bl702 lighting-app bl702 0 0 0 0.0
(read only) 3358 3358 0 0.0
(read/write) 1187267 1187283 16 0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 292 292 0 0.0
.bss 69793 69793 0 0.0
.bss_psram 30064 30064 0 0.0
.comment 48 48 0 0.0
.data 4064 4064 0 0.0
.debug_abbrev 1556113 1556113 0 0.0
.debug_aranges 134376 134376 0 0.0
.debug_frame 492532 492532 0 0.0
.debug_info 40701841 40701783 -58 -0.0
.debug_line 5284141 5284120 -21 -0.0
.debug_loc 3417622 3417633 11 0.0
.debug_ranges 372072 372072 0 0.0
.debug_str 3575802 3575802 0 0.0
.hbn 536 536 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 144 144 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 107568 107584 16 0.0
.rsvd 2960 2960 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 573412 573412 0 0.0
.symtab 173472 173472 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3358 3358 0 0.0
.text 954682 954680 -2 -0.0
bl702+rpc 0 0 0 0.0
(read only) 3358 3358 0 0.0
(read/write) 1280415 1280431 16 0.0
.bleromro 6342 6342 0 0.0
.bleromrw 124 124 0 0.0
.boot2 292 292 0 0.0
.bss 77841 77841 0 0.0
.bss_psram 30320 30320 0 0.0
.comment 48 48 0 0.0
.data 4608 4608 0 0.0
.debug_abbrev 1704359 1704359 0 0.0
.debug_aranges 142616 142616 0 0.0
.debug_frame 520296 520296 0 0.0
.debug_info 45117268 45117211 -57 -0.0
.debug_line 5683184 5683163 -21 -0.0
.debug_loc 3614576 3614587 11 0.0
.debug_ranges 395848 395848 0 0.0
.debug_str 3979339 3979339 0 0.0
.hbn 536 536 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 160 160 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 122208 122224 16 0.0
.rsvd 2960 2960 0 0.0
.sha_ocram 72 72 0 0.0
.shstrtab 304 304 0 0.0
.stack 2048 2048 0 0.0
.strtab 634476 634476 0 0.0
.symtab 191936 191936 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3358 3358 0 0.0
.text 1032092 1032092 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 679927 679935 8 0.0
(read/write) 171168 171160 -8 -0.0
.bss 80788 80788 0 0.0
.data 3388 3388 0 0.0
.rodata 88319 88319 0 0.0
.text 591292 591300 8 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 643271 643279 8 0.0
(read/write) 157500 157500 0 0.0
.bss 79996 79996 0 0.0
.data 3388 3388 0 0.0
.rodata 78231 78231 0 0.0
.text 564720 564728 8 0.0
lock-ftd LP_CC2652R7 (read only) 676447 676463 16 0.0
(read/write) 172016 172000 -16 -0.0
.bss 78244 78244 0 0.0
.data 3316 3316 0 0.0
.rodata 76679 76679 0 0.0
.text 599288 599304 16 0.0
lock-mtd LP_CC2652R7 (read only) 662947 662955 8 0.0
(read/write) 180772 180764 -8 -0.0
.bss 73500 73500 0 0.0
.data 3316 3316 0 0.0
.rodata 103299 103307 8 0.0
.text 559168 559168 0 0.0
pump-app LP_CC2652R7 (read only) 689379 689427 48 0.0
(read/write) 159804 159756 -48 -0.0
.bss 78196 78196 0 0.0
.data 3280 3280 0 0.0
.rodata 90931 90939 8 0.0
.text 597968 598008 40 0.0
pump-controller-app LP_CC2652R7 (read only) 674571 674571 0 0.0
(read/write) 174740 174740 0 0.0
.bss 78324 78324 0 0.0
.data 3304 3304 0 0.0
.rodata 86931 86931 0 0.0
.text 587160 587160 0 0.0
shell LP_CC2652R7 (read only) 671198 671198 0 0.0
(read/write) 181968 181968 0 0.0
.bss 82860 82860 0 0.0
.data 3384 3384 0 0.0
.rodata 85070 85070 0 0.0
.text 585816 585816 0 0.0
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 642217 642209 -8 -0.0
(read/write) 203696 203696 0 0.0
.ARM.attributes 44 44 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 197096 197096 0 0.0
.comment 194 194 0 0.0
.data 1480 1480 0 0.0
.debug_abbrev 934242 934242 0 0.0
.debug_aranges 87448 87448 0 0.0
.debug_frame 300212 300212 0 0.0
.debug_info 20360345 20360288 -57 -0.0
.debug_line 2661062 2661052 -10 -0.0
.debug_loc 2797107 2797120 13 0.0
.debug_ranges 281744 281744 0 0.0
.debug_str 3019502 3019502 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105705 105713 8 0.0
.shstrtab 232 232 0 0.0
.stab 204 204 0 0.0
.stabstr 441 441 0 0.0
.stack 2048 2048 0 0.0
.strtab 377379 377379 0 0.0
.symtab 256048 256048 0 0.0
.text 534392 534376 -16 -0.0
cyw30739 light cyw930739m2evb_01 (read/write) 585986 585986 0 0.0
.app_xip_area 462860 462860 0 0.0
.bss 65568 65568 0 0.0
.data 740 740 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 590058 590074 16 0.0
.app_xip_area 461628 461644 16 0.0
.bss 70864 70864 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) 550974 550982 8 0.0
.app_xip_area 433352 433360 8 0.0
.bss 60104 60104 0 0.0
.data 696 696 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
linux chip-tool-ipv6only arm64 (read only) 12060708 12060708 0 0.0
(read/write) 729224 729224 0 0.0
.bss 34136 34136 0 0.0
.data 3008 3008 0 0.0
.data.rel.ro 671552 671552 0 0.0
.dynamic 560 560 0 0.0
.got 15328 15328 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 585780 585780 0 0.0
.text 9744372 9744372 0 0.0
thermostat-no-ble arm64 (read only) 2516220 2516220 0 0.0
(read/write) 145096 145096 0 0.0
.bss 56312 56312 0 0.0
.data 1832 1832 0 0.0
.data.rel.ro 77568 77568 0 0.0
.dynamic 560 560 0 0.0
.got 5336 5336 0 0.0
.init 24 24 0 0.0
.init_array 432 432 0 0.0
.rodata 151320 151320 0 0.0
.text 2102752 2102752 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 0 0 0 0.0
(read only) 840952 840952 0 0.0
(read/write) 1760276 1760268 -8 -0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 189720 189720 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2672 2672 0 0.0
.debug_abbrev 1257355 1257355 0 0.0
.debug_aranges 111496 111496 0 0.0
.debug_frame 374608 374608 0 0.0
.debug_info 28074894 28074836 -58 -0.0
.debug_line 3795435 3795426 -9 -0.0
.debug_loc 3692531 3692518 -13 -0.0
.debug_ranges 363464 363464 0 0.0
.debug_str 3528327 3528327 0 0.0
.heap 840952 840952 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 580224 580224 0 0.0
.symtab 425120 425120 0 0.0
.text 1559496 1559488 -8 -0.0
.zero.table 8 8 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 0 0 0 0.0
(read only) 841752 841752 0 0.0
(read/write) 1700836 1700828 -8 -0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188920 188920 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2672 2672 0 0.0
.debug_abbrev 1242900 1242900 0 0.0
.debug_aranges 110760 110760 0 0.0
.debug_frame 377044 377044 0 0.0
.debug_info 27621029 27620972 -57 -0.0
.debug_line 3803918 3803909 -9 -0.0
.debug_loc 3675957 3675944 -13 -0.0
.debug_ranges 361432 361432 0 0.0
.debug_str 3515590 3515590 0 0.0
.heap 841752 841752 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 539857 539857 0 0.0
.symtab 410192 410192 0 0.0
.text 1500856 1500848 -8 -0.0
.zero.table 8 8 0 0.0
light cy8ckit_062s2_43012 0 0 0 0.0
(read only) 850072 850072 0 0.0
(read/write) 1614324 1614300 -24 -0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 180808 180808 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2464 2464 0 0.0
.debug_abbrev 1078288 1078288 0 0.0
.debug_aranges 102960 102960 0 0.0
.debug_frame 347296 347296 0 0.0
.debug_info 22964134 22964076 -58 -0.0
.debug_line 3356551 3356545 -6 -0.0
.debug_loc 3351431 3351444 13 0.0
.debug_ranges 319944 319944 0 0.0
.debug_str 3314336 3314336 0 0.0
.heap 850072 850072 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 475364 475364 0 0.0
.symtab 377968 377968 0 0.0
.text 1422664 1422640 -24 -0.0
.zero.table 8 8 0 0.0
lock cy8ckit_062s2_43012 0 0 0 0.0
(read only) 845088 845088 0 0.0
(read/write) 1648508 1648516 8 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 185776 185776 0 0.0
.comment 200 200 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2480 2480 0 0.0
.debug_abbrev 1080317 1080317 0 0.0
.debug_aranges 103408 103408 0 0.0
.debug_frame 349200 349200 0 0.0
.debug_info 23217240 23217182 -58 -0.0
.debug_line 3358988 3358978 -10 -0.0
.debug_loc 3376363 3376376 13 0.0
.debug_ranges 322544 322544 0 0.0
.debug_str 3333467 3333467 0 0.0
.heap 845088 845088 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 479595 479595 0 0.0
.symtab 380496 380496 0 0.0
.text 1451864 1451872 8 0.0
.zero.table 8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1150636 1150644 8 0.0
.bss 99820 99820 0 0.0
.data 852 852 0 0.0
.text 597732 597740 8 0.0
lock-app qpg6105+debug (read/write) 1118204 1118212 8 0.0
.bss 96316 96316 0 0.0
.data 864 864 0 0.0
.text 565304 565312 8 0.0
telink all-clusters-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1015724 1015724 0 0.0
bss 97788 97788 0 0.0
text 686848 686840 -8 -0.0
all-clusters-minimal-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 951424 951432 8 0.0
bss 96840 96840 0 0.0
text 648368 648370 2 0.0
contact-sensor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 855956 855956 0 0.0
bss 88968 88968 0 0.0
text 578910 578910 0 0.0
light-switch-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 871668 871668 0 0.0
bss 89052 89052 0 0.0
text 592914 592916 2 0.0
lighting-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 949720 949704 -16 -0.0
bss 97196 97196 0 0.0
text 658980 658956 -24 -0.0
ota-requestor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 883060 883076 16 0.0
bss 89996 89996 0 0.0
text 602720 602726 6 0.0
thermostat tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 875752 875760 8 0.0
bss 90444 90444 0 0.0
text 594324 594326 2 0.0

bzbarsky-apple
bzbarsky-apple approved these changes Feb 18, 2023
View reviewed changes
Copy link
Contributor

@bzbarsky-apple bzbarsky-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems plausible, but would be good to have @Rob-Houtepen-Signify take a look....

@jmartinez-silabs
Copy link
Member Author

@bzbarsky-apple I did confirm that the scenario I describe can and does happen. Well could. With this PR this timing issue doesn't happen

@github-actions
Copy link

PR #25172: Size comparison from 03fc0b5 to caeff31

Increases (1 build for cc32xx)
platform target config section 03fc0b5 caeff31 change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_loc 2797107 2797120 13 0.0
.rodata 105705 105713 8 0.0
Decreases (1 build for cc32xx)
platform target config section 03fc0b5 caeff31 change % change
cc32xx lock CC3235SF_LAUNCHXL (read only) 642217 642209 -8 -0.0
.debug_info 20360345 20360288 -57 -0.0
.debug_line 2661062 2661052 -10 -0.0
.text 534392 534376 -16 -0.0
Full report (1 build for cc32xx)
platform target config section 03fc0b5 caeff31 change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 642217 642209 -8 -0.0
(read/write) 203696 203696 0 0.0
.ARM.attributes 44 44 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 197096 197096 0 0.0
.comment 194 194 0 0.0
.data 1480 1480 0 0.0
.debug_abbrev 934242 934242 0 0.0
.debug_aranges 87448 87448 0 0.0
.debug_frame 300212 300212 0 0.0
.debug_info 20360345 20360288 -57 -0.0
.debug_line 2661062 2661052 -10 -0.0
.debug_loc 2797107 2797120 13 0.0
.debug_ranges 281744 281744 0 0.0
.debug_str 3019502 3019502 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105705 105713 8 0.0
.shstrtab 232 232 0 0.0
.stab 204 204 0 0.0
.stabstr 441 441 0 0.0
.stack 2048 2048 0 0.0
.strtab 377379 377379 0 0.0
.symtab 256048 256048 0 0.0
.text 534392 534376 -16 -0.0

@yufengwangca yufengwangca merged commit 04adc52 into project-chip:master Feb 19, 2023
@jmartinez-silabs jmartinez-silabs deleted the fix/onoff_timeoff branch February 19, 2023 13:02
@Rob-Houtepen-Signify
Copy link
Contributor

It depends how OffWithEffect is implemented. Other than MoveToLevelWithOnOff which can be interrupted, OffWithEffect cannot be interrupted. So setting the OnOff to False directly, but still have the lighting effect is also fine.
But in all cases, OnTime shall be made 0 if OnOff is set to False.

lecndav pushed a commit to lecndav/connectedhomeip that referenced this pull request Mar 22, 2023
@jmartinez-silabs
[OnOff] Fix OffWaitTime delayed state off (project-chip#25172)
ceec1a3 
* Fix issue where OnTime was set to 0 and the updateOnOffTimeCommand callback was called before OnOff off State was set causing OffWaitTime to wrongly be reseted.

* Fix expected string in Cirque MobileDeviceTest since The log changed in the on off server
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yufengwangca yufengwangca yufengwangca approved these changes

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

@amitnj amitnj Awaiting requested review from amitnj

@andy31415 andy31415 Awaiting requested review from andy31415

@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

@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

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

@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

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

@hawk248 hawk248 Awaiting requested review from hawk248

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmeg-sfy jmeg-sfy Awaiting requested review from jmeg-sfy

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

@kcoppock kcoppock Awaiting requested review from kcoppock

@kkasperczyk-no kkasperczyk-no Awaiting requested review from kkasperczyk-no

@ksperling-apple ksperling-apple Awaiting requested review from ksperling-apple

@lazarkov lazarkov Awaiting requested review from lazarkov

@lpbeliveau-silabs lpbeliveau-silabs Awaiting requested review from lpbeliveau-silabs

@LuDuda LuDuda Awaiting requested review from LuDuda

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

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@pjzander-signify pjzander-signify Awaiting requested review from pjzander-signify

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@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

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

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

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

@xylophone21 xylophone21 Awaiting requested review from xylophone21

Assignees

No one assigned

Labels

app review - approved test driver

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[BUG][TC-OO-2.3] OffWaitTime doesn't decrement after transitioning to Delayed Off state

4 participants

@jmartinez-silabs @Rob-Houtepen-Signify @yufengwangca @bzbarsky-apple