Yulong
6c20bc3203
component/bt: Added the hash key generated directly in the bluedroid module.
...
1. Change all the hash used from the coap module to generated by the bluedroid module directly.
component/bt: Added the <string.h> include file to the gattc_co module to avoid compile error.
2018-04-28 03:11:05 -04:00
Jiang Jiang Jian
cc2d1fda96
Merge branch 'bugfix/btdm_modify_include_path' into 'master'
...
component/bt : modify header files to avoid conflict
See merge request idf/esp-idf!2195
2018-04-27 12:01:46 +08:00
Jiang Jiang Jian
44c3318749
Merge branch 'mesh/feature_fix_root' into 'master'
...
Mesh/feature fix root
See merge request idf/esp-idf!2308
2018-04-27 10:56:35 +08:00
Tian Hao
b9855df44e
example: fix ble hid device demo include
2018-04-27 10:52:55 +08:00
qiyueixa
ebd1849e18
mesh: add fix root function
2018-04-26 21:15:35 +08:00
Tian Hao
adada3f67e
component/bt : modify header files to avoid conflict
...
1. add the L1 include path with a prefix, such like osi/list.h, stack/a2d_api.h and etc.
2. modify component, only bluedroid/api/include/api is export to another component and application,
other include path just for bluedroid used
3. put bluedroid/include into common/include/common, so the root directory of bluedroid have no include path.
4. modify doxygen to use esp_bt.h and redirect to
component/bt/bluedroid/api/include/api/
fix compile
2018-04-26 19:32:06 +08:00
Ivan Grokhotkov
0236592fe5
Merge branch 'feature/esp32_sw_breaks' into 'master'
...
ESP32 SW Breakpoints Support
See merge request idf/esp-idf!2316
2018-04-26 18:05:38 +08:00
Ivan Grokhotkov
add969f69d
Merge branch 'bugfix/partition_make3.81' into 'master'
...
partition table: Fix regression with make 3.81
See merge request idf/esp-idf!2314
2018-04-26 15:29:15 +08:00
Alexey Gerenkov
439140d269
esp32: Adds support for SW breakpoints in flash
...
Disables app image integrity checks when running under OpenOCD control.
Allows setting breakpoints in flash before application start (just after reset).
2018-04-26 10:17:02 +03:00
Ivan Grokhotkov
4083a356a8
Merge branch 'bugfix/build_failure_with_heap_task_tracking' into 'master'
...
Fix build failure if CONFIG_HEAP_TASK_TRACKING enabled
See merge request idf/esp-idf!2315
2018-04-26 15:16:43 +08:00
Jiang Jiang Jian
464dbbdaa9
Merge branch 'bugfix/fix_a_minor_compile_issue' into 'master'
...
Bugfix/fix a minor compile issue
See merge request idf/esp-idf!2307
2018-04-26 14:31:04 +08:00
Jiang Jiang Jian
37513cd738
Merge branch 'feature/wifi_add_wifi_event_mask' into 'master'
...
add WiFi event mask API
See merge request idf/esp-idf!2072
2018-04-26 14:27:42 +08:00
Mahavir Jain
5cdd08ef5a
heap: fix build failure due to missing header
...
Closes https://github.com/espressif/esp-idf/issues/1881
Signed-off-by: Mahavir Jain <mahavir@espressif.com>
2018-04-26 11:08:58 +05:30
Jiang Jiang Jian
9b9eb7e724
Merge branch 'bugfix/fix_some_wifi_phy_mode_bugs' into 'master'
...
esp32: fix some wifi phy mode bugs
See merge request idf/esp-idf!2294
2018-04-26 10:27:32 +08:00
Angus Gratton
8fbdad5b0c
partition table: Fix regression with make 3.81
...
"undefine" was added in make 3.8.2
Namespace the global partition table option variables to minimise scope leakage.
2018-04-26 12:07:27 +10:00
Angus Gratton
081c830d2f
Merge branch 'feature/partition_size_check' into 'master'
...
partition_table: Check configured flash size fits in partition table
See merge request idf/esp-idf!2274
2018-04-26 08:48:31 +08:00
Angus Gratton
d9cbfe42f9
Merge branch 'bugfix/log_macro_statements' into 'master'
...
log: Make ESP_LOGx macros into single statements
See merge request idf/esp-idf!2275
2018-04-26 08:05:49 +08:00
Angus Gratton
fa3205737f
partition_table: Check configured flash size fits in partition table
...
Check happens at build time, so flash size config may need to be changed.
Also fixes MD5_OPT undefined warning, closes https://github.com/espressif/esp-idf/issues/1867
2018-04-26 09:51:55 +10:00
Angus Gratton
e3d404bb8f
Merge branch 'bugfix/ci_retry_build_example' into 'master'
...
ci: Try to build examples in second time in case of error
See merge request idf/esp-idf!2302
2018-04-26 07:36:52 +08:00
Angus Gratton
2f318d16fa
log: Make ESP_LOGx macros into single statements
...
Requires a semicolon after any use (previously this was optional due to trailing } after expansion)
Closes https://github.com/espressif/esp-idf/issues/1757
2018-04-26 09:08:07 +10:00
jack
81e4cad615
fix the bug that in mdns test code redefine esp_err_t to uint32_t, which should be int32_t
2018-04-25 21:05:21 +08:00
Jiang Jiang Jian
683270958c
Merge branch 'feature/btdm_set_bredr_txpower' into 'master'
...
component/bt : add BR/EDR TX power set
See merge request idf/esp-idf!2267
2018-04-25 20:53:21 +08:00
Liu Zhi Fu
f5ae421e14
esp32: fix some wifi phy mode bugs
...
Fix several WiFi phy mode bugs
2018-04-25 20:32:18 +08:00
XiaXiaotian
364c15b9f8
add WiFi event mask API
2018-04-25 19:25:43 +08:00
Tian Hao
e660785532
component/bt : add BR/EDR TX power set
2018-04-25 15:28:19 +08:00
Jiang Jiang Jian
d8c63160af
Merge branch 'bugfix/btdm_fix_gatt_cache_error' into 'master'
...
Component/bt: fix gattc some errors
See merge request idf/esp-idf!2104
2018-04-25 14:57:18 +08:00
Jiang Jiang Jian
14b0285a87
Merge branch 'feature/btdm_cherry-pick_ble_hid_device' into 'master'
...
Feature/btdm cherry pick ble hid device
See merge request idf/esp-idf!1701
2018-04-25 14:53:23 +08:00
Ivan Grokhotkov
f885e8b8de
Merge branch 'doc/openocd_release_update' into 'master'
...
docs: update download links for OpenOCD
See merge request idf/esp-idf!2259
2018-04-25 12:22:21 +08:00
Anton Maklakov
842cd7b38e
CI: Try to build examples in second time in case of error
...
It will help to work around the weird bug during buillding a batch of examples
2018-04-25 11:06:04 +08:00
Ivan Grokhotkov
0b1bb2ab57
Merge branch 'bugfix/fatfs_readwrite_test_failure' into 'master'
...
fatfs/test: increase stack size in read-write unit test
See merge request idf/esp-idf!2256
2018-04-24 23:43:24 +08:00
Ivan Grokhotkov
907248b6a7
Merge branch 'feature/nvs_coverage' into 'master'
...
NVS: add power off recovery and coverage test into CI
See merge request idf/esp-idf!2246
2018-04-24 23:42:00 +08:00
Ivan Grokhotkov
52f9a5ca16
Merge branch 'bugfix/sdspi_wp_cd_pins' into 'master'
...
sdmmc, sdspi: fix handling of CD and WP
See merge request idf/esp-idf!2285
2018-04-24 20:53:47 +08:00
Ivan Grokhotkov
e0f1524c86
sdmmc: add tests for CD and WP pins for SD and SPI mode
2018-04-24 19:08:44 +08:00
Ivan Grokhotkov
e19901c898
sdmmc: don’t print sdio_reset warning when CD is idle
2018-04-24 19:08:44 +08:00
Ivan Grokhotkov
85ab4fc83e
sdmmc host: add handling of CD and WP pins
...
Previous version of the code only connected CD and WP to the
peripheral, in fact the hardware does not use the values of these
signals automatically. This adds code to read CD and WP values when
command is executed and return errors if card is not present, or
write command is executed when WP signal is active.
2018-04-24 19:08:44 +08:00
Ivan Grokhotkov
829c6cef39
sdmmc host: when parameter validation fails, exit cleanly
...
This fixes lock-up which happened when sending a command, if the
previous command has failed.
2018-04-24 19:08:44 +08:00
Jiang Jiang Jian
edcaa5f300
Merge branch 'bugfix/minor_fix_for_wifi_tx' into 'master'
...
esp32: minor fix for WiFi TX
See merge request idf/esp-idf!2281
2018-04-24 13:42:41 +08:00
Ivan Grokhotkov
50304d719e
Merge branch 'bugfix/esp_tls_error_logging' into 'master'
...
esp-tls: Expand error logging
See merge request idf/esp-idf!2284
2018-04-23 20:18:30 +08:00
Liu Zhi Fu
2461a780aa
more
2018-04-23 19:09:46 +08:00
Ivan Grokhotkov
5a3b2eddd3
Merge branch 'bugfix/esp_tls_memory_leak' into 'master'
...
esp-tls: fix memory leak when using CA certification validation
See merge request idf/esp-idf!2283
2018-04-23 18:57:11 +08:00
Jiang Jiang Jian
cad88fb18c
Merge branch 'bugfix/authmode_change_event_peg_core_in_wep_mode' into 'master'
...
bugfix/wrong_authmode_change_event_is_reported_in_wep_mode
See merge request idf/esp-idf!2282
2018-04-23 18:51:46 +08:00
zhiweijian
be107320f7
Component/bt: fix gatt cache error
...
- fix sev == NULL error
- fix start_handle == end_handle
2018-04-23 15:43:10 +08:00
Ivan Grokhotkov
92a16ac6e6
sdspi: fix CD and WP incorrectly configured as outputs
2018-04-23 14:35:40 +08:00
Ivan Grokhotkov
2a7d85cfa4
sdmmc, sdspi: fix initializers to be C++-compatible, add test
...
Closes https://github.com/espressif/esp-idf/issues/1861
Closes https://github.com/espressif/arduino-esp32/issues/1312
2018-04-23 14:35:13 +08:00
Deng Xin
aab573746e
Bug fix of authmode change event peg core in wep mode
...
auth mode change event will report continous in wep mode due to wrong original auth record
close github issue https://github.com/espressif/esp-idf/issues/1804
2018-04-23 14:25:36 +08:00
Flavio Bayer
d477d3c5bd
bugfix/sdspi_host.c: wrong CD/WP pin configuration
...
Looks like the configuration of CP and WP pins are wrong, since the check for `gpio_cd` and `gpio_wp` in `slot_config` seems to be swapped.
2018-04-23 11:32:42 +10:00
Angus Gratton
088c73bd22
Merge branch 'feature/disable_ble_service_change_pr1673' into 'master'
...
Add option to ena/dis BLE service change registration
See merge request idf/esp-idf!2210
2018-04-23 09:15:02 +08:00
Angus Gratton
f4241dc796
Merge branch 'bugfix/typo_in_aws_iot_config' into 'master'
...
Typo in aws_iot_config.h
See merge request idf/esp-idf!2280
2018-04-23 09:02:02 +08:00
Jiang Jiang Jian
e37ceaed32
Merge branch 'bugfix/tw18453_fix_ap_eapol_retry_bug' into 'master'
...
esp32: fix soft-AP eapol retry issue
See merge request idf/esp-idf!2264
2018-04-22 16:37:24 +08:00
Liu Zhi Fu
db5f927087
esp32: fix the bug that soft-AP fails to retry eapol
...
Fix the issue that soft-AP fails to retry eapol frame when multiple
stations connects it at the same time.
More
2018-04-22 10:19:31 +08:00