Jiang Jiang Jian
a662002924
Merge branch 'bugfix/btdm_add_sequential_check_when_add_include_service' into 'master'
...
component/bt: add sequential check when add include service
See merge request idf/esp-idf!3277
2018-09-30 14:19:54 +08:00
Zhi Wei Jian
5d71940178
component/bt: add sequential check when add include service
2018-09-30 14:19:54 +08:00
Jiang Jiang Jian
d6bc6fad8b
Merge branch 'bugfix/btdm_add_ESP_BLE_SM_ONLY_ACCEPT_SPECIFIED_SEC_AUTH_in_set_security_param_API' into 'master'
...
Component/bt: add only accept sepecified authentication function for SMP
See merge request idf/esp-idf!3385
2018-09-30 14:18:23 +08:00
Jiang Jiang Jian
545778c9a9
Merge branch 'docs/wifi_correct_mistake_in_csi_doc' into 'master'
...
esp32: correct a mistake about secondary channel of CSI in wifi.rst
See merge request idf/esp-idf!3405
2018-09-30 13:47:52 +08:00
Ivan Grokhotkov
757de2518d
Merge branch 'doc/can_remove_disclaimer' into 'master'
...
can: remove license disclaimer
See merge request idf/esp-idf!3381
2018-09-30 12:05:08 +08:00
zhiweijian
3050e55801
Component/bt: add only accept sepecified Authentication
2018-09-29 21:23:55 +08:00
Jiang Jiang Jian
7014c14537
Merge branch 'bugfix/btdm_add_service_source_param_for_ESP_GATTC_SEARCH_CMPL_EVT' into 'master'
...
Component/bt: add “service from” param for ESP_GATTC_SEARCH_CMPL_EVT
See merge request idf/esp-idf!3399
2018-09-29 20:18:26 +08:00
Jiang Jiang Jian
df1ab11a8e
Merge branch 'bugfix/btdm_fix_service_change_cannot_read_write_and_no_descr' into 'master'
...
Component/bt: fix service change char can’t read and write and no descr
See merge request idf/esp-idf!3402
2018-09-29 20:16:07 +08:00
XiaXiaotian
5e1b05abc3
esp32: correct a mistake about secondary channel of CSI in wifi.rst
2018-09-29 15:32:09 +08:00
He Yin Ling
252b9ad5ea
Merge branch 'ci/adjust_expire_time_for_artifacts' into 'master'
...
ci: adjust expire time for CI artifacts:
See merge request idf/esp-idf!3327
2018-09-29 13:43:01 +08:00
He Yin Ling
b4fe43912f
ci: adjust expire time for CI artifacts:
...
set shorter time to save some space on server. For those artifacts need
to be stored for long time, we can manually press "keep" button in job page.
Also add a CI job to check if all artifacts have set expire time.
2018-09-29 03:54:14 +00:00
zhiweijian
e6d737780a
Component/bt: add “service from” param for ESP_GATTC_SEARCH_CMPL_EVT
2018-09-28 12:59:01 +00:00
zhiweijian
54b841dc30
Component/bt: fix service change char can’t read and write and no descr
2018-09-28 19:57:25 +08:00
Ivan Grokhotkov
0a7065195c
Merge branch 'bugfix/regression_in_light_sleep_mode' into 'master'
...
esp32: fix regression introduced in automatic light sleep pm
See merge request idf/esp-idf!3371
2018-09-28 09:49:39 +08:00
Ivan Grokhotkov
4981c10ab3
Merge branch 'fix/sdio_slave_reset_ret_queue' into 'master'
...
sdio_slave: fix the ret_queue crash issue when being reset by the master
See merge request idf/esp-idf!3360
2018-09-27 18:25:57 +08:00
Ivan Grokhotkov
71b5ce55d3
Merge branch 'feature/mbedtls_2_13_1' into 'master'
...
mbedtls: update to 2.13.1
See merge request idf/esp-idf!3301
2018-09-27 14:15:25 +08:00
Ivan Grokhotkov
0eff312411
can: remove license disclaimer
2018-09-27 13:25:59 +08:00
Ivan Grokhotkov
5ebf4f7022
Merge branch 'feature/move_rtc_data_rtc_rodata_to_RTC_FAST_seg' into 'master'
...
esp32: Add option to place .rtc_data and .rtc_rodata into the RTC_FAST segment
See merge request idf/esp-idf!2128
2018-09-27 13:05:06 +08:00
Ivan Grokhotkov
84d2f510ea
Merge branch 'bugfix/ci_example_test' into 'master'
...
tools: Make Utility.console_log accept Unicode and byte strings as well
See merge request idf/esp-idf!3367
2018-09-27 11:26:44 +08:00
Ivan Grokhotkov
ea7e6bd8f6
Merge branch 'feature/py23_kconfig_new' into 'master'
...
tools: Make kconfig_new Python3-compatible and enable Python3 in idf.py
See merge request idf/esp-idf!3304
2018-09-27 11:26:32 +08:00
Ivan Grokhotkov
11b444b8f4
Merge branch 'bugfix/sysview_enable_cmake' into 'master'
...
cmake: add app_trace as FreeRTOS dependency
See merge request idf/esp-idf!3335
2018-09-27 11:21:54 +08:00
Ivan Grokhotkov
6baf743212
Merge branch 'bugfix/lwip_compat_headers' into 'master'
...
lwip: add compatibility headers for sntp.h and esp_ping.h
See merge request idf/esp-idf!3231
2018-09-27 11:21:37 +08:00
Ivan Grokhotkov
135eef767f
Merge branch 'bugfix/idf_ver_out_of_tree' into 'master'
...
cmake: pass repository path to git when doing git describe
See merge request idf/esp-idf!3328
2018-09-27 11:21:25 +08:00
Jiang Jiang Jian
6163e1d713
Merge branch 'bugfix/btdm_coex_hw_blocking' into 'master'
...
component/bt : fix coexist hardware blocking bug
See merge request idf/esp-idf!3362
2018-09-27 11:17:15 +08:00
Tian Hao
337960338d
component/bt : fix coexist hardware blocking bug
...
fix the bug following:
1. after disable bluetooth controller, wifi cannot TX/RX any packets.
2. when software coexist working, there's a little ratio cause wifi task watchdog timeout
3. when software coexist working, there's a little ratio cause bluetooth cannot receive anything.
feature:
1. add libbtdm_app.a git commit local and remote checking
Known issues:
1. there's still a bug occurs with a very very low ratio cause bluetooth
cannot receive anything. The reproduce interval may great than 3days ~ 1week via
7x24 hours heavy testing.
2018-09-26 21:24:46 +08:00
Jiang Jiang Jian
93df37522f
Merge branch 'feature/mesh_decoupling' into 'master'
...
mesh: decoupling
See merge request idf/esp-idf!3261
2018-09-26 20:20:27 +08:00
Roland Dobai
9ea9d111c8
tools: Make Utility.console_log accept Unicode and byte strings as well
2018-09-26 12:56:00 +02:00
Jiang Jiang Jian
fa784476ba
Merge branch 'bugfix/btdm_fix_get_bond_list_error_sometimes' into 'master'
...
Component/bt: fix get bond list error sometimes
See merge request idf/esp-idf!3288
2018-09-26 18:06:23 +08:00
Jiang Jiang Jian
042ef68ea5
Merge branch 'feature/btdm_add_send_service_change_indication_API' into 'master'
...
Component/bt: add gatts send service change indication API
See merge request idf/esp-idf!3302
2018-09-26 18:05:04 +08:00
Mahavir Jain
b5c321d981
esp32: fix regression introduced in automatic light sleep pm
...
Closes: https://github.com/espressif/esp-idf/issues/2459
Signed-off-by: Mahavir Jain <mahavir@espressif.com>
2018-09-26 08:52:15 +05:30
Angus Gratton
607d899503
Merge branch 'feature/py23_examples' into 'master'
...
Examples: Add Python 2&3 support
See merge request idf/esp-idf!3237
2018-09-26 08:41:42 +08:00
Angus Gratton
7e3f498d15
Merge branch 'docs/general_notes_zh_CN' into 'master'
...
docs: translate the general-notes document into Chinese
See merge request idf/esp-idf!2867
2018-09-26 07:23:38 +08:00
qiyueixa
fe4dabe869
mesh: decoupling
...
Remove dependencies which cause mesh code to be linked even if mesh is not used.
2018-09-25 23:49:27 +08:00
michael
d4071a7c19
sdio_slave: fix the ret_queue crash issue when being reset by the master
2018-09-25 20:30:25 +08:00
Jiang Jiang Jian
46ad2c6ad0
Merge branch 'feature/wifi_esptouch_support_both_multicast_and_broadcast_packet' into 'master'
...
esp32: esp-touch supports both multicast and broadcast packets
See merge request idf/esp-idf!3291
2018-09-25 19:48:33 +08:00
Ivan Grokhotkov
e1ac237169
Merge branch 'doc/fix_config_links' into 'master'
...
doc: Fix config links, add navigation lists to config items page
See merge request idf/esp-idf!3310
2018-09-25 18:23:24 +08:00
zhiweijian
9fb188a1d9
Component/bt: add gatts send service change indication API
2018-09-25 08:26:55 +00:00
Roland Dobai
975688b97f
examples: Use flushed print to see logs on the CI server
2018-09-25 08:05:56 +02:00
Roland Dobai
17b7959de9
Examples: Add Python 2&3 support
2018-09-25 08:05:56 +02:00
morris
0ea7723238
doc/general_notes:translate from en to zh_CN
...
translate the document [general-notes] into Chinese
2018-09-25 12:59:52 +08:00
XiaXiaotian
7b7964b47a
esp32: esp-touch supports both multicast and broadcast packets
...
Previously, esp-touch only supports multicast packets which are
transmitted from cellphone. But for most dual frequency routers
whose SSIDs of 5G and 2.4G are the same, broadcast packets are
forwarded from 5G interface to 2.4G interface while multicast
packets are not. In order to make esp-touch work when cellphone
connects to 5G interface of these routers, esp-touch is improved
to support both multicast and broadcast packets. Meanwhile, new
APP which is compiled with Andriod or IOS library(>= v0.3.6.2)
must be used in this situation. Note that for some routers,
broadcast and multicast packets are forwarded from 5G interface
to 2.4G interface only when another WiFi device is connected to
2.4G interface of the router. Old APP which is compiled with
Android or IOS library(< v0.3.6.2) also works with this improvement
when cellphone connects to 2.4G interface of the router.
The Android and IOS library of new esp-touch APP is now available
on Github.
Android: https://github.com/EspressifApp/EsptouchForAndroid
IOS: https://github.com/EspressifApp/EsptouchForIOS
2018-09-25 10:38:01 +08:00
Angus Gratton
96cd3b75cd
Merge branch 'feature/mbedtls_mem_alloc_options' into 'master'
...
mbedtls: configurable options for controlling dynamic memory allocations
See merge request idf/esp-idf!3343
2018-09-25 08:24:29 +08:00
Angus Gratton
66fd7e9cc3
Merge branch 'bugfix/python_gen_empty_partition' into 'master'
...
app_update: Make gen_empty_partition.py Python 2 & 3 compatible
See merge request idf/esp-idf!3347
2018-09-25 08:23:38 +08:00
Angus Gratton
dc135ed1f6
Merge branch 'feature/async_esp_http_client' into 'master'
...
Non Blocking `esp_http_perform()` API in esp_http_client
See merge request idf/esp-idf!3049
2018-09-25 08:20:06 +08:00
Angus Gratton
a4aadd1926
Merge branch 'feature/nvs_encryption' into 'master'
...
nvs_flash: Add support for nvs encryption
See merge request idf/esp-idf!2700
2018-09-25 08:15:55 +08:00
Angus Gratton
6ed00f50be
Merge branch 'bug_fix/multipage_blob_support' into 'master'
...
nvs_util: Fix generation of multipage blob data format
See merge request idf/esp-idf!3349
2018-09-25 08:01:57 +08:00
Jiang Jiang Jian
3665715d4d
Merge branch 'mesh/bugfix' into 'master'
...
mesh: bugfix
See merge request idf/esp-idf!3286
2018-09-24 20:31:31 +08:00
Roland Dobai
baca21050f
app_update: Make gen_empty_partition.py Python 2 & 3 compatible
...
Closes https://github.com/espressif/esp-idf/issues/2457
2018-09-24 12:16:16 +02:00
Shivani Tipnis
7c1360b10a
nvs_util: Fix multipage blob data format generate
2018-09-24 15:44:31 +05:30
Sagar Bijwe
48fccbf5dd
nvs_flash: Add support for nvs encryption
2018-09-24 11:25:21 +05:30