From 2d1626b10a6f93ae23adb1acc03d0a97c9495384 Mon Sep 17 00:00:00 2001 From: Kwang-Hui Cho <54692798+Kwang-Hui@users.noreply.github.com> Date: Wed, 21 Apr 2021 14:36:37 +0900 Subject: [PATCH 1/3] apps:esp32: update sdkconfig according to iot-core kconfig changes Signed-off-by: Kwang-Hui Cho <54692798+Kwang-Hui@users.noreply.github.com> --- apps/esp32/light_example/sdkconfig | 2 ++ apps/esp32/ota_demo/sdkconfig | 1 + apps/esp32/switch_example/sdkconfig | 2 ++ 3 files changed, 5 insertions(+) diff --git a/apps/esp32/light_example/sdkconfig b/apps/esp32/light_example/sdkconfig index e0584603..9f847479 100644 --- a/apps/esp32/light_example/sdkconfig +++ b/apps/esp32/light_example/sdkconfig @@ -339,7 +339,9 @@ CONFIG_HEAP_TRACING_OFF=y # CONFIG_HEAP_TRACING_TOHOST is not set # CONFIG_HEAP_TRACING is not set CONFIG_STDK_IOT_CORE=y +CONFIG_STDK_IOT_CORE_EASYSETUP_DISCOVERY_SSID=y CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP=y +CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP_USE_SOCKET_API=y # CONFIG_STDK_IOT_CORE_EASYSETUP_X509 is not set # CONFIG_STDK_IOT_CORE_EASYSETUP_LOG_SUPPORT_NO_USE_LOGFILE is not set CONFIG_STDK_IOT_CORE_LOG_LEVEL_ERROR=y diff --git a/apps/esp32/ota_demo/sdkconfig b/apps/esp32/ota_demo/sdkconfig index 9a713f92..9bfbfc1d 100644 --- a/apps/esp32/ota_demo/sdkconfig +++ b/apps/esp32/ota_demo/sdkconfig @@ -339,6 +339,7 @@ CONFIG_HEAP_TRACING_OFF=y # CONFIG_HEAP_TRACING_TOHOST is not set # CONFIG_HEAP_TRACING is not set CONFIG_STDK_IOT_CORE=y +CONFIG_STDK_IOT_CORE_EASYSETUP_DISCOVERY_SSID=y CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP=y CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP_USE_SOCKET_API=y # CONFIG_STDK_IOT_CORE_EASYSETUP_X509 is not set diff --git a/apps/esp32/switch_example/sdkconfig b/apps/esp32/switch_example/sdkconfig index e0584603..9f847479 100644 --- a/apps/esp32/switch_example/sdkconfig +++ b/apps/esp32/switch_example/sdkconfig @@ -339,7 +339,9 @@ CONFIG_HEAP_TRACING_OFF=y # CONFIG_HEAP_TRACING_TOHOST is not set # CONFIG_HEAP_TRACING is not set CONFIG_STDK_IOT_CORE=y +CONFIG_STDK_IOT_CORE_EASYSETUP_DISCOVERY_SSID=y CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP=y +CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP_USE_SOCKET_API=y # CONFIG_STDK_IOT_CORE_EASYSETUP_X509 is not set # CONFIG_STDK_IOT_CORE_EASYSETUP_LOG_SUPPORT_NO_USE_LOGFILE is not set CONFIG_STDK_IOT_CORE_LOG_LEVEL_ERROR=y From aeb8a562da1a5aa063545158887e78d5a5b56dcb Mon Sep 17 00:00:00 2001 From: Kwang-Hui Cho <54692798+Kwang-Hui@users.noreply.github.com> Date: Wed, 21 Apr 2021 15:13:42 +0900 Subject: [PATCH 2/3] apps:esp8266: update sdkconfig according to iot-core kconfig changes Signed-off-by: Kwang-Hui Cho <54692798+Kwang-Hui@users.noreply.github.com> --- apps/esp8266/light_example/sdkconfig | 1 + apps/esp8266/switch_example/sdkconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/esp8266/light_example/sdkconfig b/apps/esp8266/light_example/sdkconfig index 26d3daf8..6df9eaff 100644 --- a/apps/esp8266/light_example/sdkconfig +++ b/apps/esp8266/light_example/sdkconfig @@ -354,6 +354,7 @@ CONFIG_OPENSSL_ASSERT_DO_NOTHING=y # CONFIG_ENABLE_PTHREAD is not set # CONFIG_USING_SPIFFS is not set CONFIG_STDK_IOT_CORE=y +CONFIG_STDK_IOT_CORE_EASYSETUP_DISCOVERY_SSID=y CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP=y CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP_USE_SOCKET_API=y # CONFIG_STDK_IOT_CORE_EASYSETUP_X509 is not set diff --git a/apps/esp8266/switch_example/sdkconfig b/apps/esp8266/switch_example/sdkconfig index 26d3daf8..6df9eaff 100644 --- a/apps/esp8266/switch_example/sdkconfig +++ b/apps/esp8266/switch_example/sdkconfig @@ -354,6 +354,7 @@ CONFIG_OPENSSL_ASSERT_DO_NOTHING=y # CONFIG_ENABLE_PTHREAD is not set # CONFIG_USING_SPIFFS is not set CONFIG_STDK_IOT_CORE=y +CONFIG_STDK_IOT_CORE_EASYSETUP_DISCOVERY_SSID=y CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP=y CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP_USE_SOCKET_API=y # CONFIG_STDK_IOT_CORE_EASYSETUP_X509 is not set From e8da9df5e4d34f24379ab47a69dd1a15b5af9e91 Mon Sep 17 00:00:00 2001 From: stdk-scm <63764571+stdk-scm@users.noreply.github.com> Date: Wed, 28 Apr 2021 15:20:05 +0900 Subject: [PATCH 3/3] Sync-up with iot-core 1.6.0 Signed-off-by: stdk-scm <63764571+stdk-scm@users.noreply.github.com> --- iot-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iot-core b/iot-core index e8be6488..bd34cca4 160000 --- a/iot-core +++ b/iot-core @@ -1 +1 @@ -Subproject commit e8be6488359d9ce4d9acdf87450ba79b35bd8f9b +Subproject commit bd34cca41bd15eb428bd7185542be500852c94a3