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
3,634 Commits 20 Branches 148 Tags 384 MiB
7827bc486d
Commit Graph

3634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yulong
7827bc486d component/bt: Fiexd the bug of the gattc cannot get the db properties. 2017-09-18 23:15:32 -04:00
Ivan Grokhotkov
d55a7cdfee Merge branch 'bugfix/minor_nvs_remove_unused_header' into 'master' 
nvs: minor - removed unused header inclusion

See merge request !1279
 2017-09-19 08:29:58 +08:00
Ivan Grokhotkov
3924594aed Merge branch 'feature/toolchain-update' into 'master' 
make,docs: update toolchain

See merge request !1269
 2017-09-18 19:32:39 +08:00
Amey Inamdar
c8945bb82a nvs: minor - removed unused header inclusion 
Signed-off-by: Amey Inamdar <amey.inamdar@gmail.com>
 2017-09-18 17:02:32 +05:30
Jiang Jiang Jian
e9655c5d90 Merge branch 'feature/btdm_cherry_pick_ble_new_api' into 'master' 
Feature/btdm cherry pick ble new api

See merge request !1113
 2017-09-18 18:17:11 +08:00
Yulong
388bf8d579 componnent/bt: remove the <<<<<<< HEAD in the code. 2017-09-18 05:44:50 -04:00
Yulong
8925a90d40 squash again 
squash the commit.
component/bt:Added the update_white_list & set_prefer_conn_params API to the bt project.

component/bt: Added the get white list size API & delete the read adv tx power API.

component/bt: Change the esp_gap_ble_api.h esp_ble_gap_set_prefer_conn_params API docs.

changed btm_find_dev to btm_find_or_alloc_dev

component/bt: Change the rssi API deep copy method.

component/bt: Change the code as comment in the gitlab.

squash the commit.
component/bt:Added the update_white_list & set_prefer_conn_params API to the bt project.

component/bt: Added the get white list size API & delete the read adv tx power API.

component/bt: Change the esp_gap_ble_api.h esp_ble_gap_set_prefer_conn_params API docs.

changed btm_find_dev to btm_find_or_alloc_dev

component/bt: Change the rssi API deep copy method.

component/bt: Change the code as comment in the gitlab.

component/bt: change the ESP_BLE_CONN_PARAM_UNDEF redefinition error.

component/bt: Change the ESP_BLE_IS_VALID_PARAM function with the compile error.
 2017-09-18 05:39:26 -04:00
Angus Gratton
0db01b4a4d windows: Update windows prereq script & precompiled environment download 2017-09-18 18:26:57 +10:00
Ivan Grokhotkov
3154168eb4 Merge branch 'feature/log_buffer' into 'master' 
feat(log): add new function to log buffer with level.

See merge request !1150
 2017-09-18 15:02:34 +08:00
michael
8244fa95fe feat(log): add new function to log buffer with level and hex dump. 2017-09-18 11:44:54 +08:00
Ivan Grokhotkov
7551e1d310 make,docs: update toolchain to 1.22.0-72-g4d49225 2017-09-18 10:32:44 +08:00
Angus Gratton
9a1ba5985b Merge branch 'feature/partition_table_expand_line' into 'master' 
partition_table: Expand vars before splitting fields (github #841)

See merge request !1174
 2017-09-18 09:18:25 +08:00
Jiang Jiang Jian
3d7ec475d1 Merge branch 'feature/btdm_cherry_pick_change_gattc_api' into 'master' 
component/bt: Change all the gattc API && bta gattc layer.

See merge request !1147
 2017-09-15 19:39:29 +08:00
Jiang Jiang Jian
5980edaef8 Merge branch 'refactor/btdm_modify_spp_client_for_ci' into 'master' 
component/bt:modify for gattc new api ci

See merge request !1271
 2017-09-15 19:37:24 +08:00
Jiang Jiang Jian
18f2a29a99 Merge branch 'bugfix/btdm_smp_close_compile_error' into 'master' 
component/bt: fix the bug when close the SMP module in the menuconfig will lead to compile error.

See merge request !1265
 2017-09-15 19:36:30 +08:00
xiewenxiang
3fbc4ff353 component/bt:modify for gattc new api ci 2017-09-15 17:53:36 +08:00
Ivan Grokhotkov
4d62f8e5d0 Merge branch 'bugfix/apptrace_init_sequence' into 'master' 
Changed initialization sequence of application tracing component on APP CPU so i…

See merge request !1256
 2017-09-15 15:02:42 +08:00
Jiang Jiang Jian
aacffd1727 Merge branch 'bugfix/btdm_blufi_malloc' into 'master' 
component/bt : fix a malloc bzero of blufi

See merge request !1264
 2017-09-15 12:06:56 +08:00
Tian Hao
dff95aed65 component/bt : fix a malloc bzero of blufi 2017-09-15 11:08:42 +08:00
Yulong
875ba996d5 component/bt: fix the bug when close the SMP module in the menuconfig will lead to compile error. 2017-09-15 10:32:28 +08:00
Alexey Gerenkov
b09f4acb27 Added proper handling of apptrace and pthread initialization errors 2017-09-14 20:47:43 +02:00
krzychb
a1ebeed303 Changed initialization sequence of application tracing component on APP CPU so it follows completion of initialization of the same component on PRO CPU. Previously, because of missing locking mechanism, both components were printing logs to UART at the same time. As results logs contained only corrupted characters / were not legible at all. Internal tracking: esp-idf/openocd-esp32, Issue 15 2017-09-14 20:47:43 +02:00
Jiang Jiang Jian
5e50c9d884 Merge branch 'bugfix/btdm_modify_mtu_in_spp_client_demo' into 'master' 
component/bt: modify mtu api in spp client demo

See merge request !1266
 2017-09-14 22:24:52 +08:00
yulong
09a3e4fd58 squesh the commit. 
component/bt: Change the idf test KnownIssues file.

component/bt: Fixed the bug of gattc mutilple read.
 2017-09-14 09:35:36 -04:00
zhiweijian
31cb284967 Component/bt: modify mtu api in spp client demo 2017-09-14 21:11:10 +08:00
Jiang Jiang Jian
4c97fc04ca Merge branch 'bugfix/optimize_lwip_loopback_route' into 'master' 
optimize lwip route when loopback open and in "APSTA" mode

See merge request !1252
 2017-09-14 21:07:58 +08:00
Jiang Jiang Jian
5aa52709c2 Merge branch 'bugfix/fix_some_wifi_lib_bugs' into 'master' 
Fix some wifi lib bugs

See merge request !1255
 2017-09-14 20:39:02 +08:00
Jiang Jiang Jian
c74d944edf Merge branch 'feature/refractor_smartconfig' into 'master' 
Refractor smartconfig

See merge request !1253
 2017-09-14 20:38:30 +08:00
Jeroen Domburg
0460069582 Merge branch 'bugfix/panic_dport_no_mutex' into 'master' 
Panic: stop dport access handler without trying to use a lock

See merge request !1244
 2017-09-14 18:07:06 +08:00
Jiang Jiang Jian
fff90da8d6 Merge branch 'bugfix/btdm_gatt_read_by_type_bug' into 'master' 
component/bt: Fix gatt read by type response bug

See merge request !1102
 2017-09-14 17:24:02 +08:00
Jiang Jiang Jian
169361b38b Merge branch 'feature/btdm_ble_spp_server_demo' into 'master' 
component/bt: add example for ble spp server

See merge request !1042
 2017-09-14 17:15:17 +08:00
Jiang Jiang Jian
f90eb1c371 Merge branch 'feature/btdm_ble_spp_client_demo' into 'master' 
component/bt: add example for ble spp client

See merge request !1043
 2017-09-14 17:15:01 +08:00
zhangyanjiao
164006509f optimize lwip route when loopback open and in "APSTA" mode 2017-09-14 16:19:05 +08:00
XiaXiaotian
6bfbe6e4ed Fix some wifi lib bugs 
1. add adc2 coexistence

2. change NOW() to WDEV_NOW()

3. call ets_timer_done() before calling ets_timer_setfn()

4. fix the bug that api lock is not unlocked when call esp_wifi_stop()
   twice

5. more hmac tx buffer limit from 32 to 64.
 2017-09-14 15:19:46 +08:00
Ivan Grokhotkov
2a0e6c40d0 Merge branch 'feature/ext_ram_allocatable_using_heap_alloc_cap' into 'master' 
Make external RAM allocatable using heap_alloc_cap

See merge request !1226
 2017-09-14 14:28:12 +08:00
Ivan Grokhotkov
ad0d30302b Merge branch 'bugfix/ci_sphinx_warnings' into 'master' 
ci: Add new check_doc_warnings.sh script, pre-process log lines

See merge request !1258
 2017-09-14 13:46:18 +08:00
Angus Gratton
4b8aa9e20d ci: Add new check_doc_warnings.sh script, pre-process log lines 
* Fixes issue in !1250 when IDF_PATH changes on build runner
* Allows checking document warnings before CI run
* Will be robust to line number changes in document files
 2017-09-14 13:46:35 +10:00
Ivan Grokhotkov
b2adaf2a4c Merge branch 'feature/docs_adc_api_reference' into 'master' 
More details added to  description of ADC API

See merge request !1240
 2017-09-14 10:49:12 +08:00
Jeroen Domburg
6d95934a3c Make 80MHz PSRAM work as well, add testcase for weirdness reported on esp32 forums, clean up unused define in psram code 2017-09-14 10:47:44 +08:00
Jeroen Domburg
875ae6a134 Add option to allocate external RAM using heap_alloc_caps 2017-09-14 10:47:44 +08:00
Ivan Grokhotkov
538e9d83fc Merge branch 'bugfix/docs_formatting' into 'master' 
Resolved docs formatting issues that sneak into documentation on master with MR 1061

See merge request !1257
 2017-09-14 10:42:57 +08:00
krzychb
53fde7842e Resolved docs formatting issues that sneak into documentation with MR 1061 2017-09-13 21:00:48 +02:00
Jiang Jiang Jian
574daad1c4 Merge branch 'feature/btdm_update_to_bluedroid7.1_l2cap' into 'master' 
component/bt: Added the new feature of the l2cap layer from the bluedroid new version 7.1.1

See merge request !1087
 2017-09-13 20:39:38 +08:00
Jiang Jiang Jian
33a4a6a510 Merge branch 'feature/add_espnow' into 'master' 
add ESPNOW feature

See merge request !1061
 2017-09-13 20:32:53 +08:00
Jiang Jiang Jian
b70329040d Merge branch 'bugfix/btdm_gatts_notify_stress_test_crash' into 'master' 
component/bt: fix bug for gatts notify stress test crash

See merge request !1245
 2017-09-13 20:27:17 +08:00
Ivan Grokhotkov
dfaf166436 Merge branch 'feature/toolchain-update' into 'master' 
Toolchain update

See merge request !1204
 2017-09-13 18:05:09 +08:00
Ivan Grokhotkov
a91b330b49 Merge branch 'bugfix/spiffs_submodule' into 'master' 
spiffs: Track spiffs submodule in component

See merge request !1251
 2017-09-13 18:02:32 +08:00
Ivan Grokhotkov
82fb2768aa build system: trim crosstool-ng commit ID when checking version 
Since 2.11.0, git does not default to 7 characters for short commit IDs,
instead automatically estimating the number of characters based on
repository size [1]. If the toolchain was compiled on a computer with
new version of git installed, commit ID will contain 8 characters, and
the check for the toolchain version will fail. As a workaround, trim the
commit ID to 7 characters when checking the version.

[1] e6c587c733
 2017-09-13 17:27:47 +08:00
Angus Gratton
61e3a5bd16 windows: Update toolchain & MSYS package download links 2017-09-13 17:27:47 +08:00
Angus Gratton
e250dbb433 windows: Add workaround for "git submodule" stray output bug 
TW10271
 2017-09-13 17:27:47 +08:00