Merge remote-tracking branch 'internal/develop_rel_1_6_1' into develop

stdk-scm · stdk-scm · commit d630c654d6db · 2021-05-18T16:19:23.000+09:00
* internal/develop_rel_1_6_1:
  Sync-up with iot-core 1.6.1
  rtl: add CONFIG_STDK_CORE_EASYSETUP_DISCOVER_SSID to example
diff --git a/apps/rtl8195/light_example/sdkconfig.h b/apps/rtl8195/light_example/sdkconfig.h
@@ -3,6 +3,7 @@
 #define _SDKCONFIG_H_
 
 #define CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP_USE_SOCKET_API
+#define CONFIG_STDK_IOT_CORE_EASYSETUP_DISCOVERY_SSID
 #define CONFIG_MBEDTLS_XTEA_C 1
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA 1
 #define CONFIG_MBEDTLS_AES_C 1
diff --git a/apps/rtl8195/switch_example/sdkconfig.h b/apps/rtl8195/switch_example/sdkconfig.h
@@ -3,6 +3,7 @@
 #define _SDKCONFIG_H_
 
 #define CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP_USE_SOCKET_API
+#define CONFIG_STDK_IOT_CORE_EASYSETUP_DISCOVERY_SSID
 #define CONFIG_MBEDTLS_XTEA_C 1
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA 1
 #define CONFIG_MBEDTLS_AES_C 1
diff --git a/apps/rtl8720c/light_example/sdkconfig.h b/apps/rtl8720c/light_example/sdkconfig.h
@@ -3,6 +3,7 @@
 #define _SDKCONFIG_H_
 
 #define CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP_USE_SOCKET_API
+#define CONFIG_STDK_IOT_CORE_EASYSETUP_DISCOVERY_SSID
 #define CONFIG_MBEDTLS_XTEA_C 1
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA 1
 #define CONFIG_MBEDTLS_AES_C 1
diff --git a/apps/rtl8720c/switch_example/sdkconfig.h b/apps/rtl8720c/switch_example/sdkconfig.h
@@ -3,6 +3,7 @@
 #define _SDKCONFIG_H_
 
 #define CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP_USE_SOCKET_API
+#define CONFIG_STDK_IOT_CORE_EASYSETUP_DISCOVERY_SSID
 #define CONFIG_MBEDTLS_XTEA_C 1
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA 1
 #define CONFIG_MBEDTLS_AES_C 1
diff --git a/apps/rtl8721c/light_example/sdkconfig.h b/apps/rtl8721c/light_example/sdkconfig.h
@@ -3,6 +3,7 @@
 #define _SDKCONFIG_H_
 
 #define CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP_USE_SOCKET_API
+#define CONFIG_STDK_IOT_CORE_EASYSETUP_DISCOVERY_SSID
 #define CONFIG_MBEDTLS_XTEA_C 1
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA 1
 #define CONFIG_MBEDTLS_AES_C 1
diff --git a/apps/rtl8721c/switch_example/sdkconfig.h b/apps/rtl8721c/switch_example/sdkconfig.h
@@ -3,6 +3,7 @@
 #define _SDKCONFIG_H_
 
 #define CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP_USE_SOCKET_API
+#define CONFIG_STDK_IOT_CORE_EASYSETUP_DISCOVERY_SSID
 #define CONFIG_MBEDTLS_XTEA_C 1
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA 1
 #define CONFIG_MBEDTLS_AES_C 1
diff --git a/iot-core b/iot-core
@@ -1 +1 @@
-Subproject commit bd34cca41bd15eb428bd7185542be500852c94a3
+Subproject commit e1c9bb390f3b27d051e55018ee00ed85e75ed6f1
