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
11,858 Commits 20 Branches 148 Tags 384 MiB
aa66520d0b
Commit Graph

11858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jiang Jiang Jian
aa66520d0b Merge branch 'bugfix/pmf_bcast_deauth_fix_v4.0' into 'release/v4.0' 
Stop dropping bcast PMF deauths/disassocs with certain reason codes (Backport v4.0)

See merge request espressif/esp-idf!14803
 2021-09-15 07:03:31 +00:00
Jiang Jiang Jian
72b1f29307 Merge branch 'bugfix/bt_spp_timer_collision_v4.0' into 'release/v4.0' 
Fix timer collision in role switch(v4.0)

See merge request espressif/esp-idf!14821
 2021-09-15 07:00:32 +00:00
Jiang Jiang Jian
cf4c28fbcb Merge branch 'cherry-pick-e8360fe0' into 'release/v4.0' 
wpa_supplicant: clean tls client state machine (backport v4.0)

See merge request espressif/esp-idf!15037
 2021-09-15 06:41:57 +00:00
Kapil Gupta
bcfed14255 wpa_supplicant: clean tls client state machine (backport v4.0) 2021-09-15 14:41:49 +08:00
Cao Sen Miao
1f33d7830f Merge branch 'bugfix/flash_encryption_v4.0.0' into 'release/v4.0' 
ota: fix ota with flash encryption(backport v4.0)

See merge request espressif/esp-idf!14925
 2021-09-14 09:42:57 +00:00
Cao Sen Miao
771a02da93 ota: fix ota with flash encryption 2021-09-14 12:40:56 +08:00
Cao Sen Miao
83dbaaaee8 flash_encryption: Quick fixed the issue that block when flash_encryption_write, Related https://github.com/espressif/esp-idf/issues/6322, Related https://github.com/espressif/esp-idf/issues/6254 2021-09-13 14:46:00 +08:00
Michael (XIAO Xufeng)
0a8e7be7cc Merge branch 'bugfix/modbus_add_task_affinity_and_callbacks_v40' into 'release/v4.0' 
freemodbus: add task affinity and callbacks (backport v4.0)

See merge request espressif/esp-idf!14544
 2021-09-10 18:54:21 +00:00
aleks
f26621fd9e freemodbus: add affinity option for modbus stack tasks 2021-09-11 01:55:20 +08:00
Michael (XIAO Xufeng)
fb0c3e8016 Merge branch 'bugfix/fix_modbus_rs485_rts_en_fail_v40' into 'release/v4.0' 
Bugfix/fix modbus rs485 rts en fail (backport v4.0)

See merge request espressif/esp-idf!14472
 2021-09-10 17:43:56 +00:00
Alex Lisitsyn
a183b32972 Bugfix/fix modbus rs485 rts en fail (backport v4.0) 2021-09-11 01:43:49 +08:00
Michael (XIAO Xufeng)
f875a9e726 Merge branch 'bugfix/modbus_fix_invalid_error_handling_for_duplicate_param_key_v40' into 'release/v4.0' 
freemodbus: fix invalid error handling for duplicate param key (backport v4.0)

See merge request espressif/esp-idf!14785
 2021-09-09 18:00:38 +00:00
Michael (XIAO Xufeng)
39fd83885a Merge branch 'bugfix/modbus_allow_master_slave_work_simultaneously_v40' into 'release/v4.0' 
freemodbus: fix issues when modbus master and slave work simultaneously (backport v4.0)

See merge request espressif/esp-idf!14966
 2021-09-09 17:58:16 +00:00
Alex Lisitsyn
83cc427577 freemodbus: fix issues when modbus master and slave work simultaneously (backport v4.0) 2021-09-10 01:58:11 +08:00
Roland Dobai
47ed58eb25 Merge branch 'feature/oocd_ver_upgrade_v4.0' into 'release/v4.0' 
tools: Updates OpenOCD version to 'v0.10.0-esp32-20210902' (v4.0)

See merge request espressif/esp-idf!15135
 2021-09-09 07:39:32 +00:00
Alexey Gerenkov
f721f452ab tools: Updates OpenOCD version to 'v0.10.0-esp32-20210902' 2021-09-08 21:23:50 +03:00
Wang Meng Yang
f657430aec Merge branch 'bugfix/controller_hci_uart_sdkconfig_v4.0' into 'release/v4.0' 
controller_hci_uart: fixed the sdkconfig.defaults in the example(backport v4.0)

See merge request espressif/esp-idf!14809
 2021-09-08 06:05:08 +00:00
Wang Meng Yang
416e92e5e3 Merge branch 'bugfix/ble_set_scan_param_error_v4.0' into 'release/v4.0' 
Fix the bug when ble setting scan param

See merge request espressif/esp-idf!13979
 2021-09-08 02:00:57 +00:00
Wang Meng Yang
1cb40eae67 Merge branch 'bugfix/hf_disc_acl_no_disc_v4.0' into 'release/v4.0' 
bugfix/acl can't disconnect when hfp_client disconnect [release/v4.0]

See merge request espressif/esp-idf!15059
 2021-09-07 10:13:22 +00:00
Mahavir Jain
ebbad183d1 Merge branch 'feature/update_expat_v4.0' into 'release/v4.0' 
expat: Update library from 2.2.9 to 2.4.1(backport v4.0)

See merge request espressif/esp-idf!15070
 2021-09-07 03:35:51 +00:00
Mahavir Jain
6097f78ea7 Merge branch 'feature/update_cjson_submodule_v4.0' into 'release/v4.0' 
cJSON: Update submodule to v1.7.15 (v4.0)

See merge request espressif/esp-idf!15077
 2021-09-06 06:38:10 +00:00
yuanjm
22c1618dd9 expat: Update library from 2.2.9 to 2.4.1 2021-09-06 12:04:28 +08:00
jincheng
55ca8774ba fix timer collision in role switch 
Closes https://github.com/espressif/esp-idf/issues/7203
 2021-09-06 10:30:02 +08:00
Shubham Kulkarni
cd0f22c258 cJSON: Update submodule to latest release. 
This update fixes NULL pointer dereference issues in previous release

Closes https://github.com/espressif/esp-idf/issues/7317
 2021-09-06 07:45:21 +05:30
Michael (XIAO Xufeng)
2b077cedb1 Merge branch 'bugfix/mcpwm-deadtime-preset-config-backport_v4.0' into 'release/v4.0' 
MCPWM/deadtime: fix and sync preset deadtime modes with well-known definition (backport v4.0)

See merge request espressif/esp-idf!14625
 2021-09-03 04:46:28 +00:00
Li Hang Fan
f68e0e0ef4 MCPWM/deadtime: fix and sync preset deadtime modes with well-known definition 
Closes https://github.com/espressif/esp-idf/issues/7321
 2021-09-03 12:46:19 +08:00
jincheng
ed4b55fee7 fix acl can not disconnect when hf_client disconnect 2021-09-03 11:01:33 +08:00
Wang Meng Yang
f5b9cf028b Merge branch 'bugfix/btdm_fix_some_Document_Description_Error_v4.0' into 'release/v4.0' 
component/bt: fix some ble document description error(backport v4.0)

See merge request espressif/esp-idf!14826
 2021-09-03 01:40:46 +00:00
David Čermák
150594f3a9 Merge branch 'Bugfix/pppos_coonection_lost_v4.0' into 'release/v4.0' 
Bugfix/PPPOS fix stack smashing, modify get operator and add access technology(backport v4.0)

See merge request espressif/esp-idf!14032
 2021-09-01 14:25:45 +00:00
XieWenxiang
6253befcbc component/bt: fix some ble document description error 2021-09-01 20:48:00 +08:00
David Čermák
01b79d0df4 Merge branch 'Bugfix/pppos_coonection_lost' into 'master' 
Bugfix/PPPOS fix stack smashing, modify get operator and add access technology

Closes IDFGH-2262 and IDFGH-3844

See merge request espressif/esp-idf!11557

(cherry picked from commit 5d92cdc5d9)

d59ffd91 Expose get operator name command. Add get access tech
935edc9e rename dce parameter
7f3bcc13 esp-modem: prefix the crash issue both bg96 and sim800l in OVERALL mode
 2021-09-01 18:33:36 +08:00
Nachiket Kukade
05cceabf15 esp_wifi: Update wifi lib 
1. Stop dropping bcast PMF deauths/disassocs with certain reason codes
2. Fix MIC comparison logic in BIP check
 2021-08-25 14:55:01 +08:00
Ivan Grokhotkov
d64bf0dfbe Merge branch 'bugfix/xmc_overerase_v4.0' into 'release/v4.0' 
bootloader: add xmc spi_flash startup flow to improve reliability (v4.0)

See merge request espressif/esp-idf!14779
 2021-08-25 03:40:44 +00:00
Wang Meng Yang
91ba111dba Merge branch 'bugfix/fix_a2dp_sink_blocked_v4.0' into 'release/v4.0' 
Bugfix/Fix a2dp Sink Blocked Bugs[backport v4.0]

See merge request espressif/esp-idf!14014
 2021-08-23 05:17:08 +00:00
Wang Meng Yang
fa3ff3afac Merge branch 'component_bt/add_spp_faq_v4.0' into 'release/v4.0' 
Component_bt/Add FAQ in SPP Demo README[backport v4.0]

See merge request espressif/esp-idf!14799
 2021-08-23 05:16:26 +00:00
Jiang Jiang Jian
1bcad13691 Merge branch 'bugfix/spp_memory_leak_v4.0' into 'release/v4.0' 
Fix spp memory leak(v4.0)

See merge request espressif/esp-idf!14865
 2021-08-20 02:51:04 +00:00
Michael (XIAO Xufeng)
606955382e spi_flash: fix the corruption of ROM after calling bootloader_execute_flash_command 
The user register, especially dummy related ones, needs to be restored, otherwise the ROM function will not work.

Introduced in dd40123129
 2021-08-19 22:10:18 +08:00
Michael (XIAO Xufeng)
1c69e063d2 bootloader: add xmc spi_flash startup flow to improve reliability 2021-08-19 16:41:08 +08:00
xiongweichao
640cc93b03 components/bt: fix spp memory leak 
Closes https://github.com/espressif/esp-idf/issues/7238
 2021-08-19 14:44:48 +08:00
Island
f076d9bb85 Merge branch 'bugfix/ble_mesh_cve_recommendation_v4.0' into 'release/v4.0' 
ble_mesh: Update the SIG recommendations for CVE issues (v4.0)

See merge request espressif/esp-idf!14844
 2021-08-18 12:42:08 +00:00
Zim Kalinowski
5fd93f27cc Merge branch 'bugfix/remove_bt_get_mac_v4.0' into 'release/v4.0' 
bt: Remove unused function esp_bt_get_mac. (v4.0)

See merge request espressif/esp-idf!14837
 2021-08-18 05:04:29 +00:00
lly
780db9b7bf ble_mesh: Update the SIG recommendations for CVE issues 2021-08-18 11:00:22 +08:00
Chinmay Chhajed
77e8e0e362 bt: Remove unused function esp_bt_get_mac. 2021-08-17 18:57:01 +05:30
liqigan
95f2edde07 add FAQ in SPP demo README 2021-08-17 15:20:53 +08:00
Zim Kalinowski
66fb27c0e8 Merge branch 'bugfix/add_critical_section_in_uart_driver_v4.0' into 'release/v4.0' 
UART: add missing critical section wrappers around rx_buffered_len (backport v4.0)

See merge request espressif/esp-idf!14778
 2021-08-16 09:32:22 +00:00
Omar Chebib
abd6ea3087 uart: Add missing critical section wrappers around rx_buffered_len 
The missing barriers caused uart_get_buffered_data_len() to (very rarely)
return a garbage value. When used in MicroPython, though, this caused
select() to return and a subsequent read() to stall indefinitely until
a char was actually available.

Signed-off-by: Chen Yi Qun <chenyiqun@espressif.com>

Closes https://github.com/espressif/esp-idf/issues/6397
Merges https://github.com/espressif/esp-idf/pull/6396
 2021-08-16 17:32:14 +08:00
wangmengyang
2d431023ee controller_hci_uart: fixed the sdkconfig.defaults in the example 2021-08-16 17:23:58 +08:00
aleks
efa0aeb831 freemodbus: fix invalid error handling for duplicate param_key 2021-08-13 10:06:59 +02:00
Roland Dobai
33a2927dab Merge branch 'feature/oocd_ver_upgrade_v4.0' into 'release/v4.0' 
tools: Updates OpenOCD version to 'v0.10.0-esp32-20210721' (v4.0)

See merge request espressif/esp-idf!14696
 2021-08-10 14:16:10 +00:00
Zim Kalinowski
eeb4dd74c6 Merge branch 'feature/skip_known_failure_cases_v4.0' into 'release/v4.0' 
CI: Ignore Known Failure Cases Result (v4.0)

See merge request espressif/esp-idf!14651
 2021-08-10 02:29:53 +00:00