Angus Gratton
8569d51651
Merge branch 'bugfix/fix_i2s_include_head_bug' into 'master'
...
Bugfix(I2S): Fix i2s build error
See merge request espressif/esp-idf!6512
2019-10-29 13:19:00 +08:00
Angus Gratton
055cc251b7
Merge branch 'feature/esp32s2beta_merge' into 'master'
...
esp32s2beta: Merge support to master
Closes IDF-513, IDF-756, IDF-758, IDF-999, IDF-753, IDF-749, IDF-754, IDF-840, and IDF-755
See merge request espressif/esp-idf!6100
2019-10-29 13:02:01 +08:00
Mahavir Jain
d2e62a1602
Merge branch 'NimBLE/update_to_nimble-1.2.0_release' into 'master'
...
NimBLE: Update NimBLE submodule to latest `nimble-1.2.0-idf` release
See merge request espressif/esp-idf!6350
2019-10-29 12:52:05 +08:00
Prasad Alatkar
c5339779a7
NimBLE: Update NimBLE submodule to latest `nimble-1.2.0-idf` release
2019-10-29 12:52:05 +08:00
Mahavir Jain
67a2f558df
Merge branch 'feature/esp_tls_add_wolfssl_and_segregate_files' into 'master'
...
feature/esp_tls :segregate esp_tls , seperate mbedtls api and add wolfssl support for esp32
See merge request espressif/esp-idf!6095
2019-10-29 12:49:40 +08:00
Jiang Jiang Jian
21d49a7e0d
Merge branch 'bugfix/coex_semaphore_take_in_isr_lock' into 'master'
...
fix bug that semaphore may schedule out in ISR locking
See merge request espressif/esp-idf!6425
2019-10-28 18:43:37 +08:00
Tian Hao
4987a5ad90
fix bug that semaphore may schedule out in Critical Section
...
1. Since BLE full-scan feature for BLE mesh change the controller code cause this problem,
it cause coex semaphore take in "interrupt disable", then it may cause task schedule
and cause crash in freertos
2. Fix newlib lock ISR context and critical section check
3. Fix bt controller ISR context and critical section check
2019-10-28 18:43:35 +08:00
Aditya Patwardhan
988f0c8feb
ESP_TLS: Generalizing error messages for esp_tls
...
:Replace mbedtls specific error messages
2019-10-28 16:05:31 +05:30
Aditya Patwardhan
f7eaa5f946
ESP_TLS: Restructuring esp_tls
...
1)Segregating mbedtls API into seperate file and cleaned esp_tls.c
2)Added support for wolfssl for CMake and make
3)Added support for debug_wolfssl (with menuconfig option)
4)Added info on wolfssl in ESP-TLS docs
2019-10-28 16:05:22 +05:30
Angus Gratton
36cd75d7ed
spi_flash tests: Fix exclusion of new API tests in legacy mode
2019-10-28 18:58:05 +11:00
Angus Gratton
894a3b4771
spi_flash: Remove duplicate spi_flash_rom_patch in CMakeLists.txt
2019-10-28 18:58:05 +11:00
Angus Gratton
eea0a6bc56
examples: Add ESP32 DUT class to ext_flash_fatfs example test
2019-10-28 18:58:05 +11:00
Angus Gratton
c6d22c9d65
esp32s2beta: Change default version to "A"
...
Fixes CI, and most customers should have version "A".
2019-10-28 18:58:05 +11:00
Angus Gratton
6e1aa985e7
ci: Increase INT_WDT_TIMEOUT_MS for PSRAM configs
...
This shouldn't be necessary, it's a workaround for a bug
in the config system.
2019-10-28 18:58:05 +11:00
Angus Gratton
1f62d4be74
esp32s2beta: Updated the beta chip version config to match the markings
2019-10-28 18:58:05 +11:00
Xia Xiaotian
5ffb42b4dd
esp_wifi: support esp32s2beta A, B and marlin3 chip
2019-10-28 18:58:05 +11:00
Romain
5491365874
Fix build error semphr.h:74:3: error: #error "include FreeRTOS.h" must appear in source files before "include semphr.h"
...
FreeRTOS.h must always be included before semphr.h
Merges https://github.com/espressif/esp-idf/pull/4251
2019-10-28 12:21:26 +08:00
Jiang Jiang Jian
758db1e008
Merge branch 'bugfix/fix_mesh_proxy_adv_with_wrong_dev_name' into 'master'
...
ble_mesh: using bt device name in mesh proxy adv
Closes BLEMESH-51
See merge request espressif/esp-idf!6438
2019-10-26 20:45:10 +08:00
Jiang Jiang Jian
ea0f0b1700
Merge branch 'feature/btdm_add_api_to_set_channel_classification' into 'master'
...
Feature/btdm add api to set channel classification
Closes BT-450
See merge request espressif/esp-idf!6229
2019-10-26 20:42:58 +08:00
Jiang Jiang Jian
eef065374e
Merge branch 'bugfix/btdm_disable_bt_gatt' into 'master'
...
components/bt: Disable BR/EDR GATT
Closes BT-456
See merge request espressif/esp-idf!6420
2019-10-26 20:42:37 +08:00
Jiang Jiang Jian
87e1dfa31e
Merge branch 'bugfix/btdm_check_avrc_connected_error' into 'master'
...
components/bt: Fix error in checking AVRC connected
See merge request espressif/esp-idf!6415
2019-10-26 20:42:04 +08:00
Jiang Jiang Jian
a334ace26a
Merge branch 'doc/handle_github_prs' into 'master'
...
address typos fix from PR
Closes IDFGH-2054
See merge request espressif/esp-idf!6481
2019-10-26 20:24:57 +08:00
Jiang Jiang Jian
e461668ea6
Merge branch 'bugfix/mdns_invalid_hostname_queries' into 'master'
...
mdns: fix crash for hostname queries
See merge request espressif/esp-idf!6480
2019-10-26 20:24:29 +08:00
Angus Gratton
7ce75a42c7
Merge branch 'master' into feature/esp32s2beta_merge
2019-10-25 15:13:52 +11:00
Marius Vikhammer
3d1170031b
mdns: fix crash for hostname queries
...
Receiving TXT, PTR, SDPTR and SRV record type queries would crash the application if the hostname
was used as instance name.
Closes https://github.com/espressif/esp-idf/issues/4224
2019-10-25 03:56:38 +00:00
baohongde
ed984cc9b5
components/bt: Add API and EVT for BLE set channels(BLE)
2019-10-25 11:39:35 +08:00
baohongde
eaf5f6a319
components/bt: Add API and EVT for set AFH channels(BR/EDR)
2019-10-25 11:39:22 +08:00
Jiang Jiang Jian
f974811150
Merge branch 'feature/hf_ag' into 'master'
...
Feature: BT/HFP AG.
Closes BT-346 and BT-428
See merge request espressif/esp-idf!6306
2019-10-25 10:57:43 +08:00
baohongde
d6201066a3
components/bt: Fix error in checking AVRC connected
2019-10-25 02:50:31 +00:00
baohongde
93f86b8a6d
components/bt: Disable BR/EDR GATT
2019-10-25 02:49:51 +00:00
Angus Gratton
caa59da5de
Merge branch 'bugfix/can_reset_mode_entry' into 'master'
...
can: Fix reset mode entry and exit calls
See merge request espressif/esp-idf!6442
2019-10-25 10:31:08 +08:00
Angus Gratton
36d440bd59
ci: Temporarily ignore CAN example test failures
...
Due to internal CI issue.
2019-10-25 12:49:42 +11:00
Darian Leung
434d1d29d1
can: Fix reset mode entry and exit calls
...
This commit fixes multiple bugs caused by incorrect calls to
can_enter_reset_mode() and can_exit_reset_mode. Example test
scripts also updated to match new runners.
2019-10-25 03:40:43 +08:00
Rebecca (Bex) Cran
bbb4e0e8f8
Fix typo (tree/three) in uart.rst
...
Merges https://github.com/espressif/esp-idf/pull/4237
2019-10-24 21:20:24 +08:00
Krzysztof Budzynski
bae5062175
Merge branch 'doc/review_hw-ref-toctree-issues' into 'master'
...
Make "H/W Reference" toctree symmetrical
See merge request espressif/esp-idf!6449
2019-10-24 16:56:12 +08:00
Mahavir Jain
8661f5f2e7
Merge branch 'nimble/esp_ble_mesh_adv_fix' into 'master'
...
nimble: Miscellaneous changes
See merge request espressif/esp-idf!6471
2019-10-24 14:38:02 +08:00
Hrishikesh Dhayagude
a26dfe70aa
nimble: Miscellaneous changes
...
1. Update NimBLE submodule as per changes in adv interval and stop port
2. Make changes in ESP BLE Mesh NimBLE host code for the same
2019-10-24 14:38:01 +08:00
Angus Gratton
3caa54e546
Merge branch 'feature/add_ping_example' into 'master'
...
add ping example
Closes WIFI-1196 and IDF-1068
See merge request espressif/esp-idf!6340
2019-10-24 11:37:38 +08:00
Angus Gratton
4322c863e2
Merge branch 'bugfix/docs_rst_fix_quotation' into 'master'
...
docs: quotation mark fix in recently added comment
See merge request espressif/esp-idf!6459
2019-10-24 11:18:50 +08:00
Angus Gratton
ba74534efb
Merge branch 'bugfix/esp_tls_check_buffer_size' into 'master'
...
esp-tls: Asserting maximum output buffer in tls-write.
See merge request espressif/esp-idf!6317
2019-10-23 14:45:28 +08:00
Angus Gratton
c474a7c56e
Merge branch 'feature/wifi_redo_scan_example' into 'master'
...
esp_wifi: Additional code snippets in esp_wifi_scan_example
Closes WIFI-1248
See merge request espressif/esp-idf!6310
2019-10-23 14:12:33 +08:00
Hrudaynath Dhabe
019502a36e
esp_wifi: Additional code snippets in esp_wifi_scan_example
2019-10-23 14:12:32 +08:00
Angus Gratton
9f93067649
Merge branch 'bugfix/select_with_sdmmc_mount' into 'master'
...
VFS: Fix bug which occurs when driver is installed during a select() call
Closes IDFGH-1259
See merge request espressif/esp-idf!6359
2019-10-23 14:05:49 +08:00
Angus Gratton
b525fa2c0a
Merge branch 'doc/review_api-ref_periph-spi_master' into 'master'
...
Review the file api-reference/peripherals/spi_master.rst.
See merge request espressif/esp-idf!5540
2019-10-23 14:04:04 +08:00
Angus Gratton
04dbe663be
Merge branch 'feature/heap_caps_get_size_free' into 'master'
...
add heap_caps_get_allocated_size
See merge request espressif/esp-idf!6375
2019-10-23 14:02:50 +08:00
Angus Gratton
740f334b4b
Merge branch 'bugfix/fix_embed_files_docs_with_cmake' into 'master'
...
docs: cmake docs fixes
See merge request espressif/esp-idf!5391
2019-10-23 13:19:47 +08:00
Angus Gratton
5bec9fb010
Merge branch 'bugfix/random_en_dis_for_app' into 'master'
...
bootloader_support: Fix using shared CLK_EN and RST_EN regs for random
See merge request espressif/esp-idf!6198
2019-10-23 13:18:01 +08:00
Angus Gratton
b216e3b5c8
Merge branch 'feature/lwip_support_mdns_queries' into 'master'
...
lw-IP: support mdns queries
See merge request espressif/esp-idf!5242
2019-10-23 13:10:41 +08:00
Angus Gratton
bf1d32d008
Merge branch 'feature/esptool_v2.8' into 'master'
...
esptool: Bump to v2.8 release
See merge request espressif/esp-idf!6437
2019-10-23 06:03:00 +08:00
David Cermak
b1fbf97802
docs: quotation mark fix in recently added comment
2019-10-22 21:26:37 +02:00