Krzysztof Budzynski
c94339c559
Merge branch 'doc/fatal_errors_zh_CN' into 'master'
...
zh_CN translation of fatal-errors
See merge request espressif/esp-idf!4418
2019-07-04 15:00:16 +08:00
suda-morris
471f4b2f0e
zh_CN translation of fatal_error
2019-07-04 14:01:53 +08:00
Angus Gratton
533c080bc1
Merge branch 'bugfix/cmake_mconf_build' into 'master'
...
cmake: Fix some bugs building mconf-idf from scratch
See merge request espressif/esp-idf!5413
2019-07-04 13:38:20 +08:00
Krzysztof Budzynski
0794a26f7b
Merge branch 'doc/merge_make-related_documents' into 'master'
...
Merge make-related documents:
See merge request espressif/esp-idf!5304
2019-07-04 13:16:18 +08:00
Wang Fang
b24341a664
Merge make-related documents:
...
1. Moved get-started files, 7 documents in total, from get-started-cmake folder to hw-reference folder;
2. Deleted get-started files, 7 documents in total, in get-started folder;
3. Updated links in get-started-cmake/index.rst and in get-started/index.rst;
4. Modified descriptions for build system in these files.
2019-07-04 13:16:18 +08:00
Ivan Grokhotkov
b293518ec7
Merge branch 'feature/optimize_ci_config_file' into 'master'
...
CI: use features from latest Gitlab in CI config file
See merge request idf/esp-idf!4896
2019-07-04 10:56:45 +08:00
Mahavir Jain
28f1cdf5ed
Merge branch 'feature/local_ctrl_no_sec' into 'master'
...
ESP Local Ctrl Feature Added
See merge request idf/esp-idf!5348
2019-07-04 00:45:29 +08:00
Anurag Kar
b75f8b1b20
ESP Local Control Feature Added
...
List of changes:
* New component esp_local_ctrl added
* Example added under examples/protocols/esp_local_ctrl
* Documentation added under protocols/esp_local_ctrl
* Demo client side app esp_local_ctrl.py added under examples/protocols/esp_local_ctrl/scripts
* protocomm_ble : protocomm_ble_config_t given struct name for allowing forward declaration
* esp_prov/transport_softap renamed to transport_http
* transport_http module supports verification of server certificate
* transport_http module performs name resolution before connection
2019-07-03 21:31:04 +05:30
Angus Gratton
c5c853a8ca
Merge branch 'bugfix/vfs_kconfig' into 'master'
...
VFS: Fix Kconfig prefix
See merge request idf/esp-idf!5431
2019-07-03 17:21:33 +08:00
Ivan Grokhotkov
a1ae89f8e2
Merge branch 'bugfix/bt_config_option_test' into 'master'
...
Fix the irrelevant characters added to test the config options
See merge request idf/esp-idf!5436
2019-07-03 17:17:15 +08:00
Hrishikesh Dhayagude
daa71d5e18
Fix the irrelevant characters added to test the config options
2019-07-03 17:17:14 +08:00
He Yin Ling
e390dd3eab
CI: use `include` to split large CI config file
2019-07-03 16:59:50 +08:00
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
Ivan Grokhotkov
47da3d3334
Merge branch 'bugfix/idf_py_reconfigure_for_ccache_flag' into 'master'
...
idf.py: Run reconfigure on ccache option change.make --no-ccache default
See merge request idf/esp-idf!5429
2019-07-03 16:51:12 +08:00
Jiang Jiang Jian
1e7ffbf943
Merge branch 'bugfix/uuid_value' into 'master'
...
Correct UUID value for ESP_GATT_UUID_ENVIRONMENTAL_SENSING_SVC
See merge request idf/esp-idf!5409
2019-07-03 16:49:30 +08:00
Hrishikesh Dhayagude
46a268dc78
Correct UUID value for ESP_GATT_UUID_ENVIRONMENTAL_SENSING_SVC
2019-07-03 16:49:30 +08:00
Angus Gratton
2639d5b6c3
cmake: Fix some bugs building mconf-idf from scratch
...
- Makefile didn't quite work with out-of-tree build unless there was already an in-tree build done.
- CMake needs to delete some of the in-tree build artifacts or they're used instead of the correct
files.
2019-07-03 18:40:55 +10: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
Roland Dobai
43eb58da99
VFS: Fix Kconfig prefix
2019-07-02 17:17:18 +02: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
Sergei Silnov
b7ca18edcd
idf.py Run reconfigure on ccache option change.make --no-ccache default
2019-07-02 13:37:55 +02: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