From c6622a8f68c011f9380b7261d4b848a83f4c2f81 Mon Sep 17 00:00:00 2001 From: kurisaw <2053731441@qq.com> Date: Fri, 20 Dec 2024 10:52:10 +0800 Subject: [PATCH] Only one rtc device is allowed and update sdk version --- projects/etherkit_basic_rtc/.config | 2 +- projects/etherkit_basic_rtc/rtconfig.h | 1 - rt-thread/components/drivers/rtc/soft_rtc.c | 4 +--- sdk-bsp-rzn2l-etherkit.yaml | 4 ++-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/projects/etherkit_basic_rtc/.config b/projects/etherkit_basic_rtc/.config index 63a0c04..3c8c2b6 100644 --- a/projects/etherkit_basic_rtc/.config +++ b/projects/etherkit_basic_rtc/.config @@ -145,7 +145,7 @@ CONFIG_RT_SERIAL_USING_DMA=y # CONFIG_RT_USING_PM is not set CONFIG_RT_USING_RTC=y CONFIG_RT_USING_ALARM=y -CONFIG_RT_USING_SOFT_RTC=y +# CONFIG_RT_USING_SOFT_RTC is not set # CONFIG_RT_USING_SDIO is not set # CONFIG_RT_USING_SPI is not set # CONFIG_RT_USING_WDT is not set diff --git a/projects/etherkit_basic_rtc/rtconfig.h b/projects/etherkit_basic_rtc/rtconfig.h index c7706ca..208e8c6 100644 --- a/projects/etherkit_basic_rtc/rtconfig.h +++ b/projects/etherkit_basic_rtc/rtconfig.h @@ -88,7 +88,6 @@ #define RT_SERIAL_USING_DMA #define RT_USING_RTC #define RT_USING_ALARM -#define RT_USING_SOFT_RTC #define RT_USING_PIN /* Using USB */ diff --git a/rt-thread/components/drivers/rtc/soft_rtc.c b/rt-thread/components/drivers/rtc/soft_rtc.c index 8d1e0fb..a53873d 100644 --- a/rt-thread/components/drivers/rtc/soft_rtc.c +++ b/rt-thread/components/drivers/rtc/soft_rtc.c @@ -263,8 +263,6 @@ static int rt_soft_rtc_init(void) rt_device_register(&soft_rtc_dev, "rtc", RT_DEVICE_FLAG_RDWR); - source_device = &soft_rtc_dev; - init_ok = RT_TRUE; return 0; @@ -322,7 +320,7 @@ static void cmd_rtc_sync(int argc, char **argv) rt_kprintf("local time: %.*s", 25, ctime(&now)); rt_kprintf("timestamps: %ld\n", (long)tv.tv_sec); } -MSH_CMD_EXPORT_ALIAS(cmd_rtc_sync, rtc_sync, Update time by soft rtc); +MSH_CMD_EXPORT_ALIAS(cmd_rtc_sync, rtc_sync, Update time by rtc); #endif #endif /* RT_USING_SYSTEM_WORKQUEUE */ diff --git a/sdk-bsp-rzn2l-etherkit.yaml b/sdk-bsp-rzn2l-etherkit.yaml index 39ceb54..4d3978e 100644 --- a/sdk-bsp-rzn2l-etherkit.yaml +++ b/sdk-bsp-rzn2l-etherkit.yaml @@ -14,7 +14,7 @@ board: sale_contact_global: https://www.rt-thread.org/ small_image: docs/figures/small.png vendor: Renesas - version: 1.1.0 + version: 1.1.1 chip: chip_name: R9A07G084 clock_source: HSE @@ -78,7 +78,7 @@ features_zh: - 电压:核心 1.1V,I/O 3.3V,1.8V pkg_type: Board_Support_Packages pkg_vendor: RealThread -pkg_version: 1.1.0 +pkg_version: 1.1.1 example_projects: - project_name: etherkit_blink_led project_description: LED闪烁示例