From 6cb7f14bdf4783575d0ee9efe2449eeba4eebc65 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Sat, 15 Jan 2022 13:47:11 -0500 Subject: [PATCH 1/3] =?UTF-8?q?[netutils]=20=E4=BC=98=E5=8C=96=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iot/netutils/Kconfig | 59 ++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/iot/netutils/Kconfig b/iot/netutils/Kconfig index 7ac68ec498..8ba747839a 100644 --- a/iot/netutils/Kconfig +++ b/iot/netutils/Kconfig @@ -56,31 +56,28 @@ if PKG_USING_NETUTILS default n if PKG_NETUTILS_NTP - if PKG_NETUTILS_VER_NUM > 0x10200 - config NTP_USING_AUTO_SYNC - bool "Enable NTP to synchronize RTC automatically" - select RT_USING_SYSTEM_WORKQUEUE - default y - - if NTP_USING_AUTO_SYNC - config NTP_AUTO_SYNC_FIRST_DELAY - int "NTP first sync delay time(second) for network connect" - default 30 - - config NTP_AUTO_SYNC_PERIOD - int "NTP auto sync period(second)" - default 3600 - endif + config NTP_USING_AUTO_SYNC + bool "Enable NTP to synchronize RTC automatically" + depends on PKG_NETUTILS_VER_NUM > 0x10200 + select RT_USING_SYSTEM_WORKQUEUE + default y - endif + if NTP_USING_AUTO_SYNC + config NTP_AUTO_SYNC_FIRST_DELAY + int "NTP first sync delay time(second) for network connect" + default 30 - if PKG_NETUTILS_VER_NUM <= 0x10200 - config NETUTILS_NTP_TIMEZONE - int "Timezone for calculate local time" - range -12 12 - default 8 + config NTP_AUTO_SYNC_PERIOD + int "NTP auto sync period(second)" + default 3600 endif + config NETUTILS_NTP_TIMEZONE + int "Timezone for calculate local time" + depends on PKG_NETUTILS_VER_NUM <= 0x10200 + range -12 12 + default 8 + config NETUTILS_NTP_HOSTNAME string "NTP server name1" default "cn.ntp.org.cn" @@ -123,6 +120,7 @@ if PKG_USING_NETUTILS prompt "Version" help Select the netutils version + default PKG_USING_NETUTILS_LATEST_VERSION if RT_VER_NUM >= 0x40100 default PKG_USING_NETUTILS_V131 config PKG_USING_NETUTILS_LATEST_VERSION @@ -130,20 +128,23 @@ if PKG_USING_NETUTILS config PKG_USING_NETUTILS_V131 bool "v1.3.1" + depends on RT_VER_NUM < 0x40100 config PKG_USING_NETUTILS_V130 bool "v1.3.0" + depends on RT_VER_NUM < 0x40100 - if RT_VER_NUM < 0x40004 - config PKG_USING_NETUTILS_V120 - bool "v1.2.0" + config PKG_USING_NETUTILS_V120 + bool "v1.2.0" + depends on RT_VER_NUM < 0x40004 - config PKG_USING_NETUTILS_V110 - bool "v1.1.0" + config PKG_USING_NETUTILS_V110 + bool "v1.1.0" + depends on RT_VER_NUM < 0x40004 - config PKG_USING_NETUTILS_V100 - bool "v1.0.0" - endif + config PKG_USING_NETUTILS_V100 + bool "v1.0.0" + depends on RT_VER_NUM < 0x40004 endchoice From 0c22d6146b8a568facdfa12aa69a63da1e0ba804 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Sat, 15 Jan 2022 14:30:23 -0500 Subject: [PATCH 2/3] =?UTF-8?q?[netutils]=20=E5=8F=91=E5=B8=83v1.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iot/netutils/Kconfig | 8 +++++++- iot/netutils/package.json | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/iot/netutils/Kconfig b/iot/netutils/Kconfig index 8ba747839a..fe02afdf21 100644 --- a/iot/netutils/Kconfig +++ b/iot/netutils/Kconfig @@ -121,11 +121,15 @@ if PKG_USING_NETUTILS help Select the netutils version default PKG_USING_NETUTILS_LATEST_VERSION if RT_VER_NUM >= 0x40100 - default PKG_USING_NETUTILS_V131 + default PKG_USING_NETUTILS_V132 config PKG_USING_NETUTILS_LATEST_VERSION bool "latest" + config PKG_USING_NETUTILS_V132 + bool "v1.3.2" + depends on RT_VER_NUM < 0x40100 + config PKG_USING_NETUTILS_V131 bool "v1.3.1" depends on RT_VER_NUM < 0x40100 @@ -150,6 +154,7 @@ if PKG_USING_NETUTILS config PKG_NETUTILS_VER string + default "v1.3.2" if PKG_USING_NETUTILS_V132 default "v1.3.1" if PKG_USING_NETUTILS_V131 default "v1.3.0" if PKG_USING_NETUTILS_V130 default "v1.2.0" if PKG_USING_NETUTILS_V120 @@ -160,6 +165,7 @@ if PKG_USING_NETUTILS config PKG_NETUTILS_VER_NUM hex default 0x99999 if PKG_USING_NETUTILS_LATEST_VERSION + default 0x10302 if PKG_USING_NETUTILS_V132 default 0x10301 if PKG_USING_NETUTILS_V131 default 0x10300 if PKG_USING_NETUTILS_V130 default 0x10200 if PKG_USING_NETUTILS_V120 diff --git a/iot/netutils/package.json b/iot/netutils/package.json index ea93ba1db8..86e0114ede 100644 --- a/iot/netutils/package.json +++ b/iot/netutils/package.json @@ -26,6 +26,12 @@ "homepage": "https://github.com/RT-Thread-packages/netutils#readme", "doc": "https://www.rt-thread.org/document/site/rtthread-application-note/packages/netutils/an0018-rtthread-system-netutils/", "site": [ + { + "version": "v1.3.2", + "URL": "https://github.com/RT-Thread-packages/netutils/archive/1.3.2.zip", + "filename": "netutils-1.3.2.zip", + "VER_SHA": "NULL" + }, { "version": "v1.3.1", "URL": "https://github.com/RT-Thread-packages/netutils/archive/1.3.1.zip", From 4d90295e5b3db7a7839beebc6c21ab1c494b685b Mon Sep 17 00:00:00 2001 From: "Man, Jianting (Meco)" <920369182@qq.com> Date: Sun, 16 Jan 2022 23:00:59 -0500 Subject: [PATCH 3/3] Update Kconfig --- iot/netutils/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iot/netutils/Kconfig b/iot/netutils/Kconfig index fe02afdf21..bb86dae0f1 100644 --- a/iot/netutils/Kconfig +++ b/iot/netutils/Kconfig @@ -120,7 +120,7 @@ if PKG_USING_NETUTILS prompt "Version" help Select the netutils version - default PKG_USING_NETUTILS_LATEST_VERSION if RT_VER_NUM >= 0x40100 + default PKG_USING_NETUTILS_LATEST_VERSION if RT_VER_NUM = 0x40100 default PKG_USING_NETUTILS_V132 config PKG_USING_NETUTILS_LATEST_VERSION