Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4736 commits 10 branches 75 tags 114 MiB
Commit graph

3597 commits

Author SHA1 Message Date
Zhang Zhao Xiang
7535dbc454 fix zero dma buffer bug: must be 4-bytes aligned 2018-04-23 19:33:11 +08:00
Zhang Zhao Xiang
aeb4d8e3c2 modify i2s param and comments 2018-04-23 14:30:55 +08:00
Ivan Grokhotkov
ba13d282dd Merge branch 'bugfix/mbedtls_patches_3.0' into 'release/v3.0' 
Bugfix/mbedtls patches 3.0

See merge request idf/esp-idf!2261
 2018-04-19 17:30:16 +08:00
Ivan Grokhotkov
806d23b17b Merge branch 'cherry-pick-595ddfd8' into 'release/v3.0' 
CI: build_ssc_in_multiple_ci_jobs

See merge request idf/esp-idf!2183
 2018-04-19 15:00:01 +08:00
Ivan Grokhotkov
e410f4268e Merge branch 'feature/uart_add_api_get_cmd_position_v3.0' into 'release/v3.0' 
driver(uart):  Provide an API to get the position of the cmd char from queue

See merge request idf/esp-idf!2254
 2018-04-19 14:58:28 +08:00
Ivan Grokhotkov
8de29499ce mbedtls: Add bounds check before length read 
This is part of the patch for CVE-2018-9989.
Cherry-picked from 740b218386
Ref. https://github.com/espressif/esp-idf/issues/1860
 2018-04-19 12:58:48 +08:00
Ivan Grokhotkov
ffab6084f0 mbedtls: Prevent arithmetic overflow on bounds check 
Part of the patch for CVE-2018-9989.
Cherry-picked from 5224a7544c.
Ref. https://github.com/espressif/esp-idf/issues/1860
 2018-04-19 12:58:48 +08:00
Ivan Grokhotkov
f58c664e2b mbedtls: Add bounds check before signature length read 
Part of the patch for CVE-2018-9988.
Cherry-picked from a1098f81c2
Ref. https://github.com/espressif/esp-idf/issues/1860
 2018-04-19 12:58:47 +08:00
Ivan Grokhotkov
b42ba1b0a5 mbedtls: Prevent arithmetic overflow on bounds check 
Part of the patch for CVE-2018-9988.
Cherry-pick of 027f84c69f
Ref. https://github.com/espressif/esp-idf/issues/1860
 2018-04-19 12:58:47 +08:00
Ivan Grokhotkov
67ba85650d mbedtls: Prevent bounds check bypass through overflow in PSK identity parsing 
This is a patch for CVE-2017-18187.
Cherry-picked from 83c9f495ff
Ref. https://github.com/espressif/esp-idf/issues/1730
 2018-04-19 12:58:47 +08:00
Ivan Grokhotkov
0a97cb62ef mbedtls: disable support for RSASSA-PSS signatures 
This is a workaround for CVE-2018-0487.
Ref. https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2018-01
Ref. https://github.com/espressif/esp-idf/issues/1730
 2018-04-19 12:58:47 +08:00
Ivan Grokhotkov
594e1b5e44 mbedtls: disable truncated HMAC 
This is a workaround for CVE-2018-0488.
Ref. https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2018-01
Ref. https://github.com/espressif/esp-idf/issues/1730
 2018-04-19 12:26:41 +08:00
Ivan Grokhotkov
e4a840d8cf soc/rtc, sleep: don’t lower the bias for wakeup state 
This fixes watchdog resets occurring during wakeup from light sleep.
 2018-04-18 18:22:49 +08:00
kooho
7a32ae363e driver(uart):Provide an API to get the position of the cmd char from queue without modify the queue. 2018-04-18 10:11:02 +08:00
Jiang Jiang Jian
fddc905fa3 Merge branch 'bugfix/tw19728_support_static_allocation_of_freertos_queue_used_by_isr' into 'release/v3.0' 
esp32/driver/bt: support static allocation of FreeRTOS queues used by ISR routine

See merge request idf/esp-idf!2171
 2018-04-12 23:07:51 +08:00
Jiang Jiang Jian
574dd08085 Merge branch 'bugfix/i2s_mix_result_with_error_code' into 'release/v3.0' 
fix i2s mix result and error code

See merge request idf/esp-idf!2187
 2018-04-11 18:30:45 +08:00
Zhang Zhao Xiang
bf4184a049 fix i2s mix result and error code 2018-04-10 12:04:05 +08:00
Liu Zhi Fu
212222a9e0 esp32/bt/driver: support static allocation of FreeRTOS queues used by ISR routine 
Support static allocation of FreeRTOS queues used by ISR routine in WiFi/BT/esp_timer/driver etc
 2018-04-09 13:39:31 +08:00
Ivan Grokhotkov
6d3f81aa77 pm: fix initialisation only done in dual core mode 
Introduced in 9377d4ac. Accidentally put the new code block under an
 2018-04-08 14:08:31 +08:00
He Yin Ling
8d0d7972f3 test: use SSC_BLE_WIFI to test NVS cases 2018-04-03 19:23:32 +08:00
Ivan Grokhotkov
e6acfedd3c Merge branch 'feature/build_ssc_in_multiple_ci_jobs' into 'master' 
CI: support build SSC in multiple jobs

See merge request idf/esp-idf!1622

(cherry picked from commit 595ddfd825)

493a9266 CI: support build SSC in multiple jobs
48e3e3ef test: change SSC binary path
 2018-04-03 19:18:15 +08:00
Angus Gratton
0f5cae0218 heap: Change test_multi_heap_on_host multi-config to bash script not Makefile 
Hopefully fix some CI building issues with parallel builds.
 2018-04-03 16:35:47 +10:00
Deomid Ryabkov
712bd1d773 Try to merge tail with next block when splitting 
When splitting a memory block, check if the next block is free.
If it is, then just extend it upwards instead of creating a new block.
This fixes a bug where when shrinking existing allocations would result in irreversible free space fragmentation.

When testing on the host, test all the poisoning configurations.
 2018-04-03 16:35:47 +10:00
Jiang Jiang Jian
4e36ede3bf Merge branch 'feature/i2s_add_expand_function' into 'release/v3.0' 
Add a new i2s feature to expand the original i2s width

See merge request idf/esp-idf!2174
 2018-04-02 21:51:14 +08:00
Jiang Jiang Jian
2f2aa41ea7 Merge branch 'bugfix/btdm_slow_interrupt_reaction_for_v3.0' into 'release/v3.0' 
Bugfix/btdm slow interrupt reaction for v3.0

See merge request idf/esp-idf!2159
 2018-04-02 20:04:52 +08:00
Jiang Jiang Jian
089438139d Merge branch 'bugfix/some_wifi_bugs_for_v3.0' into 'release/v3.0' 
Bugfix/some wifi bugs for v3.0

See merge request idf/esp-idf!2168
 2018-04-02 16:34:09 +08:00
Jiang Jiang Jian
e468a105d8 Merge branch 'cherry-pick-f46ad1fe' into 'release/v3.0' 
Merge branch 'bugfix/btdm_fix_get_PID_key_error' into 'release/v3.0'

See merge request idf/esp-idf!2169
 2018-04-02 16:12:26 +08:00
Jiang Jiang Jian
894ddea353 Merge branch 'cherry-pick-8eaae966' into 'release/v3.0' 
Merge branch 'bugfix/flash_mapp' into 'release/v3.0'

See merge request idf/esp-idf!2170
 2018-04-02 16:12:05 +08:00
Zhang Zhao Xiang
fed3c3ebf0 Add a new i2s feature to expand the original i2s width 2018-04-02 05:24:38 +00:00
Jiang Jiang Jian
f8515688cb Merge branch 'bugfix/i2c_bugfix_for_v3.0' into 'release/v3.0' 
driver(i2c): fix i2c bugs for release/v3.0

See merge request idf/esp-idf!2152
 2018-03-31 17:12:55 +08:00
Tian Hao
b9dab23437 component/bt : fix interrupt slow reaction cause assert(interrupt wdt) 
Some application lock interrupt(portENTER_CRITICAL) too long time,
it will cause bluetooth cannot react interrupt in time, then t will
cause some assert, assert info following:
1. ld_acl.c 1900
2. ld_fm.c 340
3. other assert reference to this.
 2018-03-31 06:52:00 +00:00
Tian Hao
5632385d5f component/bt : add bluetooth controller library compile version 2018-03-31 06:52:00 +00:00
Jiang Jiang Jian
cfcb22fe16 Merge branch 'bugfix/btdm_fix_get_PID_key_error' into 'master' 
Component/bt: fix get PID key error

See merge request idf/esp-idf!2156

(cherry picked from commit f46ad1fec8)

109a93bf Component/bt: fix get PID key error
 2018-03-31 06:51:31 +00:00
Jiang Jiang Jian
d6e3943233 Merge branch 'bugfix/flash_mapp' into 'master' 
spi_flash: add api to get valid mmu table pages number

See merge request idf/esp-idf!2070

(cherry picked from commit 8eaae96658)

75550315 add api get valid mmu table pages number
fa687743 spi_flash:
49a236da fix CI failed when flash chip size if 2MBytes
 2018-03-31 06:51:08 +00:00
Deng Xin
b563219f93 Fix some wifi bugs 
1. Do not filter out TKIP MIC ERR packet
2. Modify response retry counter from 32 to 5
3. support enrollee feature in APSTA mode
 2018-03-31 06:50:15 +00:00
Jiang Jiang Jian
d881fcd380 Merge branch 'bugfix/btdm_modify_open_API_params' into 'release/v3.0' 
Component/bt: modify open API params for v3.0

See merge request idf/esp-idf!2166
 2018-03-30 19:41:31 +08:00
zhiweijian
058a38a141 Component/bt: fix connect fail when remote addr type is random 2018-03-30 17:10:56 +08:00
Jiang Jiang Jian
1fca253a65 Merge branch 'bugfix/btdm_fix_no_set_rand_addr_event_callback' into 'master' 
Component/bt: fix no set rand add callback

See merge request idf/esp-idf!2140

(cherry picked from commit 6ffd089c97)

aa236809 Component/bt: fix no set rand add callback event
 2018-03-30 16:05:43 +08:00
Jiang Jiang Jian
cf69dfa458 Merge branch 'cherry-pick-b26ab188' into 'release/v3.0' 
Merge branch 'bugfix/btdm_fix_service_change_event_param_error' into 'release/v3.0'

See merge request idf/esp-idf!2161
 2018-03-30 15:53:51 +08:00
Jiang Jiang Jian
a80e687f8c Merge branch 'bugfix/btdm_fix_service_change_event_param_error' into 'master' 
Component/bt: fix service change event params error

See merge request idf/esp-idf!2150

(cherry picked from commit b26ab188af)

f5d58142 Component/bt: fix service change event params error
 2018-03-30 14:57:24 +08:00
baohongde
bc90b89e2b component/bt: Fix xQueueGenericSend assertion in release/v3.0 2018-03-30 14:53:27 +08:00
kooho
14baac302f driver(i2c):Fixed i2c bug for release/v3.0 2018-03-29 14:03:04 +08:00
wangmengyang
af211fcf0c component/bt: bugfix for no link key notification event on repairing for initiating side of simple_pairing 
In response to: https://github.com/espressif/esp-idf/issues/1275
 2018-03-27 15:49:52 +08:00
zhiweijian
48c7afde27 Component/bt: fix build error when close SMP 2018-03-21 13:48:05 +08:00
Jiang Jiang Jian
c9ed467e26 Merge branch 'bugfix/dfs_rtc_fixes' into 'master' 
DFS related fixes

See merge request idf/esp-idf!2102

(cherry picked from commit 8478823039)

9377d4ac pm: fix incorrect configuration at startup
7167ad45 pm: improve debug output from esp_pm_dump_locks
1618dbc9 soc/rtc: wait for frequency switch to complete
 2018-03-21 12:02:58 +08:00
Jiang Jiang Jian
f0eb023f17 Merge branch 'bugfix/wifi_lwip_set_ip_post_wrong_event_v3.0' into 'release/v3.0' 
Fix the bug that incorrect event is posted when setting static ip of softap and ethernet

See merge request idf/esp-idf!2096
 2018-03-21 11:45:34 +08:00
XiaXiaotian
8944b90a06 Fix the bug that incorrect event is posted when setting static ip of softap and ethernet 2018-03-21 11:01:32 +08:00
Jiang Jiang Jian
9e4ec90a1e Merge branch 'bugfix/tw18031_lwip_assert' into 'release/v3.0' 
cherry pick 'bugfix/redirect_psram_muxes_to_single_mux' into 'release/v3.0'

See merge request idf/esp-idf!2055
 2018-03-21 10:22:30 +08:00
Jiang Jiang Jian
e4357d9cf3 Merge branch 'cherry-pick-0f6f762b' into 'release/v3.0' 
cherry pick 'bugfix/btdm_add_char_descr_uuid_error' into 'release/v3.0'

See merge request idf/esp-idf!2100
 2018-03-21 10:21:54 +08:00
Jiang Jiang Jian
db17ffef00 Merge branch 'cherry-pick-8ab17d7c' into 'release/v3.0' 
cherry pick 'bugfix/btdm_avrc_remote_bda_error_when_disconnect' into 'release/v3.0'

See merge request idf/esp-idf!2099
 2018-03-20 19:58:24 +08:00
Jiang Jiang Jian
7f2a9f0359 Merge branch 'bugfix/btdm_fix_reconnect_fail_in_smp_v30' into 'release/v3.0' 
Component/bt: fix reconnect fail in smp for v3.0

See merge request idf/esp-idf!2075
 2018-03-20 18:49:13 +08:00
Jiang Jiang Jian
ecdeea9a85 Merge branch 'bugfix/btdm_add_char_descr_uuid_error' into 'master' 
component/bt: Change the char_uuid to descr_uuid in the add descriptor callback params.

See merge request idf/esp-idf!2065

(cherry picked from commit 0f6f762be0)

c802ea84 component/bt: Change the char_uuid to descr_uuid in the add descriptor callback params.
 2018-03-20 18:43:59 +08:00
Jiang Jiang Jian
cfce9e1c72 Merge branch 'bugfix/btdm_avrc_remote_bda_error_when_disconnect' into 'master' 
component/bt: Fix bug: AVRC remote_bda error when disconnect

See merge request idf/esp-idf!2093

(cherry picked from commit 8ab17d7ccf)

2531975c component/bt: Fix bug: AVRC remote_bda error when disconnect
 2018-03-20 18:24:50 +08:00
Jiang Jiang Jian
dfce994b54 Merge branch 'feature/optimize_wifi_tx_v3.0' into 'release/v3.0' 
esp32: optimize wifi tx

See merge request idf/esp-idf!2092
 2018-03-20 18:22:24 +08:00
Liu Zhi Fu
37a4b0e933 esp32: optimize wifi tx 
1. Optimize WiFi TX retry counter
2. Optimize WiFi TX timeout
 2018-03-20 15:23:47 +08:00
Jiang Jiang Jian
8fab9ffb95 Merge branch 'bugfix/wpa2_assert_when_use_sha256_signature' into 'master' 
bugfix of wpa2 assert when use sha256 do signature

See merge request idf/esp-idf!2089

(cherry picked from commit 45eb556ddf)

bc97b0f3 bugfix of wpa2 assert when use sha256 do signature
 2018-03-20 15:20:13 +08:00
Liu Zhi Fu
0399c8ecaf esp32: Fix wifi stop never returns issue 
Fix esp_wifi_stop never returns issue
 2018-03-19 21:06:05 +08:00
Jiang Jiang Jian
a12e7fa638 Merge branch 'bugfix/tw19020_force_1.9V_when_flash_is_80M_v3.0' into 'release/v3.0' 
bootloader: force SDIO 1.9V if flash is 80M

See merge request idf/esp-idf!2084
 2018-03-19 18:50:47 +08:00
Jiang Jiang Jian
3278f755d2 Merge branch 'bugfix/fix_wpa2_disconnect_assert_issue_v3.0' into 'release/v3.0' 
fix the issue that wpa2 assert when disconnect from AP

See merge request idf/esp-idf!2066
 2018-03-19 18:24:01 +08:00
Liu Zhi Fu
30281166b1 bootloader: force SDIO 1.9V if flash is 80M 
If the SPI flash frequency is 80M, the voltage of SDIO is 1.9V,
otherwise, it can configured to 1.8V or 1.9V via menuconfig.
 2018-03-19 16:45:05 +08:00
Jiang Jiang Jian
9bd227f8c5 Merge branch 'bugfix/btdm_fix_gattc_open_API_v30' into 'release/v3.0' 
component/bt: fix gattc open api for v3.0

See merge request idf/esp-idf!2077
 2018-03-19 14:27:22 +08:00
Jiang Jiang Jian
998e18ed69 Merge branch 'bugfix/multi_connection_performance' into 'release/v3.0' 
component/bt : improve multi-connection performance and stability

See merge request idf/esp-idf!2068
 2018-03-19 14:05:19 +08:00
zhiweijian
d0e553358a Component/bt: fix reconnect fail in smp 2018-03-19 11:15:38 +08:00
Jiang Jiang Jian
0cdb8b4888 Merge branch 'bugfix/btdm_fix_get_attr_value_error_after_prepare_write_v30' into 'release/v3.0' 
Component/bt: fix get attr value error after prepare write for v3.0

See merge request idf/esp-idf!2028
 2018-03-19 10:48:39 +08:00
Jiang Jiang Jian
c1e4ebf2bc Merge branch 'cherry-pick-db690e3f-2' into 'release/v3.0' 
Component/bt: add params check in prefer_conn_params() for v3.0

See merge request idf/esp-idf!2062
 2018-03-19 10:47:55 +08:00
Jiang Jiang Jian
71ca4c50b0 Merge branch 'bugfix/btdm_clear_start_stop_adv_callback_when_complete_v30' into 'release/v3.0' 
Component/bt: clear start/stop adv callback when complete_v3.0

See merge request idf/esp-idf!2029
 2018-03-19 10:47:19 +08:00
Darian Leung
c4a6eef841 bugfix/Fix BLK3_RESERVED_FLAG register and other minor bugs 
This commit fixes an incorrect register definition for BLK3_RESERVED_FLAG.
Other bugs include a missing conditional check, and updated comments
on modifying eFuse checking behavior.
 2018-03-16 20:56:27 +08:00
zwj
05b5671fc4 component/bt: fix gattc open api 2018-03-16 19:23:31 +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
Tian Hao
bc12970dde component/bt : improve multi-connection performance and stability 2018-03-15 15:36:53 +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
XiaXiaotian
acff7e58d2 fix the issue that wpa2 assert when disconnect from AP 2018-03-15 14:42:31 +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
48ea4bc7f4 Merge branch 'bugfix/btdm_add_param_check_in_gap_set_prefer_conn_params' into 'master' 
Component/bt: add_params_check_in_prefer_conn_params()

See merge request idf/esp-idf!1944

(cherry picked from commit db690e3f85)

b09d681d Component/bt: add_params_check_in_prefer_conn_params()
 2018-03-15 12:07:01 +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
Angus Gratton
c82adcae1b Merge branch 'bugfix/redirect_psram_muxes_to_single_mux' into 'master' 
Fake S32C1I operation for muxes in PSRAM

See merge request idf/esp-idf!1688
 2018-03-14 17:51:50 +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
zhiweijian
ebfc47c34b Component/bt: clear start/stop adv callback when complete 2018-03-09 11:14:11 +08:00
zhiweijian
681805b6c7 Component/bt: fix get attr value error after prepare write 2018-03-09 11:10:04 +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
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
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
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
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
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
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
XiaXiaotian
891c1f4a2b Fix the bug that in sniffer mode it asserts when receive misc data at first. 
close github issue#1037 WiFi Promiscuous filter breaks w/
WIFI_PROMIS_FILTER_MASK_ALL and issue#1404
esp_wifi_set_promiscuous_filter set WIFI_PROMIS_FILTER_MASK_ALL error
 2018-01-23 19:12:37 +08:00
Tian Hao
f5c962d8b2 component/bt : fix the bug of pscan when interrupt react slowly 2018-01-23 14:16:02 +08:00
me-no-dev
c68fd9d545 mdns: Fix case where service is NULL and that will cause exception 2018-01-22 23:27:24 +08:00
me-no-dev
d6c06ed0b5 mdns: Fix issue with some mDNS parsers 
Some mDNS parser have issue with zero terminated TXT lists. This fix targets to overcome this issue. Found and tested with jmdns.
 2018-01-22 23:27:20 +08:00
me-no-dev
8baa6b9d8b Import mDNS changes 2018-01-22 23:27:14 +08:00
Jiang Jiang Jian
df93f672e3 Merge branch 'bugfix/btdm_pair_fail_with_random_address' into 'master' 
component/bt: Fix bug when pair with random address

See merge request !1784
 2018-01-16 18:18:00 +08:00
Jiang Jiang Jian
4a55009f3e Merge branch 'bugfix/fix_rare_ci_example_build_errors' into 'release/v3.0' 
cherry-pick fix rare ci example build errors to release v3.0

See merge request !1813
 2018-01-16 17:13:08 +08:00
Jiang Jiang Jian
dfcff0a5bf Merge branch 'bugfix/btdm_discon_when_upd_conn_params_in_smp_for_v3.0' into 'release/v3.0' 
component/bt: fix disconnect after connection params update in smp for v3.0

See merge request !1805
 2018-01-16 16:41:26 +08:00
Jiang Jiang Jian
ff3566e40b Merge branch 'bugfix/btdm_fix_conn_params_update_failed_in_SMP_for_v3.0' into 'release/v3.0' 
Component/bt: fix update connection params error in smp for v3.0

See merge request !1809
 2018-01-16 16:38:36 +08:00
Anton Maklakov
93c18bb2b4 build system: Fix undefined variables 
make/project.mk:315: warning: undefined variable `CC'
    make/project.mk:316: warning: undefined variable `LD'
    make/project.mk:317: warning: undefined variable `AR'
    make/project.mk:62: warning: undefined variable `MAKECMDGOALS'
    components/partition_table/Makefile.projbuild:24: warning: undefined variable `quote'
    components/bootloader/Makefile.projbuild:123: warning: undefined variable 'BOOTLOADER_DIGEST_BIN'
    components/bootloader/Makefile.projbuild:123: warning: undefined variable 'SECURE_BOOTLOADER_KEY'
 2018-01-16 09:51:08 +08:00
XiaXiaotian
c5f63bf701 Fix two wifi bugs 
1. Fix the bug that receiving beacon time is not correct.

2. close github issue#233 esp_wifi_restore() bug.
 2018-01-15 20:42:44 +08:00
zhiweijian
ced95c7fb0 Component/bt: fix update connection params error in smp for v3.0 2018-01-15 19:55:50 +08:00
Jiang Jiang Jian
309fb23ffc Merge branch 'cherry-pick-c401a74b' into 'release/v3.0' 
Merge branch 'bugfix/btdm_aes_encrypt_workaround' into 'master'

See merge request !1800
 2018-01-15 18:49:25 +08:00
Jiang Jiang Jian
e9a230c20c Merge branch 'cherry-pick-0cd97cec' into 'release/v3.0' 
Merge branch 'bugfix/btdm_error_when_add_device_to_whitelist_twice' into 'master'

See merge request !1799
 2018-01-15 18:49:11 +08:00
Jiang Jiang Jian
b0c7f28aed Merge branch 'bugfix/fix_qos_bug_in_11g_mode_v3.0' into 'release/v3.0' 
Bugfix/fix qos bug in 11g mode v3.0

See merge request !1790
 2018-01-15 18:26:30 +08:00
zhiweijian
7bc1e7608c component/bt: fix disconnect after connection params update in smp 2018-01-15 17:12:23 +08:00
Jiang Jiang Jian
449ce1bad9 Merge branch 'bugfix/btdm_aes_encrypt_workaround' into 'master' 
component/bt: disable Secure Connections to workaround AES encryption issue

See merge request !1719
 2018-01-15 14:47:28 +08:00
Jiang Jiang Jian
424a5e2705 Merge branch 'bugfix/btdm_error_when_add_device_to_whitelist_twice' into 'master' 
component/bt: Fix bug when add device to whitelist twice

See merge request !1700
 2018-01-15 14:46:13 +08:00
Liu Zhi Fu
9b0c252e67 esp32: fix qos bug in 11g mode 
Fix qos bug in 11g mode (release/v3.0 - 8e861901)
 2018-01-12 14:14:20 +08:00
Ivan Grokhotkov
2a55629556 Merge branch 'feature/toolchain-80-g6c4433a-v30' into 'release/v3.0' 
Toolchain: Update to version 1.22.0-80-g6c4433a (v3.0 backport)

See merge request !1772
 2018-01-11 21:45:11 +08:00
Angus Gratton
b523660199 build: Remove explict -lstdc++-psram-workaround 
This is now handled internally to the toolchain.
 2018-01-11 10:32:28 +11:00
Jiang Jiang Jian
150be549eb Merge branch 'cherry-pick-675844c4' into 'release/v3.0' 
Merge branch 'bugfix/assert_in_PSRAM_WIFI' into 'master'

See merge request !1773
 2018-01-10 20:58:47 +08:00
Jiang Jiang Jian
10898a33ed Merge branch 'cherry-pick-16391c27' into 'release/v3.0' 
Merge branch 'bugfix/full_calibration_will_not_use_init_data' into 'master'

See merge request !1774
 2018-01-10 20:58:33 +08:00
Jiang Jiang Jian
404a6b3782 Merge branch 'bugfix/full_calibration_will_not_use_init_data' into 'master' 
Fix bug that when we do full calibration init data bin is not used

See merge request !1746
 2018-01-10 17:02:08 +08:00
Jiang Jiang Jian
29f999361e Merge branch 'bugfix/assert_in_PSRAM_WIFI' into 'master' 
bug fix of assert happen in PSRAM

See merge request !1745
 2018-01-10 16:48:04 +08:00
zhiweijian
7d3e8998d8 Component/bt: fix can not remove boned device if it is connected 2018-01-10 10:46:11 +08:00
Jiang Jiang Jian
e276b98fe4 Merge branch 'bugfix/BLE_SM_Security_Flags_pr1320_v30' into 'release/v3.0' 
bt: Fix ble sm security flags (v3.0 backport)

See merge request !1754
 2018-01-09 15:49:04 +08:00
Jiang Jiang Jian
de7381b77e Merge branch 'bugfix/btdm_avrc_connect_state_evt_for_v3.0' into 'release/v3.0' 
component/bt: add AVRC event for remote features indication

See merge request !1734
 2018-01-09 15:39:02 +08:00
wangmengyang
645d9b9590 component/bt: add AVRC event for remote features indication 
1. remove the feature mask parameter from AVRC connection state event, as the AVCTP connection can be initiated by remote device before service discovery to remote device is performed. \
In this case, AVRCP connection state event may not be reported after connection initated by remote device is established.
2. remove ESP_AVRC_CT_MAX_EVT
3. add more documentations to AVRC APIs
 2018-01-08 19:43:54 +08:00
Tim Cook
eb408e50c4 n btm_sec_save_le_key() set BTM_SEC_LE_LINK_KEY_KNOWN (and BTM_SEC_LE_LINK_KEY_AUTHED if MITM was used) when process a local Long Term Key (key type BTM_LE_KEY_LENC). This is because these flags share bits with the BTM_SEC_FLAG_LKEY_KNOWN (and BTM_SEC_FLAG_LKEY_AUTHED) flag in btm_api.h. Without this code a link that is encrypted via SM pairing where only the local device exchanges the LTK (peer does not send its LTK) will not allow GATT operations that require encryption (request will be incorrectly rejected with insufficient authentication reason, regardless of if MITM is required). 
Merges https://github.com/espressif/esp-idf/pull/1320
 2018-01-08 10:37:19 +11:00
Tim Cook
60da98ee0b set ble_rsp_key member of structure bte_appl_cfg in function bta_dm_co_ble_set_rsp_key_req (function incorrectly uses ble_init_key member). 
Merges https://github.com/espressif/esp-idf/pull/1320
 2018-01-08 10:37:18 +11:00
baohongde
314f6f371c component/bt: Standardize code 
Reported from github:
https://github.com/espressif/esp-idf/issues/1402
https://github.com/espressif/esp-idf/issues/1403
 2018-01-05 19:31:53 +08:00
XiaXiaotian
27c28eb1e6 Close socket request will abort tcp write/connect 
When tcp write/connect is running, close socket request will abort
    it and continue to delete netconn and close tcp. Do not immediately
    return after aborting tcp write/connect. Otherwise, tcp close
    requeset will block and tcp write/connect will crash.
 2018-01-03 11:23:57 +08:00
Per Malmberg
2cc07d0c4c Fix regression in i2c_master_read() which rejected all data lenths. 2018-01-02 10:01:23 +11:00
Jiang Jiang Jian
da81b97e17 Merge branch 'bugfix/recompile_with_new_psram_toolchain_v3.0' into 'release/v3.0' 
recompile wifi lib with new toolchain 1.22.0-78-g4b87650

See merge request !1729
 2017-12-29 18:33:46 +08:00