From 6ae28b904b14414ff605edd0a3751e1349f4e817 Mon Sep 17 00:00:00 2001 From: "ethan.du" Date: Thu, 27 Feb 2020 12:39:44 +0800 Subject: [PATCH 1/2] ucloud iot pkg update v1.0.1 --- iot/iot_cloud/ucloud_iot_sdk/Kconfig | 256 +++++++++++----------- iot/iot_cloud/ucloud_iot_sdk/package.json | 68 +++--- 2 files changed, 160 insertions(+), 164 deletions(-) diff --git a/iot/iot_cloud/ucloud_iot_sdk/Kconfig b/iot/iot_cloud/ucloud_iot_sdk/Kconfig index fb00b8cfb8..a7472e3d7b 100644 --- a/iot/iot_cloud/ucloud_iot_sdk/Kconfig +++ b/iot/iot_cloud/ucloud_iot_sdk/Kconfig @@ -1,130 +1,126 @@ - -# Kconfig file for package ucloud_iot_sdk -menuconfig PKG_USING_UCLOUD_IOT_SDK - bool "ucloud_iot_sdk: ucloud iot sdk for uiot-core platform." - select RT_USING_SAL - default n - -if PKG_USING_UCLOUD_IOT_SDK - - config PKG_UCLOUD_IOT_SDK_PATH - string - default "/packages/iot/iot_cloud/ucloud_iot_sdk" - - config PKG_USING_UCLOUD_MQTT - bool "Enable Mqtt" - default y - if PKG_USING_UCLOUD_MQTT - choice - prompt "Auth Mode" - default PKG_USING_UCLOUD_MQTT_STATIC_AUTH - help - Select the Auth Mode - - config PKG_USING_UCLOUD_MQTT_STATIC_AUTH - bool "Enable Static Register" - - config PKG_USING_UCLOUD_MQTT_DYNAMIC_AUTH - bool "Enable Dynamic Register" - endchoice - endif - - menu "Ucloud Device Config" - menuconfig PKG_USING_UCLOUD_IOT_SDK_CONFIG - bool "Device Config" - default y - config PKG_USING_UCLOUD_IOT_SDK_PRODUCT_SN - string "Config Product SN" - depends on PKG_USING_UCLOUD_MQTT - default "produce_sn" - - config PKG_USING_UCLOUD_IOT_SDK_DEVICE_SN - string "Config Device SN" - depends on PKG_USING_UCLOUD_MQTT - default "device_sn" - - config PKG_USING_UCLOUD_IOT_SDK_DEVICE_SECRET - string "Config Device Secret" - depends on PKG_USING_UCLOUD_MQTT && PKG_USING_UCLOUD_MQTT_STATIC_AUTH - default "device_secret" - help - static register device needed othterwise null - - config PKG_USING_UCLOUD_IOT_SDK_PRODUCT_SECRET - string "Config Product Secret" - depends on PKG_USING_UCLOUD_MQTT && PKG_USING_UCLOUD_MQTT_DYNAMIC_AUTH - default "product_secret" - help - dynamic register device needed othterwise null - endmenu - - config PKG_USING_UCLOUD_TLS - bool "Enable Tls" - depends on PKG_USING_UCLOUD_MQTT - default n - select PKG_USING_MBEDTLS - - config PKG_USING_UCLOUD_MQTT_SAMPLE - bool "Enable Ucloud Mqtt Sample" - depends on PKG_USING_UCLOUD_MQTT - default n - - config PKG_USING_UCLOUD_MQTT_DYNAMIC_AUTH_SAMPLE - bool "Enable Ucloud Mqtt Dynamic Auth Sample" - depends on PKG_USING_UCLOUD_MQTT_DYNAMIC_AUTH - default n - - config PKG_USING_UCLOUD_SHADOW - bool "Enable Shadow" - depends on PKG_USING_UCLOUD_MQTT - default n - - config PKG_USING_UCLOUD_SHADOW_SAMPLE - bool "Enable Ucloud Shadow Sample" - depends on PKG_USING_UCLOUD_SHADOW - default n - - config PKG_USING_UCLOUD_DEV_MODEL - bool "Enable Dev Model" - depends on PKG_USING_UCLOUD_MQTT - default n - - config PKG_USING_UCLOUD_DEV_MODEL_SAMPLE - bool "Enable Ucloud Dev Model Sample" - depends on PKG_USING_UCLOUD_DEV_MODEL - default n - - config PKG_USING_UCLOUD_OTA - bool "Enable Ota" - depends on PKG_USING_UCLOUD_MQTT - default n - - config PKG_USING_UCLOUD_OTA_SAMPLE - bool "Enable Ucloud Ota Sample" - depends on PKG_USING_UCLOUD_OTA - default n - - config PKG_USING_UCLOUD_DEBUG - bool "Enable Ucloud Debug" - default n - - choice - prompt "Version" - default PKG_USING_UCLOUD_IOT_SDK_LATEST_VERSION - help - Select the package version - - config PKG_USING_UCLOUD_IOT_SDK_V100 - bool "v1.0.0" - - config PKG_USING_UCLOUD_IOT_SDK_LATEST_VERSION - bool "latest" - endchoice - - config PKG_UCLOUD_IOT_SDK_VER - string - default "v1.0.0" if PKG_USING_UCLOUD_IOT_SDK_V100 - default "latest" if PKG_USING_UCLOUD_IOT_SDK_LATEST_VERSION - -endif - +# Kconfig file for package ucloud_iot_sdk +menuconfig PKG_USING_UCLOUD_IOT_SDK + bool "ucloud_iot_sdk: Ucloud iot sdk for uiot-core platform." + select RT_USING_SAL + default n + +if PKG_USING_UCLOUD_IOT_SDK + + config PKG_UCLOUD_IOT_SDK_PATH + string + default "/packages/iot/iot_cloud/ucloud_iot_sdk" + + menu "Ucloud Device Config" + menuconfig PKG_USING_UCLOUD_IOT_SDK_CONFIG + bool "Device Config" + default y + config PKG_USING_UCLOUD_IOT_SDK_PRODUCT_SN + string "Config Product SN" + default "produce_sn" + + config PKG_USING_UCLOUD_IOT_SDK_PRODUCT_SECRET + string "Config Product Secret" + default "product_secret" + help + dynamic register device needed + + config PKG_USING_UCLOUD_IOT_SDK_DEVICE_SN + string "Config Device SN" + default "device_sn" + + config PKG_USING_UCLOUD_IOT_SDK_DEVICE_SECRET + string "Config Device Secret" + default "device_secret" + help + static register device needed + endmenu + + config PKG_USING_UCLOUD_MQTT + bool "Enable Mqtt Link uiot-core Platform" + default n + + config PKG_USING_UCLOUD_MQTT_SAMPLE + bool "Enable Ucloud Mqtt Sample" + depends on PKG_USING_UCLOUD_MQTT + default n + + config PKG_USING_UCLOUD_MQTT_DYNAMIC_AUTH_SAMPLE + bool "Enable Ucloud Mqtt Dynamic Auth Sample" + depends on PKG_USING_UCLOUD_MQTT + default n + + config PKG_USING_UCLOUD_HTTP + bool "Enable Http Link uiot-core Platform" + select PKG_USING_UCLOUD_TLS + default n + + config PKG_USING_UCLOUD_HTTP_PUBLISH_SAMPLE + bool "Enable Ucloud Http Publish Sample" + depends on PKG_USING_UCLOUD_HTTP + default n + + config PKG_USING_UCLOUD_HTTP_UPLOAD_FILE_SAMPLE + bool "Enable Ucloud Http Upload File Sample" + depends on PKG_USING_UCLOUD_HTTP + default n + + config PKG_USING_UCLOUD_SHADOW + bool "Enable Shadow" + depends on PKG_USING_UCLOUD_MQTT + default n + + config PKG_USING_UCLOUD_SHADOW_SAMPLE + bool "Enable Ucloud Shadow Sample" + depends on PKG_USING_UCLOUD_SHADOW + default n + + config PKG_USING_UCLOUD_DEV_MODEL + bool "Enable Dev Model" + depends on PKG_USING_UCLOUD_MQTT + default n + + config PKG_USING_UCLOUD_DEV_MODEL_SAMPLE + bool "Enable Ucloud Dev Model Sample" + depends on PKG_USING_UCLOUD_DEV_MODEL + default n + + config PKG_USING_UCLOUD_OTA + bool "Enable Ota" + depends on PKG_USING_UCLOUD_MQTT + default n + select PKG_USING_FAL + + config PKG_USING_UCLOUD_OTA_SAMPLE + bool "Enable Ucloud Ota Sample" + depends on PKG_USING_UCLOUD_OTA + default n + + config PKG_USING_UCLOUD_TLS + bool "Enable Tls" + depends on PKG_USING_UCLOUD_MQTT || PKG_USING_UCLOUD_HTTP + default n + select PKG_USING_MBEDTLS + + config PKG_USING_UCLOUD_DEBUG + bool "Enable Ucloud Debug" + default n + + choice + prompt "Version" + default PKG_USING_UCLOUD_IOT_SDK_LATEST_VERSION + help + Select the package version + + config PKG_USING_UCLOUD_IOT_SDK_V101 + bool "v1.0.1" + + config PKG_USING_UCLOUD_IOT_SDK_LATEST_VERSION + bool "latest" + endchoice + + config PKG_UCLOUD_IOT_SDK_VER + string + default "v1.0.1" if PKG_USING_UCLOUD_IOT_SDK_V101 + default "latest" if PKG_USING_UCLOUD_IOT_SDK_LATEST_VERSION + +endif diff --git a/iot/iot_cloud/ucloud_iot_sdk/package.json b/iot/iot_cloud/ucloud_iot_sdk/package.json index abd7893f0d..6274b7e2b7 100644 --- a/iot/iot_cloud/ucloud_iot_sdk/package.json +++ b/iot/iot_cloud/ucloud_iot_sdk/package.json @@ -1,34 +1,34 @@ -{ - "name": "ucloud_iot_sdk", - "description": "ucloud iot sdk for uiot-core platform.", - "description_zh": "用于快速连接优刻得物联网平台的软件包。", - "enable": "PKG_USING_UCLOUD_IOT_SDK", - "keywords": [ - "ucloud_iot_sdk" - ], - "category": "iot", - "author": { - "name": "ucloud", - "email": "ethan.du@ucloud.cn", - "github": "ucloud" - }, - "license": "Apache-2.0", - "repository": "https://github.com/ucloud/ucloud-iot-rtthread-package.git", - "icon": "https://www.rt-thread.org/qa/template/fxiaomi/style/image/logo.png", - "homepage": "https://github.com/ucloud/ucloud-iot-rtthread-package", - "doc": "https://github.com/ucloud/ucloud-iot-rtthread-package/tree/master/docs", - "site": [ - { - "version": "v1.0.0", - "URL": "https://github.com/ucloud/ucloud-iot-rtthread-package.git", - "filename": "ucloud_iot_sdk-1.0.0.zip", - "VER_SHA": "43b03bc27e8176718b44af134b8ac1c296b1164c" - }, - { - "version": "latest", - "URL": "https://github.com/ucloud/ucloud-iot-rtthread-package.git", - "filename": "ucloud_iot_sdk.zip", - "VER_SHA": "master" - } - ] -} +{ + "name": "ucloud_iot_sdk", + "description": "ucloud iot sdk for uiot-core platform.", + "description_zh": "用于快速连接优刻得物联网平台的软件包。", + "enable": "PKG_USING_UCLOUD_IOT_SDK", + "keywords": [ + "ucloud_iot_sdk" + ], + "category": "iot", + "author": { + "name": "ucloud", + "email": "ethan.du@ucloud.cn", + "github": "ucloud" + }, + "license": "Apache-2.0", + "repository": "https://github.com/ucloud/ucloud-iot-rtthread-package.git", + "icon": "https://www.rt-thread.org/qa/template/fxiaomi/style/image/logo.png", + "homepage": "https://github.com/ucloud/ucloud-iot-rtthread-package", + "doc": "https://github.com/ucloud/ucloud-iot-rtthread-package/tree/master/docs", + "site": [ + { + "version": "v1.0.1", + "URL": "https://github.com/ucloud/ucloud-iot-rtthread-package/archive/v1.0.1.zip", + "filename": "ucloud_iot_sdk-v1.0.1.zip", + "VER_SHA": "" + }, + { + "version": "latest", + "URL": "https://github.com/ucloud/ucloud-iot-rtthread-package.git", + "filename": "ucloud_iot_sdk.zip", + "VER_SHA": "master" + } + ] +} From 0c7fbe1918d7ba08b0d9bce315a26f28c3291c9f Mon Sep 17 00:00:00 2001 From: "ethan.du" Date: Thu, 27 Feb 2020 12:43:48 +0800 Subject: [PATCH 2/2] modify tab to space --- iot/iot_cloud/ucloud_iot_sdk/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/iot/iot_cloud/ucloud_iot_sdk/Kconfig b/iot/iot_cloud/ucloud_iot_sdk/Kconfig index a7472e3d7b..d23422da7f 100644 --- a/iot/iot_cloud/ucloud_iot_sdk/Kconfig +++ b/iot/iot_cloud/ucloud_iot_sdk/Kconfig @@ -51,19 +51,19 @@ if PKG_USING_UCLOUD_IOT_SDK config PKG_USING_UCLOUD_HTTP bool "Enable Http Link uiot-core Platform" - select PKG_USING_UCLOUD_TLS + select PKG_USING_UCLOUD_TLS default n - config PKG_USING_UCLOUD_HTTP_PUBLISH_SAMPLE + config PKG_USING_UCLOUD_HTTP_PUBLISH_SAMPLE bool "Enable Ucloud Http Publish Sample" depends on PKG_USING_UCLOUD_HTTP default n - - config PKG_USING_UCLOUD_HTTP_UPLOAD_FILE_SAMPLE + + config PKG_USING_UCLOUD_HTTP_UPLOAD_FILE_SAMPLE bool "Enable Ucloud Http Upload File Sample" depends on PKG_USING_UCLOUD_HTTP default n - + config PKG_USING_UCLOUD_SHADOW bool "Enable Shadow" depends on PKG_USING_UCLOUD_MQTT @@ -101,7 +101,7 @@ if PKG_USING_UCLOUD_IOT_SDK default n select PKG_USING_MBEDTLS - config PKG_USING_UCLOUD_DEBUG + config PKG_USING_UCLOUD_DEBUG bool "Enable Ucloud Debug" default n