Merge branch 'feature/update_v3.0.1' into 'master'

update iotkit embedded to v3.0.1

See merge request esp-components/esp-aliyun!184

Author: wujiangang

.gitignore

@@ -10,3 +10,6 @@ examples/*/*/build/*
 # config
 sdkconfig
 sdkconfig.old
+
+# VS Code Settings
+.vscode/

.gitlab-ci.yml

@@ -25,16 +25,10 @@ build_esp8266_demo:
     - echo -e "Host gitlab.espressif.cn\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
     - git --version
     - git submodule update --init --recursive
-    - git clone --branch release/v3.1 --depth 1 $GITLAB_SSH_SERVER/sdk/ESP8266_RTOS_SDK.git
+    - git clone --branch release/v3.2 --depth 1 $GITLAB_SSH_SERVER/sdk/ESP8266_RTOS_SDK.git
     - export IDF_PATH=$CI_PROJECT_DIR/ESP8266_RTOS_SDK
-    - cp -r patch/* iotkit-embedded/
-    - cd iotkit-embedded
-    - make distclean
-    - echo 2 | make reconfig
-    - make -j1
-    - cd ..
     - cd examples/solutions/smart_light
-    - make defconfig
+    - make chip=esp8266 defconfig
     - make
 
 build_esp32_demo:
@@ -56,14 +50,8 @@ build_esp32_demo:
     - cd esp-idf
     - ./tools/ci/mirror-submodule-update.sh
     - cd ..
-    - cp -r patch/* iotkit-embedded
-    - cd iotkit-embedded
-    - make distclean
-    - echo 1 | make reconfig
-    - make -j1
-    - cd ..
     - cd examples/solutions/smart_light
-    - make defconfig
+    - make chip=esp32 defconfig
     - make
 
 push_to_github:

.gitmodules

@@ -0,0 +1,102 @@
+menu "iotkit embedded"
+
+    menu "Aliyun linkkit device key"
+
+        config LINKKIT_FIRMWARE_VERSION
+            string "Device version"
+            default "0.0.1"
+            help
+                aliyun linkkit device version
+
+        config LINKKIT_PRODUCT_KEY
+            string "Product key"
+            default "xxxx"
+            help
+               aliyun linkkit product key.
+
+        config LINKKIT_PRODUCT_SECRET
+            string "Product secret"
+            default "xxxx"
+            help
+               aliyun linkkit product secret.
+
+        config LINKKIT_DEVICE_NAME
+            string "Device name"
+            default "xxxx"
+            help
+                aliyun linkkit device name.
+
+        config LINKKIT_DEVICE_SECRET
+            string "Device secret"
+            default "xxxx"
+            help
+                aliyun linkkit device secret.
+    endmenu
+
+    menu "Aliyun linkkit awss config"
+        config AWSS_ENCRYPT_TYPE
+            int "Get the security level of the `smartconfig` service"
+            range 1 5
+            default 3
+            help
+                Get the security level of the `smartconfig` service
+
+        config AWSS_CONN_ENCRYPT_TYPE
+            int "Get Security level for wifi configuration with connection.Used for AP solution of router and App"
+            range 3 5
+            default 4
+            help
+                Get Security level for wifi configuration with connection.Used for AP solution of router and App
+
+        config AWSS_TIMEOUT_INTERVAL_MS
+            int "Get the timeout period of the distribution service (`AWSS`), in milliseconds"
+            range 0 1800000
+            default 180000
+            help
+                Get the timeout period of the distribution service (`AWSS`), in milliseconds
+
+        config AWSS_CHANNELSCAN_INTERVAL_MS
+            int "Get the length of time scanned on each channel (`channel`), in milliseconds"
+            range 0 1000
+            default 200
+            help
+                Get the length of time scanned on each channel (`channel`), in milliseconds
+    endmenu
+
+    menu "Aliyun linkkit netwoek config"
+        config TCP_ESTABLISH_TIMEOUT_MS
+            int "Device tcp connection timeout wait time milliseconds"
+            range 0 100000
+            default 10000
+            help
+                Device tcp connection timeout wait time milliseconds
+
+        config TLS_ESTABLISH_TIMEOUT_MS
+            int "Device tls connection timeout wait time milliseconds"
+            range 0 100000
+            default 10000
+            help
+                Device tls connection timeout wait time milliseconds
+    endmenu
+
+config HAL_SEM_MAX_COUNT
+    int "The maximum count value that can be reached of the semaphore"
+    default 255
+    range 0 255
+    help
+        The recommended value of maximum count of the semaphore is 255
+
+config HAL_SEM_INIT_COUNT
+    int "The count value assigned to the semaphore when it is created"
+    default 0
+    range 0 10
+    help
+        The recommended value of count of the semaphore is 0
+config HAL_TLS_HANDSHAKE_TIMEOUT
+    int "TLS Handsake Timeout"
+    default 180
+    range 0 65535
+    help
+        Default TLS handshake timeout to host in seconds
+
+endmenu

Kconfig

@@ -30,7 +30,7 @@ ESP 设备包括 [ESP芯片](https://www.espressif.com/zh-hans/products/hardware
 
 # <span id = "aliyunprepare">3.阿里云平台准备</span>
 根据[阿里官方文档](https://github.com/aliyun/iotkit-embedded?spm=5176.doc42648.2.4.e9Zu05)，在阿里云平台创建产品，创建设备，同时自动产生 `product key`, `product secert`, `device name`, `device secret`。  
-`product key`, `product secert`, `device name`, `device secret` 将在 6.1.2 节用到。
+`product key`, `product secert`, `device name`, `device secret` 将在 6.2.3 节用到。
 
 # <span id = "compileprepare">4.环境搭建</span>
 **如果您熟悉 ESP 开发环境，可以很顺利理解下面步骤; 如果您不熟悉某个部分，比如编译，烧录，需要您结合官方的相关文档来理解。如您需阅读 [ESP-IDF 编程指南](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/index.html)文档等。**  
@@ -58,42 +58,27 @@ $ ./components/esptool_py/esptool/esptool.py --help
 
 > Espressif SDK 下载好后：  
 > ESP-IDF: 请切换到 release/v3.2 分支： `git checkout release/v3.2`  
-> ESP8266_RTOS_SDK: 请切换到 release/v3.1 分支： `git checkout release/v3.1`
+> ESP8266_RTOS_SDK: 请切换到 release/v3.2 分支： `git checkout release/v3.2`
 
 # <span id = "makeflash">6.编译 & 烧写 & 运行</span>
 ## 6.1 编译
 
 ### 6.1.1 导出编译器
 参考 [工具链的设置](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/get-started/linux-setup.html)
 
-### 6.1.2 编译 iotkit-embedded SDK
-1. 拷贝针对 iotkit-embedded 的 patch
+### 6.1.2 编译 demo 示例
+**由于 esp32 和 esp8266 将会采用不同的 sdkconfig.defaults 和对应的 partitions.csv，在对应的 make 命令中加入了对应的芯片选项，如 chip=esp32 或 chip=esp8266。**
 
-为了解决在 MacOS 下的编译问题，修改了部分 iotkit-embedded 中的文件。
-在 esp-aliyun 目录下执行：
+当 chip=esp32 时将默认使用 sdkconfig_esp32.defaults 以及 partitions_esp32.csv。
+当 chip=esp8266 时将默认使用 sdkconfig_esp8266.defaults 以及 partitions_esp8266.csv。
 
-```
-cp -r patch/* iotkit-embedded/
-```
-
-2. 编译生成 `libiot_sdk.a`
-
-```
-cd iotkit-embedded
-make reconfig
-# 选择 esp8266 或 esp32 平台
-make
-cd ..
-```
-
-### 6.1.3 编译 demo 示例
-- 进入需要编译的 example, 配置三元组信息等
+以上需要特别注意。
 
 在 esp-aliyun 目录下执行：
 
 ```
 cd examples/solutions/smart_light
-make defconfig
+make chip=esp32 defconfig
 make menuconfig
 ```
 
@@ -105,7 +90,7 @@ make menuconfig
 2.生成最终 bin
 
 ```
-make
+make -j8
 ```
 
 ## 6.2 擦除 & 编译烧写 & 下载固件 & 查看 log
@@ -115,13 +100,17 @@ make
 ```
 make erase_flash
 ```
+> 注：无需每次擦除，擦除后需要重做 6.2.3。
 
 ### 6.2.2 烧录程序
 ```
 make flash
 ```
 
-## 6.2.3 运行
+### 6.2.3 烧录三元组信息
+参考 [量产说明](./config/mass_mfg/README.md) 文档烧录三元组 NVS 分区。
+
+## 6.2.4 运行
 
 ```
 make monitor

README.md

@@ -1,40 +1,65 @@
 # Makefile
 
-# CFLAGS +=
+COMPONENT_PRIV_INCLUDEDIRS := \
+iotkit-embedded/coap_server/CoAPPacket \
+iotkit-embedded/coap_server/server \
+iotkit-embedded/dev_bind/impl \
+iotkit-embedded/dev_bind/impl/os \
+iotkit-embedded/dev_bind/impl/awss_reset \
+iotkit-embedded/wifi_provision/dev_ap \
+iotkit-embedded/wifi_provision/frameworks \
+iotkit-embedded/wifi_provision/frameworks/aplist \
+iotkit-embedded/wifi_provision/frameworks/ieee80211 \
+iotkit-embedded/wifi_provision/frameworks/statics \
+iotkit-embedded/wifi_provision/frameworks/utils \
+iotkit-embedded/wifi_provision/p2p \
+iotkit-embedded/wifi_provision/phone_ap \
+iotkit-embedded/wifi_provision/router_ap \
+iotkit-embedded/wifi_provision/smartconfig \
+iotkit-embedded/wifi_provision/zero_config
 
-# version of iotkit-embedded: https://github.com/aliyun/iotkit-embedded
-IE_VER := $(shell cd ${IE_PATH} && git describe --always --tags --dirty)
+COMPONENT_ADD_INCLUDEDIRS := \
+conn_mgr \
+iotkit-embedded/atm \
+iotkit-embedded/coap_server \
+iotkit-embedded/dev_bind \
+iotkit-embedded/dev_model \
+iotkit-embedded/dev_sign \
+iotkit-embedded/dynamic_register \
+iotkit-embedded/mqtt \
+iotkit-embedded/ota \
+iotkit-embedded/infra \
+iotkit-embedded/wifi_provision \
+iotkit-embedded \
+wrappers
 
-# version of esp-aliyun: https://github.com/espressif/esp-aliyun
-EA_VER := $(shell cd ${ESP_ALIYUN_PATH} && git describe --always --tags --dirty)
+COMPONENT_SRCDIRS := \
+conn_mgr \
+iotkit-embedded/atm \
+iotkit-embedded/certs \
+iotkit-embedded/dev_bind/impl \
+iotkit-embedded/dev_bind/impl/os \
+iotkit-embedded/dev_bind/impl/awss_reset \
+iotkit-embedded/dev_model \
+iotkit-embedded/dev_reset \
+iotkit-embedded/dev_sign \
+iotkit-embedded/dynamic_register \
+iotkit-embedded/infra \
+iotkit-embedded/mqtt \
+iotkit-embedded/ota \
+iotkit-embedded/wifi_provision/dev_ap \
+iotkit-embedded/wifi_provision/frameworks \
+iotkit-embedded/wifi_provision/frameworks/aplist \
+iotkit-embedded/wifi_provision/frameworks/ieee80211 \
+iotkit-embedded/wifi_provision/frameworks/statics \
+iotkit-embedded/wifi_provision/frameworks/utils \
+iotkit-embedded/wifi_provision/p2p \
+iotkit-embedded/wifi_provision/phone_ap \
+iotkit-embedded/wifi_provision/router_ap \
+iotkit-embedded/wifi_provision/smartconfig \
+iotkit-embedded/wifi_provision/zero_config \
+iotkit-embedded/coap_server/CoAPPacket \
+iotkit-embedded/coap_server/server \
+wrappers
 
-CFLAGS += -DIE_VER=\"$(IE_VER)\"
-CFLAGS += -DEA_VER=\"$(EA_VER)\"
-
-COMPONENT_IOTKIT_RELEASE_PATH = iotkit-embedded/output/release
-
-COMPONENT_ADD_INCLUDEDIRS :=	\
-$(COMPONENT_IOTKIT_RELEASE_PATH)/include			\
-$(COMPONENT_IOTKIT_RELEASE_PATH)/include/imports		\
-$(COMPONENT_IOTKIT_RELEASE_PATH)/include/exports		\
-iotkit-embedded/src/services/awss	\
-platform/crypto/include	\
-platform/hal	\
-platform/include
-
-COMPONENT_SRCDIRS :=			\
-platform/hal/os/espressif
-
-ifdef CONFIG_TARGET_PLATFORM_ESP8266
-# ESP8266 platform
-COMPONENT_SRCDIRS += platform/crypto/src	\
-platform/hal/ssl/openssl
-
-else
-# ESP32 platform
-COMPONENT_SRCDIRS += platform/hal/ssl/mbedtls
-endif
-
-# link libiot_sdk.a
-LIBS += iot_sdk
-COMPONENT_ADD_LDFLAGS += -L $(COMPONENT_PATH)/$(COMPONENT_IOTKIT_RELEASE_PATH)/lib $(addprefix -l,$(LIBS))
+CFLAGS += -Wno-char-subscripts