alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,325 Commits 20 Branches 148 Tags 384 MiB
899ef49272
Commit Graph

12325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
weitianhua
899ef49272 Seperate BTA_JV_L2CAP for less bin size 2020-08-26 15:30:26 +08:00
Jiang Jiang Jian
a27ea5a6c8 Merge branch 'feature/bt_secure_conn_downgrade_check_v4.1' into 'release/v4.1' 
Bluedroid: Authentication fixes in Legacy and Secure Connection.

See merge request espressif/esp-idf!9339
 2020-08-26 11:33:12 +08:00
Angus Gratton
d54f4bd691 Merge branch 'bugfix/idf_build_process_default_v4.1' into 'release/v4.1' 
cmake: fix issue with setting defaults in idf_build_process (v4.1)

See merge request espressif/esp-idf!9712
 2020-08-26 07:58:54 +08:00
Island
1c8ce47465 Merge branch 'bugfix/ble_mesh_check_subnet_before_update_beacon_sent_v4.1' into 'release/v4.1' 
ble_mesh: Check if subnet exists before updating beacon_sent (v4.1)

See merge request espressif/esp-idf!9396
 2020-08-24 17:20:12 +08:00
Angus Gratton
9b7dca3769 Merge branch 'bugfix/bootloader_common_get_sha256_of_partition_v4.1' into 'release/v4.1' 
bootloader_support: Fix bootloader_common_get_sha256_of_partition(), can handle a long image (v4.1)

See merge request espressif/esp-idf!9953
 2020-08-24 13:37:27 +08:00
Angus Gratton
24efb6308d Merge branch 'bugfix/mbedtls_mpi_exp_mod_v4.1' into 'release/v4.1' 
mbedtls: Fix a case for mpi_montgomery_exp_calc() when Z is not init (v4.1)

See merge request espressif/esp-idf!9495
 2020-08-24 13:36:51 +08:00
Chinmay Chhajed
6f22d7590e Bluedroid: Authentication fixes in Legacy and Secure Connection. 
Prevent a remote device from doing a Bluetooth Impersonation Attack
(BIAS) by:

- Preventing remote device to downgrade secure connection
feature mask. Secure connection feature mask should remain same or
increase to enabled in link key generation and authentication.

- Doing a mutual authentication during Legacy Authentication.

Signed-off-by: Chinmay Chhajed <chinmay.chhajed@espressif.com>
 2020-08-24 10:27:04 +05:30
Jiang Jiang Jian
91903234a9 Merge branch 'bugfix/fix_event_bug_in_GAP_API_release_v4.1' into 'release/v4.1' 
Bugfix/fix event bug in GAP API [backport v4.1]

See merge request espressif/esp-idf!9192
 2020-08-24 12:34:30 +08:00
Jiang Jiang Jian
294a00c15d Merge branch 'feature/esp_spp_stop_srv_v4.1' into 'release/v4.1' 
bugfix/Add API esp_spp_stop_srv and fix collection of SPP [backport v4.1]

See merge request espressif/esp-idf!10011
 2020-08-24 12:34:04 +08:00
Jiang Jiang Jian
55203e9c09 Merge branch 'bugfix/wifi_deinit_stop_crash_v4.1' into 'release/v4.1' 
esp_wifi: fix the crash when wifi stop after deinit (v4.1)

See merge request espressif/esp-idf!10030
 2020-08-24 12:32:58 +08:00
Jiang Jiang Jian
a40a5405b7 Merge branch 'feature/make_tcp_rto_configurable_v4.1' into 'release/v4.1' 
make TCP rto time configurable (backport v4.1)

See merge request espressif/esp-idf!9212
 2020-08-24 12:32:23 +08:00
Jiang Jiang Jian
c547044f28 Merge branch 'bugfix/fix_error_in_ag_api_4.1' into 'release/v4.1' 
Fix error of AG API return line v4.1

See merge request espressif/esp-idf!9604
 2020-08-24 12:32:21 +08:00
Jiang Jiang Jian
d4af9d1ce4 Merge branch 'bugfix/fix_hci_max_page_num_v4.1' into 'release/v4.1' 
bugfix/Support for more Bluetooth HID devices [backport v4.1]

See merge request espressif/esp-idf!9661
 2020-08-24 12:31:22 +08:00
Jiang Jiang Jian
bb0fe3785f Merge branch 'bugfix/fix_softap_mode_wpa_memory_leak_issue_v4.1' into 'release/v4.1' 
bugfix: fix softap mode wpa memory leak (backport v4.1)

See merge request espressif/esp-idf!9846
 2020-08-24 12:30:37 +08:00
Jiang Jiang Jian
84b9ce81bb Merge branch 'bugfix/fix_get_bond_device_list_v4.1' into 'release/v4.1' 
bugfix/fix esp_bt_gap_get_bond_device_list bug [backport v4.1]

See merge request espressif/esp-idf!9667
 2020-08-24 12:30:07 +08:00
Jiang Jiang Jian
6b1473e084 Merge branch 'bugfix/fix_ping_specify_length_issue_v4.1' into 'release/v4.1' 
bugfix: fix ICMP specify length issue (backport v4.1)

See merge request espressif/esp-idf!9402
 2020-08-24 12:29:41 +08:00
Jiang Jiang Jian
975b8d228f Merge branch 'bugfix/put_periph_module_enable/diable_into_iram_v4.1' into 'release/v4.1' 
wifi, bt: move esp_phy_common_clock_disable into periph_ctrl and put it into IRAM(v4.1)

See merge request espressif/esp-idf!9936
 2020-08-24 12:28:25 +08:00
Jiang Jiang Jian
a36a020657 Merge branch 'bugfix/connect_param_check_and_channel_map_bugs_v4.1' into 'release/v4.1' 
components/bt:Fix channel map instant reverse and add ble connect paramter check.(backport 4.1)

See merge request espressif/esp-idf!9235
 2020-08-24 12:27:59 +08:00
Jiang Jiang Jian
788fe71b6b Merge branch 'nimble/nrpa_support_v4.1' into 'release/v4.1' 
NimBLE: Add Non-Resolvable private address support and misc fixes (Backport v4.1)

See merge request espressif/esp-idf!9740
 2020-08-24 12:27:03 +08:00
Jiang Jiang Jian
9c96e4554c Merge branch 'mesh/bugfix_set_type_4.1' into 'release/v4.1' 
mesh/bugfix (backport 4.1)

See merge request espressif/esp-idf!9111
 2020-08-24 12:25:26 +08:00
Michael (XIAO Xufeng)
c9ca1fbe78 Merge branch 'bugfix/fix_touch_sensor_api_backport_v4.1' into 'release/v4.1' 
(High priority) driver(touch): fix touch sensor driver redundancy (backport v4.1)

See merge request espressif/esp-idf!9872
 2020-08-23 16:08:49 +08:00
Krzysztof Budzynski
e3e5a41bc9 Merge branch 'doc/broken_readme_links_v4.1' into 'release/v4.1' 
Docs: Fix broken README links (v4.1)

See merge request espressif/esp-idf!9502
 2020-08-22 00:40:19 +08:00
Krzysztof Budzynski
c47cbe8139 Merge branch 'docs/doc138_backport_v4.1' into 'release/v4.1' 
Fix incorrect redirect link in getting started guide (backport v4.1)

See merge request espressif/esp-idf!9719
 2020-08-22 00:38:37 +08:00
Krzysztof Budzynski
d2fd9c10b3 Merge branch 'doc/freertos_backport_v4.1' into 'release/v4.1' 
add a note about ESP-IDF FreeRTOS version (backport v4.1)

See merge request espressif/esp-idf!9811
 2020-08-22 00:18:25 +08:00
lly
3d888ca777 ble_mesh: Check if subnet exists before updating beacon_sent 
- Before updating the "beacon_sent" of a subnet, we need to check
  if the subnet still exists, especially for a Provisioner.
- Fix a bug which will cause Provisioner failed to send Secure
  Network Beacon if no device is provisioned
 2020-08-21 12:58:34 +00:00
Island
2a5679c253 Merge branch 'bugfix/ble_mesh_model_recv_fix_v4.1' into 'release/v4.1' 
Bugfix/ble mesh model recv fix (v4.1)

See merge request espressif/esp-idf!9007
 2020-08-21 20:37:53 +08:00
Island
b7259bab36 Merge branch 'bugfix/ble_mesh_local_model_sub_v4.1' into 'release/v4.1' 
Bugfix/ble mesh local model sub (v4.1)

See merge request espressif/esp-idf!8983
 2020-08-21 20:37:37 +08:00
He Yin Ling
a3f71eeeb4 Merge branch 'test/merge_ble_mesh_node_and_provioner_in_console_v4.1' into 'release/v4.1' 
Test:merge ble mesh node and provioner in console (backport v4.1)

See merge request espressif/esp-idf!9912
 2020-08-21 20:00:34 +08:00
Lu Chang Jie
3512a775bc Test:merge ble mesh node and provioner in console 2020-08-21 20:00:32 +08:00
Michael (XIAO Xufeng)
869742de00 Merge branch 'bugfix/freemodbus_fix_long_frame_buffer_failure_backport4_1' into 'release/v4.1' 
freemodbus: freemodbus fix long frame buffer failure (backport v4.1)

See merge request espressif/esp-idf!8197
 2020-08-21 18:59:45 +08:00
Michael (XIAO Xufeng)
2a4e91553d Merge branch 'bugfix/mcpwm_fault_init_copypaste_typo_bp4.1' into 'release/v4.1' 
MCPWM: Fix PWM-fault init function that read config incorrectly (backport v4.1)

See merge request espressif/esp-idf!9553
 2020-08-21 18:58:25 +08:00
Michael (XIAO Xufeng)
fc1f1902a8 Merge branch 'bugfix/gpio_hold_function_for_esp32' into 'release/v4.1' 
Bugfix/gpio hold function for esp32 (backport v4.1)

See merge request espressif/esp-idf!9175
 2020-08-21 18:50:23 +08:00
lly
9ba5899206 ble_mesh: correct the return type [Zephyr] 2020-08-21 07:21:15 +00:00
lly
6b6cf151cf ble_mesh: Add net_buf_simple_init_with_data [Zephyr] 2020-08-21 07:21:15 +00:00
lly
897acd6a1d ble_mesh: Optimize model recv operations [Zephyr] 
Previously the model recv operation is a littl fuzzy.
With the changes, the model recv operation is splitted into:
- find op
- check app_idx
- check dst
- check length
- update info & handle message
 2020-08-21 07:21:15 +00:00
lly
cc36e415c0 ble_mesh: Local model (un)subscribes group address 2020-08-21 07:18:44 +00:00
lly
a43e5feee8 ble_mesh: Define a macro for invalid company id 2020-08-21 07:18:44 +00:00
Island
ab6139b9df Merge branch 'bugfix/ble_mesh_check_model_status_v4.1' into 'release/v4.1' 
ble_mesh: stack: Check model status with variable length (v4.1)

See merge request espressif/esp-idf!9399
 2020-08-21 14:57:03 +08:00
Island
6e42afb45b Merge branch 'bugfix/ble_mesh_not_define_bool_v4.1' into 'release/v4.1' 
Bugfix/ble mesh not define bool (v4.1)

See merge request espressif/esp-idf!9394
 2020-08-21 14:56:46 +08:00
Island
252aaf2ab7 Merge branch 'bugfix/ble_mesh_bt_hex_v4.1' into 'release/v4.1' 
ble_mesh: Fix wrong log output with bt_hex (v4.1)

See merge request espressif/esp-idf!9393
 2020-08-21 14:56:34 +08:00
Island
9ff30e81c5 Merge branch 'bugfix/ble_mesh_remove_relay_dependency_v4.1' into 'release/v4.1' 
ble_mesh: Remove relay option dependency (v4.1)

See merge request espressif/esp-idf!9026
 2020-08-21 14:56:23 +08:00
Island
7bc32cb773 Merge branch 'bugfix/ble_mesh_rework_prov_pdu_len_check_v4.1' into 'release/v4.1' 
ble_mesh: Rework prov pdu length check (v4.1)

See merge request espressif/esp-idf!9003
 2020-08-21 14:56:07 +08:00
Mahavir Jain
12cb99e815 Merge branch 'bugfix/enable_mbedtls_renegotiation_v4.1' into 'release/v4.1' 
esp-tls: enable TLS renegotiation using explicit API call (v4.1)

See merge request espressif/esp-idf!9592
 2020-08-21 12:30:45 +08:00
Michael (XIAO Xufeng)
866dde5025 Merge branch 'bugfix/sdmmc_check_slot_before_pullup_4.1' into 'release/v4.1' 
sdmmc: Correctly check function parameters before using them (4.1)

See merge request espressif/esp-idf!9055
 2020-08-20 21:59:31 +08:00
Mahavir Jain
829080e10e Merge branch 'bugfix/convert-string-to-bytes_v4.1' into 'release/v4.1' 
components: convert string to bytes to fix TypeError (backport v4.1)

See merge request espressif/esp-idf!9733
 2020-08-20 21:54:21 +08:00
Mahavir Jain
67504984c1 Merge branch 'feature/upgrade_mbedtls_to_v4.1' into 'release/v4.1' 
mbedtls: update to mbedtls release v2.16.7 (v4.1)

See merge request espressif/esp-idf!9907
 2020-08-20 21:52:51 +08:00
Mahavir Jain
29c40aa784 Merge branch 'bugfix/mbedtls_disable_sha_mpi_v4.1' into 'release/v4.1' 
mbedtls: Don't compile hardware MPI & SHA files if disabled in config (v4.1)

See merge request espressif/esp-idf!9403
 2020-08-20 21:50:36 +08:00
Mahavir Jain
6e22f6bae9 Merge branch 'fix/esp_tls_wolfssl_fix_cert_verify_v4.1' into 'release/v4.1' 
esp_tls_wolfssl : fix incorrect error message after handshake fails (v4.1)

See merge request espressif/esp-idf!9231
 2020-08-20 21:48:50 +08:00
Mahavir Jain
23a36bdd77 Merge branch 'bugfix/http_server_lru_v4.1' into 'release/v4.1' 
esp_http_server: Update LRU counter on accepting a new connection (v4.1)

See merge request espressif/esp-idf!9351
 2020-08-20 21:47:56 +08:00
Mahavir Jain
b3af5fb2c3 Merge branch 'bugfix/softap_prov_session_v4.1' into 'release/v4.1' 
protocomm_httpd: Restart security session if request is received on a new session (v4.1)

See merge request espressif/esp-idf!9116
 2020-08-20 21:47:34 +08:00