diff options
| author | Lim-LinYuanbo <[email protected]> | 2021-09-08 22:45:31 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-09-08 22:45:31 +0800 |
| commit | b404f69f851817c62697074ffb363294b91585c6 (patch) | |
| tree | f5f31152993843a5e07559a6b7b0caddcc9ebd0a /components/drivers/rtc | |
| parent | 49fcf9f4cd436d30d2df8c4e24b751194c32f43b (diff) | |
| parent | 7fa1c819ee852937705d948a58f0218c422ea6b1 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'components/drivers/rtc')
| -rw-r--r-- | components/drivers/rtc/alarm.c | 2 | ||||
| -rw-r--r-- | components/drivers/rtc/rtc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/drivers/rtc/alarm.c b/components/drivers/rtc/alarm.c index cd0a976328..2bcc51f2ee 100644 --- a/components/drivers/rtc/alarm.c +++ b/components/drivers/rtc/alarm.c @@ -777,7 +777,7 @@ void rt_alarm_dump(void) rt_kprintf("+----+---------------------+------+------+----+\n"); } -FINSH_FUNCTION_EXPORT_ALIAS(rt_alarm_dump, __cmd_alarm_dump, dump alarm info); +MSH_CMD_EXPORT_ALIAS(rt_alarm_dump, rt_alarm_dump, dump alarm info); /** \brief initialize alarm service system * diff --git a/components/drivers/rtc/rtc.c b/components/drivers/rtc/rtc.c index 5eabeed2dd..35e7ddc3c4 100644 --- a/components/drivers/rtc/rtc.c +++ b/components/drivers/rtc/rtc.c @@ -218,7 +218,7 @@ rt_err_t set_time(rt_uint32_t hour, rt_uint32_t minute, rt_uint32_t second) return ret; } -#ifdef FINSH_USING_MSH +#ifdef RT_USING_FINSH #include <finsh.h> /** * get date and time or set (local timezone) [year month day hour min sec] @@ -283,6 +283,6 @@ static void date(uint8_t argc, char **argv) } } MSH_CMD_EXPORT(date, get date and time or set (local timezone) [year month day hour min sec]) -#endif /* FINSH_USING_MSH */ +#endif /* RT_USING_FINSH */ #endif /* RT_USING_RTC */ |
