Merge pull request RT-Thread#1161 from xiangxistu/master

【release】webclient/webnet new version
enkiller · Jan 17, 2022 · 1a0304c · 1a0304c
2 parents 19053da + 495cfff
commit 1a0304c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/iot/webclient/Kconfig b/iot/webclient/Kconfig
@@ -66,7 +66,10 @@ if PKG_USING_WEBCLIENT
         prompt "Version"
         help
             Select the webclient version
-        default PKG_USING_WEBCLIENT_LATEST_VERSION
+        default PKG_USING_WEBCLIENT_V220
+
+        config PKG_USING_WEBCLIENT_V220
+            bool "v2.2.0"
 
         config PKG_USING_WEBCLIENT_V212
             bool "v2.1.2"
@@ -93,6 +96,7 @@ if PKG_USING_WEBCLIENT
 
     config PKG_WEBCLIENT_VER
        string
+       default "v2.2.0"    if PKG_USING_WEBCLIENT_V220
        default "v2.1.2"    if PKG_USING_WEBCLIENT_V212
        default "v2.1.1"    if PKG_USING_WEBCLIENT_V211
        default "v2.1.0"    if PKG_USING_WEBCLIENT_V210
@@ -104,6 +108,7 @@ if PKG_USING_WEBCLIENT
    config PKG_WEBCLIENT_VER_NUM
         hex
         default 0x99999    if PKG_USING_WEBCLIENT_LATEST_VERSION
+        default 0x20200    if PKG_USING_WEBCLIENT_V220
         default 0x20102    if PKG_USING_WEBCLIENT_V212
         default 0x20101    if PKG_USING_WEBCLIENT_V211
         default 0x20100    if PKG_USING_WEBCLIENT_V210

diff --git a/iot/webclient/package.json b/iot/webclient/package.json
@@ -49,6 +49,11 @@
       "URL": "https://github.com/RT-Thread-packages/webclient/archive/2.1.2.zip",
       "filename": "webclient-2.1.2.zip"
     },
+    {
+        "version": "v2.2.0",
+        "URL": "https://github.com/RT-Thread-packages/webclient/archive/refs/tags/2.2.0.zip",
+        "filename": "webclient-2.2.0.zip"
+    },
     {
       "version": "latest",
       "URL": "https://github.com/RT-Thread-packages/webclient.git",

diff --git a/iot/webnet/Kconfig b/iot/webnet/Kconfig
@@ -98,7 +98,10 @@ if PKG_USING_WEBNET
         prompt "Version"
         help
             Select the webnet version
-        default PKG_USING_WEBNET_LATEST_VERSION
+        default PKG_USING_WEBNET_V203
+
+        config PKG_USING_WEBNET_V203
+            bool "v2.0.3"
 
         config PKG_USING_WEBNET_V202
             bool "v2.0.2"
@@ -115,6 +118,7 @@ if PKG_USING_WEBNET
 
     config PKG_WEBNET_VER
        string
+       default "v2.0.3"    if PKG_USING_WEBNET_V203
        default "v2.0.2"    if PKG_USING_WEBNET_V202
        default "v2.0.1"    if PKG_USING_WEBNET_V201
        default "v2.0.0"    if PKG_USING_WEBNET_V200
@@ -126,6 +130,7 @@ if PKG_USING_WEBNET
         default 0x20000    if PKG_USING_WEBNET_V200
         default 0x20001    if PKG_USING_WEBNET_V201
         default 0x20002    if PKG_USING_WEBNET_V202
+        default 0x20003    if PKG_USING_WEBNET_V203
 
 endif
 
diff --git a/iot/webnet/package.json b/iot/webnet/package.json
@@ -17,6 +17,11 @@
   "icon": "https://www.rt-thread.org/qa/template/fxiaomi/style/image/logo.png",
   "homepage": "https://github.com/RT-Thread-packages/webnet#readme",
   "site": [
+    {
+        "version": "v2.0.3",
+        "URL": "https://github.com/RT-Thread-packages/webnet/archive/refs/tags/2.0.3.zip",
+        "filename": "webnet-2.0.3.zip"
+    },
     {
       "version": "v2.0.2",
       "URL": "https://github.com/RT-Thread-packages/webnet/archive/2.0.2.zip",