Jiang Jiang Jian
1b8ed9abf0
Merge branch 'bugfix/btdm_crash_in_sket_ist_v4.0' into 'release/v4.0'
...
Fix 2 bugs in r_ld_fm_sket_isr
See merge request espressif/esp-idf!5947
2019-09-05 12:02:26 +08:00
Jiang Jiang Jian
f9453ef93d
Merge branch 'bugfix/btdm_config_but_task_size_fail_v4.0' into 'release/v4.0'
...
Bugfix/btdm config but task size fail v4.0
See merge request espressif/esp-idf!5962
2019-09-05 11:26:56 +08:00
Angus Gratton
538c56426a
Merge branch 'bugfix/err_code_collision_v4.0' into 'release/v4.0'
...
Fix error code collisions and re-enable CI check (v4.0)
See merge request espressif/esp-idf!5984
2019-09-04 09:10:19 +08:00
Roland Dobai
1402e78844
Fix error code collision and CI check
2019-09-03 08:07:16 +02:00
baohongde
01f0c8ef16
components/bt: Rename some macros
2019-09-03 10:28:49 +08:00
Zac Bond
a774406b91
Use CONFIG value instead of hard-coded value.
...
Add intermediate defines.
Use CONFIG_BTU_TASK_STACK_SIZE instead of hard-coded value in Bluedroid component
2019-09-03 10:28:12 +08:00
Jiang Jiang Jian
c9bff93080
Merge branch 'feature/enable_cfg_for_tls_asymmetric_content_length_v4.0' into 'release/v4.0'
...
mbedtls: keep asymmetric tls buffer length option enabled by default (v4.0)
See merge request espressif/esp-idf!5970
2019-09-02 23:25:06 +08:00
Jiang Jiang Jian
4b8e4ff248
Merge branch 'bugfix/btdm_linking_fail_with_toolchain_8.2.0_v4.0' into 'release/v4.0'
...
components/bt: Fix linking fail with toolchain 8.2.0
See merge request espressif/esp-idf!5967
2019-09-02 22:22:22 +08:00
Jiang Jiang Jian
9dbf979cf3
Merge branch 'bugfix/btdm_remove_unused_macro_in_menuconfig_v4.0' into 'release/v4.0'
...
components/bt: Remove unused macro in menuconfig
See merge request espressif/esp-idf!5951
2019-09-02 22:21:12 +08:00
Jiang Jiang Jian
cd5dc4d05f
Merge branch 'doc/add_ble_mesh_example_description_v4.0' into 'release/v4.0'
...
ble_mesh: add ble mesh example description(backport v4.0)
See merge request espressif/esp-idf!5948
2019-09-02 14:29:13 +08:00
Angus Gratton
ebb9384681
Merge branch 'bugfix/various_cmake_fixes_v4.0' into 'release/v4.0'
...
CMake: Various backports
See merge request espressif/esp-idf!5933
2019-09-02 12:46:40 +08:00
Jiang Jiang Jian
0d3fde04ff
Merge branch 'bugfix_kconfig_deps_missing_v4.0' into 'release/v4.0'
...
kconfig: Add -MP option so .d files include empty targets (v4.0)
See merge request espressif/esp-idf!5845
2019-09-02 12:43:28 +08:00
Jiang Jiang Jian
0552ec5791
Merge branch 'update/cjson_v1_7_12_v4.0' into 'release/v4.0'
...
Update cJSON to v1.7.12 (v4.0)
See merge request espressif/esp-idf!5850
2019-09-02 12:41:30 +08:00
Jiang Jiang Jian
524eef9225
Merge branch 'test/use_correct_config_for_nvs_compatible_case_v4.0' into 'release/v4.0'
...
test: fix nvs compatible case error (backport v4.0)
See merge request espressif/esp-idf!5891
2019-09-02 12:40:46 +08:00
Jiang Jiang Jian
955f7e2877
Merge branch 'test/fix_mesh_test_case_4.0' into 'release/v4.0'
...
test: fix test case MESH_EST_2403 (backport 4.0)
See merge request espressif/esp-idf!5907
2019-09-02 12:38:51 +08:00
lly
e28834aa15
ble_mesh: add ble mesh example description
2019-09-02 12:17:47 +08:00
Jiang Jiang Jian
ac03786412
Merge branch 'bugfix/wps_workaround_for_Telstra_AP_v4.0' into 'release/v4.0'
...
wps: Relax the check on older config methods in case of WPS2.0 (backport v4.0)
See merge request espressif/esp-idf!5952
2019-09-02 12:04:49 +08:00
Mahavir Jain
a5dae2ff43
mbedtls: keep asymmetric tls buffer length option enabled by default
2019-08-31 10:24:37 +05:30
baohongde
1d0142d25d
components/bt: Fix linking fail with toolchain 8.2.0
2019-08-30 17:56:01 +08:00
Angus Gratton
65ef597da6
Merge branch 'bugfix/test_esp_efuse_table_on_host_v4.0' into 'release/v4.0'
...
CI: Fix path in the Efuse table test (v4.0)
See merge request espressif/esp-idf!5953
2019-08-30 16:27:47 +08:00
Jiang Jiang Jian
310beae373
Merge branch 'bugfix/revert_optimize_wifi_rx_v4.0' into 'release/v4.0'
...
esp_wifi: revert WiFi RX optimization
See merge request espressif/esp-idf!5941
2019-08-30 10:59:20 +08:00
liu zhifu
cf0caaec11
esp_wifi: revert WiFi RX optimization
...
Revert following commit since it has compatibility issue:
commit 45dd6175cd
esp32: optimize wifi rx
2019-08-29 21:26:42 +08:00
baohongde
4af9504a65
components/bt: Remove unused macro in menuconfig
2019-08-29 19:58:58 +08:00
Roland Dobai
64bece146c
Fix path in the Efuse table test
2019-08-29 09:50:38 +02:00
Nachiket Kukade
6b348b94e3
wps: Relax the check on older config methods in case of WPS2.0 (backport
...
v4.0)
Some APs incorrectly advertize newer WPS2.0 config method bits
without setting bits for the corresponding older methods. This
results in failures during 8-way handshake. Add a workaround to
relax this check so that WPS handshake can proceed.
2019-08-29 13:05:02 +05:30
baohongde
6222040888
Fix 2 bugs in r_ld_fm_sket_isr
...
1. When remove two elt in the 1st isr, then assert in then 2nd one.
2. When timestamp of first elt is equal to sket_clkn, then crash.
2019-08-29 11:31:57 +08:00
Angus Gratton
ea1037742d
Merge branch 'bugfix/confgen_msys_path_v4.0' into 'release/v4.0'
...
Fix sdkconfig.rename paths for confgen.py in MSYS (v4.0)
See merge request espressif/esp-idf!5904
2019-08-29 10:15:21 +08:00
Mahavir Jain
465d46e9dd
Merge branch 'bugfix/cmake_src_exclude_issue_v4.0' into 'release/v4.0'
...
cmake: fix issue with handling of EXCLUDE_SRCS (v4.0)
See merge request espressif/esp-idf!5900
2019-08-28 14:42:20 +08:00
Renz Christian Bagaporo
e71e4da388
cmake: check include directories
2019-08-28 10:28:17 +08:00
Renz Christian Bagaporo
c711e969cc
components: fix incorrect include dir args
2019-08-28 10:28:17 +08:00
Renz Christian Bagaporo
3f1ec39a8d
cmake: fix issue with checking build process args
2019-08-28 10:28:17 +08:00
Renz Christian Bagaporo
f62798cb8b
cmake: make default version 1
2019-08-28 10:28:17 +08:00
Renz Christian Bagaporo
b6c89984a9
cmake: fix build failure when git repo is initialized but no first commit
...
Closes https://github.com/espressif/esp-idf/issues/3920
2019-08-28 10:28:17 +08:00
Renz Christian Bagaporo
520ecb0c4d
ldgen: fix build issue on make when build dir is a symlink
...
Fixes an issue where build fails if the build directory is a symlink.
The issue is caused by the rule target and the final executable dependency
not matching.
Closes https://github.com/espressif/esp-idf/issues/3626
2019-08-28 10:28:17 +08:00
Per Malmberg
b669495d97
Make sure ESP_PLATFORM is defined when processing CMake files.
2019-08-28 10:28:17 +08:00
Renz Christian Bagaporo
8778c551eb
cmake: set build dir for mconf-idf
...
Fixes an issue where if idf_build_process is called in a CMake
subdirectory, menuconfig looks for the mconf-idf binary in the wrong
place (in the subdirectory build dir instead of root binary dir).
2019-08-28 10:28:17 +08:00
Renz Christian Bagaporo
c34d313a86
mbedtls: add source files to appropriate library
2019-08-28 10:28:17 +08:00
Jiang Jiang Jian
ebcb3a22b8
Merge branch 'bugfix/btdm_fix_ble_data_loss_and_send_same_pkt_twice_v4.0' into 'release/v4.0'
...
Component/bt: fix some BLE bugs (backport v4.0)
See merge request espressif/esp-idf!5909
2019-08-27 18:49:55 +08:00
Renz Christian Bagaporo
6781d01e89
cmake: fix encrypted project flash arg file generation
2019-08-27 13:35:39 +08:00
Renz Christian Bagaporo
4c9f30a869
cmake: set component properties
2019-08-27 13:35:21 +08:00
baohongde
61ba1c3026
components/bt: backport 2 BT bugfix about controller
...
1.Bugfix btdm sleep twice after wakeup request
2.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-27 10:42:40 +08:00
zhiweijian
90bbea65c1
Component/bt: fix some BLE bugs
...
- fix data loss and send same pkt twice sometimes
- fix adv data error in air sometimes
- fix adv start/stop crash sometimes
2019-08-26 20:29:01 +08:00
chenyudong
672e9f4abc
test: fix test case MESH_EST_2403
2019-08-26 20:26:46 +08:00
Roland Dobai
cb3d458050
Fix sdkconfig.rename paths for confgen.py in MSYS
...
Closes https://github.com/espressif/esp-idf/issues/3950
2019-08-26 11:12:44 +02:00
Mahavir Jain
b72ff61899
cmake: fix issue with handling of EXCLUDE_SRCS
2019-08-26 11:49:30 +05:30
He Yin Ling
83b9727c42
test: fix nvs compatible case error:
...
nvs compatible test case uses new test env and app. update test config
file.
2019-08-25 20:46:56 +08:00
Jiang Jiang Jian
7bb8b5ba9e
Merge branch 'Bugfix/nonblocking_udp_is_zero_for_4.0' into 'release/v4.0'
...
fix bug for nonblocking udp is zero for v4.0
See merge request espressif/esp-idf!5855
2019-08-23 10:50:45 +08:00
xueyunfei
1f5f6adcb6
fix bug for nonblocking udp is zero for v4.0
2019-08-21 17:07:45 +08:00
Angus Gratton
aa0bb29404
Update cJSON to v1.7.12
...
Fixes potential DoS in cJSON_Minify, see https://github.com/DaveGamble/cJSON/issues/354
2019-08-21 18:40:50 +10:00
Angus Gratton
2264ea7714
kconfig: Add -MP option so .d files include empty targets
...
Prevents make-level errors when switching IDF versions, as headers may be removed.
Similar to some mentioned here:
https://github.com/espressif/esp-idf/issues/712
2019-08-21 18:20:47 +10:00