Merge pull request RT-Thread#1163 from mysterywolf/net

[netutils] 优化版本控制并发布1.3.2
enkiller · Jan 17, 2022 · 1774906 · 1774906
2 parents 016255b + 4d90295
commit 1774906
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 30 deletions.
diff --git 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,32 +120,41 @@ if PKG_USING_NETUTILS
         prompt "Version"
         help
             Select the netutils version
-        default PKG_USING_NETUTILS_V131
+        default PKG_USING_NETUTILS_LATEST_VERSION if RT_VER_NUM = 0x40100
+        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
 
         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
 
     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
@@ -159,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
@@ -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",