Merge pull request #78 from SmartThingsCommunity/develop_rel_1_5_7

stdk-scm · web-flow · commit 0a6ee1b02860 · 2021-02-01T13:11:52.000+09:00
Develop rel 1 5 7
diff --git a/apps/esp8266/light_example/sdkconfig b/apps/esp8266/light_example/sdkconfig
@@ -344,8 +344,8 @@ CONFIG_MQTT_RECV_BUFFER=2048
 CONFIG_MQTT_SEND_CYCLE=30000
 CONFIG_MQTT_RECV_CYCLE=100
 CONFIG_MQTT_PING_TIMEOUT=3000
-# CONFIG_NEWLIB_LIBRARY_LEVEL_NORMAL is not set
-CONFIG_NEWLIB_LIBRARY_LEVEL_NANO=y
+CONFIG_NEWLIB_LIBRARY_LEVEL_NORMAL=y
+# CONFIG_NEWLIB_LIBRARY_LEVEL_NANO is not set
 # CONFIG_NEWLIB_LIBRARY_LEVEL_FLOAT_NANO is not set
 # CONFIG_NEWLIB_LIBRARY_CUSTOMER is not set
 # CONFIG_OPENSSL_DEBUG is not set
diff --git a/apps/esp8266/switch_example/sdkconfig b/apps/esp8266/switch_example/sdkconfig
@@ -344,8 +344,8 @@ CONFIG_MQTT_RECV_BUFFER=2048
 CONFIG_MQTT_SEND_CYCLE=30000
 CONFIG_MQTT_RECV_CYCLE=100
 CONFIG_MQTT_PING_TIMEOUT=3000
-# CONFIG_NEWLIB_LIBRARY_LEVEL_NORMAL is not set
-CONFIG_NEWLIB_LIBRARY_LEVEL_NANO=y
+CONFIG_NEWLIB_LIBRARY_LEVEL_NORMAL=y
+# CONFIG_NEWLIB_LIBRARY_LEVEL_NANO is not set
 # CONFIG_NEWLIB_LIBRARY_LEVEL_FLOAT_NANO is not set
 # CONFIG_NEWLIB_LIBRARY_CUSTOMER is not set
 # CONFIG_OPENSSL_DEBUG is not set
diff --git a/iot-core b/iot-core
@@ -1 +1 @@
-Subproject commit 3d808826c777b2b90ab7bb9549cbb9cb8ee5265d
+Subproject commit 5584eddcf17c14f175ce73090e612d741eca3b98
diff --git a/patches/esp8266/cJSON/0001-Add-function-to-encode-json-number-when-sprintf-not-.patch b/patches/esp8266/cJSON/0001-Add-function-to-encode-json-number-when-sprintf-not-.patch
diff --git a/patches/esp8266/cJSON/2000-cjson-fix-wrong-traling-zeroes-removing.patch b/patches/esp8266/cJSON/2000-cjson-fix-wrong-traling-zeroes-removing.patch
diff --git a/tools/esp8266/setup_esp8266.sh b/tools/esp8266/setup_esp8266.sh
@@ -35,6 +35,5 @@ git submodule update --init --recursive
 git submodule foreach --recursive git reset --hard
 
 apply_patch ${BSP_PATH} ${PATCH_PATH}
-apply_patch ${BSP_PATH}/components/json/cJSON ${PATCH_PATH}/cJSON
 apply_patch ${BSP_PATH}/components/mbedtls/mbedtls ${PATCH_PATH}/mbedtls
 
