He Yin Ling
6eca80a989
CI: try to use the correct branch of other projects used in CI:
...
1. revision defined in bot message
2. branch name (or tag name) of current IDF
3. CI_MERGE_REQUEST_TARGET_BRANCH_NAME
4. branch name parsed from `git describe`
5. default branch
2019-07-03 16:53:34 +08:00
He Yin Ling
81dd9d4e27
CI: use parallel attribute in CI config file
2019-07-03 16:53:34 +08:00
Krzysztof Budzynski
916df0df14
Merge branch 'bugfix/from_github' into 'master'
...
docs: PRs from GitHub containing documentation bug fixes and corrections
See merge request idf/esp-idf!5367
2019-07-03 16:26:55 +08:00
Jiang Jiang Jian
4e7a6d4762
Merge branch 'bugfix/btdm_wrong_bt_lib' into 'master'
...
components/bt: Fix Wrong bt lib from commit "Bluetooth component refactoring"
See merge request idf/esp-idf!5420
2019-07-03 15:33:55 +08:00
baohongde
60a3f3e09d
components/bt: Fix Wrong bt lib from commit "Bluetooth component refactoring"
2019-07-03 04:44:04 +00:00
Angus Gratton
3ff01d60a4
Merge branch 'fix/sdio_slave_reset_infloop_leak' into 'master'
...
sdio_slave: fix the send_flush infinite loop issue
See merge request idf/esp-idf!5365
2019-07-03 08:36:26 +08:00
Ivan Grokhotkov
6895ea1624
Merge branch 'feature/ext_flash_partition' into 'master'
...
Support for partitions in external flash
See merge request idf/esp-idf!5277
2019-07-02 22:18:14 +08:00
Ivan Grokhotkov
56a624e305
ci: add unit test job
2019-07-02 15:21:34 +02:00
Krzysztof
5aa019fce6
Replace hardcoded links with link roles
2019-07-02 21:01:52 +08:00
Wojciech Szczurek
82b3779b2b
Fix broken link to components/wifi_provisioning/proto
...
Merges https://github.com/espressif/esp-idf/pull/3668
2019-07-02 21:00:38 +08:00
Krzysztof
660eb84da7
Correct links
...
Closes https://github.com/espressif/esp-idf/issues/3723
2019-07-02 18:22:33 +08:00
Krzysztof
8d251d7369
Implement review comments
2019-07-02 18:22:33 +08:00
Stefan Venz
82ba58db22
Fix reference in jtag debugging section
...
Merges https://github.com/espressif/esp-idf/pull/3617
Signed-off-by: Stefan Venz <stefan.venz@protonmail.com>
2019-07-02 17:49:49 +08:00
fakefred
d1ceaf81ae
example/wifi/scan: fix README grammar
...
Merges https://github.com/espressif/esp-idf/pull/3678
2019-07-02 17:49:49 +08:00
boarchuz
b0168310db
Typo correction
...
Merges https://github.com/espressif/esp-idf/pull/3604
2019-07-02 17:49:49 +08:00
Ivan Grokhotkov
c730c9e397
nvs: minor host test fixes
...
Fixes the tests to pass when some files already exist.
Fixes clean target.
Moves CONFIG_NVS_ENCRYPTION definition into sdkconfig.h.
2019-07-02 10:26:06 +02:00
Ivan Grokhotkov
1c17558e6e
spi_flash: use same argument types in .h and .c files
...
Fixes compilations on targets where size_t != uint32_t
2019-07-02 10:26:06 +02:00
Ivan Grokhotkov
ec427a5b43
spi_flash: support for partitions in external flash
2019-07-02 10:26:06 +02:00
Ivan Grokhotkov
ebcb08ec89
host tests: correct definition of CONFIG_SPI_FLASH_USE_LEGACY_IMPL
2019-07-02 10:10:49 +02:00
Ivan Grokhotkov
240192f9fa
Merge branch 'bugfix/sec_boot_ota_fail' into 'master'
...
Bugfix: ota fails with secure boot on for image size greater than 3.2MB
See merge request idf/esp-idf!5263
2019-07-02 14:44:36 +08:00
Jiang Jiang Jian
be5e7e1c6d
Merge branch 'feature/nimble-provisioning' into 'master'
...
NimBLE-Provisioning: Add NimBLE support to existing BLE variant of unified provisioning
See merge request idf/esp-idf!5319
2019-07-02 14:20:11 +08:00
Prasad Alatkar
388b350f0d
NimBLE-provisioning: Add NimBLE support to unified provisioning framework
...
- Adds NimBLE stack support to existing BLE variant of unified provisioning.
- Uses scan response to send device name, 128 bit custom UUIDs based on service
UUID.
- Minimal changes to `app_prov.c`, component.mk, CMakeLists.txt and
`protocomm_ble.h` to accomodate NimBLE stack for provisioning.
2019-07-02 14:20:10 +08:00
Jiang Jiang Jian
e6623c4a7b
Merge branch 'bugfix/esp_timer_delete_from_cb' into 'master'
...
esp_timer: handle esp_timer_delete in timer task
Closes IDFGH-1143
See merge request idf/esp-idf!5037
2019-07-02 14:16:26 +08:00
Angus Gratton
4d4fef6da7
Merge branch 'nimble/update_submodule' into 'master'
...
NimBLE: Update nimble submodule
See merge request idf/esp-idf!5419
2019-07-02 11:26:24 +08:00
Prasad Alatkar
396258380a
NimBLE: update nimble submodule
...
- Update submodule to fix https://jira.espressif.com:8443/browse/BT-192 .
- Upstream PR: https://github.com/apache/mynewt-nimble/pull/427
2019-07-02 11:26:24 +08:00
Angus Gratton
55b823cd13
Merge branch 'feature/ringbuffer_support_allocate_memory' into 'master'
...
ringbuffer: support allocate memory in the ringbuffer before actually send
See merge request idf/esp-idf!5252
2019-07-02 08:41:26 +08:00
Ivan Grokhotkov
16014079f9
Merge branch 'bugfix/add_extern_c_for_sntp' into 'master'
...
lwip/sntp: Added extern "C"
See merge request idf/esp-idf!5398
2019-07-02 04:45:30 +08:00
Vikram Dattu
4b42f535ed
Add mmu pages available check in non-secure image hash check path.
...
Made MMU pages available check in `esp_image_format.c`
This now makes it possible to map and process bootoader image as well in chunks when image doesn't fit completely into available free pages.
Signed-off-by: Vikram Dattu <vikram.dattu@espressif.com>
2019-07-01 20:04:15 +00:00
Vikram Dattu
da77dcb0be
Changed log level for spi_master
...
There are lot of prints of `Allocate TX buffer for DMA`
Changed these from `ESP_LOGI` to `ESP_LOGD`
Signed-off-by: Vikram Dattu <vikram.dattu@espressif.com>
2019-07-01 20:04:15 +00:00
Vikram Dattu
eb99b27f2e
Bugfix: ota fails with secure boot on for image size greater than 3.2MB
...
When an OTA image size is larger than 50 MMU pages (approx. 3.2 MB), secure_boot_generate fails while trying to map it into memory:
https://gitlab.espressif.cn:6688/idf/esp-idf/blob/master/components/bootloader_support/src/esp32/secure_boot.c#L72
Instead of trying to map the whole image, secure boot code should split the image into chunks and map them one by one, like it is done in esp_image_format.c:
https://gitlab.espressif.cn:6688/idf/esp-idf/blob/master/components/bootloader_support/src/esp_image_format.c#L372
Closes https://jira.espressif.com:8443/browse/IDF-709
Signed-off-by: Vikram Dattu <vikram.dattu@espressif.com>
2019-07-01 20:04:15 +00:00
Ivan Grokhotkov
bca4afb466
Merge branch 'feature/idf_tools_dir_user_facing' into 'master'
...
IDF Tools directory: user facing changes
Closes IDF-61
See merge request idf/esp-idf!4808
2019-07-02 01:47:16 +08:00
Ivan Grokhotkov
22dfac7405
mconf-idf: update to v4.6.0.0-idf-20190603
2019-07-01 18:08:02 +02:00
Ivan Grokhotkov
4f5f30d37d
tools: add fallback tools.json for IDF v3.x
2019-07-01 18:08:02 +02:00
Ivan Grokhotkov
6f5c7a21ac
docs: update CMake getting started guide to use install.bat and export.bat
2019-07-01 18:08:02 +02:00
Ivan Grokhotkov
04d24c750a
tools: new installer for Windows
2019-07-01 18:08:02 +02:00
Ivan Grokhotkov
12b6da0388
tools: {install,export}.{bat,sh} tools
2019-07-01 14:51:44 +02:00
Ivan Grokhotkov
3d866694c9
tools.json: add idf.py.exe
2019-07-01 14:51:44 +02:00
Ivan Grokhotkov
916c0c5754
idf.py.exe wrapper program for Windows
2019-07-01 14:51:43 +02:00
Ivan Grokhotkov
1a2bf4d8ff
idf_tools: print additional info when download verification fails
2019-07-01 14:51:43 +02:00
Jiang Jiang Jian
a831db7ec0
Merge branch 'bugfix/fix_nimble_flake_issue' into 'master'
...
Fix failure in flake8 due to incorrect NimBLE path
See merge request idf/esp-idf!5415
2019-07-01 19:22:55 +08:00
Hrishikesh Dhayagude
a32534497c
Fix failure in flake8 due to incorrect NimBLE path
2019-07-01 19:22:55 +08:00
Jiang Jiang Jian
d4276f2242
Merge branch 'enhancement/move_bt_examples' into 'master'
...
Bluetooth examples restructuring
See merge request idf/esp-idf!4025
2019-07-01 19:21:57 +08:00
Hrishikesh Dhayagude
cba69dd088
Bluetooth examples restructuring
...
The existing Bluetooth examples are split as:
1. examples/bluetooth/bluedroid - Bluedroid Host (BT + BLE) examples
a. examples/bluetooth/bluedroid/classic_bt - Classic BT examples
b. examples/bluetooth/bluedroid/ble - BLE examples
c. examples/bluetooth/bluedroid/coex - Classic BT and BLE coex examples
d. examples/bluetooth/bluedroid/hci - VHCI and HCI UART examples
i. Rename ble_adv to controller_vhci_ble_adv and move it in hci folder
2. examples/bluetooth/nimble - NimBLE BLE Host + NimBLE Mesh examples
3. examples/bluetooth/esp_ble_mesh - ESP BLE Mesh examples
4. Update documentation references
2019-07-01 19:21:57 +08:00
Angus Gratton
f8d2188e93
Merge branch 'bugfix/win_flash_app_cmd' into 'master'
...
tools: Accept CTRL-T + A for app-flash in idf_monitor
Closes IDF-736
See merge request idf/esp-idf!5376
2019-07-01 15:51:44 +08:00
Angus Gratton
9ef37270f6
Merge branch 'bugfix/make_ccache_opt_in' into 'master'
...
cmake: make use of ccache opt-in
See merge request idf/esp-idf!5368
2019-07-01 15:48:31 +08:00
Angus Gratton
e7064df8e7
Merge branch 'bugfix/confgen_windows_command_line' into 'master'
...
cmake kconfig: Pass environment variables to confgen.py via a file
Closes IDF-711
See merge request idf/esp-idf!5356
2019-07-01 15:26:11 +08:00
Angus Gratton
f1e07663c4
cmake: Use environment variables file for all config binaries
2019-07-01 15:54:27 +10:00
Angus Gratton
26db058339
cmake kconfig: Pass environment variables to confgen.py via a file
...
Works around "command line too long" errors when using Windows
and CMake < 3.11
Closes IDF-711
2019-07-01 15:54:10 +10:00
Michael (XIAO Xufeng)
687908b1e9
ringbuffer: support to allocate memory on the ringbuffer before send
2019-07-01 11:41:50 +08:00
Michael (XIAO Xufeng)
c5150d16b2
ringbuffer: seperate acquire from send
2019-07-01 11:40:45 +08:00