Angus Gratton
5ce95f2bfd
Merge branch 'bugfix/ci_weekend_test_update' into 'master'
...
CI: weekend test fixes
See merge request espressif/esp-idf!6235
2019-10-14 15:30:33 +08:00
Angus Gratton
92a507c0aa
Merge branch 'bugfix/ws_client_fix_event_blocking' into 'master'
...
ws_client: fixed posting to event loop with websocket timeout
See merge request espressif/esp-idf!5901
2019-10-14 15:17:34 +08:00
Angus Gratton
5d59895067
Merge branch 'bugfix/ws_client_fixed_path_query_uri' into 'master'
...
websocket_client: fix URI parsing to include also query part in websocket connection path
See merge request espressif/esp-idf!6201
2019-10-14 15:01:59 +08:00
Angus Gratton
d4edc6a40a
Merge branch 'bugfix/mdns_answer_ip6_size' into 'master'
...
mdns: use constant size of AAAA answer instead of lw_IP struct size
Closes WIFI-771
See merge request espressif/esp-idf!6188
2019-10-14 14:59:16 +08:00
baohongde
e1d61d03de
components/bt: Fix LMP sniff req timeout
2019-10-14 14:56:07 +08:00
David Cermak
555cc11a25
tcp_transport: fix possible buffer overflow in ws transport connect
...
closes IDF-692
2019-10-14 06:50:22 +00:00
suda-morris
84c72863e1
add netbios support in restful server example
2019-10-14 14:26:43 +08:00
David Cermak
640eac84fa
mqtt: updated to latest version to include latest fixes, support for global CA store, extended error structure to receive mqtt specific errors. updated idf ssl example to use this error struct
...
https://github.com/espressif/esp-mqtt/issues/135
2019-10-14 06:26:14 +00:00
Ivan Grokhotkov
31dac92e5f
ethernet: support OpenCores ethernet MAC
...
OpenCores Ethernet MAC has a relatively simple interface, and is
already supported in QEMU. This makes it a good candidate for enabling
network support when running IDF apps in QEMU, compared to the
relatively more complex task of writing a QEMU model of ESP32 EMAC.
This driver is written with QEMU in mind: it does not implement or
handle things that aren't implemented or handled in the QEMU model:
error flags, error interrupts. The transmit part of the driver also
assumes that the TX operation is done immediately when the TX
descriptor is written (which is the case with QEMU), hence waiting for
the TX operation to complete is not necessary.
For simplicity, the driver assumes that the peripheral register
occupy the same memory range as the ESP32 EMAC registers, and the
same interrupt source number is used.
2019-10-13 17:05:26 +02:00
Ivan Grokhotkov
6e423d5cf6
drivers/can: fix skipped function calls when assertions disabled
...
When CONFIG_FREERTOS_ASSERT_DISABLE is set, the function calls wrapped
inside the assertion macros would be removed from the code.
Closes https://github.com/espressif/esp-idf/issues/4143
2019-10-13 15:37:19 +02:00
Ivan Grokhotkov
0be585179e
spiffs: fix warning when building at release optimization level
...
Closes https://github.com/espressif/esp-idf/issues/4144
2019-10-13 15:37:19 +02:00
Ivan Grokhotkov
499d087c91
C++: add provisions for optional RTTI support
...
Ref. https://github.com/espressif/esp-idf/issues/1684
This change allows RTTI to be enabled in menuconfig. For full RTTI
support, libstdc++.a in the toolchain should be built without
-fno-rtti, as it is done now.
Generally if libstdc++.a is built with RTTI, applications which do not
use RTTI (and build with -fno-rtti) could still include typeinfo
structures referenced from STL classes’ vtables. This change works
around this, by moving all typeinfo structures from libstdc++.a into
a non-loadable section, placed into a non-existent memory region
starting at address 0. This can be done because when the application
is compiled with -fno-rtti, typeinfo structures are not used at run
time. This way, typeinfo structures do not contribute to the
application binary size.
If the application is build with RTTI support, typeinfo structures are
linked into the application .rodata section as usual.
Note that this commit does not actually enable RTTI support.
The respective Kconfig option is hidden, and will be made visible when
the toolchain is updated.
2019-10-13 14:46:44 +02:00
Mahavir Jain
99659091fb
bootloader_support: fix logging prints around chip revision
2019-10-11 14:35:22 +05:30
Angus Gratton
420ee45279
Merge branch 'feature/handle_icy_uris' into 'master'
...
Modified http_parser to handle ICY uris.
See merge request espressif/esp-idf!6207
2019-10-11 14:06:16 +08:00
Angus Gratton
9f9cc717e3
Merge branch 'refactor/ethernet_remove_blocking_in_timer_callback' into 'master'
...
Ethernet: optimize and bugfix
Closes IDF-1051
See merge request espressif/esp-idf!6213
2019-10-11 13:07:38 +08:00
Vikram Dattu
742d4689dd
Modified http_parser to handle ICY uris.
...
ICY URIs e.g `http://uk1.internet-radio.com/proxy/vombat?mp=/ ;` need to
be handled differently.
For basic use case, these URIs are similar to HTTP with exception that they reply with `ICY 200` etc in place of `HTTP/1.1 200`.
In http_parser, we now also parse ICY URIs to be able to handle these similar to HTTP.
Signed-off-by: Vikram Dattu <vikram.dattu@espressif.com>
2019-10-11 05:04:08 +00:00
Hu Chao Ru
fc018987eb
add wifi init unit test cases
2019-10-11 13:00:57 +08:00
Angus Gratton
51b4e97e42
Merge branch 'fix/cmake_req_private_comp' into 'master'
...
cmake: Fix cmakelists to add required private components
See merge request espressif/esp-idf!5428
2019-10-11 12:58:45 +08:00
suda-morris
13c128fd31
Ethernet: optimize and bugfix
...
1. simplify deallocate in esp_eth_mac_new_esp32, esp_eth_mac_new_dm9051
2. remove blocking operation in os timer callback
3. check buffer size in ethernet receive function
2019-10-11 12:15:17 +08:00
suda-morris
f0bfd33a10
ethernet: fix crash in unit test
2019-10-11 02:14:12 +00:00
lly
35353de137
ble_mesh: fix not callback net_key when device is provisioned
2019-10-11 09:51:02 +08:00
liu zhifu
0e3cdce8f7
esp_wifi: fix the bug that wpa2 enterprise sta can connect open AP
2019-10-11 09:39:35 +08:00
Roland Dobai
19c644f7fd
Fix memory leak upon failure of esp_vfs_fat_sdmmc_mount()
...
Closes https://github.com/espressif/esp-idf/issues/4165
2019-10-10 14:28:43 +00:00
Jiang Jiang Jian
25c55405d4
Merge branch 'bugfix/wifi_lib_ci' into 'master'
...
ci: fix ci issues of wifi lib
See merge request espressif/esp-idf!6288
2019-10-10 22:25:36 +08:00
Prasad Alatkar
19375a674e
NimBLE: Misc changes in NimBLE porting layer and menuconfig option
...
- Minor fix to remove while loop & delay while transmitting data from
host to controller.
- Add menuconfig option to enable predefined public-private keypair for
debugging (Vol. 3, Part H, 2.3.5.6.1)
2019-10-10 17:20:15 +08:00
Angus Gratton
ae236c33a2
Merge branch 'bugfix/ut_adjtime' into 'master'
...
newlib: Fix UT - test time adjustment happens linearly
See merge request espressif/esp-idf!6245
2019-10-10 11:08:46 +08:00
Angus Gratton
6df8658b5b
Merge branch 'bugfix/fixes_from_kconfiglib_update' into 'master'
...
Fix of menuconfig bug for MSYS2 and a couple of cosmetic changes
See merge request espressif/esp-idf!6255
2019-10-10 11:06:29 +08:00
Ivan Grokhotkov
751b60b171
Merge branch 'feature/add_psram_workaround_option' into 'master'
...
make psram workaround depend on chip revison
Closes IDF-1004
See merge request espressif/esp-idf!6113
2019-10-09 23:41:09 +08:00
Aditya Patwardhan
3e9a054626
ESP32/coap_mbedtls:add macro checks
...
Closes https://github.com/espressif/esp-idf/issues/4156
2019-10-09 16:46:46 +08:00
chenyudong
c6129b81f2
ci: fix ci issues of wifi lib
...
sync esp_wifi.h to wifi lib
2019-10-09 15:07:19 +08:00
Renz Christian Bagaporo
a986283997
spiffs: follow symlinks in host test
2019-10-08 17:55:59 +08:00
Marcin Borowicz
6153a0ab62
spiffs: follow symlinks feature during partition in spiffsgen
2019-10-08 17:55:59 +08:00
lly
673f58fe03
ble_mesh: fix not restoring ble mesh cfg value
2019-10-08 16:34:05 +08:00
Ivan Grokhotkov
46a65a35d6
Merge branch 'bugfix/missing_build_targets_cmake' into 'master'
...
esptool_py: add missing phony build targets for CMake
Closes IDFGH-370
See merge request espressif/esp-idf!5838
2019-10-08 16:24:40 +08:00
Ivan Grokhotkov
416d14ca6b
Merge branch 'feat/spi_internal_header' into 'master'
...
spi: move deprecated functions into internal header
See merge request espressif/esp-idf!5985
2019-10-08 16:19:46 +08:00
Ivan Grokhotkov
b61c3d5d0f
Merge branch 'bugfix/examples_disconnect_before_restart' into 'master'
...
examples: disconnect from Wi-Fi before restart (and don't try to reconnect!)
See merge request espressif/esp-idf!6267
2019-10-08 16:16:25 +08:00
Roland Dobai
d3ed17acd7
Cosmetic Kconfig fixes
2019-10-08 08:11:53 +00:00
KonstantinKondrashov
267ca19ae8
bootloader: Fix dram_seg
2019-10-08 16:07:53 +08:00
weitianhua
9f0a44f5c0
component/bt: Fix bugs in HFP feature
2019-10-08 07:07:45 +00:00
Angus Gratton
8c1f3cb6b2
Merge branch 'feature/esp32s2beta_isr_table' into 'feature/esp32s2beta'
...
soc: Add interrupt numbers mapping for esp32s2beta
See merge request espressif/esp-idf!6204
2019-10-08 12:45:26 +08:00
Angus Gratton
1fb461a24c
Merge branch 'feature/esp32s2beta_fix_test_posix_timers_clock' into 'feature/esp32s2beta'
...
newlib: Fix test_posix_timers_clock for esp32s2beta
See merge request espressif/esp-idf!6170
2019-10-08 12:43:20 +08:00
Angus Gratton
4d7c955041
Merge branch 'bugfix/freertos_xTaskNotifyGive' into 'master'
...
freertos: remove semicolon in xTaskNotifyGive
See merge request espressif/esp-idf!6208
2019-10-08 12:21:40 +08:00
Michael (XIAO Xufeng)
afbe1ba878
spi: move deprecated functions into internal header
...
Resolves https://github.com/espressif/esp-idf/issues/4132
2019-10-08 11:51:39 +08:00
GOPTIONS\pfrost
23e9224be6
log: Add menuconfig option to log system time rather than RTOS time
...
Merges https://github.com/espressif/esp-idf/pull/3958
2019-10-08 12:03:45 +11:00
Ivan Grokhotkov
5768102d4e
esp_wifi: fix typo in comments (ESP_ERR_WIFI_NOT_STARTED)
2019-10-07 16:48:32 +02:00
David Cermak
271e6c4c9c
websocket_client: fix URI parsing to include also query part in websocket connection path
...
closes https://github.com/espressif/esp-idf/issues/4090
2019-10-07 16:40:38 +02:00
Ivan Grokhotkov
f0563b3844
system_api: call shutdown handlers in reverse order
...
Similar to how destructors should be called in reverse order to the
constructors.
2019-10-07 16:36:18 +02:00
David Cermak
50505068c4
ws_client: fixed posting to event loop with websocket timeout
...
Executing event loop `esp_event_loop_run()` with timeout causes delays in receiving events from user code. Fixed by removing the timeout to post synchronously.
closes https://github.com/espressif/esp-idf/issues/3957
2019-10-07 16:34:51 +02:00
Ivan Grokhotkov
d77a7c23da
Merge branch 'bugfix/ws_client_fixes' into 'master'
...
ws_client: various fixes
See merge request espressif/esp-idf!5879
2019-10-07 20:05:41 +08:00
Aditya Patwardhan
9f86f969b2
ESP32/esp-tls: include esp_err.h in esp_tls.h
...
Closes https://github.com/espressif/esp-idf/issues/4100
2019-10-07 19:47:32 +08:00
KonstantinKondrashov
0c44f8ccbd
esp32: Using periph_module_enable instead of the shared regs.
2019-10-07 06:47:00 +00:00
KonstantinKondrashov
807826f796
bootloader_support: Fix using shared CLK_EN and RST_EN regs for random
...
bootloader_random_enable() and bootloader_random_disable() functions
can be used in app.
This MR added the protection for shared CLK_EN and RST_EN registers.
2019-10-07 06:47:00 +00:00
Mahavir Jain
2f38a1a362
Merge branch 'bugfix/set_url_discards_username_password' into 'master'
...
fixes : set_url discards username and password
Closes IDFGH-1586
See merge request espressif/esp-idf!5694
2019-10-04 13:48:55 +08:00
ganeshlandge
9fd16c6a5f
fixes : set_url discards username and password
2019-10-04 10:42:43 +05:30
Ivan Grokhotkov
569ad7545c
esp_event, mdns: fixes for CONFIG_ETH_ENABLED=n
2019-10-03 10:52:53 +02:00
Ivan Grokhotkov
6bddcdac67
bootloader: move esp32 specific code from bootloader_common
...
Also implements bootloader_clock_get_rated_freq_mhz for esp32s2beta.
Closes IDF-758
2019-10-03 09:38:13 +02:00
David Cermak
de6ea396f1
ws_client: added subprotocol configuration option to websocket client
...
closes https://github.com/espressif/esp-idf/issues/3893
2019-10-03 07:33:32 +02:00
David Cermak
c0ba9e19fc
ws_client: fixed path config issue when ws server configured using host and path instead of uri
...
closes https://github.com/espressif/esp-idf/issues/3892
2019-10-03 07:33:32 +02:00
David Cermak
adee25d90e
ws_client: fixed transport config option when server address configured as host, port, transport rather then uri
...
closes https://github.com/espressif/esp-idf/issues/3891
2019-10-03 07:33:32 +02:00
David Cermak
ea955e1efc
ws_client: fix ping-pong mechanism to use mask, support reception of zero-payload PONG and sending non-zero-payload PING
...
Closes https://github.com/espressif/esp-idf/issues/3890
Closes https://github.com/espressif/esp-idf/issues/4138
2019-10-03 07:32:17 +02:00
Ivan Grokhotkov
e4fda32726
Merge branch 'feature/uart_isr_iram' into 'master'
...
uart: add option to put ISR in IRAM
Closes IDF-893
See merge request espressif/esp-idf!5905
2019-10-03 01:21:56 +08:00
Ivan Grokhotkov
5830f529d8
Merge branch 'master' into feature/esp32s2beta_merge
2019-10-02 19:01:39 +02:00
suda-morris
f94711c316
uart: add option to put ISR in IRAM
2019-10-02 16:43:02 +00:00
Roland Dobai
15857d9cbb
Handle deprecated values in sdkconfig.defaults
...
The issue was pointed out also in
https://github.com/espressif/esp-idf/issues/4092
2019-10-02 16:29:25 +00:00
Ivan Grokhotkov
adbf0bff53
Merge branch 'bugfix/ext_flash_load_partitions' into 'master'
...
spi_flash: ensure partition table loaded when esp_partition_register_external is called
Closes IDFGH-1916
See merge request espressif/esp-idf!6244
2019-10-02 18:50:54 +08:00
Mahavir Jain
3f9b0d8c2a
nghttp: move config.h to private_include dirs
2019-10-01 11:19:44 +00:00
KonstantinKondrashov
737ab91742
newlib: Fix UT - test time adjustment happens linearly
2019-10-01 03:09:22 +08:00
Ivan Grokhotkov
ccde8c7d2f
spi_flash: load partition table before adding an external partition
...
esp_partition_register_external did not call load_partitions, so if
it was called before any call to esp_partition_find, then the main
partition table would never be loaded. Introduce new function,
ensure_partitions_loaded, and call it both from esp_partition_find and
esp_partition_register_external.
Closes https://github.com/espressif/esp-idf/issues/4116
2019-09-30 16:11:09 +02:00
Jiang Jiang Jian
1c1108d47b
Merge branch 'bugfix/coex_fix_some_bugs' into 'master'
...
fix some coexist bugs
See merge request espressif/esp-idf!5200
2019-09-30 16:59:19 +08:00
David Cermak
d735f1d58d
ci: fix weekend test confguration update per latest refactoring of
...
grouping tests
2019-09-30 09:51:41 +02:00
Prasad Alatkar
fe08f435dc
NimBLE: Add optional mbedTLS support to NimBLE
...
- Additional menuconfig option to select either mbedTLS or Tinycrypt from NimBLE.
- Addition of `CMAC` and `ECP_RESTARTABLE` to mbedTLS menuconfig option and
`esp_config.h`.
- Changes NimBLE `component.mk` and `CMakeLists.txt` to support mbedTLS option.
- Minor changes to `app_mesh.c` application.
2019-09-30 14:15:43 +08:00
Xia Xiaotian
63019689d6
Coexist: fix some coexist bugs
...
1. Fix high beacon and broadcast packets loss ratio of WiFi to make
MDNS test pass.
2. Improve stability of WiFi performance with a little
sacrifice of throughput.
3. Improve BLE advertising and connection performance with dynamic
priority. It sacrifices a little WiFi throughput, but achieves balance
between WiFi and Bluetooth.
2019-09-30 11:49:16 +08:00
Jiang Jiang Jian
ef5c3f3564
Merge branch 'bugfix/fix_wifi_stop_leads_to_watchdog' into 'master'
...
esp_wifi: fix the bug that WiFi stop leads task watchdog
Closes WIFI-526 and WIFI-746
See merge request espressif/esp-idf!5830
2019-09-30 10:53:37 +08:00
zhangyanjiao
53d57dd736
esp_wifi:
...
1. Fixed smartconfig ipc crash
2. Fix the WiFi init sequence bug
3. Fixed the bug that WiFi stop leads to task watchdog
2019-09-29 10:44:49 +08:00
Jiang Jiang Jian
9ef656fafd
Merge branch 'bugfix/ble_mesh_client_invalid_addr_access' into 'master'
...
ble_mesh: fix client model invalid address access
See merge request espressif/esp-idf!6212
2019-09-29 10:23:51 +08:00
Jiang Jiang Jian
f44b4911ad
Merge branch 'bugfix/fix_cache_disable_access_psram' into 'master'
...
esp_wifi: Put g_promis_buf to IRAM
See merge request espressif/esp-idf!6142
2019-09-29 10:08:17 +08:00
Ivan Grokhotkov
4dac7c7df8
Merge branch 'refactor/shrink_bootloader_bin_size' into 'master'
...
bootloader: shrink bin size
Closes IDF-1043
See merge request espressif/esp-idf!6194
2019-09-28 01:40:46 +08:00
Ivan Grokhotkov
c496268b10
Merge branch 'feature/load_elf' into 'master'
...
Support ELF files loadable with gdb
Closes IDF-335
See merge request espressif/esp-idf!5779
2019-09-27 19:36:25 +08:00
suda-morris
cbab3c34f8
bootloader: shrink bin size
...
1. write a bootloader version of "getting chip revision" function.
2. reduce wordy log.
2019-09-27 10:58:30 +08:00
Ivan Grokhotkov
9c4b4aec62
Merge branch 'feature/enable_ethernet_unit_test' into 'master'
...
enable Ethernet unit test
Closes IDF-959
See merge request espressif/esp-idf!6144
2019-09-26 21:28:13 +08:00
lly
7a450222f5
ble_mesh: fix client model invalid address access
2019-09-26 20:11:22 +08:00
suda-morris
e381cec35a
freertos: remove semicolon in xTaskNotifyGive
2019-09-26 15:27:48 +08:00
xiehang
6fde73cdc4
esp_wifi: Put g_promis_buf to IRAM
2019-09-26 02:26:10 +00:00
KonstantinKondrashov
3e18681555
app_trace: Adds general support esp32s2beta chip
2019-09-26 01:03:06 +08:00
KonstantinKondrashov
c5c41eab46
soc: Add interrupt numbers mapping for esp32s2beta
...
Closes: IDF-999
2019-09-26 00:22:36 +08:00
Jiang Jiang Jian
3d8798f745
Merge branch 'bugfix/kconfig_corrections' into 'master'
...
Fix Kconfig issues discovered by upstream Kconfiglib
See merge request espressif/esp-idf!6183
2019-09-25 16:26:18 +08:00
Jiang Jiang Jian
ac0d2dc534
Merge branch 'bugfix/ble_mesh_queue_task_init_check' into 'master'
...
ble_mesh: check ble mesh queue and task init status
See merge request espressif/esp-idf!6192
2019-09-25 15:08:05 +08:00
suda-morris
7c8c9cbb68
ethernet: enable unit test
2019-09-25 11:58:16 +08:00
Prasad Alatkar
2c3648b619
BT/Bluedroid : Add support to set min encryption key requirement
...
- Modifies `smp_utils.c` to add check on encryption key size received from
peer.
- Modifies `esp_ble_gap_set_security_param` API to add minimum encryption key
size requirement.
2019-09-25 11:56:47 +08:00
Jiang Jiang Jian
a2b65e1649
Merge branch 'bugfix/btdm_loop_in_feature_req_ext' into 'master'
...
components/bt: Fix sending LMP_features_req_ext in a loop
See merge request espressif/esp-idf!6022
2019-09-25 11:51:53 +08:00
lly
0792a2fde8
ble_mesh: check ble mesh queue and task init status
2019-09-25 11:09:40 +08:00
David Cermak
e5e31c5d01
mdns: use constant size of AAAA answer in mdns packets instead of deriving from lwip struct size, since the struct could contain also zones
...
closes WIFI-771
2019-09-24 12:12:58 +02:00
Roland Dobai
5a916ce126
Support ELF files loadable with gdb
2019-09-24 07:19:50 +00:00
Shivani Tipnis
38ccf5f28b
cmake: Fix cmakelists to add required private components
...
Fixes: https://github.com/espressif/esp-idf/issues/3710
2019-09-24 10:46:26 +05:30
Roland Dobai
833822c10b
Fix Kconfig issues discovered by upstream Kconfiglib
2019-09-23 16:10:57 +02:00
KonstantinKondrashov
c4da959fa7
soc: Fix setting timeout for RTC_WDT
2019-09-23 14:57:26 +08:00
Ivan Grokhotkov
363e41eadf
Merge branch 'bugfix/make_cxx_depend_on_pthread' into 'master'
...
cxx: force pthread to appear later in link line
See merge request espressif/esp-idf!6124
2019-09-23 12:42:50 +08:00
Angus Gratton
b0bd4d0f14
Merge branch 'fix/esp_flash_adapter_in_iram' into 'master'
...
esp_flash: put adapter to legacy functions into IRAM to be back-compatible
See merge request espressif/esp-idf!6135
2019-09-20 18:21:58 +08:00
Angus Gratton
a68b400b9a
Merge branch 'refactor/update_spi_ethernet_api' into 'master'
...
ethernet: update spi ethernet api
See merge request espressif/esp-idf!6123
2019-09-20 18:15:25 +08:00
Angus Gratton
f7d80ed9da
Hello world example: Print ESP32-S2 Beta for esp32s2beta target
2019-09-20 17:07:34 +10:00
KonstantinKondrashov
db84ba868c
efuse: Add support for esp32s2beta
...
Updated:
- CI test_esp32s2beta_efuse_table_on_host.
- efuse_table_gen.py.
- esp_efuse_table.csv file and generated headers files.
- splitted esp32 and esp32s2beta parts.
- unit tests and api efuse.
2019-09-20 16:59:46 +10:00
KonstantinKondrashov
6257828348
app_update: Add support esp32s2beta
2019-09-20 16:57:33 +10:00
KonstantinKondrashov
6f102125b4
bootloader: Add support esp32s2beta
2019-09-20 16:57:33 +10:00
KonstantinKondrashov
d06b2a3598
esp32s2beta: Add support esp32s2beta
...
Added reading MAC address
Closes: IDF-756
2019-09-20 16:57:27 +10:00
Jiang Jiang Jian
a469c179f8
Merge branch 'bugfix/fix_the_for_smartconfig_send_broadcast_to_phone' into 'master'
...
fix the bug that ESP32 sends broadcast to phone after smartconfig is done
Closes WIFI-1115
See merge request espressif/esp-idf!6071
2019-09-20 14:01:59 +08:00
KonstantinKondrashov
a25841bc9a
newlib: Fix test_posix_timers_clock for esp32s2beta
2019-09-20 14:01:22 +08:00
Wang Fang
32adfdc307
Add Chinese translation for the 2nd batch of the files in storage folder in api-reference.
...
1. The translation should be first reviewed by technical reviewers;
2. and then by language reviewers.
For the translation for the first batch of files, please see !MR5620 and !MR5613
2019-09-20 12:32:55 +08:00
Angus Gratton
adfc06a530
Merge branch 'master' into feature/esp32s2beta_merge
2019-09-20 10:28:37 +10:00
Angus Gratton
83680bd96b
Merge branch 'feature/esp32s2beta' into feature/esp32s2beta_merge
2019-09-19 21:08:20 +10:00
suda-morris
546ac64a9e
ethernet: update spi-ethernet api
2019-09-19 09:41:21 +00:00
Jiang Jiang Jian
d78831ab2b
Merge branch 'bugfix/remove_v40_deprecations' into 'master'
...
Remove features deprecated before ESP-IDF V4.0
Closes IDF-507
See merge request espressif/esp-idf!5841
2019-09-19 16:07:01 +08:00
suda-morris
77eb32b710
make psram workaround depend on chip revison
...
Since ESP32 revision 3, the PSRAM workaround is not needed.
2019-09-19 13:20:34 +08:00
Angus Gratton
bcaaaa1632
Merge branch 'feature/esp32s2beta_wdt' into 'feature/esp32s2beta'
...
esp32s2beta: Re-enable interrupt WDT, RTC_WDT, Task wdt
See merge request espressif/esp-idf!5786
2019-09-19 11:10:58 +08:00
gengyuchao
87995c5f75
bugfix:btmd fix the problem that fixed_queue_enqueue may give the wrong semaphore if list_append fail to calloc a new node
2019-09-18 17:43:35 +08:00
Jiang Jiang Jian
5051bb906a
Merge branch 'bugfix/ble_mesh_get_timer_remaining_time' into 'master'
...
ble_mesh: fix ble mesh get timer remaining time
See merge request espressif/esp-idf!6060
2019-09-18 16:38:24 +08:00
michael
70d771eb2d
esp_flash: put adapter to legacy functions into IRAM to be back-compatible
2019-09-18 15:07:47 +08:00
xiehang
e1496449b1
esp_wifi: Update wifi lib
2019-09-18 10:16:35 +10:00
Renz Christian Bagaporo
f1b5c326f4
cxx: force pthread to appear later in link line
2019-09-17 20:08:12 +08:00
Ivan Grokhotkov
3cd687b35a
Merge branch 'fix/esp_flash_coredump' into 'master'
...
esp_flash: fix coredump issues
See merge request espressif/esp-idf!5917
2019-09-17 17:40:30 +08:00
Ivan Grokhotkov
bf68285689
Merge branch 'feature/compile_option_O0' into 'master'
...
build_system: add new compiler optimization levels
See merge request espressif/esp-idf!5686
2019-09-17 16:54:55 +08:00
Angus Gratton
d10107a50e
idf_test: Disable tests for Wi-Fi auto reconnect
...
Disable one, remove IDF tag from the other
2019-09-17 18:41:09 +10:00
suda-morris
dd248ffc32
Add chip revision into image header
...
Check chip id and chip revision before boot app image
Closes https://github.com/espressif/esp-idf/issues/4000
2019-09-16 18:13:53 +08:00
lly
9ee5e3d8ed
ble_mesh: fix duplicate memory free during receiving status message
2019-09-16 17:34:08 +08:00
lly
e1b04df763
ble_mesh: make unicast elem lookup O(1)
2019-09-16 14:55:41 +08:00
Angus Gratton
6b7da96d5b
ulp: Add header for common ULP definitions
...
Fixes problems with duplicate error codes in the two chip-specific ulp headers
2019-09-16 16:18:53 +10:00
Angus Gratton
438d513a95
Merge branch 'master' into feature/esp32s2beta_merge
2019-09-16 16:18:48 +10:00
Angus Gratton
0efdeb202e
Merge branch 'fix/elf_sha256_esp32s2beta' into 'feature/esp32s2beta'
...
build_system/app_update: fix the linker script and re-enable elf-sha256
See merge request espressif/esp-idf!5972
2019-09-16 08:25:20 +08:00
Angus Gratton
66b0b8951f
Merge branch 'bugfix/esp32s2beta_docs' into 'feature/esp32s2beta'
...
esp32s2beta: Fix docs build
See merge request espressif/esp-idf!6096
2019-09-16 08:19:59 +08:00
Michael (XIAO Xufeng)
9d30b04f68
coredump: use esp_flash api in coredump
...
Also put esp_flash functions into noflash region, when
ESP32_PANIC_HANDLER_IRAM and coredump are enabled. The option disables
the re-enabling of the CPU-cache when it's disabled during coredump.
This requires all the coredump functions including the flash API to be
in the D/IRAM.
2019-09-14 17:02:08 +08:00
Michael (XIAO Xufeng)
511820820e
esp_flash: fix the coredump issue
...
During coredump, dangerous-area-checking should be disabled, and cache
disabling should be replaced by a safer version.
Dangerous-area-checking used to be in the HAL, but it seems to be more
fit to os functions. So it's moved to os functions. Interfaces are
provided to switch between os functions during coredump.
2019-09-14 17:01:36 +08:00
Michael (XIAO Xufeng)
6139864a4c
esp_flash: fix coredump for legacy spi flash API
...
When legacy mode is used, the coredump still fails during linking
because "esp_flash_init_default_chip", "esp_flash_app_init" and
"esp_flash_default_chip " are not compiled and linked.
Instead of using ``if`` macros in callers, these functions are protected
by ``if`` macros in the header, and also not compiled in the sources.
"esp_flash_default_chip" variable is compiled with safe default value.
2019-09-14 16:56:31 +08:00
Angus Gratton
c27fd32fbe
Merge branch 'feat/esp_flash_support_encrypt' into 'master'
...
esp_flash: add support for encrypted read and write
See merge request espressif/esp-idf!6008
2019-09-13 14:52:01 +08:00
Angus Gratton
9d19f4fc8e
driver docs: Fix some doxygen warnings
2019-09-13 14:30:06 +10:00
Angus Gratton
14730f049e
Merge branch 'bugfix/do_not_use_absolute_paths_to_other_components' into 'master'
...
app_update: use build system api to get partition_table dir
See merge request espressif/esp-idf!6039
2019-09-13 07:51:22 +08:00
Jack
b0c893a20c
Wi-Fi: remove wifi_fast_scan_threshold_t which is not suitable in name
2019-09-13 09:44:07 +10:00
Jack
95ec36afd4
dport: remove clock_en and reset bitname which is not suitable
2019-09-13 09:44:07 +10:00
Angus Gratton
33a186f630
soc: Remove deprecated LEDC struct register names (bit_num, div_num)
...
Deprecated since ESP-IDF V3.0
2019-09-13 09:44:07 +10:00
Angus Gratton
6195c69701
soc: remove deprecated io_mux PIN_PULLxxx_yyy macros
...
Deprecated before ESP-IDF V1.0!
2019-09-13 09:44:07 +10:00
Angus Gratton
c41b2b0415
mbedtls: Remove esp_aes_encrypt/decrypt
...
Deprecated in ESP-IDF V3.1
Anyone reading this should please include mbedtls/aes.h and use mbedTLS APIs,
not the ESP-specific APIs.
2019-09-13 09:44:07 +10:00
Angus Gratton
b022527da7
heap: Remove esp_heap_alloc_caps header
...
Deprecated in ESP-IDF V3.1
2019-09-13 09:44:07 +10:00
Angus Gratton
fb748bae7f
fatfs: Remove esp_vfs_fat_unregister()
...
Deprecated in ESP-IDF V2.0
2019-09-13 09:44:07 +10:00
Angus Gratton
ba54a552c1
esp_wifi: Remove WIFI_PS_MODEM constant
...
Deprecated in ESP-IDF V3.1
2019-09-13 09:44:07 +10:00
Angus Gratton
d63181b5e9
esp_wifi: Remove deprecated auto connect API
...
Deprecated in ESP-IDF V3.1
2019-09-13 09:44:07 +10:00
Angus Gratton
2e067f5b57
ringbuf: Remove deprecated RingbufferType_t
...
Deprecated in ESP-IDF V3.1
2019-09-13 09:44:07 +10:00
Angus Gratton
dc7d6d592e
wdt: Remove deprecated esp_task_wdt_feed() function
...
Deprecated in ESP-IDF V3.1
2019-09-13 09:44:07 +10:00
Angus Gratton
480bd0360f
esp32/esp_common: Remove deprecated esp_efuse_read_mac() function
...
Deprecated since ESP-IDF V2.0
2019-09-13 09:44:07 +10:00
Angus Gratton
bdeaf138c4
esp32/esp_common: Remove deprecated system_* APIs
...
Mostly deprecated before ESP-IDF V1.0 & V2.0
2019-09-13 09:44:07 +10:00
Angus Gratton
a9a29b1f1e
esp_adc_cal: Remove deprecated ADC calibration functions
...
Deprecated since ESP-IDF V3.1
2019-09-13 09:44:07 +10:00
Angus Gratton
fbc1d1c319
esp32: Remove deprecated system_deep_sleep function
...
Deprecated since ESP-IDF V3.0
2019-09-13 09:44:07 +10:00
Ivan Grokhotkov
88548a9b4d
esp32/test: fix usage of deprecated fields
2019-09-13 09:44:07 +10:00
Angus Gratton
11c1da5276
soc/pm: Remove deprecated use of rtc_cpu_freq_t enum
...
Removes deprecated ways of setting/getting CPU freq, light sleep freqs.
Deprecated since ESP-IDF V3.2
2019-09-13 09:44:07 +10:00
Angus Gratton
f406d020d8
driver: Remove features deprecated pre-IDF V4.0
2019-09-13 09:44:07 +10:00
Angus Gratton
f44d99b509
app_update: Remove deprecated "make erase_ota" target
...
Deprecated in v3.2
2019-09-13 09:44:07 +10:00
Angus Gratton
62c06047da
bootloader_support: Remove deprecated partition load/verify functions
...
Deprecated since v3.2
2019-09-13 09:44:07 +10:00
Angus Gratton
596ccc6793
bluetooth: Remove bt.h header (deprecated in v3.1-dev)
2019-09-13 09:44:07 +10:00
KonstantinKondrashov
e0f7fbc5fa
bootloader: expand the space for iram_loader_seg
...
Fixed ld issue: overflowed iram_loader_seg
2019-09-13 00:39:37 +08:00
KonstantinKondrashov
d1173c8f09
esp32s2beta: task_wdt
...
Closes: IDF-753
2019-09-13 00:06:22 +08:00
KonstantinKondrashov
2644ddc3e1
esp32s2beta: Using rtc_wdt API
2019-09-13 00:06:22 +08:00
KonstantinKondrashov
d3637cd06b
rtc_wdt: re-enable RTC_WDT
2019-09-13 00:03:52 +08:00
KonstantinKondrashov
3ffa33c84d
esp32s2beta: re-enable int_wdt
2019-09-13 00:03:52 +08:00
Michael (XIAO Xufeng)
d7d5aebdee
soc: fix memory map for esp32 and esp32s2beta
2019-09-12 16:17:52 +08:00
Liu Han
3ca07b3e70
fix(transport): Fix a bug of the connection whether be active or not by timeout option when the select function return a correct value.
2019-09-12 13:55:47 +08:00
Jiang Jiang Jian
850893b25b
Merge branch 'bugfix/uart_select_free' into 'master'
...
VFS: Fix memory access after free() in UART select()
Closes IDFGH-1820
See merge request espressif/esp-idf!6045
2019-09-12 13:38:43 +08:00
Jiang Jiang Jian
9f145ff165
Merge branch 'feature/btdm_add_hf_nvrc_command' into 'master'
...
BT HFP: Add AT+NREC=0 command for disabling AG echo cancellation.
See merge request espressif/esp-idf!5974
2019-09-12 13:25:18 +08:00
Jiang Jiang Jian
d1e5d9c8c9
Merge branch 'bugfix/btdm_config_msbc' into 'master'
...
components/bt: Disable Wide Bond Speech when SCO data path is PCM
See merge request espressif/esp-idf!5978
2019-09-12 13:23:41 +08:00
Michael (XIAO Xufeng)
d008c47dac
esp_flash: add support for encrypted read and write
...
Using legacy implementation.
2019-09-12 12:41:50 +08:00
Michael (XIAO Xufeng)
df27a50866
app_update: re-enable elf-sha256
2019-09-11 18:29:11 +08:00
Jiang Jiang Jian
32f216441f
Merge branch 'bugfix/esp32s2beta_cache_interrupt_panic' into 'feature/esp32s2beta'
...
cache_err_int: Add cache error interrupt panic
See merge request espressif/esp-idf!5559
2019-09-11 12:48:12 +08:00
jiangguangming
1b31191753
fix bug for cmake build system
...
The path of ${SDKCONFIG_H} does not exist, should be replaced by ${sdkconfig_header}.
2019-09-11 11:00:19 +08:00
zhangyanjiao
d885df946a
fix the bug that ESP32 sends broadcast to phone after smartconfig done
2019-09-11 10:42:16 +08:00
michael
213f8cf7ef
ci: forbid esp32s2beta tests from being built in make
2019-09-11 09:31:47 +08:00
Angus Gratton
2402d0952d
Merge branch 'bugfix/flash_encryption_disable_plaintext' into 'master'
...
flash encryption: Always disable plaintext reflashes in Release mode
See merge request espressif/esp-idf!6051
2019-09-11 07:59:33 +08:00
Li Shuai
d48aac96a1
util-test: Fix the conflict target of esp32_test_logo between esp32s2beta and esp32
2019-09-10 20:49:36 +08:00
Jiang Jiang Jian
3b606aa21f
Merge branch 'bugfix/wpa2_ent_eap_reauth_fail' into 'master'
...
wpa_supplicant: Fix EAP Re-authentication issue
See merge request espressif/esp-idf!5588
2019-09-10 20:14:22 +08:00
lly
5d1f84f69c
ble_mesh: fix ble mesh get timer remaining time
2019-09-10 16:58:41 +08:00
Angus Gratton
49ca39d35c
Merge branch 'bugfix/multi_heap_printf' into 'master'
...
heap: Fix printf usage in heap poisoning
See merge request espressif/esp-idf!6046
2019-09-10 13:26:27 +08:00
Roland Dobai
7cc225c85b
VFS: Fix memory access after free() in UART select()
...
Closes https://github.com/espressif/esp-idf/issues/4030
2019-09-10 04:59:03 +00:00
Angus Gratton
c052a38e2a
bootloader: Link RTC clock functions to the iram_loader section
...
As flash encryption & secure boot needs these functions after the app is loaded.
Fixes regression introduced in fb72a6f629
2019-09-10 11:28:17 +10:00
Angus Gratton
b547aef2a0
flash encryption: Ensure flash encryption can't be disabled if Secure Boot is on
2019-09-10 11:28:11 +10:00
Darian Leung
e52c0d0da2
heap: Fix printf usage in heap poisoning
...
This commit fixes the bug where printf() is used in
verify_allocated_region() when ets_printf() should be used.
2019-09-09 21:56:39 +08:00
lly
1a8f37b383
ble_mesh: update ble mesh examples sdkconfig.defaults
2019-09-09 17:15:16 +08:00
lly
d48c89b56a
ble_mesh: fix ble mesh btc may caused memory leak
2019-09-09 17:15:16 +08:00
lly
8a41132507
ble_mesh: fix publication period timestamp initialization
2019-09-09 17:15:16 +08:00
lly
715cf7d578
ble_mesh: remove useless mesh_opcode
2019-09-09 17:15:16 +08:00
lly
8580a3211b
ble_mesh: fix bt_mesh_net_resend() caused compiling error
2019-09-09 17:15:16 +08:00
lly
8a7ab6cb3d
ble_mesh: fix adhering to the configured Friend Queue size
2019-09-09 17:15:16 +08:00
lly
29de1a9acf
ble_mesh: remove useless code bt_mesh_trans_resend()
2019-09-09 17:15:16 +08:00
lly
386a5d649c
ble_mesh: lpn remove msg from cache on rejection
2019-09-09 17:15:16 +08:00
lly
9a672caa7e
ble_mesh: introduce a helper for send callback function
2019-09-09 17:15:16 +08:00
lly
05128c98ec
ble_mesh: fix heartbeat sending on friendship established/lost
2019-09-09 17:15:16 +08:00
lly
9f80c24b74
ble_mesh: fix checking for active heartbeat publication
2019-09-09 17:15:16 +08:00
lly
b9c43cec19
ble_mesh: fix starting iv update when not on primary subnet
2019-09-09 17:15:16 +08:00
lly
3f6968e31b
ble_mesh: fix canceling publication retransmit timer
2019-09-09 17:15:16 +08:00
lly
10bffaebf1
ble_mesh: fix resending segments on correct bearer
2019-09-09 17:15:16 +08:00
lly
e152df43f1
ble_mesh: fix not sending all segments through the Friend Queue
2019-09-09 17:15:16 +08:00
lly
f449cb7843
ble_mesh: fix canceled buffer memory leak
2019-09-09 17:15:16 +08:00
lly
2afc9b820d
ble_mesh: remove some useless copy during ecdh calculation
2019-09-09 17:15:16 +08:00
lly
75b0f50aa0
ble_mesh: move heartbeat sending to transport layer
2019-09-09 17:15:16 +08:00
lly
edf0b9ee02
ble_mesh: fix provisioning send error handling
2019-09-09 17:15:16 +08:00
lly
1c06494293
ble_mesh: fix rejecting invalid remote public key
2019-09-09 17:15:16 +08:00
lly
3e47f3ec87
ble_mesh: add error checks for scan start/stop
2019-09-09 17:15:16 +08:00
lly
3e489d40ff
ble_mesh: rename reset_link() to reset_adv_link()
2019-09-09 17:15:16 +08:00
lly
f2b0b00020
ble_mesh: fix public key mismatch error handling
2019-09-09 17:15:16 +08:00
lly
630e911958
ble_mesh: update protocol error timeout from zephyr
2019-09-09 17:15:16 +08:00
lly
716db01a7f
ble_mesh: fix segmented message RPL behavior
2019-09-09 17:15:16 +08:00
lly
5f5f5cf305
ble_mesh: clear LPN sent_req on failure
2019-09-09 17:15:16 +08:00
lly
4bf4094e40
ble_mesh: update proxy sar operation from zephyr
2019-09-09 17:15:16 +08:00
lly
9c98a8d645
ble_mesh: fix postponing storage deadline indefinitely
2019-09-09 17:15:16 +08:00
lly
c44a3f1209
ble_mesh: fix RPL storage timeout handling
2019-09-09 17:15:16 +08:00
lly
9a7efd30ef
ble_mesh: fix output MIC with additional data
2019-09-09 17:15:16 +08:00
lly
f3e7656c06
ble_mesh: remove non-standard relay opearation
2019-09-09 17:15:16 +08:00
lly
0c82a32524
ble_mesh: fix finding netkey/appkey/devkey for tx/rx msg
2019-09-09 17:15:16 +08:00
lly
b8cb769ce3
ble_mesh: fix failed to set device role caused mem leak
2019-09-09 17:15:16 +08:00
lly
624bf7e3a0
ble_mesh: ble mesh btc miscellaneous modifications
2019-09-09 17:15:16 +08:00
lly
1f96bf5906
ble_mesh: fix MESH/NODE/FRND/FN/BV-11-C related bug
2019-09-09 17:15:16 +08:00
lly
f25640e9e5
ble_mesh: fix MESH/NODE/CFG/GPXY/BV-02-C & MESH/NODE/CFG/NID/BV-02-C related bug
2019-09-09 17:15:16 +08:00
lly
014a35c1df
ble_mesh: fix MESH/NODE/CFG/HBS/BV-01-C related bug
2019-09-09 17:15:16 +08:00
lly
b3bc60183d
ble_mesh: rename ble mesh client model variables and functions
2019-09-09 17:15:16 +08:00
lly
5f6259a625
ble_mesh: reorganize ble mesh model files
2019-09-09 17:15:16 +08:00
lly
a788e7cd3d
ble_mesh: sync zephyr v1.14.0 bt_hex()
2019-09-09 17:15:16 +08:00
lly
c648054e08
ble_mesh: fix provisioner prov auth bug
2019-09-09 17:15:16 +08:00
Li Shuai
d5a9b1a240
util-test: The cache and spi_flash tests passed
2019-09-09 16:59:29 +08:00
Li Shuai
fd15fd3da4
util-test: Copy the test in the esp32 directory to the esp32s2beta directory
2019-09-09 16:57:28 +08:00
Li Shuai
eb4c0ef8b2
cache_err_int: Modify cache error interrupt panic code format
2019-09-09 14:35:42 +08:00
Li Shuai
ce6c86672b
cache_err_int: Add cache error interrupt panic
2019-09-09 14:35:42 +08:00
Angus Gratton
35147119f1
Merge branch 'feature/support_ut_esp32s2beta' into 'feature/esp32s2beta'
...
ci: support build and run UT for esp32s2beta
See merge request espressif/esp-idf!5702
2019-09-09 08:34:16 +08:00
Mahavir Jain
f2eadc9378
Merge branch 'bugfix/mbedtls_client_only_config_build_failure' into 'master'
...
Fix build issues in coap library with mbedtls client only config
See merge request espressif/esp-idf!5955
2019-09-06 21:12:04 +08:00
Wang Fang
bea507378e
Add Chinese translation for README files in components and tools folders, including:
...
1. components/nvs_flash/nvs_partition_generator/README_CN.rst
2. components/wear_levelling/README_CN.rst
3. tools/mass_mfg/docs/README_CN.rst
2019-09-06 20:18:19 +08:00
Jon Shallow
430b737760
Fix libcoap building with various MbedTLS compile time options
...
components/coap/port/coap_mbedtls.c:
Add in additional compile time check wrappers for different MbedTLS
configurations.
components/coap/CMakeLists.txt:
components/coap/component.mk:
components/coap/port/coap_notls.c:
components/coap/port/include/coap_config_posix.h:
Add in the ability to compile and run if MbedTLS does not have any TLS
mode enabled.
examples/protocols/coap_client/main/coap_client_example_main.c:
Inform user that MbedTLS Client Mode is required for DTLS if not enabled,
and coaps:// has been requested.
[Lower libcoap library will still error and report this condition]
examples/protocols/coap_server/main/coap_server_example_main.c:
Inform user that MbedTLS Server Mode is required for DTLS if not enabled.
[Lower libcoap library will still error and report this condition]
Closes https://github.com/espressif/esp-idf/issues/3961
Closes https://github.com/espressif/esp-idf/issues/3971
Closes https://github.com/espressif/esp-idf/pull/3977
2019-09-06 16:13:52 +05:30
Andrew
4fdaeb6b6e
cmake: Add new compiler optimization levels definitions
...
Rename and add multiple kconfig compiler options. New compiler options
COMPILER_OPTIMIZATION_PERF and COMPILER_OPTIMIZATION_NONE have been added.
Optimize "Debug" and "Release" options to "Default" and "Size" respectively.
This commit also does the following:
- The COMPILER_OPTIMIZATION_PERF option introduced multiple bug.
This commit fixes those bugs.
- build.yml also updated to test for the new optimization options.
2019-09-06 17:37:19 +08:00
Nachiket Kukade
5df2e6b19c
wpa_supplicant: Fix EAP Re-authentication issue
...
EAP reauth frames are dropped at various stages due to current
implementation of WPA2 ENT states and EAP SM init/deinit logic.
Route EAPOL frames based on EAP pkt type and maintain EAP SM
to facilitate EAP re-authentication process.
The full fix for the change includes a fix from wifi library
(commit - 36f99df849214fbf9b0d15e58554632a568e05aa).
2019-09-06 14:59:05 +05:30
jiangguangming
4ef4b29c74
Reorganize the memory to maximize contiguous DRAM
...
1. Fix bug for variable sdkconfig_header in CMakeLists.txt
2. Modify the load address of bootloader
3. Modify the load address of application program
2019-09-06 16:18:42 +08:00
Angus Gratton
8b3e8f10cb
Merge branch 'fix/add_parentheses_to_spi_swap_data_tx' into 'master'
...
spi: Put argument of macro SPI_SWAP_DATA_TX in parentheses
See merge request espressif/esp-idf!5982
2019-09-06 16:04:56 +08:00
Angus Gratton
cd68972e32
Merge branch 'bugfix/ethernet_rx_length_check' into 'master'
...
ethernet: bugfix and optimize
Closes IDF-864, IDF-865, IDF-866, and IDF-867
See merge request espressif/esp-idf!5944
2019-09-06 15:39:20 +08:00
Alex Lisitsyn
7ff9538c48
espcoredump: fix issue with spi_flash access
...
spi_flash has been updated and its functions work from flash by default instead of IRAM that cause issue
add Kconfig value into espcoredump to enable spi_flash legacy mode (CONFIG_SPI_FLASH_USE_LEGACY_IMPL) when core dump is selected
fix spi_flash issues to work correctly with legacy mode when CONFIG_SPI_FLASH_USE_LEGACY_IMPL is used
2019-09-06 15:37:55 +08:00
Jiang Jiang Jian
fc62542e18
Merge branch 'bugfix/fix_the_bug_for_WPA_WPA2_PSK_connection_fail' into 'master'
...
fix the bug for WPA_WPA2_PSK connection fail
See merge request espressif/esp-idf!6009
2019-09-06 14:34:47 +08:00
Jiang Jiang Jian
84daad38c3
Merge branch 'bugfix/btdm_a2dp_sink_media_suspend_cmd_unack' into 'master'
...
bugfix/btdm_a2dp_sink_media_suspend_cmd_unack
See merge request espressif/esp-idf!5937
2019-09-06 14:29:45 +08:00
Jiang Jiang Jian
35874254b9
Merge branch 'bugfix/rom_miniz_notes' into 'master'
...
rom: Add warnings for miniz functions that won't work due to missing malloc
Closes IDFGH-1814
See merge request espressif/esp-idf!6012
2019-09-06 14:18:57 +08:00
baohongde
cb2e1f93d1
components/bt: Fix sending LMP_features_req_ext in a loop
...
Remove xtensa/xtruntime.h at the same time
2019-09-06 12:00:54 +08:00
Chinmay Chhajed
a6cc964a26
esp_http_server : Bugfix in parsing of empty header values
...
This MR is intended to fix incorrect parsing of HTTP requests when empty header values are present.
The issue is was due to asymmetric behavior of `http_parser` library, which in case of:
non-empty header values : invokes callbacks with the pointer to the start of a value
empty header values : invokes callbacks with pointer to the start of next header or section
Since HTTP server relies on this pointer (along with length of the value) to locate the end of a value, and replace the line terminators (CRLFs) with null characters, the second case needed to be handled correctly.
Closes IDFGH-1539
Closes https://github.com/espressif/esp-idf/issues/3803
2019-09-06 11:02:36 +08:00
Angus Gratton
f23b3fdbe4
rom: Add warnings for miniz functions that won't work due to missing malloc
...
Closes https://github.com/espressif/esp-idf/issues/4024
2019-09-06 11:01:34 +10:00
zhangyanjiao
45c72dd372
fix the bug that STA fails to connect WPA_WPA2_PSK Apple AP
2019-09-05 20:20:42 +08:00
jiangguangming
c057c141eb
Fix bug for reserved memory regions
...
1. Release 16KB memory of reserved regions to heap
2. Modify the dram_seg address of bootloader to 0x3FFF8000, size is 16K
2019-09-05 19:00:14 +08:00
Li Shuai
bd29202520
1. Fix backtrace is incomplete
...
2. Optimization code style
2019-09-05 18:40:33 +08:00
wanglei
653d8b5bdd
update cache and spiram related files and bug fixes
...
1. remove speed dependency of SPIRAM
2. support wrap mode of cache, flash and SPIRAM
3. fix some bugs on cache modes support
2019-09-05 14:14:49 +08:00
Jiang Jiang Jian
8d85792acc
Merge branch 'bugfix/btdm_crash_in_sket_ist' into 'master'
...
Fix 2 bugs in r_ld_fm_sket_isr
See merge request espressif/esp-idf!5946
2019-09-05 12:01:35 +08:00
Jiang Jiang Jian
07bd6d49ca
Merge branch 'bugfix/btdm_config_but_task_size_fail' into 'master'
...
Use CONFIG value instead of hard-coded value.
See merge request espressif/esp-idf!5961
2019-09-05 11:26:50 +08:00
Xia Xiaotian
f9aaaa6c3a
esp_wifi: synchronize WiFi header file with WiFi library
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
63329b169b
ci: limit example test to ESP32s
2019-09-04 10:53:25 +10:00
KonstantinKondrashov
7f270d4299
newlib: Fix UT - test time adjustment happens linearly
...
Obtaining accurate and adjustable time occurs closer to each other.
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
76a3a5fb48
ci: disable unavailable tests for esp32s2beta
2019-09-04 10:53:25 +10:00
Angus Gratton
e44df658d5
spiram: Fix ESP32 SPIRAM when using SPIRAM_TYPE_AUTO, disable "AUTO" for ESP32-S2
...
Requirement to enable for ESP32-S2 captured in IDF-912.
2019-09-04 10:53:25 +10:00
Angus Gratton
0c88ef3232
driver: Fix UART interrupt handle read bug
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
eb158e9a22
ci: disable UTs for esp32s2beta without runners
2019-09-04 10:53:25 +10:00
Angus Gratton
c22965b22c
freertos: Restore uxPortCompareSet() in ESP32 unicore & make compatible code for ESP32S2Beta
...
This macro is used in places which expect it to work even without dual core being on.
Still make "mux" functions in FreeRTOS into no-ops as the mux is not needed.
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
e9901d15a1
rtc: fix memory map
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
053f419ced
stdatomic: support gcc built-in functions for esp32s2beta
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
55859f59cb
support for esp32s2beta
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
43135dc348
spi: convenient LL macro
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
9f1c8f0c76
spi_flash: support esp32s2beta
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
b76d5d74d9
mbedtls: support esp32s2beta
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
3b39e60f97
driver: remove unused drivers for esp32s2beta
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
05739798c3
soc: s2beta support
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
9baa7826be
fix unit test and examples for s2beta
2019-09-04 10:53:25 +10:00
Renz Christian Bagaporo
a4ee680bbf
app_update: use build system api to get partition_table dir
2019-09-03 19:47:53 +08:00
Martin Thierer
3bb42d0736
spi: Put argument of macro SPI_SWAP_DATA_TX/RX in parentheses
...
Close https://github.com/espressif/esp-idf/pull/3996
2019-09-03 15:21:23 +08:00
Angus Gratton
c5747027b4
Merge branch 'bugfix/cmake_bootloader_python' into 'master'
...
build system: Pass Python executable through to bootloader build
See merge request espressif/esp-idf!5956
2019-09-03 12:55:58 +08:00
suda-morris
14ffd355e6
ethernet: bugfix and optimize
...
1. check frame length before pass to stack
2. replace semaphore with task notify
2019-09-03 11:01:16 +08:00
baohongde
019067b6ac
components/bt: Rename some macros
2019-09-03 10:23:05 +08:00
Zac Bond
f8212988c4
Use CONFIG value instead of hard-coded value.
...
Add intermediate defines.
Use CONFIG_BTU_TASK_STACK_SIZE instead of hard-coded value in Bluedroid component
2019-09-03 10:21:45 +08:00
Angus Gratton
002104b262
Merge branch 'bugfix/err_code_collision' into 'master'
...
Fix error code collisions and re-enable CI check
Closes IDF-832
See merge request espressif/esp-idf!5923
2019-09-03 08:30:40 +08:00
Jiang Jiang Jian
9b070666e1
Merge branch 'bugfix/btdm_linking_fail_with_toolchain_8.2.0' into 'master'
...
components/bt: Fix linking fail with toolchain 8.2.0
See merge request espressif/esp-idf!5782
2019-09-02 22:21:59 +08:00
Jiang Jiang Jian
81cf2cf130
Merge branch 'bugfix/btdm_remove_unused_macro_in_menuconfig' into 'master'
...
components/bt: Remove unused macro in menuconfig
See merge request espressif/esp-idf!5950
2019-09-02 22:20:49 +08:00
baohongde
185f47ab7e
components/bt: Disable Wide Bond Speech when SCO data path is PCM
2019-09-02 20:50:09 +08:00
nif
75578300f1
BT HFP: Add AT+NREC=0 command for disabling AG echo cancellation.
2019-09-02 09:28:38 +00:00
Jiang Jiang Jian
a4a95e6c67
Merge branch 'bugfix/coex_bb_reset_lock' into 'master'
...
fix bug that wifi start/stop may cause crash
See merge request espressif/esp-idf!5968
2019-09-02 14:25:50 +08:00
Jiang Jiang Jian
6fa20a4d33
Merge branch 'test/use_correct_config_for_nvs_compatible_case' into 'master'
...
test: fix nvs compatible case error:
See merge request espressif/esp-idf!5890
2019-09-02 12:40:38 +08:00
Jiang Jiang Jian
a2e0c6b1ab
Merge branch 'test/fix_mesh_test_case' into 'master'
...
test: fix test case MESH_EST_2403
See merge request espressif/esp-idf!5813
2019-09-02 12:38:38 +08:00
Angus Gratton
eca4b855d9
Merge branch 'bugfix/secure_boot_ecdsa_config' into 'master'
...
secure boot: Ensure mbedTLS enables ECDSA if signatures are checked in app
See merge request espressif/esp-idf!5960
2019-09-02 08:31:18 +08:00
Tian Hao
3af18c0422
fix some coex bugs
...
1. fix the bug that bb reset lock unhandled may cause assert in vPortCPUReleaseMutexIntsDisabledInternal
2. fix wifi mac reset may blocking then cause wdt timeout
3. fix bug wifi mac reset before coex init
2019-08-30 22:06:29 +08:00
Angus Gratton
d1f2ea7cdf
Merge branch 'bugfix/make_build_issue_if_build_dir_symlink' into 'master'
...
ldgen: fix build issue on make when build dir is a symlink
Closes IDFGH-1340
See merge request espressif/esp-idf!5915
2019-08-30 16:27:21 +08:00
Angus Gratton
879778a677
Merge branch 'refactor/move_smartconfig_ack_to_wifi' into 'master'
...
smartconfig: move smartconfig_ack to esp_wifi conponent
Closes IDFGH-1758
See merge request espressif/esp-idf!5881
2019-08-30 16:27:11 +08:00
Angus Gratton
ff5cb217fe
Merge branch 'bugfix/unicore_config_prevent_ipc_code' into 'master'
...
ipc: prevent code getting pulled in for unicore configuration
See merge request espressif/esp-idf!5795
2019-08-30 16:26:47 +08:00
Angus Gratton
6123f78897
mbedtls: Make ECDHE-PSK config item depend on ECDHE
2019-08-30 15:01:53 +10:00
Angus Gratton
abd6d40796
secure boot: Ensure mbedTLS enables ECDSA if signatures are checked in app
...
and all ECDSA to be disabled if secure boot is not enabled
Previously if ECDSA disabled in config then secure_boot_signatures.c would
fail to build (whether or not secure boot was enabled).
To avoid breaking apps that might be using the signature scheme with custom OTA
without enabling secure boot signatures in config, this change just disables
this functionality if unavailable in mbedTLS config.
Possible fix for root cause of https://github.com/espressif/esp-idf/pull/3703
2019-08-30 14:56:11 +10:00
baohongde
d12503eb55
components/bt: Remove unused macro in menuconfig
2019-08-29 19:58:05 +08:00
Mahavir Jain
d6982e0401
Merge branch 'feature/enable_cfg_for_tls_asymmetric_content_length' into 'master'
...
mbedtls: keep asymmetric tls buffer length option enabled by default
See merge request espressif/esp-idf!5678
2019-08-29 19:45:06 +08:00
Angus Gratton
e3e21b7954
build system: Pass Python executable through to bootloader build
...
Fixes failures if the PYTHON cache setting doesn't match the
default of "python" on the PATH.
2019-08-29 18:53:18 +10:00
Roland Dobai
612db28b6f
Fix error code collision and CI check
2019-08-29 08:14:08 +00:00
baohongde
b6fe44b520
Fix 2 bugs in r_ld_fm_sket_isr
...
1. When remove two elt in the 1st isr, then assert in then 2nd one.
2. When timestamp of first elt is equal to sket_clkn, then crash.
2019-08-29 11:27:57 +08:00
Jon Shallow
e7033716db
LwIP: Make IP_PKTINFO support configurable
...
LwIP has support for IP_PKTINFO, but it cannot be activated as it is
not configurable. This fix adds in the ability to configure it.
Merges https://github.com/espressif/esp-idf/pull/3983
2019-08-29 11:20:56 +08:00
suda-morris
a36cc962a3
smartconfig: move smartconfig_ack to esp_wifi conponent
2019-08-29 10:39:30 +08:00
Angus Gratton
1cd54d34f6
Merge branch 'bugfix/bootloader_factory_reset_with_wake_up_from_deep_sleep' into 'master'
...
bootloader: Blocking the Factory reset during wake up from deep sleep
Closes IDFGH-1536
See merge request espressif/esp-idf!5673
2019-08-29 09:35:08 +08:00
Angus Gratton
06898325e6
Merge branch 'bugfix/bootloader_efuse_build_regression' into 'master'
...
bootloader: add definition of esp_clk_apb_freq
Closes IDFGH-1734
See merge request espressif/esp-idf!5913
2019-08-29 08:35:48 +08:00
Jiang Jiang Jian
17dc04183a
Merge branch 'bugfix/fix_the_bug_for_softap_set_authmode' into 'master'
...
wifi: fix the bug for softAP set authmode
Closes WIFI-449
See merge request espressif/esp-idf!5823
2019-08-28 19:05:00 +08:00
Mahavir Jain
ebe53416ad
ipc: prevent code getting pulled in for unicore configuration
2019-08-28 12:47:08 +05:30
wangmengyang
30bc5953f2
bugfix that call of esp_a2d_media_ctrl(ESP_A2D_MEDIA_CTRL_SUSPEND) will not get an ACK from callback on A2DP sink
...
# Conflicts:
# components/bootloader/subproject/components/micro-ecc/micro-ecc
2019-08-28 15:16:10 +08:00
Mahavir Jain
5582878f8e
mbedtls: keep asymmetric tls buffer length option enabled by default
2019-08-28 06:23:33 +00:00
Angus Gratton
a21ca2270a
Merge branch 'feature/deep_sleep_fast_wake' into 'master'
...
bootloader: Reduce the time spent in image validation when waking from deep sleep
See merge request espressif/esp-idf!5140
2019-08-28 08:54:28 +08:00
Jiang Jiang Jian
039f9d0a20
Merge branch 'bugfix/btdm_fix_ble_data_loss_and_send_same_pkt_twice' into 'master'
...
Component/bt: fix some BLE bugs
See merge request espressif/esp-idf!5896
2019-08-27 18:48:45 +08:00
Ivan Grokhotkov
fb72a6f629
bootloader: add definition of esp_clk_apb_freq
...
Commit 8cd04c80
has added a dependency of efuse component on
esp_clk_apb_freq, however there was no definition of this function in
the bootloader context.
Reported at https://esp32.com/viewtopic.php?f=13&t=12035
2019-08-27 12:01:11 +02:00
Renz Christian Bagaporo
c50a67567a
ldgen: fix build issue on make when build dir is a symlink
...
Fixes an issue where build fails if the build directory is a symlink.
The issue is caused by the rule target and the final executable dependency
not matching.
Closes https://github.com/espressif/esp-idf/issues/3626
2019-08-27 13:53:31 +08:00
Angus Gratton
8d8d4a57e1
Merge branch 'bugfix/reset_periph_modules' into 'master'
...
driver: Add a reset before enabling if a module is off
Closes IDF-188
See merge request espressif/esp-idf!4843
2019-08-26 16:38:23 +08:00
zhiweijian
f002d1c6aa
Component/bt: fix dome BLE bugs
...
- fix data loss and send same pkt twice sometimes
- fix adv data error in air sometimes
- fix adv start/stop crash sometimes
2019-08-26 14:17:46 +08:00
Jiang Jiang Jian
f68cd62abd
Merge branch 'bugfix/btdm_security_vulnerability_on_encryption_key_size' into 'master'
...
bugfix/btdm_security_vulnerability_on_encryption_key_size
See merge request espressif/esp-idf!5868
2019-08-26 14:08:22 +08:00
He Yin Ling
954a23be37
test: fix nvs compatible case error:
...
nvs compatible test case uses new test env and app. update test config
file.
2019-08-25 20:35:49 +08:00
KonstantinKondrashov
30953ba9c4
app_update: Fix UTs for FACTORY_RESET and APP_TEST
2019-08-23 10:21:06 +00:00
KonstantinKondrashov
69f45c3674
bootloader: Factory reset not for deep sleep
...
Closes: https://github.com/espressif/esp-idf/issues/3800
Closes: IDFGH-1536
2019-08-23 10:21:06 +00:00
Jiang Jiang Jian
8db44f67d7
Merge branch 'bugfix/wps_workaround_for_Telstra_AP' into 'master'
...
wps: Relax the check on older config methods in case of WPS2.0
See merge request espressif/esp-idf!5781
2019-08-23 17:32:46 +08:00
Dmitry
a0730fec2a
Performance monitor component. The component contains APIs, example and
...
documentation.
2019-08-23 11:20:12 +03:00
zhangyanjiao
ff96965a91
wifi: fix the bug for softAP set authmode
2019-08-23 14:37:08 +08:00
Ivan Grokhotkov
12c9d9a564
spi_flash: remove duplicate definition of spi_flash_unlock
...
The other (static) definition is in flash_ops.c, all references are
also in flash_ops.c.
2019-08-23 12:37:55 +08:00
wangmengyang
76b6902e96
components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link for preventing KNOB attack
...
This patch is to address the CVE-2019-9506 vulnerability.
2019-08-23 08:26:15 +08:00
suda-morris
5a09de8245
cbor: add tinycbor library and example
2019-08-22 17:44:29 +08:00
fuzhibo
c9a911e4aa
rtc: update from bringup branch
2019-08-22 15:03:18 +08:00
Jiang Jiang Jian
0a30468945
Merge branch 'feature/wifi_use_new_event_api' into 'master'
...
esp_wifi/event: wifi use new event api
Closes WIFI-696
See merge request espressif/esp-idf!5454
2019-08-21 21:12:28 +08:00
KonstantinKondrashov
c543aac91e
bootloader: API for the fast wakeup and custom using RTC mem
...
Added "Reserve RTC FAST memory for custom purposes" option.
Added a boot counter.
2019-08-21 11:44:37 +00:00
Tim Nordell
43393cf4d1
bootloader: Support for skipping validation upon wake from deep sleep
...
This saves time when waking up from deep sleep, but potentially decreases
the security of the system. If the application able to modify itself
(especially areas that are loaded into RAM) in flash while running
without crashing or is modifies the cached bits of information about
what was last booted from the bootloader, this could cause security
issues if the user does a "deep sleep reset" since the full validation
is skipped.
Signed-off-by: Tim Nordell <tim.nordell@nimbelink.com>
2019-08-21 11:44:37 +00:00
Tim Nordell
82984f0539
bootloader: Do not obfuscate RAM if we are not doing image validation
...
No need to take this step if we are not doing image validation. The
obfuscation only buys us a tiny bit of "security" anyways since the
main parts of flash are memory mapped, too. This saves a little bit of
wake-up time when waking up from deep sleep when the
BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP option is set.
Signed-off-by: Tim Nordell <tim.nordell@nimbelink.com>
2019-08-21 11:44:37 +00:00
Tim Nordell
1e32fa2cf7
bootloader: Remove extraneous newlines from some debug statements
...
ESP_LOGD(...) provides its own new lines so remove these from these
debug strings.
Signed-off-by: Tim Nordell <tim.nordell@nimbelink.com>
2019-08-21 11:44:37 +00:00
Prasad Alatkar
393eb1700d
NimBLE: Add misc menuconfig options
...
- Add option to configure stack size of NimBLE host task, update NimBLE
submodule for the same.
- Change max concurrent connections supported to 9 inline with controller.
2019-08-21 19:28:47 +08:00
Jiang Jiang Jian
14608cc0fb
Merge branch 'Bugfix/nonblocking_udp_is_zero' into 'master'
...
fix bug for nonblocking udp is zero
Closes WIFI-756
See merge request espressif/esp-idf!5792
2019-08-21 16:44:11 +08:00
Angus Gratton
3aef62527a
Merge branch 'update/cjson_v1_7_12' into 'master'
...
Update cJSON to v1.7.12
See merge request espressif/esp-idf!5776
2019-08-21 16:40:35 +08:00
Angus Gratton
319d44b1a6
Merge branch 'bugfix/esp_timer_null_checks' into 'master'
...
esp_timer: Add parameter NULL checks to public API
See merge request espressif/esp-idf!5804
2019-08-21 16:17:15 +08:00
Angus Gratton
38d61f83db
Merge branch 'feature/esp32s2beta_update' into 'feature/esp32s2beta'
...
esp32s2beta: Merge master into esp32s2beta branch
See merge request espressif/esp-idf!5724
2019-08-21 15:20:28 +08:00
xueyunfei
36920b4062
fix bug for nonblocking udp is zero
2019-08-21 11:25:17 +08:00
Renz Christian Bagaporo
a1a2f33459
esptool_py: add missing phony build targets for CMake
...
Adds targets erase_flash and monitor for users not using idf.py.
Closes https://github.com/espressif/esp-idf/issues/2420 .
2019-08-21 10:01:00 +08:00
Xia Xiaotian
80f1c13fd7
esp_wifi: update WiFi library to support esp32s2beta
2019-08-21 10:45:07 +10:00
Ivan Grokhotkov
636c6a9a30
Merge branch 'feature/ulp_macro_updates' into 'master'
...
ulp: updates for ULP macros (PRs from Github)
Closes IDFGH-1492
See merge request espressif/esp-idf!5801
2019-08-20 20:40:09 +08:00
Nachiket Kukade
19a1af88a5
wps: Relax the check on older config methods in case of WPS2.0
...
Some APs incorrectly advertize newer WPS2.0 config method bits
without setting bits for the corresponding older methods. This
results in failures during 8-way handshake. Add a workaround to
relax this check so that WPS handshake can proceed.
2019-08-20 09:58:41 +00:00
liu zhifu
003a9872b7
esp_wifi: wifi support new event mechanism
...
1. WiFi support new event mechanism
2. Update examples to use new event mechanism
2019-08-20 09:39:51 +00:00
Ivan Grokhotkov
5944f575cf
Merge branch 'bugfix/newlib_time_test' into 'master'
...
newlib: Fix UT - test time adjustment happens linearly
See merge request espressif/esp-idf!5712
2019-08-20 16:24:30 +08:00
Angus Gratton
9d8c21d8fb
Merge branch 'feature/esp32s2beta_rtc_vddsdio_get_config' into 'feature/esp32s2beta'
...
soc: Update rtc_vddsdio_get_config for esp32s2beta
See merge request espressif/esp-idf!5759
2019-08-20 13:14:07 +08:00
Angus Gratton
0a0bb09585
Merge 'master' into feature/esp32s2beta_update
2019-08-20 13:55:23 +10:00
Jiang Jiang Jian
23aef7d8d8
Merge branch 'cleanup/make_supp_headers_private' into 'master'
...
wpa_supplicant: Make internally used crypto headers private
Closes IDF-476
See merge request espressif/esp-idf!5666
2019-08-19 17:11:34 +08:00
Angus Gratton
2085845c80
freertos: Have ESP32S2-Beta target select FREERTOS_UNICORE directly
2019-08-19 15:03:48 +10:00
Angus Gratton
685c9cc867
esp32sbeta: Add timer_ll.h
2019-08-19 15:03:48 +10:00
Angus Gratton
6990a7cd54
Merge branch 'master' into feature/esp32s2beta_update
2019-08-19 15:03:43 +10:00
Angus Gratton
b1d67ad344
Merge branch 'bugfix/remove_transport_strcasestr' into 'master'
...
tcp_transport: replace transport_strcasestr with strcasestr
Closes IDF-548
See merge request espressif/esp-idf!5802
2019-08-19 10:36:32 +08:00
Nachiket Kukade
9ec363a25d
wpa_supplicant: Make internally used crypto headers private
...
A lot of internally used crypto headers are publicly includeable
in user projects. This leads to bug reports when these headers
are incorrectly used or the API's are not used as intended.
Move all crypto headers into private crypto src folder, also move
crypto_ops into Supplicant to remove dependecy on crypto headers.
Closes IDF-476
2019-08-17 11:48:37 +00:00
baohongde
38ae31ebc4
components/bt: Fix linking fail with toolchain 8.2.0
2019-08-16 09:54:18 +00:00
Angus Gratton
76453ccfa5
Merge branch 'bugfix/ledc_clock_mode' into 'master'
...
driver: ledc: Fix clock mode selection
See merge request espressif/esp-idf!5747
2019-08-16 17:39:16 +08:00
chenyudong
2116968d78
test: fix test case MESH_EST_2403
2019-08-16 09:15:31 +00:00
Angus Gratton
727ffbe908
esp_timer: Add parameter NULL checks to public API
...
Return ESP_ERR_INVALID_ARG if the handle is NULL, instead of crashing.
As reported via forum https://esp32.com/viewtopic.php?f=13&t=11721&p=47926#p47926
2019-08-16 13:00:21 +10:00
Angus Gratton
74c2eb3aff
Merge branch 'fix/esp_flash_set_get_wp' into 'master'
...
esp_flash: fix the set/get write protection functions
See merge request espressif/esp-idf!5682
2019-08-16 06:14:48 +08:00
Ivan Grokhotkov
61a1a468bb
tcp_transport: replace transport_strcasestr with strcasestr
...
esp32-2019r1 toolchain version includes 'strcasestr', so the version
provided in tcp_transport component is no longer needed.
2019-08-15 17:51:54 +02:00
Saket Dandawate
ccc95191ea
ulp: Add aditional uint32_t object to ulp_insn_t
...
Used to get the encoded instruction from bit-field structs.
Merges https://github.com/espressif/esp-idf/pull/3759
2019-08-15 17:34:26 +02:00
boarchuz
28ca2d72b8
ulp: Correct misleading corrections of i2c comments
...
Merges https://github.com/espressif/esp-idf/pull/3580
2019-08-15 17:34:19 +02:00
boarchuz
68b3677daa
ulp: Correct misleading i2c write mask comments
...
Merges https://github.com/espressif/esp-idf/pull/3580
2019-08-15 17:34:11 +02:00
boarchuz
88a69823cf
ulp: Expand ULP macro functionality
...
Merges https://github.com/espressif/esp-idf/pull/3580
2019-08-15 17:34:11 +02:00
Hrudaynath Dhabe
53e7beb95b
esp_https_ota: Added error checking functionalities.
...
Current implimentation of esp_http_ota does not perform any error-checking in the data writing phase calls `esp_ota_get_next_update_partition()` irrespetive of the received state of the image. A few additional error checking mechanism have now been added inside the esp_https_ota which returns the control in case an invalid header is received and a wrapper to the function `esp_http_client_is_complete_data_received()` of `esp_http_client` has been added.
2019-08-15 21:10:00 +08:00
Ivan Grokhotkov
5863509804
Merge branch 'bugfix/vfs_concurrent_select' into 'master'
...
VFS: Support concurrent VFS select calls & improve the documentation
Closes IDFGH-1072
See merge request espressif/esp-idf!5538
2019-08-15 19:57:30 +08:00
Angus Gratton
848465da90
driver: Check ledc config result in PCNT tests
2019-08-15 06:53:46 +00:00
Angus Gratton
1dd2f3e07b
driver: ledc: Fix low/high speed parameter setting
...
Fix regression introduced in 2e8c85d8ff
2019-08-15 06:53:46 +00:00
Angus Gratton
a50ae86707
Merge branch 'bugfix/mbedtls_add_source_files_to_appropriate_library' into 'master'
...
mbedtls: add source files to appropriate library
See merge request espressif/esp-idf!5761
2019-08-15 13:32:20 +08:00
Renz Christian Bagaporo
6875080b9b
mbedtls: add source files to appropriate library
2019-08-15 12:43:45 +08:00
Angus Gratton
b6b7ea4f10
Merge branch 'bugfix/fix_flash_read_error_in_dio_mode' into 'master'
...
bugfix(flash): add spi dio address bitlen configure in psram init
See merge request espressif/esp-idf!5783
2019-08-15 11:28:19 +08:00
Prasad Alatkar
4c7b83defc
NimBLE: Fix bug in protocomm_nimble
chararcteristic access callback
...
Fixes bug in `protocomm_nimble` while writing to characteristic with length greater than MTU value.
2019-08-15 10:50:30 +08:00
Angus Gratton
0781868c36
Merge branch 'bugfix/mdns_send_bye_service_instance' into 'master'
...
mdns: fix missing bye packet if services removed with mdns_service_remove_all() or mdns_free()
See merge request espressif/esp-idf!5308
2019-08-15 10:50:17 +08:00
Angus Gratton
ee6b1399aa
Merge branch 'feature/exclude_rom_from_example_header_files' into 'master'
...
exclude rom headers in examples
Closes IDF-557
See merge request espressif/esp-idf!5051
2019-08-15 10:50:01 +08:00
chenjianqiang
74e2e46402
bugfix(flash): add spi dio address bitlen configure in psram init
2019-08-14 20:57:30 +08:00
Angus Gratton
367ecc2d60
Merge branch 'refactor/timerg_in_test' into 'master'
...
timer_group: refactoring to avoid direct register access in the ISR
See merge request espressif/esp-idf!5656
2019-08-14 15:32:16 +08:00
Angus Gratton
2fcbc6aaa5
esp_eth: KConfig formatting fix
2019-08-14 16:50:30 +10:00
David Cermak
a001998d52
mdns: fix missing bye packet if services removed with mdns_service_remove_all() or mdns_free()
...
Closes https://github.com/espressif/esp-idf/issues/3660
2019-08-14 05:54:54 +00:00
Angus Gratton
f72dc5b271
Update cJSON to v1.7.12
...
Fixes potential DoS in cJSON_Minify, see https://github.com/DaveGamble/cJSON/issues/354
2019-08-14 10:03:27 +10:00
KonstantinKondrashov
62ee29250e
soc: Update rtc_vddsdio_get_config for esp32s2beta
...
Closes: IDF-749
2019-08-13 20:04:49 +08:00
Ivan Grokhotkov
0a74227cfa
bump version to 4.1
2019-08-13 10:09:52 +02:00
Angus Gratton
278c2f1aea
Merge branch 'feature/esp32s2beta' into feature/esp32s2beta_update
2019-08-13 17:16:44 +10:00
Angus Gratton
a3a67a4452
nvs_flash: Include xtensa component when building NVS tests on hosts
...
esp_attr.h moved to xtensa component in 61ce868396
2019-08-13 17:16:12 +10:00
Angus Gratton
e32d27e7e8
esp_eth: Add CONFIG_ETH_ENABLED flag to enable/disable ethernet at build time
...
Always enabled by default, as SPI/Ethernet support is enabled by default.
2019-08-13 17:14:16 +10:00
Xia Xiaotian
bcff8afbba
esp_wifi: update esp32s2beta WiFi library
2019-08-13 17:14:16 +10:00
Angus Gratton
9a2e29e068
esp32s2beta: Invert RSA_CONSTANT_TIME_DISABLE_REG to RSA_CONSTANT_TIME_REG
2019-08-13 17:14:16 +10:00
Angus Gratton
8111b222c8
bt: Update to match master
2019-08-13 17:14:16 +10:00
Angus Gratton
18c5cfadae
Fix function prototypes
2019-08-13 17:14:16 +10:00
Angus Gratton
c47e1756f8
examples: Rename deprecate CONFIG_CONSOLE_UART_NUM macro
2019-08-13 17:14:16 +10:00
Angus Gratton
4002c6060a
lwip: Enable ethernet for both ESP32 & ESP32-S2Beta (SPI ethernet)
2019-08-13 17:14:16 +10:00
Angus Gratton
eb7ad6ca17
bootloader: Fix SPI dummy clock settings for ESP32S2-beta
2019-08-13 17:14:16 +10:00
Angus Gratton
d5f5fadbee
bootloader: Include FreeRTOS component for the FREERTOS_UNICORE header, only
2019-08-13 17:14:16 +10:00
Angus Gratton
309376f51a
spi_flash: Force legacy mode for ESP32-S2
...
Can be removed once IDF-763 is merged
2019-08-13 17:14:16 +10:00
Angus Gratton
dc9170966b
freertos: Force UNICORE mode on ESP32S2
2019-08-13 17:14:16 +10:00
Angus Gratton
80a4a11808
Merge branch 'bugfix/fix_mbedtls_net_sockets_error_handling' into 'master'
...
mbedtls: use `errno` instead of `SO_ERROR` for getting socket errors
See merge request espressif/esp-idf!5727
2019-08-13 14:38:28 +08:00
Angus Gratton
aa2a972261
Merge branch 'bugfix/fix_encrypted_project_flash_arg_file_gen' into 'master'
...
CMake: fix encrypted project flash arg file generation
See merge request espressif/esp-idf!5741
2019-08-13 13:45:57 +08:00
suda-morris
b1497f2187
exclude rom headers in examples
...
1. avoid including rom headers directly in examples
2. add common API interface for CRC calculation in esp_common component
2019-08-13 11:10:22 +08:00
suda-morris
f86e82cb63
efuse: update the scheme of getting chip revision
2019-08-13 10:59:02 +08:00
Jiang Jiang Jian
65b9032dba
Merge branch 'bugfix/reuse_pmk_without_set_config' into 'master'
...
wifi: Avoid recalculating PMK when esp_wifi_set_config is not called
Closes IDFGH-1520
See merge request espressif/esp-idf!5745
2019-08-12 23:33:45 +08:00
Angus Gratton
872ba98cc9
Merge branch 'feature/esp32s2beta_crosscore_int' into 'feature/esp32s2beta'
...
esp32s2beta: crosscore_int simplify for esp32s2beta
See merge request espressif/esp-idf!5668
2019-08-12 15:23:56 +08:00
Angus Gratton
212e7be28c
Merge branch 'bugfix/core_id_arg' into 'master'
...
doc: Add clarifications Xtensa Core ID and "Core ID" used in FreeRTOS are different
Closes IDFGH-407
See merge request espressif/esp-idf!5661
2019-08-12 15:16:51 +08:00
Angus Gratton
8f74271d5d
esp_rom: Fail immediately if the wrong SoC's header file is included
2019-08-12 16:57:40 +10:00
Angus Gratton
2f56116db2
Cleanup of previous merge commit
2019-08-12 16:57:40 +10:00
Angus Gratton
e8bdfe07ae
Merge branch 'feature/tls_psk_authentication' into 'master'
...
esp_tls: add psk verification mode
Closes IDFGH-992
See merge request espressif/esp-idf!5095
2019-08-12 12:45:34 +08:00
Angus Gratton
b0ef3cdc9f
Merge branch 'bugfix/check_include_dirs' into 'master'
...
CMake: Check if component include dirs are directories
See merge request espressif/esp-idf!5701
2019-08-12 12:45:11 +08:00
Angus Gratton
4fe74b8f64
freertos: Rename CORE_ID_PRO/CORE_ID_APP macros to CORE_ID_REGVAL_xxx
...
Old values remain for compatibility.
As suggested in https://github.com/espressif/esp-idf/issues/2567
2019-08-12 11:12:34 +10:00
Angus Gratton
a40e164988
doc: Add clarifications Xtensa Core ID and "Core ID" used in FreeRTOS are different
...
Closes https://github.com/espressif/esp-idf/issues/2567
2019-08-12 11:11:28 +10:00
Angus Gratton
aa3c988c17
sha: Add fault injection checks reading hash digest state
...
Vulnerability reported by LimitedResults under Espressif Bug Bounty Program.
2019-08-11 11:16:33 +10:00
Angus Gratton
caea2889c8
aes: Add fault injection checks when writing key to hardware
...
Vulnerability reported by LimitedResults under Espressif Bug Bounty Program.
2019-08-11 11:16:33 +10:00
Sagar Bijwe
b1f657fc65
wifi: Avoid recalculating PMK when esp_wifi_set_config is not called
...
Scenarios where this fix is applicable.
1) Every time the system is powered-on/restarted without calling
esp_wifi_set_config.
2) esp_wifi_init()/connect()/stop()/deinit() is called multiple
times without esp_wifi_set_config.
Closes IDFGH-1520
2019-08-09 16:28:33 +05:30
Konstantin Kondrashov
9a669bfbb9
rmt/driver: Add module reset before enabling
2019-08-09 17:09:56 +08:00
Konstantin Kondrashov
a418b603d0
pcnt/driver: Add module reset before enabling
2019-08-09 17:09:56 +08:00
Konstantin Kondrashov
5c560e0cd1
sdmmc_host/driver: Add module reset before enabling
2019-08-09 17:09:56 +08:00
Konstantin Kondrashov
437228e947
i2s/driver: Add module reset before enabling
2019-08-09 17:09:56 +08:00
Konstantin Kondrashov
d064cd485c
can/driver: Add module reset before enabling
2019-08-09 17:09:56 +08:00
Konstantin Kondrashov
c082d13075
uart/driver: Add module reset before enabling
...
This commit prevents infinite restarts caused due to an interrupt flag
was left uncleared.
Closes: https://github.com/espressif/esp-idf/issues/1981
Closes: IDF-188
2019-08-09 17:09:56 +08:00
Renz Christian Bagaporo
e3c236d2fe
cmake: fix encrypted project flash arg file generation
2019-08-09 16:35:31 +08:00
Jiang Jiang Jian
2b71eff25f
Merge branch 'bugfix/efuse_write_config' into 'master'
...
efuse: set timing configuration before writing
See merge request espressif/esp-idf!4750
2019-08-09 14:25:45 +08:00
Angus Gratton
d6b641949c
Merge branch 'bugfix/httpd_sess_close' into 'master'
...
httpd_sess_close: Check for session validity before closing
See merge request espressif/esp-idf!5705
2019-08-09 14:20:51 +08:00
Michael (XIAO Xufeng)
d850a0bd1c
esp_attr: add flag_attr to support enums used as flags
2019-08-09 13:46:32 +08:00
Michael (XIAO Xufeng)
264ffbeb14
timer_group: use the LL
2019-08-09 13:46:31 +08:00
Michael (XIAO Xufeng)
feea477023
timer_group: add LL functions for WDT
2019-08-09 13:46:30 +08:00
Michael (XIAO Xufeng)
c02981a99b
timer_group: support interrupt LL and some utility functions in ISR
2019-08-09 13:46:30 +08:00
chenjianqiang
a97fe5615f
feat(timer): refator timer group driver (partly pick)
2019-08-09 13:46:29 +08:00
Michael (XIAO Xufeng)
b413a240cb
esp_attr: support force_inline
2019-08-09 13:46:28 +08:00
Angus Gratton
cb0f724e39
Merge branch 'feature/repl_suppl_crypto_by_mbedtls' into 'master'
...
wpa_supplicant: Port more crypto functions to use mbedtls
Closes WIFI-1590
See merge request espressif/esp-idf!5684
2019-08-09 12:52:03 +08:00
Renz Christian Bagaporo
4dd2b9edb1
components: fix incorrect include dir args
2019-08-09 08:40:17 +08:00
Michael (XIAO Xufeng)
e947522f38
esp_flash: improve the comments a bit
2019-08-08 23:18:01 +08:00
Michael (XIAO Xufeng)
e5704ab1a8
esp_flash: fix the set/get write protection functions
...
Add support for get write protection support, fixed the duplicated
set_write_protection link.
All the write_protection check in the top layer are removed. The lower
levels (chip) should ensure to disable write protection before the
operation start.
2019-08-08 23:18:00 +08:00
Mahavir Jain
ab6ad844b1
mbedtls: use errno
instead of SO_ERROR
for getting socket errors
...
As per upgrade notes of lwIP v2.1.0:
socket API: according to the standard, SO_ERROR now only returns asynchronous errors.
All other/normal/synchronous errors are (and always were) available via 'errno'.
LWIP_SOCKET_SET_ERRNO has been removed - 'errno' is always set - and required!
Refer: https://www.nongnu.org/lwip/2_1_x/upgrading.html
Fixes https://github.com/espressif/esp-azure/issues/51
2019-08-08 12:17:32 +00:00
Angus Gratton
77bd32a503
Merge branch 'bugfix/libsodium_test_timeouts' into 'master'
...
test: Set timeout of libsodium ed25519_convert test to 60s
See merge request espressif/esp-idf!5552
2019-08-08 15:02:51 +08:00
Angus Gratton
c1e3e1cd9a
Merge branch 'bugfix/fix_ledc_clock_select_bug' into 'master'
...
driver(ledc): fixed ledc clock selection bug
See merge request espressif/esp-idf!3612
2019-08-08 13:56:21 +08:00
Angus Gratton
cbb45b4559
Merge branch 'bugfix/config_panic_gdbstub_build_issue' into 'master'
...
esp32_gdbstub: fix build error with esp32-2019r1 toolchain
See merge request espressif/esp-idf!5709
2019-08-08 13:53:40 +08:00
Angus Gratton
04ae56806c
Merge branch 'master' into feature/esp32s2beta_update
2019-08-08 15:26:58 +10:00
KonstantinKondrashov
24bd75955f
newlib: Fix UT - test time adjustment happens linearly
...
Obtaining accurate and adjustable time occurs closer to each other.
2019-08-08 12:38:33 +08:00
Angus Gratton
24d26fccde
Merge branch 'master' into feature/esp32s2beta_update
2019-08-08 13:44:24 +10:00
Angus Gratton
14b8ea3b87
Merge branch 'feat/sdio_slave_efuse_default_3v3' into 'master'
...
sdio_slave: updates the document about DAT2 pin, also the version value read from CCCR registers
See merge request espressif/esp-idf!4733
2019-08-08 10:41:14 +08:00
Jiang Jiang Jian
562218d4db
Merge branch 'feature/lwip_prefer_allocate_memory_in_psram' into 'master'
...
Try to allocate some memories in SPIRAM first. If failed, try to allocate in internal RAM then
See merge request espressif/esp-idf!5695
2019-08-07 21:00:14 +08:00
Michael (XIAO Xufeng)
3fd896fe64
sdio_slave: update version read from CCCR to 2.0
2019-08-07 17:10:34 +08:00
Sagar Bijwe
80a5bd8e54
wpa_supplicant: Port more crypto functions to use mbedtls
...
Use mbedtls PBKDF2 and SHA1 for faster calculations during four-way
handshake.
Closes WIFI-1590
2019-08-07 07:23:28 +00:00
morris
1877a9fcd8
Merge branch 'feature/esp32s2beta_rtc_driver' into 'feature/esp32s2beta'
...
Feature/esp32s2beta rtc driver
See merge request espressif/esp-idf!5243
2019-08-07 14:43:17 +08:00
Mahavir Jain
5203a15439
esp32_gdbstub: fix build error with esp32-2019r1 toolchain
...
Fixes https://github.com/espressif/esp-idf/issues/3866
2019-08-07 11:56:13 +05:30
David Cermak
f3d6a34e7d
esp_tls: enable psk verification mode, added mqtt example using psk authentication
2019-08-07 14:27:40 +10:00
fuzhibo
572084821b
add Comment for touchpad
2019-08-07 11:39:17 +08:00
Piyush Shah
c93cab858e
httpd_sess_close: Check for session validity before closing
...
If httpd_sess_trigger_close() gets called twice for the same socket,
the first httpd_sess_close() cb closes the correct socket, but the second
invocation closes the wrong socket which was just accepted and added to
the socket db. Checking for the lru counter will help identify this as the
counter is set only for requests actually served.
2019-08-06 19:31:57 +05:30
kooho
2e8c85d8ff
driver(ledc): fixed ledc clock selection bug.
2019-08-06 16:11:18 +08:00
Mahavir Jain
10c3b42f71
coap: kconfig cleanup, have component specific configuration for common options
2019-08-06 10:37:40 +05:30
Mahavir Jain
852c176a40
coap: add mbedtls in depedency list for CMake build
2019-08-06 10:37:40 +05:30
Jon Shallow
1aaec808da
Add DTLS support to libcoap using MbedTLS
...
This update supports DTLS, TLS is a future TODO
components/coap/CMakeLists.txt:
components/coap/component.mk:
Add in the new files that have to be built
Replace libcoap/src/coap_notls.c with libcoap/src/coap_mbedtls.c
components/coap/libcoap:
Update the version to include the current version for supporting MbedTLS
components/coap/port/coap_debug.c:
components/coap/port/coap_mbedtls.c:
components/coap/port/include/coap/coap_dtls.h:
New port files for DTLS
components/coap/port/include/coap_config_posix.h:
Include building with MbedTLS
examples/protocols/coap_client/README.md:
examples/protocols/coap_client/main/CMakeLists.txt:
examples/protocols/coap_client/main/Kconfig.projbuild:
examples/protocols/coap_client/main/coap_client_example_main.c:
examples/protocols/coap_client/main/component.mk:
Update CoAP client to support DTLS
examples/protocols/coap_client/main/coap_ca.pem
examples/protocols/coap_client/main/coap_client.crt
examples/protocols/coap_client/main/coap_client.key
New PKI Certs for CoAP client (copied from wpa2_enterprise example)
examples/protocols/coap_server/README.md:
examples/protocols/coap_server/main/CMakeLists.txt:
examples/protocols/coap_server/main/Kconfig.projbuild:
examples/protocols/coap_server/main/coap_server_example_main.c:
examples/protocols/coap_server/main/component.mk:
Update CoAP server to support DTLS
Change "no data" to "Hello World!" to prevent confusion
examples/protocols/coap_server/main/coap_ca.pem
examples/protocols/coap_server/main/coap_server.crt
examples/protocols/coap_server/main/coap_server.key
New PKI Certs for CoAP server (copied from wpa2_enterprise example)
Closes https://github.com/espressif/esp-idf/pull/3345
Closes https://github.com/espressif/esp-idf/issues/1379
2019-08-06 10:37:40 +05:30
Angus Gratton
39f090a4f1
Merge branch 'deprecate/spi_common_claim_macros' into 'master'
...
spi_common: remove deprecated spi_common_periph_claim macros
See merge request espressif/esp-idf!5677
2019-08-06 11:16:17 +08:00
xueyunfei
40e808c63b
Try to allocate some LWIP memories in SPIRAM first. If failed, try to allocate in internal RAM then
2019-08-06 10:23:27 +08:00
Jiang Jiang Jian
2d36e42b5f
Merge branch 'bugfix/fix_wifi_bugs_for_authmode_and_multi_ssid' into 'master'
...
wifi: fix wifi bugs for authmode and multi ssid
Closes WIFI-558, WIFI-560, WIFI-449, WIFI-567, and WIFI-597
See merge request espressif/esp-idf!5387
2019-08-05 21:18:27 +08:00
Michael (XIAO Xufeng)
26fc858ea4
spi_common: remove deprecated spi_common_periph_claim macros
2019-08-05 09:26:47 +00:00
Roland Dobai
2211039b6d
docs: Correct and extend the documentation about VFS select()
2019-08-05 11:17:43 +02:00
Roland Dobai
91ce5db172
VFS: Support concurrent VFS select calls
...
Closes https://github.com/espressif/esp-idf/issues/3392
2019-08-05 11:17:41 +02:00
fuzhibo
fbb0687b97
1.update touch driver; 2.update adc/dac driver; 3.add temp sensor driver;
2019-08-05 16:21:18 +08:00
fuzhibo
bf79e9d70a
Driver: gpio and rtcio dirver update
2019-08-05 16:21:18 +08:00
fuzhibo
b055bff580
1.update touch driver; 2.update adc/dac driver; 3.add temp sensor driver;
2019-08-05 16:21:18 +08:00
fuzhibo
83e00cf643
Driver: gpio and rtcio dirver update
2019-08-05 16:21:18 +08:00
kooho
2139ca668d
Update I2S driver for esp32s2beta.
2019-08-05 16:05:16 +08:00
morris
60db9e1a34
Merge branch 'feature/esp32s2beta_pcnt_timer_group_driver' into 'feature/esp32s2beta'
...
Driver(LEDC,PCNT, TIMER_GROUP): Update PCNT,Timer_Group driver for esp32s2beta
See merge request espressif/esp-idf!5239
2019-08-05 15:51:27 +08:00
Angus Gratton
7ef5fa8a0a
Merge branch 'feature/transport_support_der_certs' into 'master'
...
tcp transport ssl DER-support
See merge request espressif/esp-idf!5627
2019-08-05 09:52:08 +08:00
Angus Gratton
b23718995a
Merge branch 'bugfix/strict_prototypes' into 'master'
...
Enable strict prototypes checks
Closes IDFGH-757
See merge request espressif/esp-idf!4546
2019-08-05 09:38:39 +08:00
Tian Hao
a9dfae66ea
bugfix btdm sleep twice after wakeup request
...
This problem may cause HCI send command timeout.
When host call VHCI api to do btdm_wakeup_request, then controller
wakeup process will be handled in ISR and controller task context.
As host task priority is lower than controller task and ISR,
it will cause an incorrect behavior that before VHCI take the
rx_flow_on_semaphore, controller sleep again, then VHCI cannot take
the semaphore and has to wait the automatic wakeup.
2019-08-04 07:17:13 +00:00