Skip to content

Master rel 1 5 7 #79

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 11 commits into from
Feb 2, 2021
Merged

Master rel 1 5 7 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
81a36a1
Merge pull request #513 from STDK/develop_rel_1_5_5
stdk-scm Dec 24, 2020
89999ab
Fix incorrect saturation value sent back to SmartThings (#76)
bbaraban Jan 4, 2021
d607f21
Sync-up with iot-core 1.5.6
stdk-scm Jan 6, 2021
3a344fb
Merge remote-tracking branch 'internal/develop_rel_1_5_6' into develop
stdk-scm Jan 6, 2021
d00dd7e
Merge pull request #77 from SmartThingsCommunity/develop_rel_1_5_6
stdk-scm Jan 6, 2021
769d7e3
Merge pull request #518 from STDK/develop_rel_1_5_6
YongsulOh Jan 19, 2021
eebedd2
esp8266: Use CONFIG_NEWLIB_LIBRARY_LEVEL_NORMAL for all esp8266 sampl…
YongsulOh Jan 14, 2021
cd74d74
Sync-up with iot-core 1.5.7
stdk-scm Jan 20, 2021
fc4790d
Merge remote-tracking branch 'internal/develop_rel_1_5_7' into develop
stdk-scm Jan 20, 2021
0a6ee1b
Merge pull request #78 from SmartThingsCommunity/develop_rel_1_5_7
stdk-scm Feb 1, 2021
c687662
Merge branch 'develop'
stdk-scm Feb 1, 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: 1 addition & 1 deletion apps/capability_sample/caps_colorControl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions apps/esp8266/light_example/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions apps/esp8266/switch_example/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion apps/rtl8721c/light_example/main/caps_colorControl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion iot-core
Open in desktop
Submodule iot-core updated 11 files
+13 −0 CHANGELOG.md
+4 −4 src/easysetup/http/tcp/iot_easysetup_http_socket.c
+8 −9 src/easysetup/http/tcp/iot_easysetup_httpd.c
+1 −1 src/include/iot_easysetup.h
+1 −1 src/include/st_dev_version.h
+2 −2 src/iot_capability.c
+9 −2 src/port/bsp/posix/iot_bsp_fs_posix.c
+2 −2 src/port/os/mocos/iot_os_util_mocos.c
+13 −17 test/TC_FUNC_iot_easysetup_st_mqtt.c
+3 −0 test/TC_FUNC_iot_main.c
+1 −1 test/TC_FUNC_iot_nv_data.c
102 changes: 0 additions & 102 deletions patches/esp8266/cJSON/0001-Add-function-to-encode-json-number-when-sprintf-not-.patch
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions patches/esp8266/cJSON/2000-cjson-fix-wrong-traling-zeroes-removing.patch
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tools/esp8266/setup_esp8266.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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