Merge branch 'develop'

stdk-scm · stdk-scm · commit c6876629e0c8 · 2021-02-02T08:45:54.000+09:00
* develop: Sync-up with iot-core 1.5.7 esp8266: Use CONFIG_NEWLIB_LIBRARY_LEVEL_NORMAL for all esp8266 sample apps Sync-up with iot-core 1.5.6 Fix incorrect saturation value sent back to SmartThings (#76) | Conflicts: | iot-core : sync with latest iot-core
diff --git a/apps/capability_sample/caps_colorControl.c b/apps/capability_sample/caps_colorControl.c
@@ -57,7 +57,7 @@ static void caps_colorControl_attr_color_send(caps_colorControl_data_t *caps_dat
             NULL);
 
     value[1].type = IOT_CAP_VAL_TYPE_NUMBER;
-    value[1].number = caps_data->hue_value;
+    value[1].number = caps_data->saturation_value;
 
     cap_evt[1] = st_cap_create_attr(caps_data->handle,
             (char *) caps_helper_colorControl.attr_saturation.name,
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/apps/rtl8721c/light_example/main/caps_colorControl.c b/apps/rtl8721c/light_example/main/caps_colorControl.c
@@ -57,7 +57,7 @@ static void caps_colorControl_attr_color_send(caps_colorControl_data_t *caps_dat
             NULL);
 
     value[1].type = IOT_CAP_VAL_TYPE_NUMBER;
-    value[1].number = caps_data->hue_value;
+    value[1].number = caps_data->saturation_value;
 
     cap_evt[1] = st_cap_create_attr(caps_data->handle,
             (char *) caps_helper_colorControl.attr_saturation.name,
diff --git a/iot-core b/iot-core
@@ -1 +1 @@
-Subproject commit 6d7077fc1407eeae7508f6a09dfd61ecf23d78be
+Subproject commit 6566d2212c703b515f562ca703c440707833c3f2
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
 
