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
18bea96bf5
esp32: verify that RTC_NOINIT_ATTR vars are preserved after WDT reset
...
Related to https://github.com/espressif/esp-idf/issues/2973
2019-07-01 20:55:10 +00: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
Angus Gratton
0c8192f3be
Merge branch 'feature/mconf_simple_expand' into 'master'
...
mconf-idf: Use same 'simple expand' logic, same as kconfig-frontends
See merge request idf/esp-idf!5390
2019-07-01 10:33:35 +08:00
Angus Gratton
bd69998516
mconf-idf: Use same 'simple expand' logic, same as kconfig-frontends
...
Previously, wordexp() was used. However for providing Windows builds
of mconf-idf we can't use wordexp() so we use this simplified
environment variable expansion code instead.
The reasoning here is to make the behaviour consistent across Windows
(CMake vs GNU Make), Linux & macOS mconf.
2019-07-01 00:38:55 +00:00
Jiang Jiang Jian
70474ae844
Merge branch 'feature/btdm_avrcp_volume' into 'master'
...
components/bt: Add AVRCP feature about volume
See merge request idf/esp-idf!5209
2019-06-30 16:40:10 +08:00
Jiang Jiang Jian
f1b8723996
Merge branch 'refactor/new_bt_component' into 'master'
...
Bluetooth component refactoring
See merge request idf/esp-idf!5366
2019-06-30 16:39:01 +08:00
Hrishikesh Dhayagude
21165edf41
Bluetooth component refactoring
2019-06-30 16:39:00 +08:00
Jiang Jiang Jian
66e333e352
Merge branch 'feature/move_supplicant_to_idf_new' into 'master'
...
supplicant/wifi: move supplicant to idf
Closes IDFGH-1233 and WIFI-392
See merge request idf/esp-idf!5219
2019-06-30 14:02:22 +08:00
baohongde
30d7002731
components/bt: Add AVRCP feature about volume
2019-06-30 03:46:15 +00:00
Deng Xin
c139683024
supplicant/esp_wifi: move supplicant to idf
...
Move supplicant to idf and do following refactoring:
1. Make the folder structure consitent with supplicant upstream
2. Remove duplicated header files and minimize the public header files
3. Refactor for WiFi/supplicant interfaces
2019-06-29 22:46:52 +08:00
Renz Christian Bagaporo
72a5762525
cmake: make use of ccache opt-in
2019-06-29 00:22:57 +00:00
Ivan Grokhotkov
39a5fbdfee
Merge branch 'bugfix/idf_py_fix_subcommand_options' into 'master'
...
idf.py: Fix subcommand options
Closes IDF-740
See merge request idf/esp-idf!5386
2019-06-29 00:15:13 +08:00
Ivan Grokhotkov
dcd5e9cf08
Merge branch 'bugfix/ci_fix_mirror-submodule-update' into 'master'
...
tools: Keep script behaviour
See merge request idf/esp-idf!5362
2019-06-28 23:57:14 +08:00
Renz Christian Bagaporo
4848dfa710
esptool_py: use component property to simplify arg file generation
...
esptool_py used to create its own custom target to attach properties to.
This commit uses component properties instead, and the APIs used to set
and retrieve those properties in order to simplify generation of
argument files to esptool.py.
2019-06-28 18:14:25 +08:00
Angus Gratton
c165335554
Merge branch 'bugfix/make_V_flag' into 'master'
...
gnu make: Make V= behaviour consistent with V=0
Closes IDFGH-1175
See merge request idf/esp-idf!5334
2019-06-28 16:39:44 +08:00
Sergei Silnov
56db269fb5
idf.py: Fix subcommand options
2019-06-28 10:07:38 +02:00
Angus Gratton
265d7dc4e5
Merge branch 'bugfix/fix_secure_boot_support' into 'master'
...
Fixes to secure boot support in CMake
See merge request idf/esp-idf!4977
2019-06-28 15:38:59 +08:00
Angus Gratton
d9ca915fa4
Merge branch 'bugfix/cmake_project_vars_not_set_by_redefinition' into 'master'
...
cmake: set variables set by project call
See merge request idf/esp-idf!5187
2019-06-28 15:31:10 +08:00
Kerry Jones
28d79e242f
lwip/sntp: Added extern "C"
...
so that sntp_set_time_sync_notification_cb can be used from c++
Signed-off-by: Konstantin Kondrashov <konstantin@espressif.com>
Merges: https://github.com/espressif/esp-idf/pull/3700
2019-06-28 14:51:28 +08:00
Angus Gratton
d96379ba0f
Merge branch 'feature/nvs_util_decryption' into 'master'
...
nvs_util: Add NVS decryption feature + Optimisations
See merge request idf/esp-idf!5003
2019-06-28 13:07:24 +08:00
Jiang Jiang Jian
936720d3ef
Merge branch 'feature/add_limitation_for_max_tx_power' into 'master'
...
esp_wifi: add limitation for setting maximum WiFi TX power
See merge request idf/esp-idf!5331
2019-06-28 11:18:11 +08:00
Anton Maklakov
e5de1991d4
tools: Keep script behaviour
2019-06-28 10:05:31 +07:00
Renz Christian Bagaporo
67909fe2a0
ci: test fail on build time works
2019-06-28 10:54:21 +08:00