zhiweijian
d3646ca59f
Component/bt: fix eddystone demo error
2018-03-16 18:28:58 +08:00
Jiang Jiang Jian
0cb7b27f8b
Merge branch 'cherry-pick-702b4610-2' into 'release/v3.0'
...
Component/bt: fix set error params and return callback when start adv for v3.0
See merge request idf/esp-idf!2061
2018-03-15 18:07:19 +08:00
Jiang Jiang Jian
2319e8a0eb
Merge branch 'cherry-pick-dc66940f' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_a2dp_disc_rsn_error_when_as_master' into 'release/v3.0'
See merge request idf/esp-idf!2067
2018-03-15 18:06:00 +08:00
Jiang Jiang Jian
7a863cca7c
Merge branch 'cherry-pick-047870fd' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_string_to_bdaddr_error_when_opening_nano' into 'v3.0'
See merge request idf/esp-idf!2064
2018-03-15 15:34:48 +08:00
Jiang Jiang Jian
9c42b6194e
Merge branch 'bugfix/btdm_a2dp_disc_rsn_error_when_as_master' into 'master'
...
component/bt: Fix bug: a2dp disc_rsn error when as master
See merge request idf/esp-idf!1995
(cherry picked from commit dc66940f82
)
f1d3f689
component/bt: Fix bug: a2dp disc_rsn error when as master
2018-03-15 15:28:53 +08:00
Jiang Jiang Jian
3511109b6e
Merge branch 'bugfix/btdm_a2dp_cleanup_bug_3.0' into 'release/v3.0'
...
component/bt: Fix bug of a2dp cleanup bug when connected in v3.0
See merge request idf/esp-idf!2040
2018-03-15 15:04:07 +08:00
Jiang Jiang Jian
0f45323879
Merge branch 'bugfix/btdm_string_to_bdaddr_error_when_opening_nano' into 'master'
...
component/bt: Fix bug: string_to_bdaddr() error when opening nano
See merge request idf/esp-idf!1981
(cherry picked from commit 047870fd80
)
54320d5f
component/bt: Fix bug: string_to_bdaddr() error when opening nano
2018-03-15 14:15:31 +08:00
Jiang Jiang Jian
69686ae8a9
Merge branch 'bugfix/btdm_fix_set_error_channel_map_in_adv_params' into 'master'
...
Component/bt: fix set error params and return callback when start adv
See merge request idf/esp-idf!1943
(cherry picked from commit 702b46108c
)
4056878c
Component/bt: fix set error params and add callback in adv params
2018-03-15 12:04:56 +08:00
Jiang Jiang Jian
28cb5624ef
Merge branch 'bugfix/esp_timer_overflow_for_v3_0' into 'release/v3.0'
...
component/esp32: fix esp_timer bug
See merge request idf/esp-idf!1878
2018-03-15 10:48:15 +08:00
Tian Hao
c574ad90df
component/esp32: fix esp_timer bug
...
1. fix the bug that cause esp_timer_get_time is not accuracy(the max margin may be 106s).
2. fix the bug that causes esp timer come too early.
2018-03-13 15:03:54 +08:00
baohongde
1d03398a64
component/bt: Fix bug of a2dp cleanup bug when connected in v3.0
2018-03-12 16:36:11 +08:00
Jiang Jiang Jian
daf1d05576
Merge branch 'cherry-pick-17e8d49f' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_update_pktLen_have_no_callback' into 'release/v3.0'
See merge request idf/esp-idf!2010
2018-03-09 16:29:35 +08:00
Jiang Jiang Jian
816a98c3ad
Merge branch 'bugfix/fix_some_wifi_bugs_v3.0' into 'release/v3.0'
...
esp32: fix some WiFi bugs
See merge request idf/esp-idf!1987
2018-03-09 16:21:40 +08:00
Jiang Jiang Jian
392b0b89e3
Merge branch 'bugfix/wifi_lwip_close_socket_when_tcp_connecting_v3.0' into 'release/v3.0'
...
Close socket request will abort tcp write/connect
See merge request idf/esp-idf!1741
2018-03-08 20:28:42 +08:00
Liu Zhi Fu
229be8c025
esp32: fix some WiFi bugs
...
1. Fix esp_wifi_deinit causes system crash issue
2. Fix QoS AC map issue
2018-03-06 16:59:24 +08:00
Jiang Jiang Jian
e4fb19000a
Merge branch 'bugfix/btdm_update_pktLen_have_no_callback' into 'master'
...
component/bt: Fix bug:update pktlen have no callback
See merge request idf/esp-idf!1913
(cherry picked from commit 17e8d49f26
)
acdad323
component/bt: Fix bug:update pktlen have no callback
2018-03-05 16:15:39 +08:00
Jiang Jiang Jian
0e640c61bd
Merge branch 'bugfix/btdm_mem_leak_of_bt_3.0' into 'release/v3.0'
...
component/bt: Fix mem leak of bt in v3.0
See merge request idf/esp-idf!1925
2018-03-05 16:07:08 +08:00
Ivan Grokhotkov
ce64bcb81f
Merge branch 'adc_calibration_release_3.0' into 'release/v3.0'
...
esp_adc_cal/cherry pick into release 3.0
See merge request idf/esp-idf!1986
2018-03-02 17:19:45 +08:00
baohongde
5e48c2bfef
component/bt: Fix mem leak of bt in v3.0
2018-03-02 03:53:07 +00:00
Darian Leung
55c179a599
esp_adc_cal/Add eFuse functionality and update calibration method
...
This commit updates the esp_adc_cal ocmponent to support eFuse functionality.
The method of calibraiton has also been changed
2018-02-26 21:52:00 +08:00
Jiang Jiang Jian
1181b65f7d
Merge branch 'cherry-pick-22dcdce9' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_scan_result_of_adv_type_wrong' into 'release/v3.0'
See merge request idf/esp-idf!1914
2018-02-24 10:24:17 +08:00
Jiang Jiang Jian
3b116ae0cb
Merge branch 'bugfix/btdm_a2dp_task_stack_size_for_v3.0' into 'release/v3.0'
...
component/bt: make A2DP sink task size configurable through menuconfig
See merge request idf/esp-idf!1890
2018-02-24 10:18:12 +08:00
Jiang Jiang Jian
54b595ed51
Merge branch 'bugfix/btdm_alarm_free_for_v3.0' into 'release/v3.0'
...
component/bt: free timer resources after using them
See merge request idf/esp-idf!1888
2018-02-24 10:17:15 +08:00
Ivan Grokhotkov
cf2600adef
Merge branch 'bugfix/realloc_corruption_bug_v30' into 'release/v3.0'
...
heap: Fix bug when realloc moves data between heaps (backport to v3.0)
See merge request idf/esp-idf!1934
2018-02-11 13:43:00 +08:00
Angus Gratton
f7eecfcc67
heap: Fix bug when realloc moves data between heaps
...
When realloc-ing to a smaller buffer size which ends up allocated in a different heap, the heap
structure is corrupted. This can only happen:
* If heap checking is Comprehensive (meaning buffers are never shrunk in place) and the heap the buffer was originally allocated in is full.
* Calling heap_caps_realloc() to deliberately move a buffer to a different capabilities type, and shrink it at the same time.
Probable fix for https://github.com/espressif/esp-idf/issues/1582
Probably the same issue:
https://www.esp32.com/viewtopic.php?f=2&t=4583
https://www.esp32.com/viewtopic.php?f=13&t=3717
2018-02-09 19:24:37 +08:00
Jiang Jiang Jian
eac9eb36d1
Merge branch 'bugfix/btdm_scan_result_of_adv_type_wrong' into 'master'
...
component/bt: Fix bug:scan result of adv type is wrong
See merge request idf/esp-idf!1897
(cherry picked from commit 22dcdce949
)
79fd3f4f
component/bt: Fix bug:scan result of adv type is wrong
2018-02-06 15:53:16 +08:00
Angus Gratton
ec05f3af8f
Merge branch 'bugfix/cjson_171_backport_v30' into 'release/v3.0'
...
Update cJSON to v1.7.1 (backport to v3.0)
See merge request idf/esp-idf!1907
2018-02-05 22:30:07 +08:00
wangmengyang
9bfb2f0cab
component/bt: make A2DP sink task size configurable through menuconfig
...
1. make the A2DP sink task stack size configurable through menuconfig
# Conflicts:
# components/bt/Kconfig
# components/bt/bluedroid/api/include/esp_a2dp_api.h
# components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_sink.c
# components/bt/bluedroid/btc/profile/std/a2dp/btc_a2dp_source.c
# components/bt/bluedroid/osi/include/thread.h
2018-02-05 19:47:58 +08:00
Angus Gratton
963fa0fd3a
Update cJSON to v1.7.1
...
* Fix buffer overflow issue in cJSON 1.6.0
* Change cJSON structure to git submodule
Closes https://github.com/espressif/esp-idf/issues/1577
2018-02-05 14:52:39 +08:00
Jiang Jiang Jian
8856cc055a
Merge branch 'bugfix/btdm_fix_stop_adv_no_callback_when_adv_has_been_stoped_for_v30' into 'release/v3.0'
...
Component/bt: fix stop adv no callback when adv has been stoped for v3.0
See merge request idf/esp-idf!1857
2018-02-01 20:15:51 +08:00
wangmengyang
fab14106c8
component/bt: free timer resources after using them
...
Bluedroid use a set of timer function pairs such as btu_start_timer/btu_stop_timer, btu_sys_start_timer/btu_sys_stop_timer for use, in a lack of timer release functions. Thus the timers may be exhausted after some event sequence such as repetition of connection/reconnection with different devices. The maximum timer number used in bluedroid is given by ALARM_CBS_NUM which is 30 for now. This bugfix borrowed some update from bluedroid in Andoroid 7.0, which add timer release functions which promote the recycle of timer resources.
# Conflicts:
# components/bt/bluedroid/stack/btu/btu_task.c
# components/bt/bluedroid/stack/gatt/gatt_main.c
# components/bt/bluedroid/stack/rfcomm/port_utils.c
# components/bt/bluedroid/stack/rfcomm/rfc_utils.c
2018-02-01 13:52:19 +08:00
zhiweijian
154294e79f
Component/bt: fix stop adv no callback when adv has been stoped
2018-01-31 20:24:02 +08:00
Jiang Jiang Jian
e1d965e4b9
Merge branch 'bugfix/btdm_fix_BT_load_boned_in_smp_for_v30' into 'release/v3.0'
...
Component/bt: fix bt loads all the bonded devices in smp for v3.0
See merge request idf/esp-idf!1856
2018-01-31 16:45:58 +08:00
Ivan Grokhotkov
673d4679ce
Merge branch 'cherry-pick-0f22a53f' into 'release/v3.0'
...
sysview: fix compilation in 1 core mode, refactor timer choices (cherry-pick for 3.0)
See merge request idf/esp-idf!1873
2018-01-29 22:33:36 +08:00
Ivan Grokhotkov
95f6f88aa7
Merge branch 'bugfix/sysview_timer_1core' into 'master'
...
sysview: fix compilation in 1 core mode, refactor timer choices
See merge request idf/esp-idf!1822
(cherry picked from commit 0f22a53fc2
)
c3d82157
sysview: fix compilation in 1 core mode, refactor timer choices
2018-01-29 17:29:23 +08:00
zhiweijian
621794abb5
Component/bt: fix bt load boned in smp
2018-01-26 14:45:36 +08:00
Jiang Jiang Jian
f918cb185d
Merge branch 'bugfix/btdm_fix_bonded_device_list_error_after_reboot_v30' into 'release/v3.0'
...
Component/bt: fix bonded device list error after reboot for v3.0
See merge request !1849
2018-01-26 11:38:19 +08:00
zhiweijian
ab22836859
Component/bt: fix bonded device list error after reboot
2018-01-26 02:04:56 +00:00
Jiang Jiang Jian
9539d44158
Merge branch 'cherry-pick-c25be19e' into 'release/v3.0'
...
Merge branch 'bugfix/multi_ping_crash' into 'release/v3.0'
See merge request !1851
2018-01-25 23:12:56 +08:00
Jiang Jiang Jian
b6b8af498c
Merge branch 'bugfix/fix_uart_related_bug' into 'release/v3.0'
...
driver(uart): merge uart related bugfixes into v3.0
See merge request !1845
2018-01-25 19:34:04 +08:00
Wu Jian Gang
194b1324d2
Merge branch 'bugfix/multi_ping_crash' into 'master'
...
fix(ping): fix crash when multi-ping
See merge request !1768
2018-01-25 19:21:46 +08:00
Jiang Jiang Jian
7a030ff8d6
Merge branch 'cherry-pick-02821571' into 'release/v3.0'
...
Merge branch 'bugfix/xRingbufferSend_timeout_bug' into 'release/v3.0'
See merge request !1843
2018-01-25 16:13:46 +08:00
Jiang Jiang Jian
d9a0f9d443
Merge branch 'bugfix/wifi_fix_espnow_mem_leak_v3.0' into 'release/v3.0'
...
fix espnow memory leak
See merge request !1842
2018-01-24 21:44:27 +08:00
kooho
3a6be05945
driver(uart):merge branch into v3.0 which fixed three bug related with uart
...
1. uart fifo reset
2. uart pattern interrupt
3. uart buffered_len error.
2018-01-24 21:27:31 +08:00
Ivan Grokhotkov
d1c536258c
Merge branch 'bugfix/xRingbufferSend_timeout_bug' into 'master'
...
bugfix(ringbuffer): Fix ringbuffer_send timeout bug
See merge request !1823
2018-01-24 17:00:24 +08:00
XiaXiaotian
5a1247246c
fix espnow memory leak
2018-01-24 16:20:20 +08:00
Jiang Jiang Jian
45758b6be0
Merge branch 'cherry-pick-ce2e4cbc' into 'release/v3.0'
...
Merge branch 'bugfix/log_hex_buffer_pr1519' into 'release/v3.0'
See merge request !1839
2018-01-24 15:55:46 +08:00
Jiang Jiang Jian
6183de959a
Merge branch 'bugfix/wifi_fix_sniffer_rx_misc_data_assert_v3.0' into 'release/v3.0'
...
Fix the bug that in sniffer mode it asserts when receive misc data at first
See merge request !1833
2018-01-23 22:52:10 +08:00
Jiang Jiang Jian
e9a4eb57b9
Merge branch 'bugfix/log_hex_buffer_pr1519' into 'master'
...
Fix hexdump comment and array size. See issue #1518 .
See merge request !1832
2018-01-23 22:45:55 +08:00
Jiang Jiang Jian
5894e15f6b
Merge branch 'bugfix/btdm_classicbt_pscan_assert_for_v3.0' into 'release/v3.0'
...
component/bt : fix the bug of pscan when interrupt react slowly
See merge request !1835
2018-01-23 22:39:28 +08:00