Skip to content

Commit 4250870

Browse files
adigiemaciejbaczmanski
authored andcommitted
samples: matter: Set user data before starting timer
Set user data before starting timer, as with short delays, timer may expire before setting the data. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent f5cc119 commit 4250870

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

samples/matter/common/src/event_triggers/default_event_triggers.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ CHIP_ERROR FactoryResetCallback(TestEventTrigger::TriggerValue delayMs)
9898
delayedContext->action = DelayedAction::FactoryReset;
9999
delayedContext->value = delayMs;
100100

101-
k_timer_start(&sDelayTimer, K_MSEC(delayMs), K_NO_WAIT);
102101
k_timer_user_data_set(&sDelayTimer, reinterpret_cast<void *>(delayedContext.get()));
102+
k_timer_start(&sDelayTimer, K_MSEC(delayMs), K_NO_WAIT);
103103

104104
delayedContext.release();
105105

@@ -134,8 +134,8 @@ CHIP_ERROR BlockMainThreadCallback(TestEventTrigger::TriggerValue blockingTimeS)
134134
delayedContext->action = DelayedAction::BlockMainThread;
135135
delayedContext->value = blockingTimeS * 1000;
136136

137-
k_timer_start(&sDelayTimer, K_MSEC(delayTimeMs), K_NO_WAIT);
138137
k_timer_user_data_set(&sDelayTimer, reinterpret_cast<void *>(delayedContext.get()));
138+
k_timer_start(&sDelayTimer, K_MSEC(delayTimeMs), K_NO_WAIT);
139139

140140
delayedContext.release();
141141

0 commit comments

Comments
 (0)