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

1409 commits

Author SHA1 Message Date
lly 6e45c091e3 doc: Fix some ble mesh description 2020-04-30 11:39:07 +00:00
lly d77da91ffb ble_mesh: Add some common macros for sensor model 2020-04-30 11:32:53 +00:00
lly 13817a190c ble_mesh: Allow empty sensor series column value 2020-04-30 11:32:53 +00:00
lly 4e858153a8 ble_mesh: Check if same sensor (settings) property id exists 2020-04-30 11:32:53 +00:00
lly ca95b54ce4 ble_mesh: Allow empty sensor settings exist 2020-04-30 11:32:53 +00:00
lly 9b1b2f9b5d ble_mesh: Support BLE advertising simultaneously 2020-04-30 08:23:24 +00:00
lly caeb040857 ble_mesh: Fix time scene wrong macro name 2020-04-27 16:27:52 +08:00
lly 012b810d29 ble_mesh: Add ble mesh white list test function 
Using the ble mesh white list test functions, a node can choose to
only receive mesh messages from a specific node and relay the
messages for it. Messages from other nodes will be ignored.
 2020-04-26 06:44:45 +00:00
Jiang Jiang Jian f3f88e241b Merge branch 'bugfix/btdm_backports_v3.3_0328' into 'release/v3.3' 
Bugfix/btdm backports v3.3 0328

See merge request espressif/esp-idf!8153
 2020-04-16 21:08:10 +08:00
xiewenxiang 23474dc737 component/bt: fix don't dequeue the command queue after process the read_by_type_req(backport v3.3) 2020-03-31 16:45:57 +08:00
baohongde 0ac0a3126f components/coex: Fix wakeup delay with DFS 2020-03-28 21:15:21 +08:00
baohongde 41fe01cc99 components/bt: Fix assert when create conntion cancel 2020-03-28 21:08:52 +08:00
Island 151b6d9bef Merge branch 'bugfix/allow_adv_stop_again_in_host' into 'release/v3.3' 
Fix allow to send stop adv hci cmd when host adv state is disable

See merge request espressif/esp-idf!7993
 2020-03-17 23:52:04 +08:00
lly cc07e9d203 ble_mesh: Fix ble mesh nimble host deinit 2020-03-17 14:42:46 +08:00
gengyuchao ab175f8845 fix allow to send stop adv hci cmd when host adv state is disable 2020-03-16 21:37:07 +08:00
Jiang Jiang Jian bf568f2eb4 Merge branch 'bugfix/ble_mesh_miscellaneous_fix_v3.3' into 'release/v3.3' 
Bugfix/ble mesh miscellaneous fix (v3.3)

See merge request espressif/esp-idf!7971
 2020-03-16 13:27:35 +08:00
Jiang Jiang Jian 36cddd0bae Merge branch 'bugfix/ble_mesh_update_3.3' into 'release/v3.3' 
Bugfix/ble mesh update 3.3

See merge request espressif/esp-idf!7801
 2020-03-16 13:26:44 +08:00
Prasad Alatkar 4fb4c01c53 NimBLE: Add Host based privacy (RPA) feature support (v3.3) 
- This feature removes dependency on controller to use privacy (RPA)
 2020-03-15 21:43:01 +05:30
Prasad Alatkar 237f7eb92a NimBLE: Fix check for static random address & add MSYS_1 in menuconfig (v3.3) 2020-03-15 21:43:01 +05:30
Hrishikesh Dhayagude 5ca8851be8 NimBLE: Use dynamic buffers instead of static memory (v3.3) 
The NimBLE host buffers that consume a significant amount of memory are
now allocated dynamically.
The advantage is that, the memory can be reclaimed in cases where BLE
is turned off and not required for the current boot cycle
 2020-03-15 21:43:01 +05:30
Prasad Alatkar b6c88b683f NimBLE: Misc changes in host flow control, ble_gap_unpair, ble_hs_hci_rx_evt & example (v3.3) 
- Add menuconfig option for NimBLE host flow control
- Include changes in `blecent` example from upstream PR!702
- add ble_hs_lock in ble_gap_unpair Upstream PR!584
- ble_hs_hci_rx_evt, upstream PR!738
 2020-03-15 21:43:01 +05:30
lly a8763e6517 ble_mesh: Move dev_role to the end of model_pub 2020-03-13 19:53:26 +08:00
lly de022501b7 ble_mesh: Use the right netkey during iv update 2020-03-13 19:53:23 +08:00
lly 0d6dd36af9 ble_mesh: Use the right net_idx & app_idx for publish 2020-03-13 19:53:19 +08:00
lly 68dba56ac8 ble_mesh: Check buf->ref before unref the buffer 2020-03-13 19:53:16 +08:00
lly 9f32f4b405 ble_mesh: Fix mesh memory use-after-free issue 2020-03-13 19:53:12 +08:00
lly c19a01d100 ble_mesh: Add ble mesh deinit in btc task 2020-03-13 19:53:08 +08:00
lly 2ae6eedb30 ble_mesh: Free beacon timer when deinit mesh 2020-03-13 19:53:02 +08:00
lly e73ad2c391 ble_mesh: Use lock for mesh timer operations 2020-03-13 19:52:50 +08:00
Mahavir Jain 6babdfc0b7 ipc: prevent code getting pulled in for unicore configuration 2020-03-12 16:28:00 +05:30
Chinmay Chhajed 72fb22ed51 This MR is intended to fix Bluetooth event scheduling when WiFi is also enabled. 
The global interrupts will be disabled before taking current
time for scheduling further bluetooth events. Earlier disabling
interrupts was taking some time because of which WiFi events were
interrupting in current bluetooth scheduling.

Also fixes ble crash issue triggered by ble event irq miss (0x20000).
 2020-03-05 18:58:28 +05:30
lly 0e2c77b185 ble_mesh: Calc incomplete timeout based on msg info 2020-02-27 15:47:26 +08:00
lly 91ad0f9f4a ble_mesh: Start the timer when starting to send the client message 2020-02-27 15:47:12 +08:00
lly 70eadc0b05 ble_mesh: No timeout for client message to non-unicast address 2020-02-27 15:46:54 +08:00
lly 49fc8c86b3 ble_mesh: Unify client application and lower transport layer timeout 2020-02-27 15:46:19 +08:00
lly 04a6ac3cf5 ble_mesh: Allow maximum 377 octets payload 2020-02-27 15:46:03 +08:00
lly 9fa5c14d58 ble_mesh: Reset transport info when node is removed 2020-02-27 15:45:46 +08:00
lly cc19e1da9b ble_mesh: Provisioner ignores msg from removed node 2020-02-27 15:45:15 +08:00
June 2548168277 backport mr !6031 - fix security info restore bug 2020-02-21 20:17:17 +08:00
Jiang Jiang Jian 7ab0a59bb3 Merge branch 'bugfix/host_and_example_bugfix_backport_to_v3.3' into 'release/v3.3' 
Bugfix/host and example bugfix backport to v3.3

See merge request espressif/esp-idf!7723
 2020-02-21 18:15:48 +08:00
Jiang Jiang Jian 7d1c44fb7e Merge branch 'bugfix/btdm_role_switch_v3.3' into 'release/v3.3' 
Fix bugs about role switch

See merge request espressif/esp-idf!7721
 2020-02-21 17:49:46 +08:00
gengyuchao 94255c421d Fix some typo in idf release v3.3 2020-02-20 20:05:10 +08:00
gengyuchao b6e9a15e81 Component/bt : 
Add handling of osi memory calloc failure.
Add length check for snprintf in osi config.
 2020-02-20 19:39:03 +08:00
gengyuchao 53664c80ff component/bt: Fix the issue with pointer type conversion in gattc. Unified att(db_sizedb_size) count pointer type in bta and btc, change pointer type in bta from int to uint16_t. 2020-02-20 19:16:01 +08:00
baohongde 74b964ed67 Fix bugs about role switch 
Jitter in FHS
Jitter in first PULL
Receive EDR packet fail after role switch
 2020-02-20 19:11:45 +08:00
gengyuchao 6241139685 example/ble_throughput: 
Fixed the throughput wasting memory and packet loss issues.
Fixed the throughput crash bug because of using the Mutex.
 2020-02-20 18:05:23 +08:00
gengyuchao 4375e60a6e bugfix: ble add missing gatt descriptors 2020-02-20 17:54:45 +08:00
Jiang Jiang Jian 26383e95fd Merge branch 'feature/esp32_5p0_backport_v3p3' into 'release/v3.3' 
backport esp325p0 new features and code optimize to v3.3

See merge request espressif/esp-idf!7564
 2020-02-20 17:38:23 +08:00
Jiang Jiang Jian 365092fb57 Merge branch 'bugfix/coex_a2dp_stuck_after_creating_another_connection_v3.3' into 'release/v3.3' 
components/coex: Fix a2dp stuck after creating another connection

See merge request espressif/esp-idf!7663
 2020-02-20 14:16:53 +08:00
Jiang Jiang Jian 3aa0922221 Merge branch 'bugfix/controller_initializer_order' into 'release/v3.3' 
fix initializer order for BT_CONTROLLER_INIT_CONFIG_DEFAULT

See merge request espressif/esp-idf!7623
 2020-02-19 17:09:17 +08:00
Jiang Jiang Jian a4bbcbcf98 Merge branch 'bugfix/ble_mesh_fix_compile_error_with_cpp_3.3' into 'release/v3.3' 
ble_mesh: Fix compile error with c++ files (v3.3)

See merge request espressif/esp-idf!7585
 2020-02-18 20:44:31 +08:00
baohongde 7592ec77f5 components/coex: Fix a2dp stuck after creating another connection 2020-02-18 20:22:48 +08:00
June eec53257dc backport esp32 5p0 new features to v3p3 2020-02-18 15:21:07 +08:00
Jiang Jiang Jian 9b67208b14 Merge branch 'hfp_a2dp_iphone_3.3' into 'release/v3.3' 
components bt/: Disable sniff mode during (e)SCO connection for HFP. [backport 3.3]

See merge request espressif/esp-idf!7250
 2020-02-14 16:48:06 +08:00
Jiang Jiang Jian 91f0fcc3b3 Merge branch 'feat/nimble_esp_ble_mesh_v3.3' into 'release/v3.3' 
Add support of NimBLE host in ESP-BLE-Mesh (backport v3.3)

See merge request espressif/esp-idf!7510
 2020-02-14 16:43:05 +08:00
Hrishikesh Dhayagude cf6f1e8246 Add support of NimBLE host in ESP-BLE-Mesh - v3.3 2020-02-13 12:33:23 +05:30
lly 46b1608f44 ble_mesh: Fix compile error with c++ files 2020-02-13 09:58:56 +08:00
Jiang Jiang Jian 2eb4374a5b Merge branch 'bugfix/coex_schm_rebased_v3.3' into 'release/v3.3' 
components/esp_wifi: improve coexistence performance according to specific WiFi/BT/BLE scienario (Backport v3.3)

See merge request espressif/esp-idf!7410
 2020-02-12 17:07:18 +08:00
Xia Xiaotian a41443184e components/esp_wifi: improve coexistence performance according to specific WiFi/BT/BLE scienario 
1. Improve WiFi throughput in some Classic BT scienarios(idle, inquire scan,
       connected, sniff, a2dp pause, etc).

    2. Support WiFi + Classic BT + BLE mesh coexistence scienario.

    3. Improve WiFi scan and connect succeed ratio in coexistence scienario.

    4. Do not support to choose software coexistence preference anymore for it is
       determined according to coexistence scienario automatically.

components/lwip: increase TCP send buffer and receive window limitation when TCP window scale is enabled

components/ble_mesh: Fix some bugs about ble mesh

    1. fix send acl pkt after ble have sent terminate ind modify min adv interval to 10ms.
 2020-02-12 16:13:28 +08:00
El Jeffo 79dff0ef12 fix initializer order for BT_CONTROLLER_INIT_CONFIG_DEFAULT 2020-02-07 18:59:03 +08:00
Angus Gratton fd348b7bd8 bugfix: bt Kconfig included a UTF-8 comma 
Displays incorrectly on Python 3, but can crash Python 3 if the system default encoding is not utf-8
 2020-02-07 09:10:56 +11:00
Hrishikesh Dhayagude a03b9c7465 Add NimBLE files in ESP-BLE-Mesh again 
Revert "ble_mesh: Remove NimBLE implementation for ESP-BLE-MESH"

This reverts commit 925f93614c.
 2020-02-05 13:37:54 +05:30
lly 925f93614c ble_mesh: Remove NimBLE implementation for ESP-BLE-MESH 2020-02-03 12:04:00 +08:00
lly b19671e0d4 ble_mesh: Add ESP BLE Mesh implementation 
1. BLE Mesh Core

    * Provisioning: Node Role
        * PB-ADV and PB-GATT
        * Authentication OOB

    * Provisioning: Provisioner Role
        * PB-ADV and PB-GATT
        * Authentication OOB

    * Networking
        * Relay
        * Segmentation and Reassembly
        * Key Refresh
        * IV Update

    * Proxy Support

    * Multiple Client Models Run Simultaneously
        * Support multiple client models send packets to different nodes simultaneously
        * No blocking between client model and server

    * NVS Storage
        * Store BLE Mesh node related information in flash
        * Store BLE Mesh Provisioner related information in flash

2. BLE Mesh Models

    * Foundation Models
        * Configuration Server Model
        * Configuration Client Model
        * Health Server Model
        * Health Client Model

    * Generic
        * Generic OnOff Server
        * Generic OnOff Client
        * Generic Level Server
        * Generic Level Client
        * Generic Default Transition Time Server
        * Generic Default Transition Time Client
        * Generic Power OnOff Server
        * Generic Power OnOff Setup Server
        * Generic Power OnOff Client
        * Generic Power Level Server
        * Generic Power Level Setup Server
        * Generic Power Level Client
        * Generic Battery Server
        * Generic Battery Client
        * Generic Location Server
        * Generic Location Setup Server
        * Generic Location Client
        * Generic Admin Property Server
        * Generic Manufacturer Property Server
        * Generic User Property Server
        * Generic Client Property Server
        * Generic Property Client

    * Sensor Server Model
        * Sensor Server
        * Sensor Setup Server
        * Sensor Client

    * Time and Scenes
        * Time Server
        * Time Setup Server
        * Time Client
        * Scene Server
        * Scene Setup Server
        * Scene Client
        * Scheduler Server
        * Scheduler Setup Server
        * Scheduler Client

    * Lighting
        * Light Lightness Server
        * Light Lightness Setup Server
        * Light Lightness Client
        * Light CTL Server
        * Light CTL Setup Server
        * Light CTL Client
        * Light CTL Temperature Server
        * Light HSL Server
        * Light HSL Setup Server
        * Light HSL Client
        * Light HSL Hue Server
        * Light HSL Saturation Server
        * Light xyL Server
        * Light xyL Setup Server
        * Light xyL Client
        * Light LC Server
        * Light LC Setup Server
        * Light LC Client

3. BLE Mesh Applications

    * BLE Mesh Node
        * OnOff Client Example
        * OnOff Server Example

    * BLE Mesh Provisioner
        * Example

    * Fast Provisioning
        * Vendor Fast Prov Server Model
        * Vendor Fast Prov Client Model
        * Examples

    * Wi-Fi & BLE Mesh Coexistence
        * Example

    * BLE Mesh Console Commands
        * Examples
 2020-02-03 12:03:36 +08:00
baohongde 30779731ea components/bt: backport release/v3.3 
Fix A2DP stuck when BLE's interval is too small
Bugfix that bluetooth controller may not be able to enter sleep after end of wake up request
Fix LMP sniff req timeout
 2020-01-16 15:47:31 +08:00
zhiweijian 5187d64c34 component/bt: fix blufi prepare write buf len invalid 2020-01-14 17:45:40 +08:00
zhiweijian 927c4afa5b Component/bt: Fix GATTC trigger open event multiple times 2020-01-14 17:41:45 +08:00
weitianhua e284ff818b hfp a2dp iphone 3.3 2020-01-08 19:37:51 +08:00
baohongde 611c0c3897 components/bt: Choose AVRC category according to A2DP role 2019-12-31 15:31:54 +08:00
baohongde 09b8979987 components/bt: Revert changes of security mask 2019-12-25 20:13:35 +08:00
baohongde 83184631a4 components/bt: Disable some unsupported security mask 2019-12-22 08:56:18 +00:00
Geng Yu Chao db8bcc60f9 Bugfix/btdm fix doc and host bug backport v3.3 2019-12-18 14:19:13 +08:00
Jiang Jiang Jian 97dba89daf Merge branch 'bugfix/btdm_avrc_metadata_length_error_v3.3' into 'release/v3.3' 
components/bt: Fix AVRC metadata length error

See merge request espressif/esp-idf!6884
 2019-12-16 14:07:20 +08:00
Angus Gratton 88cf7ed87e Merge branch 'bugfix/wifi_internal_memory_v3.3' into 'release/v3.3' 
wifi: Include DMA reserved pool when allocating internal-only memory (v3.3)

See merge request espressif/esp-idf!6628
 2019-12-16 13:39:43 +08:00
Jiang Jiang Jian 82f1be5e5a Merge branch 'bugfix/hfp_client_indication_v3.3' into 'release/v3.3' 
component/bt: Fix bugs in HFP feature v3.3

See merge request espressif/esp-idf!6852
 2019-12-16 11:32:10 +08:00
Jiang Jiang Jian 7b73cf613c Merge branch 'component_bt/osi_fixed_queue_v3.3' into 'release/v3.3' 
component_bt/: Fix_pointer_type_fixed_queue v3.3

See merge request espressif/esp-idf!6847
 2019-12-16 11:31:24 +08:00
Angus Gratton 876ac4e963 bt: Include DMA reserved pool when allocating internal-only memory 
Fix for root cause of https://github.com/espressif/esp-idf/issues/3592
 2019-12-12 23:09:59 +00:00
weitianhua 3ceae811be adaptation for nano-format 2019-11-29 17:55:22 +08:00
weitianhua 8977e92b4c component_bt/:bugfix_hfp_client_indication_define_and_cnum_error 2019-11-29 16:22:34 +08:00
baohongde 42b2524776 components/bt: Fix AVRC metadata length error 2019-11-29 15:56:51 +08:00
Jiang Jiang Jian faf96bd108 Merge branch 'bugfix/btdm_run_out_of_frame_element_v3.3' into 'release/v3.3' 
components/bt: Fix assert due to no free element form

See merge request espressif/esp-idf!6701
 2019-11-27 22:22:33 +08:00
weitianhua 97b43b4054 component_bt/: Fix pointer type in fixed_queue 2019-11-27 16:09:44 +08:00
Jiang Jiang Jian 51a49a861a Merge branch 'bugfix/btdm_assert_deinit_a2dp_while_playing_v3.3' into 'release/v3.3' 
components/bt: Fix assert when deinit A2DP while playing music

See merge request espressif/esp-idf!6535
 2019-11-14 20:12:31 +08:00
baohongde 0f7dc2ec02 components/bt: Fix assert due to no free element form 2019-11-14 15:51:39 +08:00
Xia Xiaotian 9592346090 Coexist: fix some coexist bugs 
1. Fix high beacon and broadcast packets loss ratio of WiFi to make
   MDNS test pass.
2. Improve stability of WiFi performance with a little
   sacrifice of throughput.
3. Improve BLE advertising and connection performance with dynamic
   priority. It sacrifices a little WiFi throughput, but achieves balance
   between WiFi and Bluetooth.
4. fix bug bb reset lock flag to avoid bb reset lock unhandle
5. fix bug wifi reset mac cause task watch dog timeout
6. fix bug wifi reset mac position
 2019-10-29 17:18:12 +00:00
Jiang Jiang Jian 1dd8411e04 Merge branch 'bugfix/coex_semaphore_take_in_isr_lock_v3.3' into 'release/v3.3' 
fix bug that semaphore may schedule out in ISR locking (v3.3)

See merge request espressif/esp-idf!6427
 2019-10-30 00:49:42 +08:00
Jiang Jiang Jian e6a71fe29c Merge branch 'bugfix/btdm_disable_bt_gatt_v3.3' into 'release/v3.3' 
components/bt: Disable BR/EDR GATT

See merge request espressif/esp-idf!6506
 2019-10-30 00:48:14 +08:00
baohongde c570e253fe components/bt: Fix assert when deinit A2DP while playing music 2019-10-29 20:04:15 +08:00
wangmengyang 3a5249aea9 bugfix that call of esp_a2d_media_ctrl(ESP_A2D_MEDIA_CTRL_SUSPEND) will not get an ACK from callback on A2DP sink 2019-10-29 10:14:19 +00:00
baohongde 28c19e623f components/bt: Disable BR/EDR GATT 2019-10-29 10:10:52 +00:00
Tian Hao cabe66195c fix bug that semaphore may schedule out in Critical Section 
1. Since BLE full-scan feature for BLE mesh change the controller code cause this problem,
it cause coex semaphore take in "interrupt disable", then it may cause task schedule
and cause crash in freertos
2. Fix newlib lock ISR context and critical section check
3. Fix bt controller ISR context and critical section check
 2019-10-29 14:43:00 +08:00
Prasad Alatkar 3545b58986 NimBLE: Port NimBLE stack to IDF Release v3.3 (Backport v3.3) 
Includes all the latest NimBLE stack changes from idf-v4.0 with few idf-v3.3
specific modifications.
- Addition of nimble component as submodule (`nimble-1.1.0-idf-v3.3`), contains
  IDF v3.3 specific minor changes.
- Example applications are identical to idf-v4.0
- Modification in `bt/Kconfig` to accommodate NimBLE as a BT host.
 2019-10-18 13:23:24 +08:00
Jiang Jiang Jian 46b12a560a Merge branch 'bugfix/btdm_backports_v3.3_0903' into 'release/v3.3' 
Bugfix/btdm backports v3.3 0903

See merge request espressif/esp-idf!5983
 2019-09-29 16:19:22 +08:00
Prasad Alatkar 9c87165bc8 BT/Bluedroid : Add support to set min encryption key requirement (Backport v3.3) 
- Backport(v3.3) of IDF MR!6122
- Modifies `smp_utils.c` to add check on encryption key size received from
  peer.
- Modifies `esp_ble_gap_set_security_param` API to add minimum encryption key
  size requirement.
 2019-09-29 16:06:27 +08:00
baohongde 285925a43b components:bt: backports release/v3.3 0903 
Remove xtensa/xruntime.h
Fix sending Lmp_feature_req_ext in a loop
Fix 2 bugs in r_ld_fm_sket_isr
fix data loss and send same pkt twice sometimes
fix adv data error in air sometimes
fix adv start/stop crash sometimes
Fix connect fail with some speakers
clear BT/BLE interruots after controller disable
add sco_data_path to be set in sdkconfig and do not reset the value upon HCI reset command
 2019-09-23 18:02:28 +08:00
wangmengyang 9e51598ee7 component/bt: fix some performance issues in A2DP source data flow control 
1. modify the limit of frames to send to avoid dropping packet on A2DP source due to TX data queue overflow
2. reduce the A2DP source data queue size in order to achieve faster control respnonse
 2019-09-20 11:52:46 +00:00
Jiang Jiang Jian 39ac9cb44b Merge branch 'bugfix/btdm_fix_hci_enhance_conn_complete_evt_unpack_error_v3.3' into 'release/v3.3' 
component/bt: fix unpack hci enhance connection complete event error(backport v3.3)

See merge request espressif/esp-idf!5281
 2019-09-08 23:11:18 +08:00
Jiang Jiang Jian 38e2d3bec6 Merge branch 'bugfix/btdm_mem_leak_v3.3' into 'release/v3.3' 
components/bt: Fix memory leak about rfcomm

See merge request espressif/esp-idf!5622
 2019-09-08 23:09:24 +08:00
wangmengyang 0ce9d2662d add missing source files to CMakeLists for HFP 2019-09-03 11:51:16 +08:00
wangmengyang 3becdd7850 components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link for preventing KNOB attack 
This patch is to address the CVE-2019-9506 vulnerability.
 2019-08-28 08:13:30 +00:00
Tian Hao 3ca82d5923 bugfix btdm sleep twice after wakeup request 
This problem may cause HCI send command timeout.

When host call VHCI api to do btdm_wakeup_request, then controller
wakeup process will be handled in ISR and controller task context.
As host task priority is lower than controller task and ISR,
it will cause an incorrect behavior that before VHCI take the
rx_flow_on_semaphore, controller sleep again, then VHCI cannot take
the semaphore and has to wait the automatic wakeup.
 2019-07-27 18:07:20 +08:00
baohongde b9f2531e8c components/bt: Fix memory leak about rfcomm 2019-07-25 16:51:40 +08:00
Michael Balzer e97f72ea24 Merge remote-tracking branch 'upstream/release/v3.3' 
# Conflicts:
#	.gitlab-ci.yml
#	components/bootloader/project_include.cmake
#	components/bootloader_support/include/bootloader_common.h
#	components/bootloader_support/src/bootloader_common.c
#	components/bt/Kconfig
#	components/bt/bluedroid/btc/profile/std/include/btc_gap_ble.h
#	components/bt/bluedroid/stack/btm/btm_ble_gap.c
#	components/bt/bluedroid/stack/btm/btm_devctl.c
#	components/bt/bluedroid/stack/include/stack/hcidefs.h
#	components/bt/bluedroid/stack/smp/smp_act.c
#	components/bt/bt.c
#	components/bt/lib
#	components/driver/Kconfig
#	components/driver/include/driver/rmt.h
#	components/driver/test/test_spi_master.c
#	components/driver/uart.c
#	components/esp32/CMakeLists.txt
#	components/esp32/Kconfig
#	components/esp32/ld/esp32.project.ld.in
#	components/esp32/ld/esp32.spiram.rom-functions-dram.ld
#	components/esp32/ld/esp32.spiram.rom-functions-iram.ld
#	components/esp32/lib
#	components/esp32/spiram.c
#	components/esp32/spiram_psram.c
#	components/esp32/test/test_wifi.c
#	components/esp32/wifi_init.c
#	components/esp_http_server/include/esp_http_server.h
#	components/esp_http_server/src/esp_httpd_priv.h
#	components/esp_http_server/src/httpd_parse.c
#	components/esp_http_server/src/httpd_sess.c
#	components/esp_http_server/src/httpd_txrx.c
#	components/esp_http_server/src/httpd_uri.c
#	components/esp_http_server/test/test_http_server.c
#	components/esp_https_ota/src/esp_https_ota.c
#	components/ethernet/emac_main.c
#	components/freemodbus/Kconfig
#	components/idf_test/include/idf_performance.h
#	components/idf_test/integration_test/TC_IT_BLUEDROID_SMP.yml
#	components/lwip/Kconfig
#	components/newlib/test/test_time.c
#	components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
#	components/spi_flash/Kconfig
#	components/ulp/cmake/CMakeLists.txt
#	components/ulp/component_ulp_common.cmake
#	components/vfs/vfs.c
#	docs/conf_common.py
#	docs/en/api-reference/provisioning/wifi_provisioning.rst
#	examples/mesh/internal_communication/main/Kconfig.projbuild
#	examples/protocols/aws_iot/subscribe_publish/main/CMakeLists.txt
#	examples/protocols/aws_iot/thing_shadow/main/CMakeLists.txt
#	examples/protocols/coap_client/README.md
#	examples/protocols/coap_server/README.md
#	examples/protocols/modbus_slave/main/Kconfig.projbuild
#	examples/protocols/mqtt/ssl/mqtt_ssl_example_test.py
#	examples/protocols/mqtt/tcp/main/Kconfig.projbuild
#	examples/protocols/mqtt/ws/mqtt_ws_example_test.py
#	examples/protocols/mqtt/wss/mqtt_wss_example_test.py
#	examples/wifi/iperf/components/iperf/iperf.c
#	requirements.txt
#	tools/ci/build_examples.sh
#	tools/ci/test_build_system_cmake.sh
#	tools/cmake/idf_functions.cmake
#	tools/cmake/kconfig.cmake
#	tools/cmake/scripts/expand_requirements.cmake
#	tools/esp_prov/README.md
#	tools/esp_prov/esp_prov.py
#	tools/esp_prov/transport/ble_cli.py
#	tools/idf.py
#	tools/kconfig_new/confgen.py
#	tools/mass_mfg/docs/README.rst
#	tools/mass_mfg/samples/sample_config.csv
#	tools/tiny-test-fw/DUT.py
#	tools/tiny-test-fw/IDF/IDFApp.py
#	tools/tiny-test-fw/IDF/IDFDUT.py
#	tools/tiny-test-fw/TinyFW.py
#	tools/unit-test-app/tools/UnitTestParser.py
#	tools/unit-test-app/unit_test.py
 2019-07-20 22:11:10 +02:00
Michael Balzer 40f01ec30a Merge remote-tracking branch 'upstream/release/v3.2' 2019-07-20 15:22:14 +02:00
zhiweijian 2821e99bcc component/bt: fix rxwinsz assert in ble and wifi coex 2019-07-04 21:17:51 +08:00
zhiweijian 62e359a4e1 component/bt: fix rxwinsz assert in ble and wifi coex 2019-07-04 20:12:04 +08:00
Jiang Jiang Jian cbec031c91 Merge branch 'bugfix/btdm_backport_2_bugs_v3.2' into 'release/v3.2' 
Bugfix/btdm backport 2 bugs v3.2

See merge request idf/esp-idf!5269
 2019-07-02 17:33:53 +08:00
zhiweijian 0e022b7db9 component/bt: fix unpack hci enhance connection complete event error 2019-06-24 03:23:59 +00:00
zhiweijian eaf8cfbf8d component/bt: fix unpack hci enhance connection complete event error 2019-06-24 03:23:31 +00:00
Jiang Jiang Jian f60acb2196 Merge branch 'feature/btdm_add_ble_link_timeout_config_v3.3' into 'release/v3.3' 
Component/bt: add ble link timeout config in menuconfig(backport v3.3)

See merge request idf/esp-idf!4825
 2019-06-19 14:47:31 +08:00
baohongde e7f57fef55 component/bt: Allow configuration of default SCO_DATA_PATH in bluetooth controller 2019-06-17 14:12:09 +08:00
baohongde 284362d62d add missing source files to CMakeLists for HFP 2019-06-17 14:06:33 +08:00
wangmengyang 29b009d6fd component/bt: fix some performance issues in A2DP source data flow control 
1. modify the limit of frames to send to avoid dropping packet on A2DP source due to TX data queue overflow
2. reduce the A2DP source data queue size in order to achieve faster control respnonse
 2019-06-17 14:06:19 +08:00
baohongde 2ee0f98d05 components/bt: Fix assert due to alloc LMP TX buffer failed 2019-06-12 19:49:28 +08:00
baohongde 267ce80355 components/bt: Fix assert due to alloc LMP TX buffer failed 2019-06-12 19:25:59 +08:00
Jiang Jiang Jian 193b8e93a8 Merge branch 'bugfix/btdm_abort_if_deinit_spp_without_init_v3.2' into 'release/v3.2' 
components/bt: Fix abort if call esp_spp_deinit without calling esp_spp_init

See merge request idf/esp-idf!4862
 2019-04-26 21:01:35 +08:00
Jiang Jiang Jian 0c13ae6b45 Merge branch 'feature/btdm_add_ble_link_timeout_config_v3.2' into 'release/v3.2' 
Component/bt: add ble link timeout config in menuconfig(backport v3.2)

See merge request idf/esp-idf!4826
 2019-04-25 20:05:19 +08:00
baohongde f95826144e components/bt: Fix abort if call esp_spp_deinit without calling esp_spp_init 2019-04-24 11:34:06 +08:00
baohongde 39dbe7daa8 components/bt: Fix abort if call esp_spp_deinit without calling esp_spp_init 2019-04-24 11:30:04 +08:00
zhiweijian 96c8343e46 Component/bt: add ble link timeout config in menuconfig 
- add ble link timeout config in menuconfig
- disable background connection when call gatts_open
 2019-04-22 21:55:06 +08:00
zhiweijian 3295ed0995 Component/bt: add ble link timeout config in menuconfig 
- add ble link timeout config in menuconfig
- disable background connection when call gatts_open
 2019-04-22 21:49:59 +08:00
XiaXiaotian 5059c7fac3 Decouple WiFi and BT with coexist to reduce bin size 
1. Do not link WiFi code when only BT or BLE is used and WiFi is not
used.

2. Do not link coexist code when CONFIG_SW_COEXIST_ENABLE is disabled.
 2019-04-17 16:59:24 +08:00
Jiang Jiang Jian acc882f4dd Merge branch 'bugfix/btdm_bugx_backport_3.2' into 'release/v3.2' 
Some bugs backport 3.2

See merge request idf/esp-idf!4773
 2019-04-16 10:45:04 +08:00
Jiang Jiang Jian fa40e43c8d Merge branch 'bugfix/btdm_fix_warning_when_disable_logs_v3.2' into 'release/v3.2' 
components/bt: Fix warning when disable debug logs or in release mode and improve the code structure

See merge request idf/esp-idf!4620
 2019-04-15 18:52:09 +08:00
Jiang Jiang Jian 9f29dbf656 Merge branch 'bugfix/btdm_fix_build_warning_when_bluedroid_disable_log_v3.2' into 'release/v3.2' 
Component/bt: fix build warning when bluedroid disable log (backport v3.2)

See merge request idf/esp-idf!4566
 2019-04-15 18:50:58 +08:00
baohongde bb518afb59 Some bugs backport 3.2 
1.Fix memory leak when set txpower
2.Fix some bugs
    Disconnect with apple device
    hci_refresh_enc_key_cmd will be ignore
    hci_refresh_enc_key_cmd will crash
 2019-04-15 16:51:29 +08:00
zhiweijian b8a2b77f70 component/bt: fix memory leak when settig tx power 2019-04-14 06:25:53 +00:00
Jiang Jiang Jian 2da22620f8 Merge branch 'feature/btdm_add_mesh_adv_type_and_srv_uuid_for_dup_scan_except_v3.2' into 'release/v3.2' 
Component/bt: add mesh beacon adv and svc uuid for duplicate scan exceptional list (backport v3.2)

See merge request idf/esp-idf!4606
 2019-04-14 02:56:43 +08:00
Jiang Jiang Jian 065d451e47 Merge branch 'bugfix/btdm_modify_HCI_GET_CMD_BUF_v3.2' into 'release/v3.2' 
Component/bt: modify HCI_GET_CMD_BUF (backport v3.2)

See merge request idf/esp-idf!4599
 2019-04-12 21:58:51 +08:00
Jiang Jiang Jian c8990eb39d Merge branch 'bugfix/btdm_add_scan_window_interval_check_v3.2' into 'release/v3.2' 
Component/bt: add scan window and interval check when set scan params (backport v3.2)

See merge request idf/esp-idf!4311
 2019-04-12 21:57:50 +08:00
Jiang Jiang Jian c90f770599 Merge branch 'bugfix/btdm_fix_blufi_prepare_write_crash_v3.2' into 'release/v3.2' 
Component/bt: fix blufi prepare write crash (backport V3.2)

See merge request idf/esp-idf!4563
 2019-04-12 21:57:23 +08:00
Jiang Jiang Jian 48978c6f2b Merge branch 'bugfix/btdm_fix_iOS_and_win10_compatibility_error_for_HID_v3.2' into 'release/v3.2' 
Component/bt: fix iOS and win10 compatibility error  for HID (backport v3.2)

See merge request idf/esp-idf!4424
 2019-04-12 21:56:40 +08:00
Jiang Jiang Jian a218d4b925 Merge branch 'bugfix/btdm_fix_warning_when_disable_logs_v3.3' into 'release/v3.3' 
components/bt: Fix warning when disable debug logs or in release mode and improve the code structure

See merge request idf/esp-idf!4619
 2019-04-04 18:45:31 +08:00
baohongde bbfe9f4efa components/bt: Fix disconnect with apple device(backport 3.3) 
1. Fix disconnect with apple device
        2. Fix hci_refresh_enc_key_cmd will be ignored
        3. Fix hci_refresh_enc_key_cmd will crash
 2019-04-03 17:24:52 +08:00
Jiang Jiang Jian f03382b0ff Merge branch 'feature/btdm_add_mesh_adv_type_and_srv_uuid_for_dup_scan_except_v3.3' into 'release/v3.3' 
Component/bt: add mesh beacon adv and svc uuid for duplicate scan exceptional list (backport v3.3)

See merge request idf/esp-idf!4605
 2019-04-01 21:49:29 +08:00
zhiweijian 3130b19cf8 Component/bt: add mesh beacon adv and svc uuid for duplicate scan exceptional list 2019-03-28 11:20:51 +08:00
zhiweijian 826146e985 Component/bt: add mesh beacon adv and svc uuid for duplicate scan exceptional list 2019-03-28 11:13:30 +08:00
baohongde 5ede49ca4a components/bt: Fix warning when disable debug logs or in release mode and improve the code structure 2019-03-26 15:29:22 +08:00
baohongde bbdb236ab7 components/bt: Fix warning when disable debug logs or in release mode and improve the code structure 2019-03-26 14:59:58 +08:00
baohongde dca83700f2 components/bt: Fix warning when disable debug logs or in release mode and improve the code structure 2019-03-26 14:46:36 +08:00
zhiweijian 6b4dcd4f5c Component/bt: modify HCI_GET_CMD_BUF 2019-03-22 15:02:20 +08:00
zhiweijian 88fe438524 Component/bt: modify HCI_GET_CMD_BUF 2019-03-22 14:59:11 +08:00
Jiang Jiang Jian 6505f82a80 Merge branch 'bugfix/btdm_fix_no_adv_report_when_scaning_with_sleep_enable_v3.3' into 'release/v3.3' 
Component/bt: fix no adv report when scaning with sleep enable (backport v3.3)

See merge request idf/esp-idf!4536
 2019-03-20 21:40:28 +08:00
Jiang Jiang Jian c05a0ae6c3 Merge branch 'bugfix/btdm_fix_build_warning_when_bluedroid_disable_log_v3.3' into 'release/v3.3' 
Component/bt: fix build warning when bluedroid disable log (backport V3.3)

See merge request idf/esp-idf!4565
 2019-03-20 21:22:33 +08:00
zhiweijian 241ba1a6bb Component/bt: fix iOS and win10 compatibility error for HID 2019-03-20 19:47:04 +08:00
zhiweijian 78d32f2e8b Component/bt: fix build warning when bluedroid disable log 2019-03-20 15:06:17 +08:00
zhiweijian 3ed0f8e113 Component/bt: fix build warning when bluedroid disable log 2019-03-20 15:02:57 +08:00
zhiweijian f237b92bc4 Component/bt: fix blufi prepare write crash 2019-03-20 14:27:11 +08:00
zhiweijian 7e1ccb56a7 Component/bt: fix blufi prepare write crash 2019-03-20 14:23:11 +08:00
zhiweijian d6bdaed141 Component/bt: fix no adv report when scanning with sleep enable 2019-03-18 17:40:19 +08:00