Merge branch 'master' into ucloud_iot_pkg_update_v101

ci.py

@@ -87,7 +87,7 @@ def json_file_content_check(json_pathname):
         print ('The category of ' + package_info['name'] + ' package is lost.')  
         return False 
 
-    if package_info['enable'] == '' :
+    if package_info.has_key('enable') is False or package_info['enable'] == '' :
         print ('The enable of ' + package_info['name'] + ' package is lost.')  
         return False 
 

iot/Kconfig

@@ -5,6 +5,7 @@ source "$PKGS_DIR/packages/iot/webclient/Kconfig"
 source "$PKGS_DIR/packages/iot/webnet/Kconfig"
 source "$PKGS_DIR/packages/iot/mongoose/Kconfig"
 source "$PKGS_DIR/packages/iot/mymqtt/Kconfig"
+source "$PKGS_DIR/packages/iot/mqttclient/Kconfig"
 source "$PKGS_DIR/packages/iot/WebTerminal/Kconfig"
 source "$PKGS_DIR/packages/iot/cJSON/Kconfig"
 source "$PKGS_DIR/packages/iot/jsmn/Kconfig"
@@ -38,5 +39,6 @@ source "$PKGS_DIR/packages/iot/smtp_client/Kconfig"
 source "$PKGS_DIR/packages/iot/abup_fota/Kconfig"
 source "$PKGS_DIR/packages/iot/libcurl2rtt/Kconfig"
 source "$PKGS_DIR/packages/iot/capnp/Kconfig"
+source "$PKGS_DIR/packages/iot/rt_cjson_tools/Kconfig"
 
 endmenu

iot/at_device/Kconfig

@@ -26,6 +26,7 @@ if PKG_USING_AT_DEVICE
         source "$PKGS_DIR/packages/iot/at_device/w60x/Kconfig"
         source "$PKGS_DIR/packages/iot/at_device/a9g/Kconfig"
         source "$PKGS_DIR/packages/iot/at_device/bc26/Kconfig"
+        source "$PKGS_DIR/packages/iot/at_device/air720/Kconfig"
         source "$PKGS_DIR/packages/iot/at_device/me3616/Kconfig"
 
     endif

iot/at_device/air720/Kconfig

@@ -0,0 +1,37 @@
+
+# Air720 AT device configuration
+menuconfig AT_DEVICE_USING_AIR720
+    bool "luat Air720"
+    default n
+
+if AT_DEVICE_USING_AIR720
+
+    config AT_DEVICE_AIR720_INIT_ASYN
+        bool "Enable initialize by thread"
+        default n
+
+    config AT_DEVICE_AIR720_SAMPLE
+        bool "Enable sample"
+        default y
+
+    if AT_DEVICE_AIR720_SAMPLE
+
+       config AIR720_SAMPLE_POWER_PIN
+            int "Power pin"
+            default -1
+
+        config AIR720_SAMPLE_STATUS_PIN
+            int "Power status pin"
+            default -1
+
+        config AIR720_SAMPLE_CLIENT_NAME
+            string "AT client device name"
+            default "uart3"
+
+        config AIR720_SAMPLE_RECV_BUFF_LEN
+            int "The maximum length of receive line buffer"
+            default 512
+
+    endif
+
+endif

iot/iot_cloud/ucloud_iot_sdk/Kconfig

@@ -88,7 +88,7 @@ if PKG_USING_UCLOUD_IOT_SDK
         bool "Enable Ota"
         depends on PKG_USING_UCLOUD_MQTT
         default n
-		select PKG_USING_FAL
+        select PKG_USING_FAL
 
     config PKG_USING_UCLOUD_OTA_SAMPLE
         bool "Enable Ucloud Ota Sample"

iot/libcurl2rtt/Kconfig

@@ -1,33 +1,33 @@
-menuconfig PKG_USING_LIBCURL2RTT
-    bool "libcurl2rtt: The curl library ported on the RT-Thread platform"
-    select RT_USING_SAL
-    select RT_USING_LIBC
-    select RT_USING_POSIX
-    select RT_USING_POSIX_TERMIOS
-    select PKG_USING_MBEDTLS
-    default n
-
-if PKG_USING_LIBCURL2RTT
-
-    config PKG_LIBCURL2RTT_PATH
-        string
-        default "/packages/iot/libcurl2rtt"
-
-    choice
-        prompt "Version"
-        default PKG_USING_LIBCURL2RTT_V076700
-        help
-            Select the LIBCURL2RTT version
-
-        config PKG_USING_LIBCURL2RTT_V076700
-            bool "v7.67.0"
-
-        config PKG_USING_LIBCURL2RTT_LATEST_VERSION
-            bool "latest"
-    endchoice
-
-    config PKG_LIBCURL2RTT_VER
-    	string
-    	default "v7.67.0" if PKG_USING_LIBCURL2RTT_V076700
-    	default "latest" if PKG_USING_LIBCURL2RTT_LATEST_VERSION
-endif
+menuconfig PKG_USING_LIBCURL2RTT
+    bool "libcurl2rtt: The curl library ported on the RT-Thread platform"
+    select RT_USING_SAL
+    select RT_USING_LIBC
+    select RT_USING_POSIX
+    select RT_USING_POSIX_TERMIOS
+    select PKG_USING_MBEDTLS
+    default n
+
+if PKG_USING_LIBCURL2RTT
+
+    config PKG_LIBCURL2RTT_PATH
+        string
+        default "/packages/iot/libcurl2rtt"
+
+    choice
+        prompt "Version"
+        default PKG_USING_LIBCURL2RTT_V076700
+        help
+            Select the LIBCURL2RTT version
+
+        config PKG_USING_LIBCURL2RTT_V076700
+            bool "v7.67.0"
+
+        config PKG_USING_LIBCURL2RTT_LATEST_VERSION
+            bool "latest"
+    endchoice
+
+    config PKG_LIBCURL2RTT_VER
+    	string
+    	default "v7.67.0" if PKG_USING_LIBCURL2RTT_V076700
+    	default "latest" if PKG_USING_LIBCURL2RTT_LATEST_VERSION
+endif

iot/libcurl2rtt/package.json

@@ -1,32 +1,32 @@
-{
-  "name": "libcurl2rtt",
-  "description": "The curl library ported on the RT-Thread platform",
-  "description_zh": "基于 RT-Thread 移植的 curl 库", 
-  "enable": "PKG_USING_LIBCURL2RTT",
-  "keywords": [
-    "curl"
-  ],
-  "category": "iot",
-  "author": {
-    "name": "liu2guang",
-    "email": "[email protected]"
-  },
-  "license": "Apache-2.0",
-  "repository": "https://github.com/liu2guang/libcurl2rtt",
-  "icon": "unknown",
-  "homepage": "https://github.com/liu2guang/libcurl2rtt/blob/master/README.md",
-  "doc": "unknown",
-  "site": [
-    {
-      "version": "v7.67.0",
-      "URL": "https://github.com/liu2guang/libcurl2rtt/archive/v7.67.0.zip",
-      "filename": "libcurl2rtt_v7.67.0.zip"
-    },
-    {
-      "version": "latest",
-      "URL": "https://github.com/liu2guang/libcurl2rtt.git",
-      "filename": "libcurl2rtt_latest.zip",
-      "VER_SHA": "master"
-    }
-  ]
-}
+{
+  "name": "libcurl2rtt",
+  "description": "The curl library ported on the RT-Thread platform",
+  "description_zh": "基于 RT-Thread 移植的 curl 库", 
+  "enable": "PKG_USING_LIBCURL2RTT",
+  "keywords": [
+    "curl"
+  ],
+  "category": "iot",
+  "author": {
+    "name": "liu2guang",
+    "email": "[email protected]"
+  },
+  "license": "Apache-2.0",
+  "repository": "https://github.com/liu2guang/libcurl2rtt",
+  "icon": "unknown",
+  "homepage": "https://github.com/liu2guang/libcurl2rtt/blob/master/README.md",
+  "doc": "unknown",
+  "site": [
+    {
+      "version": "v7.67.0",
+      "URL": "https://github.com/liu2guang/libcurl2rtt/archive/v7.67.0.zip",
+      "filename": "libcurl2rtt_v7.67.0.zip"
+    },
+    {
+      "version": "latest",
+      "URL": "https://github.com/liu2guang/libcurl2rtt.git",
+      "filename": "libcurl2rtt_latest.zip",
+      "VER_SHA": "master"
+    }
+  ]
+}

iot/mqttclient/Kconfig

@@ -0,0 +1,161 @@
+
+# Kconfig file for package mqttclient
+menuconfig PKG_USING_MQTTCLIENT
+    bool "mqttclient: A mqttclient based on the socket API, support QoS2, mbedtls."
+    default n
+
+if PKG_USING_MQTTCLIENT
+
+    config PKG_MQTTCLIENT_PATH
+        string
+        default "/packages/iot/mqttclient"
+
+    config MQTT_NETWORK_TYPE_TLS
+        bool "enable mbedtls"
+        default n
+
+    if MQTT_NETWORK_TYPE_TLS
+        config MQTT_TLS_HANDSHAKE_TIMEOUT
+            int "mbedtls handshake timeout"
+            default 5000
+    endif
+
+    config LOG_IS_SALOF
+        bool "enable salof"
+        default y
+
+    if LOG_IS_SALOF
+        config USE_LOG
+            bool "use log"
+            default y
+
+        if USE_LOG
+            config USE_SALOF
+                bool "use salof"
+                default y
+
+            if !USE_IDLE_HOOK
+                if USE_SALOF
+                    config SALOF_BUFF_SIZE
+                        int "salof buff size"
+                        default 512
+
+                    config SALOF_FIFO_SIZE
+                        int "salof fifo size"
+                        default 2048
+
+                    config SALOF_THREAD_STACK_SIZE
+                        int "salof thread size"
+                        default 2048
+
+                    config SALOF_THREAD_TICK
+                        int "salof thread tick"
+                        default 50
+                endif 
+            endif
+
+            config LOG_COLOR
+                bool "use color"
+                default n
+
+            config LOG_TS
+                bool "use timestamp"
+                default n
+
+            config LOG_TAR
+                bool "use tar"
+                default n
+
+            config USE_IDLE_HOOK
+                bool "use idle thread hook"
+                default n
+        endif
+    endif
+
+    config LOG_LEVEL
+        int "select output log level"
+        default 5
+        help
+            1 : ASSERT_LEVEL
+            2 : ERR_LEVEL
+            3 : WARN_LEVEL
+            4 : INFO_LEVEL
+            5 : DEBUG_LEVEL
+
+    config MQTT_VERSION
+        int "mqtt version, 4 is mqtt 3.1.1, 3 is mqtt 3.1"
+        default 4
+
+    config MQTT_KEEP_ALIVE_INTERVAL
+        int "mqtt keep alive interver, unit: second"
+        default 100
+
+    config MQTT_THREAD_STACK_SIZE
+        int "mqtt thread stack size"
+        default 4096
+
+    config MQTT_THREAD_PRIO
+        int "mqtt thread priority"
+        default 5
+
+    config MQTT_THREAD_TICK
+        int "mqtt thread tick"
+        default 50
+
+    config MQTT_MAX_PACKET_ID
+        int "mqtt max packet id"
+        default 0xFFFE
+
+    config MQTT_TOPIC_LEN_MAX
+        int "mqtt max topic len"
+        default 64
+
+    config MQTT_ACK_HANDLER_NUM_MAX
+        int "mqtt max handler number"
+        default 64
+
+    config MQTT_DEFAULT_BUF_SIZE
+        int "mqtt default buffer size"
+        default 1024
+
+    config MQTT_DEFAULT_CMD_TIMEOUT
+        int "mqtt default cmd timeout"
+        default 4000
+
+    config MQTT_MAX_CMD_TIMEOUT
+        int "mqtt max cmd timeout"
+        default 20000
+
+    config MQTT_MIN_CMD_TIMEOUT
+        int "mqtt min cmd timeout"
+        default 1000
+
+    config MQTT_RECONNECT_DEFAULT_DURATION
+        int "mqtt default reconnect duratton"
+        default 1000
+
+
+    config PKG_USING_MQTTCLIENT_TEST
+        bool "enable mqttclient test"
+        default n
+
+    choice
+        prompt "Version"
+        default PKG_USING_MQTTCLIENT_LATEST_VERSION
+        help
+            Select the package version
+
+        config PKG_USING_MQTTCLIENT_V100
+            bool "v1.0.0"
+
+        config PKG_USING_MQTTCLIENT_LATEST_VERSION
+            bool "latest"
+    endchoice
+
+    config PKG_MQTTCLIENT_VER
+       string
+       default "v1.0.0"    if PKG_USING_MQTTCLIENT_V100
+       default "latest"    if PKG_USING_MQTTCLIENT_LATEST_VERSION
+
+endif
+