diff options
| author | armink <[email protected]> | 2019-01-02 16:06:03 +0800 |
|---|---|---|
| committer | armink <[email protected]> | 2019-01-02 16:06:03 +0800 |
| commit | ebc14b09d5c1ccf61a7bf2e70d410dbadb087322 (patch) | |
| tree | be4cfef0dc0775ef2177472a929f10b3e3749bae | |
| parent | 77623e8119e9b4634fc26443af4623856b25804c (diff) | |
[example] Sync to latest version.
| -rw-r--r-- | examples/pm/timer_app.c | 2 | ||||
| -rw-r--r-- | examples/test/hwtimer_test.c | 30 | ||||
| -rw-r--r-- | include/rtdef.h | 2 |
3 files changed, 28 insertions, 6 deletions
diff --git a/examples/pm/timer_app.c b/examples/pm/timer_app.c index 73faf52d0a..5c20d0f690 100644 --- a/examples/pm/timer_app.c +++ b/examples/pm/timer_app.c @@ -48,7 +48,7 @@ static int timer_app_init(void) return -1; } } -INIT_EXPORT_APP(timer_app_init); +INIT_APP_EXPORT(timer_app_init); #endif /* RT_USING_PM */ diff --git a/examples/test/hwtimer_test.c b/examples/test/hwtimer_test.c index 8f69c4ef87..428373dde0 100644 --- a/examples/test/hwtimer_test.c +++ b/examples/test/hwtimer_test.c @@ -8,7 +8,7 @@ static rt_err_t timer_timeout_cb(rt_device_t dev, rt_size_t size) { - rt_kprintf("HT %d\n", rt_tick_get()); + rt_kprintf("enter hardware timer isr\n"); return 0; } @@ -35,7 +35,7 @@ int hwtimer(void) return -1; } - rt_device_set_rx_indicate(dev, timer_timeout_cb); + /* ʱ����� */ /* ����ʱ������(Ĭ��1Mhz��֧�ֵ���С����Ƶ��) */ err = rt_device_control(dev, HWTIMER_CTRL_FREQ_SET, &freq); if (err != RT_EOK) @@ -69,12 +69,34 @@ int hwtimer(void) rt_device_read(dev, 0, &val, sizeof(val)); rt_kprintf("Read: Sec = %d, Usec = %d\n", val.sec, val.usec); + /* ��ʱִ�лص����� -- ����ģʽ */ + /* ���ó�ʱ�ص����� */ + rt_device_set_rx_indicate(dev, timer_timeout_cb); + + /* ����ģʽ */ + mode = HWTIMER_MODE_PERIOD; + err = rt_device_control(dev, HWTIMER_CTRL_MODE_SET, &mode); + + /* ���ö�ʱ����ʱֵ��������ʱ�� */ + val.sec = t; + val.usec = 0; + rt_kprintf("SetTime: Sec %d, Usec %d\n", val.sec, val.usec); + if (rt_device_write(dev, 0, &val, sizeof(val)) != sizeof(val)) + { + rt_kprintf("SetTime Fail\n"); + goto EXIT; + } + + /* �ȴ��ص�����ִ�� */ + rt_thread_delay((t + 1)*RT_TICK_PER_SECOND); + EXIT: err = rt_device_close(dev); rt_kprintf("Close %s\n", TIMER); return err; } - -FINSH_FUNCTION_EXPORT(hwtimer, "Test hardware timer"); +#ifdef FINSH_USING_MSH +MSH_CMD_EXPORT(hwtimer, "Test hardware timer"); #endif +#endif /* RT_USING_HWTIMER */ diff --git a/include/rtdef.h b/include/rtdef.h index 5cb3687ce1..1ffb3d66a1 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -77,7 +77,7 @@ typedef rt_base_t rt_off_t; /**< Type for offset */ #define RT_TRUE 1 /**< boolean true */ #define RT_FALSE 0 /**< boolean fails */ -/*@}*/ +/**@}*/ /* maximum value of base type */ #define RT_UINT8_MAX 0xff /**< Maxium number of UINT8 */ |