Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
10158 commits 10 branches 75 tags 114 MiB
Commit graph

7050 commits

Author SHA1 Message Date
morris
0508ad525a ethernet: add pm lock 2019-12-03 17:37:45 +08:00
morris
97defec6cd ethernet:a bunch of bugfix from master 2019-12-03 17:37:35 +08:00
morris
96e6049dab ethernet:add start stop control 2019-12-03 17:36:48 +08:00
morris
37154d4c08 ethernet:add reference counter 2019-12-03 15:53:39 +08:00
suda-morris
42a462d584 ethernet: add gpio number into config structure 2019-12-03 15:53:39 +08:00
Prasad Alatkar
69c86bc37e NimBLE: Fix erroneous behaviour of NPL when controller not ready to receive (Backport v4.0) 2019-12-01 17:53:49 +08:00
Ivan Grokhotkov
14f1a30e38 build system: move -fno-rtti link option next to the compile option 
Previous commit has added `link_options` to the root CMakeLists.txt,
can use it to collect such global link options now.
 2019-11-28 11:02:30 +01:00
Jiang Jiang Jian
139913baa2 Merge branch 'bugfix/config_assert_thread_safety_backport_v4.0' into 'release/v4.0' 
freertos: Fix configASSERT thread safety (backport v4.0)

See merge request espressif/esp-idf!6662
 2019-11-28 11:51:13 +08:00
zhiweijian
8d189d9fb4 component/bt: allow adv stop again when adv is already stoped and fix crash when tx prog sometimes 2019-11-27 20:15:08 +08:00
weitianhua
e7a6fdca54 component/bt: Fix bugs in HFP feature 2019-11-27 16:48:26 +08:00
Jiang Jiang Jian
48dfbe05a4 Merge branch 'fixed_queue_v4.0' into 'release/v4.0' 
component_bt/: Fix_pointer_type_fixed_queue v4.0

See merge request espressif/esp-idf!6846
 2019-11-27 16:39:51 +08:00
weitianhua
5d00321d07 fix_pointer_type_fixed_queue 2019-11-27 15:06:15 +08:00
Jiang Jiang Jian
2e8ad19e35 Merge branch 'bugfix/ble_mesh_device_with_wrong_name_on_ios_v4.0' into 'release/v4.0' 
ble_mesh: fix ble mesh device with wrong name on iOS (v4.0)

See merge request espressif/esp-idf!6521
 2019-11-27 10:31:01 +08:00
Angus Gratton
7725ce4999 Merge branch 'fix/esp_flash_no_qe_4.0' into 'release/v4.0' 
esp_flash: fix the QE write issue in high freq, and support UT for external chips (backport v4.0)

See merge request espressif/esp-idf!6423
 2019-11-26 11:34:14 +08:00
Jiang Jiang Jian
e3f0854771 Merge branch 'bugfix/fix_timer_deleted_and_run_broken_callback_v4.0' into 'release/v4.0' 
esp_timer: fix the bug that when timeout of timer happens try to run callback(v4.0)

See merge request espressif/esp-idf!6769
 2019-11-22 17:38:06 +08:00
Michael (XIAO Xufeng)
b5d04a21fb esp_flash: fix the quad issue for some GD flash chips 
The GD flash with product ID 40H, is already used in Wrover-nosufix modules.
 2019-11-21 12:26:15 +08:00
Michael (XIAO Xufeng)
337b1df430 esp_flash: add unit test for external flash and QE toggling 
Tests for external flash chips used to controlled by macros, one bin for
one chip. And tests are done manually. This commit refactored the test
so that all 3 chips can all run in single test.
 2019-11-21 12:26:15 +08:00
Michael (XIAO Xufeng)
41e64bd79c esp_flash: rename internal variables for better readability 
chip_drv in HAL are renamed as host
 2019-11-21 12:26:14 +08:00
Michael (XIAO Xufeng)
2b7681ec4f esp_flash: fix set qe bit and write command issues 
There used to be dummy phase before out phase in common command
transactions. This corrupts the data.

The code before never actually operate (clear) the QE bit, once it finds
the QE bit is set. It's hard to check whether the QE set/disable
functions work well.

This commit:

1. Cancel the dummy phase

2. Set and clear the QE bit according to chip settings, allowing tests
   for QE bits. However for some chips (Winbond for example), it's not
   forced to clear the QE bit if not able to.

3. Also refactor to allow chip_generic and other chips to share the same
   code to read and write qe bit; let common command and read command share
   configure_host_io_mode.

4. Rename read mode to io mode since maybe we will write data with quad
   mode one day.
 2019-11-21 12:26:14 +08:00
Jiang Jiang Jian
a8f956e590 Merge branch 'bugfix/warning_fix_latest_freertos_v4.0' into 'release/v4.0' 
Fixed warnings for components driver, esp32 and mbedtls (v4.0)

See merge request espressif/esp-idf!6759
 2019-11-20 12:20:02 +08:00
Jiang Jiang Jian
3b879ce8c3 Merge branch 'bugfix/put_more_rx_code_to_iram_v4.0' into 'release/v4.0' 
Put some rx code to iram (backport v4.0)

See merge request espressif/esp-idf!6492
 2019-11-20 11:19:20 +08:00
Jack
5102308b2b esp_timer: fix the bug that when timeout of timer happens try to run callback, and high priority task delete the timer and break the callback 2019-11-19 22:51:28 +08:00
Shubham Kulkarni
f95a723412 Fixed warnings for components driver, esp32 and mbedtls 2019-11-19 15:02:02 +05:30
Jiang Jiang Jian
88cbc26f4d Merge branch 'bugfix/btdm_run_out_of_frame_element_v4.0' into 'release/v4.0' 
components/bt: Fix assert due to no free element form

See merge request espressif/esp-idf!6700
 2019-11-19 17:01:32 +08:00
Mahavir Jain
1b53af2e88 freertos: modify configASSERTs around scheduler state check 
Regression introduced in commit 79e74e5d5f

It is possible that some FreeRTOS APIs are invoked prior to
scheduler start condition (e.g. flash initialization in unicore mode).
In that condition these asserts should not trigger (scheduler state being yet to be started),
hence changes per this fix.
 2019-11-19 04:42:27 +00:00
Darian Leung
376107b2ae freertos: Fix configASSERT thread safety 
This commit fixes thread safety issues with configASSERT() calls
regarding the value of uxSchedulerSuspended. A false negative
occurs if a context switch to the opposite core occurs in between
the getting the core ID and the assesment.

Closes https://github.com/espressif/esp-idf/issues/4230
 2019-11-19 04:42:27 +00:00
Jiang Jiang Jian
c9294aff6f Merge branch 'bugfix/btdm_disable_some_secrity_mask_v4.0' into 'release/v4.0' 
components/bt: Disable some unsupported security mask

See merge request espressif/esp-idf!6725
 2019-11-19 12:15:36 +08:00
Angus Gratton
99fb9a3f7c Merge branch 'bugfix/miscellaneous_cmake_fixes' into 'release/v4.0' 
CMake bugfixes

See merge request espressif/esp-idf!6654
 2019-11-19 06:52:07 +08:00
xiehang
e5773cc2fe esp_wifi: Put some rx code to iram and update phy4180 2019-11-18 02:54:46 +00:00
He Yin Ling
4e6c575fed Merge branch 'feature/add_env_tag_for_32khz_xtal_uts_v4.0' into 'release/v4.0' 
soc(esp32&esp32s2beta): Add test_env for 32kHz XTAL unit tests (v4.0)

See merge request espressif/esp-idf!6603
 2019-11-18 10:44:20 +08:00
baohongde
8353ecdf36 components/bt: Disable some unsupported security mask 2019-11-17 13:45:32 +08:00
Mahavir Jain
ebc2e7bce0 Merge branch 'fix/NimBLE_protocomm_mngr' into 'release/v4.0' 
NimBLE: Fix bug in `protocomm_nimble` chararcteristic access callback (release/v4.0)

See merge request espressif/esp-idf!6703
 2019-11-15 19:11:19 +08:00
Prasad Alatkar
c595b2fa8c NimBLE: Fix bug in protocomm_nimble chararcteristic access callback (release/v4.0) 
Fixes bug in `protocomm_nimble` while writing to characteristic with length greater than MTU value.
 2019-11-14 15:24:47 +05:30
lly
eb95bc68c4 ble_mesh: fix ble mesh device with wrong name on iOS 2019-11-14 16:56:34 +08:00
baohongde
f9f49107ca components/bt: Fix assert due to no free element form 2019-11-14 15:20:54 +08:00
KonstantinKondrashov
fae116bb2e soc/esp32: Add test_env for 32kHz XTAL unit tests 2019-11-14 12:26:43 +08:00
lly
f22d46515b ble_mesh: miscellaneous modifications 
1. Clean up client_common.c
2. Clean up esp_ble_mesh directory
3. Update Kconfig.in
4. Format esp_ble_mesh files
 2019-11-14 11:59:21 +08:00
lly
27cb3d7f72 ble_mesh: adapt ble mesh with nimble host 2019-11-14 10:42:30 +08:00
lly
a302d210b9 ble_mesh: add events for configuration server model 2019-11-14 10:39:55 +08:00
lly
a32c72a1b2 ble_mesh: add Generic/Sensor/Time and Scenes/Lighting Server models 2019-11-14 10:39:49 +08:00
lly
f1850b54f3 ble_mesh: add proxy client functionality 2019-11-14 10:39:40 +08:00
lly
c85abf87b5 ble_mesh: add ble mesh friend node event 2019-11-14 10:39:17 +08:00
lly
9029ccd21b ble_mesh: add low power node api and event 2019-11-14 10:39:13 +08:00
lly
eaeb36375a ble_mesh: add heartbeat message recv callback 2019-11-14 10:39:08 +08:00
lly
805bc06127 ble_mesh: modify health server model callbacks 2019-11-14 10:39:04 +08:00
lly
4702cd1b51 ble_mesh: add separate advertising buffers for relay packets 2019-11-14 10:38:59 +08:00
Jiang Jiang Jian
720528ef11 Merge branch 'feature/nimble_host_esp_ble_mesh_v4.0' into 'release/v4.0' 
components/bt: Add support of NimBLE host in ESP BLE Mesh (backport v4.0)

See merge request espressif/esp-idf!6619
 2019-11-13 21:32:23 +08:00
Jiang Jiang Jian
6c7f72cc1b Merge branch 'bugfix/http_client_buffer_overflow_v4.0' into 'release/v4.0' 
Fix HTTP client buffer overflow (v4.0)

See merge request espressif/esp-idf!6666
 2019-11-13 16:24:51 +08:00
Jiang Jiang Jian
7061c8aec2 Merge branch 'bugfix/mdns_invalid_hostname_queries_v4.0' into 'release/v4.0' 
mdns: fix crash for hostname queries (backport v4.0)

See merge request espressif/esp-idf!6504
 2019-11-13 16:19:19 +08:00
David Cermak
3ba8ae7a62 http_client: added comments to http header generation function 2019-11-12 09:59:50 +01:00
David Cermak
2c27c55679 http_client: possible buffer overflow fixed when determining last header item to be written 
closes IDF-694
 2019-11-12 09:59:50 +01:00
Jiang Jiang Jian
077b727608 Merge branch 'bugfix/backport_some_wifi_fixes_1009_v4.0' into 'release/v4.0' 
esp_wifi: fix some WiFi bugs 1009 (backport v4.0)

See merge request espressif/esp-idf!6299
 2019-11-12 11:27:40 +08:00
Angus Gratton
79f36e85d5 Merge branch 'fix/ci_ut_psram_wroverb_v4.0' into 'release/v4.0' 
ci: fix one ut issue when using Wrover-B module with newer ver of PSRAM (backport v4.0)

See merge request espressif/esp-idf!6592
 2019-11-11 18:38:53 +08:00
Renz Christian Bagaporo
d49077c13b spiffs: fix build issue on clean project 
From issue:

I did some poking around in components/spiffs/project_include.cmake and
it looks like what is failing is it isn't getting an offset from
parttool.py. I think what the problem is that the parttool.py cannot
determine the offset of the storage partition as I can't run menuconfig
to set the custom partitions.

I have tested that this problem is solvable by manually setting the
custom partitions in sdkconfig and that is a workaround but there should
be at least a better error message in the configuration when it cannot
find the partition as this would also happen if the partition name was
misspelled.

Closes https://github.com/espressif/esp-idf/issues/4236
 2019-11-11 18:11:12 +08:00
Renz Christian Bagaporo
bc3134594d 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-11-11 18:02:32 +08:00
Renz Christian Bagaporo
8300945189 cxx: force pthread to appear later in link line 2019-11-11 18:01:45 +08:00
Ivan Grokhotkov
088ac409d7 Merge branch 'bugfix/partition_cmake_md5_v4.0' into 'release/v4.0' 
cmake: fix partition_table cmake when using md5 checksum (v4.0)

See merge request espressif/esp-idf!6640
 2019-11-09 21:17:08 +08:00
Jiang Jiang Jian
14ce4cde2e Merge branch 'bugfix/wifi_internal_memory_v4.0' into 'release/v4.0' 
wifi: Include DMA reserved pool when allocating internal-only memory (v4.0)

See merge request espressif/esp-idf!6627
 2019-11-09 13:47:33 +08:00
Wu Jian Gang
83cd515817 cmake: fix partition_table cmake when using md5 checksum 2019-11-08 18:52:18 +08:00
Angus Gratton
d48d9a1c88 Merge branch 'bugfix/i2s-bootloader-random-disable_v4.0' into 'release/v4.0' 
bugfix(i2s_bootloader_random_disable): fix bug about i2s bootloader_random_disable for release/v4.0

See merge request espressif/esp-idf!6602
 2019-11-08 17:12:02 +08:00
Michael (XIAO Xufeng)
f54cab62a2 ci: fix one ut issue when using Wrover-B module with newer ver of PSRAM 
The workaround for PSRAM that will occupy an SPI bus is enabled only when:

1. used on 32MBit ver 0 PSRAM.
2. work at 80MHz.

The test used to only check 32MBit by the config option, but for PSRAM
on Wrover-B module seems to use a newer version of 32MBit PSRAM.  So it
expects the workaround to be enabled, but actually not.

This commit split the unit test into two parts:

1. check all SPI buses are available, for all configs except psram_hspi
and psram_vspi, run on regular runners (including Wrover and Wrover-B).
a hidden option is enabled so that the compiler knows it's not building
psram_hspi or psram_vspi.

2. check the specified bus are acquired, for config psram_hspi and
psram_vspi. This only run on special runner (legacy Wrover module).
 2019-11-08 08:25:35 +00:00
Angus Gratton
c64d4236fb secure boot: In Reflashable mode, make sure the bootloader digest updates 
... whenever the bootloader.bin is updated
 2019-11-08 11:39:01 +08:00
Angus Gratton
90568fbf00 secure boot: Fix bug where verification key was not embedded in app 2019-11-08 11:39:01 +08:00
Angus Gratton
475a746e46 bt: Include DMA reserved pool when allocating internal-only memory 
Fix for root cause of https://github.com/espressif/esp-idf/issues/3592
 2019-11-08 11:37:46 +08:00
Angus Gratton
947fc14a3f wifi: Include DMA reserved pool when allocating internal-only memory 
Fix for root cause of https://github.com/espressif/esp-idf/issues/3592
 2019-11-08 11:37:46 +08:00
Hrishikesh Dhayagude
9cc272978c nimble: Miscellaneous changes 
1. Update NimBLE submodule as per changes in adv interval and stop port
2. Make changes in ESP BLE Mesh NimBLE host code for the same
 2019-11-06 18:27:14 +05:30
Hrishikesh Dhayagude
5cb6a49c1e components/bt: Add support of NimBLE host in ESP BLE Mesh 2019-11-06 18:26:30 +05:30
Hrishikesh Dhayagude
56d1e4411e NimBLE: Set the default number of max connections to the controller's value 
Also, update the NimBLE submodule to remove unwanted logging stuff
 2019-11-06 18:24:56 +05:30
Marius Vikhammer
5e042803a2 mdns: fix crash for hostname queries 
Receiving TXT, PTR, SDPTR and SRV record type queries would crash the application if the hostname
 was used as instance name.

Closes https://github.com/espressif/esp-idf/issues/4224
 2019-11-05 11:31:18 +00:00
Chen Zheng Wei
74d06101b1 bugfix(i2s_bootloader_random_disable): fix bug about i2s bootloader_random_disable for release/v4.0 
bootloader_random_disable disables the ADC incorrectly, causing the ADC to sometimes fail to work. Fix this bug
 2019-11-05 17:18:13 +08:00
David Cermak
1a8e5a40d6 ws_client: added subprotocol configuration option to websocket client 
closes https://github.com/espressif/esp-idf/issues/3893
 2019-11-02 14:12:11 +01:00
David Cermak
b529c6f282 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-11-02 14:12:11 +01:00
David Cermak
7a05879024 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-11-02 14:12:11 +01:00
David Cermak
1611386431 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-11-02 14:12:11 +01:00
Jiang Jiang Jian
6181686489 Merge branch 'bugfix/ws_client_fix_event_blocking_v4.0' into 'release/v4.0' 
ws_client: fixed posting to event loop with websocket timeout (v4.0)

See merge request espressif/esp-idf!6450
 2019-11-02 17:29:26 +08:00
Jiang Jiang Jian
0562281353 Merge branch 'bugfix/ws_buffer_overflow_fix_v4.0' into 'release/v4.0' 
tcp_transport: fix possible buffer overflow in ws transport connect (v4.0)

See merge request espressif/esp-idf!6447
 2019-11-02 17:28:12 +08:00
Jiang Jiang Jian
8bc1f6e2f5 Merge branch 'bugfix/ws_opcodes_fix_v4.0' into 'release/v4.0' 
ws_client: fix for not sending ping responses, updated to pass events also for... (v4.0)

See merge request espressif/esp-idf!6451
 2019-11-02 17:24:40 +08:00
Jiang Jiang Jian
dd99a6dbe8 Merge branch 'bugfix/ws_client_fixed_path_query_uri_v4.0' into 'release/v4.0' 
websocket_client: fix URI parsing to include also query part in websocket connection path (v4.0)

See merge request espressif/esp-idf!6452
 2019-11-02 17:19:44 +08:00
Jiang Jiang Jian
5a686d7ad1 Merge branch 'bugfix/mdns_answer_ip6_size_v4.0' into 'release/v4.0' 
mdns: use constant size of AAAA answer instead of lw_IP struct size (v4.0)

See merge request espressif/esp-idf!6453
 2019-11-02 17:17:45 +08:00
Jiang Jiang Jian
0ca0e7d3cc Merge branch 'bugfix/mdns_BCT_fix_v4.0' into 'release/v4.0' 
mdns: fixes to have the BCT passing with latest IDF/lw-IP (v4.0)

See merge request espressif/esp-idf!6454
 2019-11-02 17:17:38 +08:00
Jiang Jiang Jian
f06ef95610 Merge branch 'bugfix/bugs_in_a2dp_task_v4.0' into 'release/v4.0' 
components/bt: Not post message to a2dp ctrl queue from btc queue, just call it.

See merge request espressif/esp-idf!6532
 2019-11-02 17:17:07 +08:00
liu zhifu
0078896347 esp_wifi: fix some WiFi bugs 
Fix following WiFi bugs:
1. Fix the bug for API_CHECK_ENABLED
2. Fix the bug that wpa2 enterprise sta can connect open AP
3. Fix TKIP/CCMP PN replay attack detection bug
4. Increase buffer number type from uint8_t to uint16_t to support more than 255 buffers
5. Avoid recalculating PMK if esp_wifi_set_config() is not called
6. Fix 5.5M signal test bug
 2019-11-01 22:16:30 +08:00
David Cermak
44599d3a84 ws_client: fix for not sending ping responses, updated to pass events also for PING and PONG messages, added interfaces to send both binary and text data 
closes https://github.com/espressif/esp-idf/issues/3982
 2019-11-01 14:14:15 +00:00
David Cermak
0fa7dcb946 websocket_client: fix URI parsing to include also query part in websocket connection path 
closes https://github.com/espressif/esp-idf/issues/4090
 2019-11-01 14:07:15 +00:00
David Cermak
d3a8dcb929 tcp_transport: fix possible buffer overflow in ws transport connect 
closes IDF-692
 2019-11-01 14:05:04 +00:00
David Cermak
4e8c1b91c0 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-11-01 14:02:58 +00:00
Jiang Jiang Jian
4ed0d006b4 Merge branch 'bugfix/fix_wifi_deinit_memory_leak_v4.0' into 'release/v4.0' 
esp_wifi: fix WiFi deinit memory leak (backport v4.0)

See merge request espressif/esp-idf!6539
 2019-11-01 21:39:56 +08:00
baohongde
e85804824e components/bt: Not post message to a2dp ctrl queue from btc queue, just call it. 2019-11-01 20:12:24 +08:00
Jiang Jiang Jian
304f6a577a Merge branch 'bugfix/btdm_assert_deinit_a2dp_while_playing_v4.0' into 'release/v4.0' 
components/bt: Fix assert when deinit A2DP while playing music

See merge request espressif/esp-idf!6534
 2019-11-01 18:20:07 +08:00
David Cermak
29690afc57 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-11-01 09:50:42 +00:00
David Cermak
98450e80e5 mdns: fix possible race condition when checking DHCP status on WIFI_EVENT_STA_CONNECTED event. 
tcpip_adapter_dhcpc_get_status() returns the actual internal value of dhcp client without any locking or TCP/IP stack context call, so when CONNECTED event fired with default settings it started DHCP client in TCP/IP stack context and at the same time mdns event handler checking actual DHCP state, which could still be INIT (not STARTED). Purpose of this check is to enable PCB if DHCP was stopped before setting network interface up (typically static IP settings), so the solutin is to check against TCPIP_ADAPTER_DHCP_STOPPED state
 2019-11-01 07:51:49 +00:00
Jiang Jiang Jian
1007473a3b Merge branch 'bugfix/btdm_check_avrc_connected_error_4.0' into 'release/v4.0' 
components/bt: Fix error in checking AVRC connected

See merge request espressif/esp-idf!6440
 2019-11-01 14:14:13 +08:00
Jiang Jiang Jian
e875f59ed5 Merge branch 'feature/esp-ble-mesh-documentation-v4.0' into 'release/v4.0' 
Provide BLE Mesh documentation (v4.0)

See merge request espressif/esp-idf!6560
 2019-11-01 14:02:26 +08:00
Darian Leung
666f87109f CAN: Fix critical section compliance 
This commit makes the CAN driver ISR use the ISR version
of critical section.
 2019-11-01 12:14:39 +08:00
Jiang Jiang Jian
154f315a49 Merge branch 'Bugfix/close_nonblocking_tcp_crash_for_4.0' into 'release/v4.0' 
Bugfix/close nonblocking tcp crash for 4.0

See merge request espressif/esp-idf!6517
 2019-11-01 11:24:13 +08:00
Krzysztof Budzynski
f9fa039826 Provide BLE Mesh documentation 2019-10-31 17:08:26 +08:00
Anton Maklakov
fae64f79bb C++: prepare RTTI support 
Ref. https://github.com/espressif/esp-idf/issues/1684

Also, for full RTTI support, libstdc++.a in the toolchain should be built
in both with RTTI and w/o RTTI options. Multilib with -fno-rtti
flag is used for that.

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-31 13:27:39 +07:00
Anton Maklakov
4f297ed3fa Revert "C++: add provisions for optional RTTI support" 
This reverts commit 3d0466ccd1.
 2019-10-31 13:26:53 +07:00
Jiang Jiang Jian
8eaa440221 Merge branch 'bugfix/jump_time_54_sec_v4.0' into 'release/v4.0' 
esp_timer: Fix time jumps back ~ 54sec (v4.0)

See merge request espressif/esp-idf!6456
 2019-10-31 12:31:39 +08:00
Jiang Jiang Jian
56d5548747 Merge branch 'bugfix/btdm_backports_v4.0_1028' into 'release/v4.0' 
bt: backport btdm controller fixes to v4.0

See merge request espressif/esp-idf!6514
 2019-10-30 15:39:11 +08:00