diff options
| author | guo <[email protected]> | 2021-11-26 10:46:42 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-11-26 10:46:42 +0800 |
| commit | 7f194865e056bb39efe54de577b14aa6a63d414e (patch) | |
| tree | 10a6a99c19ed5a8c3097ec475ba23fa8f46a28ec | |
| parent | 1cea0c8c798f620994e72ce86daa0bc674a61808 (diff) | |
| parent | fc72bd1f9bea9ab7f4a1a103a55fcba0baf6193d (diff) | |
Merge pull request #5303 from armink/timer
Update Timer cmd
| -rw-r--r-- | components/finsh/cmd.c | 12 | ||||
| -rw-r--r-- | src/timer.c | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/components/finsh/cmd.c b/components/finsh/cmd.c index ee8d4c7d83..215300f20d 100644 --- a/components/finsh/cmd.c +++ b/components/finsh/cmd.c @@ -751,9 +751,9 @@ long list_timer(void) maxlen = RT_NAME_MAX; - rt_kprintf("%-*.s periodic timeout flag\n", maxlen, item_title); + rt_kprintf("%-*.s periodic timeout activated mode\n", maxlen, item_title); object_split(maxlen); - rt_kprintf(" ---------- ---------- -----------\n"); + rt_kprintf(" ---------- ---------- ----------- ---------\n"); do { next = list_get_next(next, &find_arg); @@ -781,9 +781,13 @@ long list_timer(void) timer->init_tick, timer->timeout_tick); if (timer->parent.flag & RT_TIMER_FLAG_ACTIVATED) - rt_kprintf("activated\n"); + rt_kprintf("activated "); else - rt_kprintf("deactivated\n"); + rt_kprintf("deactivated "); + if (timer->parent.flag & RT_TIMER_FLAG_PERIODIC) + rt_kprintf("periodic\n"); + else + rt_kprintf("one shot\n"); } } diff --git a/src/timer.c b/src/timer.c index 25ba175306..846c33263b 100644 --- a/src/timer.c +++ b/src/timer.c @@ -560,12 +560,12 @@ rt_err_t rt_timer_control(rt_timer_t timer, int cmd, void *arg) if(timer->parent.flag & RT_TIMER_FLAG_ACTIVATED) { /*timer is start and run*/ - *(rt_tick_t *)arg = RT_TIMER_FLAG_ACTIVATED; + *(rt_uint32_t *)arg = RT_TIMER_FLAG_ACTIVATED; } else { /*timer is stop*/ - *(rt_tick_t *)arg = RT_TIMER_FLAG_DEACTIVATED; + *(rt_uint32_t *)arg = RT_TIMER_FLAG_DEACTIVATED; } break; |