Skip to content

Commit

Permalink
Merge pull request RT-Thread#563 from ethanDu1/ucloud_iot_pkg_update_…
Browse files Browse the repository at this point in the history
…v101

Ucloud iot pkg update v101
  • Loading branch information
armink authored Feb 27, 2020
2 parents e181f73 + 251c561 commit 2b0ea8b
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 45 deletions.
78 changes: 38 additions & 40 deletions iot/iot_cloud/ucloud_iot_sdk/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Kconfig file for package ucloud_iot_sdk
menuconfig PKG_USING_UCLOUD_IOT_SDK
bool "ucloud_iot_sdk: ucloud iot sdk for uiot-core platform."
bool "ucloud_iot_sdk: Ucloud iot sdk for uiot-core platform."
select RT_USING_SAL
default n

Expand All @@ -10,58 +10,34 @@ if PKG_USING_UCLOUD_IOT_SDK
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_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"
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
static register device needed
endmenu

config PKG_USING_UCLOUD_TLS
bool "Enable Tls"
depends on PKG_USING_UCLOUD_MQTT
config PKG_USING_UCLOUD_MQTT
bool "Enable Mqtt Link uiot-core Platform"
default n
select PKG_USING_MBEDTLS

config PKG_USING_UCLOUD_MQTT_SAMPLE
bool "Enable Ucloud Mqtt Sample"
Expand All @@ -70,7 +46,22 @@ if PKG_USING_UCLOUD_IOT_SDK

config PKG_USING_UCLOUD_MQTT_DYNAMIC_AUTH_SAMPLE
bool "Enable Ucloud Mqtt Dynamic Auth Sample"
depends on PKG_USING_UCLOUD_MQTT_DYNAMIC_AUTH
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
Expand All @@ -97,13 +88,20 @@ if PKG_USING_UCLOUD_IOT_SDK
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_DEBUG
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

Expand All @@ -113,16 +111,16 @@ if PKG_USING_UCLOUD_IOT_SDK
help
Select the package version

config PKG_USING_UCLOUD_IOT_SDK_V100
bool "v1.0.0"
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.0" if PKG_USING_UCLOUD_IOT_SDK_V100
default "v1.0.1" if PKG_USING_UCLOUD_IOT_SDK_V101
default "latest" if PKG_USING_UCLOUD_IOT_SDK_LATEST_VERSION

endif
10 changes: 5 additions & 5 deletions iot/iot_cloud/ucloud_iot_sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"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": "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",
Expand Down

0 comments on commit 2b0ea8b

Please sign in to comment.