Skip to content

Develop rel 1 6 0 #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 28, 2021
Merged

Develop rel 1 6 0 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e461fee
Merge pull request #550 from STDK/develop_rel_1_5_12
stdk-scm Apr 8, 2021
2d1626b
apps:esp32: update sdkconfig according to iot-core kconfig changes
Kwang-Hui Apr 21, 2021
aeb8a56
apps:esp8266: update sdkconfig according to iot-core kconfig changes
Kwang-Hui Apr 21, 2021
e8da9df
Sync-up with iot-core 1.6.0
stdk-scm Apr 28, 2021
5ce5978
Merge remote-tracking branch 'internal/develop_rel_1_6_0' into develop
stdk-scm Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/esp32/light_example/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions apps/esp32/ota_demo/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions apps/esp32/switch_example/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions apps/esp8266/light_example/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions apps/esp8266/switch_example/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion iot-core
Open in desktop
Submodule iot-core updated 33 files
+11 −2 Makefile
+7 −0 src/Kconfig
+5 −0 src/component.cmake
+10 −2 src/component.mk
+8 −1 src/easysetup/CMakeLists.txt
+108 −0 src/easysetup/discovery/ssid/iot_easysetup_discovery_ssid.c
+0 −1 src/easysetup/http/easysetup_http.h
+151 −348 src/easysetup/http/tcp/iot_easysetup_d2d_tcp.c
+2 −4 src/easysetup/http/tcp/iot_easysetup_httpd.c
+0 −79 src/easysetup/http/tls/iot_easysetup_d2d_tls.c
+34 −5 src/easysetup/iot_easysetup_st_mqtt.c
+1 −0 src/include/bsp/iot_bsp_fs.h
+11 −19 src/include/http/iot_easysetup_http.h
+11 −2 src/include/iot_easysetup.h
+4 −0 src/include/iot_internal.h
+2 −0 src/include/iot_main.h
+11 −0 src/include/iot_mqtt.h
+2 −0 src/include/iot_net.h
+10 −0 src/include/st_dev.h
+2 −2 src/include/st_dev_version.h
+2 −1 src/iot_api.c
+0 −36 src/iot_capability.c
+127 −7 src/iot_main.c
+63 −0 src/iot_serialize.c
+23 −0 src/mqtt/client/iot_mqtt_client.c
+4 −0 src/port/http/socket/CMakeLists.txt
+46 −0 src/port/http/socket/iot_easysetup_http_impl.h
+2 −3 src/port/http/socket/iot_easysetup_http_socket.c
+43 −0 src/port/net/mbedtls/iot_net_mbedtls.c
+2 −0 src/port/net/openssl/iot_net_openssl.c
+1 −0 stdkconfig
+2 −0 stdkconfig.cmake
+6 −6 test/TC_FUNC_iot_easysetup_d2d.c