diff options
| author | Wayne Lin <[email protected]> | 2020-05-15 09:41:27 +0800 |
|---|---|---|
| committer | Wayne Lin <[email protected]> | 2020-05-15 09:41:27 +0800 |
| commit | 5d65fe074f0e0ba53673ffef6205aab6baa76d0a (patch) | |
| tree | 9847ae8364cbd3c7cec8168ba75e2c5cb15a8a41 /src/timer.c | |
| parent | 39431f5a702f3dcec843cb8884064953594243ec (diff) | |
| parent | dab737f6375f5cdd86ad3bc6d166657b17364948 (diff) | |
Merge branch 'master' of https://github.com/rt-thread/rt-thread into rtt_issues
Diffstat (limited to 'src/timer.c')
| -rw-r--r-- | src/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/timer.c b/src/timer.c index 0034f0246c..28a5a9e494 100644 --- a/src/timer.c +++ b/src/timer.c @@ -488,7 +488,7 @@ rt_err_t rt_timer_control(rt_timer_t timer, int cmd, void *arg) case RT_TIMER_CTRL_SET_PERIODIC: timer->parent.flag |= RT_TIMER_FLAG_PERIODIC; break; - /* zhaoshimin 20191204 add query the timer state */ + case RT_TIMER_CTRL_GET_STATE: if(timer->parent.flag & RT_TIMER_FLAG_ACTIVATED) { |