alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,625 Commits 20 Branches 148 Tags 384 MiB
976dc42931
Commit Graph

8679 Commits

Author SHA1 Message Date
Angus Gratton
d4e9953212 Merge branch 'bugfix/cpp_header_rom_secure_boot_v4.1' into 'release/v4.1' 
Secure Boot: Fixes the cpp macro in esp32 secure boot rom functions.

See merge request espressif/esp-idf!10572
 2020-09-24 12:25:22 +08:00
jiangguangming
387905a4ad flash_mmap: restore interrupt and cache before err return 2020-09-24 09:59:06 +08:00
jiangguangming
0ff3ceba32 flash_mmap: can mmap after get enough free MMU pages 2020-09-24 09:59:06 +08:00
Jiang Jiang Jian
b29209e3db Merge branch 'bugfix/ipv6_send_data_error_when_src_ip_miss_for_4.1' into 'release/v4.1' 
lw-ip:ipv6 send multicast data fail when src address is null ( backport 4.1)

See merge request espressif/esp-idf!10559
 2020-09-23 22:29:52 +08:00
Jiang Jiang Jian
805ee815d0 Merge branch 'bugfix/wifi_spin_lock_allocation_in_PSRAM_v4.1' into 'release/v4.1' 
wifi: Fix spin lock allocation in PSRAM bug(v4.1)

See merge request espressif/esp-idf!10552
 2020-09-23 18:58:27 +08:00
Ivan Grokhotkov
8a849b29f2 Merge branch 'bugfix/panic_instr_fetch_prohibited_v4.1' into 'release/v4.1' 
panic: skip over the first invalid PC in case of InstrFetchProhibited (v4.1)

See merge request espressif/esp-idf!10294
 2020-09-23 17:00:16 +08:00
Supreet Deshpande
66315e71fe Secure Boot: Fixes the cpp macro in esp32 secure boot rom functions. 
Closes https://github.com/espressif/esp-idf/issues/5878
 2020-09-23 02:57:30 +05:30
xueyunfei
e55af6c8a5 ipv6 send multicast data fail when src address is null for 4.1 2020-09-22 17:21:10 +08:00
David Čermák
b7fb9be045 Merge branch 'bugfix/openss_strict_verify_mode_4.1' into 'release/v4.1' 
openssl: made verification mode conversion to mbetls modes more strict (v4.1)

See merge request espressif/esp-idf!10500
 2020-09-22 16:33:02 +08:00
Angus Gratton
59ff505809 Merge branch 'bugfix/adjtime_return_outdelta_before_new_delta_set_v4.1' into 'release/v4.1' 
newlib: Fix adjtime, returns the amount of time remaining from any previous adjustment (v4.1)

See merge request espressif/esp-idf!9972
 2020-09-22 15:34:27 +08:00
dongyou
d95e91b344 Fix spin lock allocation in PSRAM bug 2020-09-22 14:28:18 +08:00
Jiang Jiang Jian
67b87e1bd8 Merge branch 'bugfix/fix_udp_tx_performance_issue_v4.1' into 'release/v4.1' 
lw-ip: fix udp tx packet loss issue (backport v4.1)

See merge request espressif/esp-idf!10018
 2020-09-22 14:16:12 +08:00
Marius Vikhammer
890a62b53e CI: Increase stack size for efuse unit test 
"Batch mode is thread-safe" case would occasionally cause a stackoverflow.
Increased stack size.
 2020-09-22 12:00:33 +08:00
weitianhua
754c91f9e1 Confirmed bugfix from Baidu project 2020-09-22 11:46:01 +08:00
David Cermak
8350f2fb6e openssl: made verification mode conversion to mbetls modes more strict 2020-09-21 13:21:41 +00:00
Angus Gratton
d83520060c Merge branch 'bugfix/esp32s2_o2_op_v4.1' into 'release/v4.1' 
freertos: fix build error at -O2 optimization level (v4.1)

See merge request espressif/esp-idf!10304
 2020-09-21 15:15:16 +08:00
ChenJianxing
4b11a05391 lwip: fix IPv6 ND6 queue too much pkts cause no mem issue and add menuconfig item for this params. 2020-09-21 11:08:47 +08:00
xiehang
4b662d1a22 lw-ip: fix udp tx packet loss issue 2020-09-21 10:58:43 +08:00
Michael (XIAO Xufeng)
214cc69fc1 Merge branch 'bugfix/spi_master_multiple_dev_with_diff_cs_lvl_4.1' into 'release/v4.1' 
spi_master: correctly set cs polarity (4.1)

See merge request espressif/esp-idf!10392
 2020-09-21 10:19:33 +08:00
Jiang Jiang Jian
1e526a5d7d Merge branch 'bugfix/wifi_create_and_start_ap_v4.1' into 'release/v4.1' 
Set default AP handlers in wifi_create_and_start_ap() v4.1

See merge request espressif/esp-idf!10457
 2020-09-20 16:36:16 +08:00
Jiang Jiang Jian
167966380b Merge branch 'docs/fix_event_typo_backport_v4.1' into 'release/v4.1' 
docs/fix event typo backport v4.1

See merge request espressif/esp-idf!9383
 2020-09-20 16:29:33 +08:00
Ivan Grokhotkov
e348a291ad spi_flash: don't call vTaskDelay in non-os context 
Fixes regression in core dump, when a crash happens in interrupt
context.
 2020-09-18 15:34:32 +00:00
Mahavir Jain
88a3f963c4 Merge branch 'bugfix/provisioning_example_warning_with_O2_optimization_v4.1' into 'release/v4.1' 
provisioning: use memcpy instead of strncpy for copying SSID (v4.1)

See merge request espressif/esp-idf!10495
 2020-09-18 17:25:59 +08:00
Island
98b6fe8f30 Merge branch 'bugfix/ble_mesh_check_stack_init_v4.1' into 'release/v4.1' 
ble_mesh: stack: Check if mesh stack initialized before init vendor client (v4.1)

See merge request espressif/esp-idf!10482
 2020-09-18 09:40:01 +08:00
Angus Gratton
5f5a398662 Merge branch 'backport/shared_stack_4.1' into 'release/v4.1' 
Backport/shared stack 4.1

See merge request espressif/esp-idf!10302
 2020-09-18 05:15:30 +08:00
Mahavir Jain
04b8564249 provisioning: use memcpy instead of strncpy for copying SSID 
Per WiFi library requirement, SSID can be non-null terminated string
if its length goes to 32 bytes (maximum). Use of strncpy in this case,
along with compiler optimization level -O2 results in some warnings
for potential use of non-null terminated strings.

Fix here ensures use of memcpy to copy SSID string upto appropriate
desired length. This helps to avoid compiler specific workaround
flags added earlier.

Closes https://github.com/espressif/esp-idf/issues/5866
Closes IDFGH-3983
 2020-09-17 15:54:23 +05:30
ChenJianxing
2c87065521 esp_wifi: update phy v4390.(backport v4.1) 2020-09-17 15:51:09 +08:00
Jiang Jiang Jian
f280be4a86 Merge branch 'bugfix/clean_wpa2_wifi_deinit' into 'master' 
wpa_supplicant: Deinit wpa2 states in wifi deinit

See merge request espressif/esp-idf!10103

(cherry picked from commit 4dcaa0e6f4)

06bc7f1d wpa_supplicant: Deinit wpa2 states in wifi deinit
 2020-09-17 06:06:40 +00:00
Jakob Hasse
89523af91f toolchain: C++ exception workaround 
* disable C++ exception FDE sorting (saves RAM)

Closes IDF-1128
 2020-09-17 10:51:39 +07:00
lly
d1311d1e23 ble_mesh: stack: Check if mesh stack initialized before init vendor client 2020-09-17 11:26:40 +08:00
Angus Gratton
94cb7e8b8f Merge branch 'bugfix/cxx_flag_operators_v4.1' into 'release/v4.1' 
esp_eth: moved extern "C" after includes (v4.1)

See merge request espressif/esp-idf!10352
 2020-09-15 16:13:06 +08:00
Angus Gratton
01db565aef Merge branch 'bugfix/ulp_as_version_v4.1' into 'release/v4.1' 
ulp: fix ULP assembler version detection for localized systems (v4.1)

See merge request espressif/esp-idf!10394
 2020-09-15 15:23:18 +08:00
Angus Gratton
ab98baff14 Merge branch 'bugfix/bootloader_skip_verify_jtag_v4.1' into 'release/v4.1' 
bootloader_support: don't check signature when JTAG is attached (v4.1)

See merge request espressif/esp-idf!10379
 2020-09-15 15:06:17 +08:00
dongyou
26bfb1cf10 Set default AP handlers in wifi_create_and_start_ap() 2020-09-15 14:53:11 +08:00
Angus Gratton
b022bb2770 Merge branch 'feature/portmux_debug_bump_timeout' into 'release/v4.1' 
bugfix/freertos: increase portmux timeouts to avoid crashing when using debug feature

See merge request espressif/esp-idf!9957
 2020-09-15 14:29:19 +08:00
Michael (XIAO Xufeng)
1ced3f9750 Merge branch 'bugfix/add_return_in_uart_wait_tx_done_bp4.1' into 'release/v4.1' 
bugfix(UART): Add return in uart_wait_tx_done(backport v4.1)

See merge request espressif/esp-idf!10336
 2020-09-14 14:25:05 +08:00
Michael (XIAO Xufeng)
edb19cd748 Merge branch 'bugfix/fix_rtcio_adc_driver_for_esp32' into 'release/v4.1' 
rtc(adc/rtcio): fix adc rtcio driver for esp32

See merge request espressif/esp-idf!8347
 2020-09-14 10:57:26 +08:00
Island
9e8b44e353 Merge branch 'bugfix/ble_mesh_prov_iv_index_v4.1' into 'release/v4.1' 
ble_mesh: stack: Using the latest iv_index for provisioning (v4.1)

See merge request espressif/esp-idf!10417
 2020-09-11 20:09:01 +08:00
Jiang Jiang Jian
df3aef80c0 Merge branch 'component/seperate_bta_jv_l2c_4.1' into 'release/v4.1' 
Component/seperate bta jv l2c 4.1

See merge request espressif/esp-idf!9645
 2020-09-11 19:38:00 +08:00
Jiang Jiang Jian
b204bc1bd6 Merge branch 'bugfix/change_pcm_config_position_4.1' into 'release/v4.1' 
Bugfix/ Change PCM config position 4.1

See merge request espressif/esp-idf!10314
 2020-09-11 19:35:55 +08:00
Jiang Jiang Jian
b131fffa84 Merge branch 'bugfix/add_protection_for_spp_api_4.1' into 'release/v4.1' 
Bugfix/add protection for spp api 4.1

See merge request espressif/esp-idf!10282
 2020-09-11 19:33:49 +08:00
lly
bca0b85fc3 ble_mesh: stack: Using the latest iv_index for provisioning 
Provisioner should always uses the latest IV Index for provisioning.
For example, if the current IV Index is 0x00000001, but prov->iv_index
is still initialized with 0x00000000, and if Provisioner uses prov->
iv_index for provisioning, this will cause the Provisioner failing to
control the node.
So here bt_mesh.iv_index is used instead of prov->iv_index.
 2020-09-11 10:56:06 +08:00
Jiang Jiang Jian
445635fe45 Merge branch 'bugfix/fix_some_wifi_bugs_0907_v4.1' into 'release/v4.1' 
bugfix: fix some wifi bugs (backport v4.1)

See merge request espressif/esp-idf!10315
 2020-09-10 22:33:05 +08:00
Felipe Neves
10c498ae7d expression_with_stack: added a tweak on TCB stackpointers to avoid false trigger of stack overflow 2020-09-10 10:00:32 -03:00
Jiang Jiang Jian
723c8d9899 Merge branch 'bugfix/btdm_spp_null_ptr_with_dynamic_memory_v4.1' into 'release/v4.1' 
components/bt: Fix SPP using NULL point with dynamic memory

See merge request espressif/esp-idf!10323
 2020-09-10 18:24:11 +08:00
Ivan Grokhotkov
97b1f0f60c Merge branch 'init_priority_fix_v4.1' into 'release/v4.1' 
CXX: make __attribute__((init_priority(n))) work (v4.1)

See merge request espressif/esp-idf!8444
 2020-09-10 16:10:10 +08:00
Ivan Grokhotkov
b695152d43 Merge branch 'feature/nvs_allow_custom_part_4.1' into 'release/v4.1' 
Feature/nvs allow custom part 4.1

See merge request espressif/esp-idf!9515
 2020-09-10 16:08:36 +08:00
Roland Dobai
28e393c062 ulp: fix ULP assembler version detection for localized systems 2020-09-10 09:35:45 +02:00
Wielebny666
67d7fad764 spi_master: correctly set cs polarity 
All devices must be added to the same spi line before use.
 2020-09-10 14:48:37 +08:00
Mahavir Jain
ae72c7d417 Merge branch 'bugfix/secure_boot_v2_sign_cmake_copy_v4.1' into 'release/v4.1' 
Add platform independent CMake copy during signing (v4.1)

See merge request espressif/esp-idf!9545
 2020-09-10 14:41:26 +08:00
Island
e42c8d2f1f Merge branch 'feat/ble_mesh_use_model_c_v4.1' into 'release/v4.1' 
ble_mesh: stack: Use model callback for operations [Zephyr] (v4.1)

See merge request espressif/esp-idf!10363
 2020-09-10 10:39:54 +08:00
Island
b5df4843b2 Merge branch 'bugfix/ble_mesh_remove_assert_v4.1' into 'release/v4.1' 
ble_mesh: stack: Avoid using assert in mesh stack (v4.1)

See merge request espressif/esp-idf!10359
 2020-09-10 10:39:00 +08:00
Island
33ddc213ad Merge branch 'bugfix/ble_mesh_nimble_ccc_handle_v4.1' into 'release/v4.1' 
ble_mesh: nimble: Fix updating ccc handle with wrong value (v4.1)

See merge request espressif/esp-idf!10355
 2020-09-10 10:38:19 +08:00
Ivan Grokhotkov
42e694bb8f bootloader_support: don't check signature when JTAG is attached 
If an insecure configuration is enabled (no hardware secure boot, just
software signature check), skip the signature check in bootloader if
JTAG debugger is attached. This allows the debugger to set breakpoints
in Flash before the application runs.

Closes https://github.com/espressif/esp-idf/issues/4734
Closes https://github.com/espressif/esp-idf/issues/4878
 2020-09-09 23:42:24 +02:00
He Yin Ling
146c714541 Merge branch 'bugfix/remove_auto_conn_case_v4.1' into 'release/v4.1' 
test: remove auto conn case because we do not support this anymore (v4.1)

See merge request espressif/esp-idf!9941
 2020-09-09 15:55:05 +08:00
ronghulin
e9ece1255a bugfix: fix some wifi bugs 
1. add sta connect again ap sent disconnect event
2. add set/get inactive time api
3. fix connect hidden AP doesn't update information
4. add rf test long short support
 2020-09-09 07:34:40 +00:00
lly
c570f51b53 ble_mesh: stack: Use model callback for operations [Zephyr] 
- Previously when a model is initialized or deinitialized, in the
  access layer, we need to check the model id with the ids in the
  table in order to find the proper model operation function.
- Currently all the operation functions of each model will be set
  during the mesh initialization. When the model is found, we can
  directly use the corresponding callback for different operations.
- Currently only init/deinit operations are registered, later we
  will add more operations.
 2020-09-09 14:00:21 +08:00
lly
67055161c1 ble_mesh: stack: Avoid using assert in mesh stack 2020-09-09 10:57:25 +08:00
Jakob Hasse
5c223e17cb esp_eth: moved extern "C" after includes 2020-09-09 10:19:10 +08:00
lly
67ed9b5799 ble_mesh: nimble: Fix updating ccc handle with wrong value 2020-09-08 21:02:34 +08:00
Chen Yi Qun
824c358097 UART: Add return in uart_wait_tx_done 
uart_wait_tx_done quit due to timeout but without return ESP_ERR_TIMEOUT.
 2020-09-08 15:10:30 +08:00
Jiang Jiang Jian
5123c80060 Merge branch 'bugfix/ipv6_fragment_for_4.1' into 'release/v4.1' 
lw-ip:fix bug for ipv6 fragment(backport4.1)

See merge request espressif/esp-idf!9648
 2020-09-08 12:21:10 +08:00
baohongde
86cd54117e components/bt: Fix SPP using NULL point with dynamic memory 2020-09-07 15:45:33 +08:00
David Čermák
d425a25875 Merge branch 'feature/mqtt_sub_update_01594bf1_v4.1' into 'release/v4.1' 
MQTT: Update submodule reference (Backport v4.1)

See merge request espressif/esp-idf!10231
 2020-09-07 14:58:56 +08:00
David Čermák
217e95d4db Merge branch 'bugfix/ws_stop_deadlock_v4.1' into 'release/v4.1' 
Websocket client: avoid deadlock if stop called from event handler (Backport 4.1)

See merge request espressif/esp-idf!10227
 2020-09-07 14:58:25 +08:00
Jiang Jiang Jian
7891ba1e24 Merge branch 'bugfix/l2cap_link_timeout_llcp_prog_btu_wtd_v4.1' into 'release/v4.1' 
Bugfix/l2cap link timeout llcp prog btu wtd v4.1

See merge request espressif/esp-idf!10254
 2020-09-07 14:11:57 +08:00
weitianhua
585120da0d Change PCM config position 2020-09-07 10:34:34 +08:00
Ivan Grokhotkov
420d436199 freertos: fix compilation warning at -O2 level 
Closes https://github.com/espressif/esp-idf/issues/5525
 2020-09-04 21:39:10 +02:00
Felipe Neves
124ec431e6 test/shared_stack_printf: improved printf with shared stack function test 2020-09-04 16:03:51 -03:00
Ivan Grokhotkov
3a96d07e11 panic: skip over the first invalid PC in case of InstrFetchProhibited 
InstrFetchProhibited usually occurs because of a jump to an invalid
pointer. In this case, PC in the exception frame is the address of
the jump destination. 'esp_ptr_executable' check in print_backtrace
function recognizes the first frame as invalid, and the backtrace is
interrupted. This prevents the user from finding the location where
the invalid pointer is dereferenced.

Bypass the 'esp_ptr_executable' check if the exception cause is
InstrFetchProhibited. Update the test case to no longer ignore this
issue.
 2020-09-04 20:56:03 +02:00
Jiang Jiang Jian
245047e82d Merge branch 'feature/enable_pcm_config_v4.1' into 'release/v4.1' 
Feature/enable pcm config v4.1

See merge request espressif/esp-idf!9654
 2020-09-04 20:07:27 +08:00
wangcheng
e963390324 component/bt: Fixed the watchdog timeout of btu task during multi-connection 2020-09-04 16:25:49 +08:00
Michael (XIAO Xufeng)
febabaa55a Merge branch 'ci/test_spi_speed_psram_enabled_4.1' into 'release/v4.1' 
driver test: disable the spi master performance test when psram is used (v4.1)

See merge request espressif/esp-idf!9638
 2020-09-04 15:55:01 +08:00
weitianhua
b4dc11a409 Add protection for rfcomm close API in SPP 2020-09-04 14:41:34 +08:00
weitianhua
15111210a1 Add some debug log for bt: 
1. Add logs for SPP not enabled successfully
2. Add information to Applicatioin layer that the A2DP is connecting to peer device

Regular BTC and BTU Task name & Add BTC Init protection

1. Regular the BTC Task Name to Close a Github issue

   Closes https://github.com/espressif/esp-idf/issues/4966

2. Add BTC Init failure protection

3. Regular BTU Task Name with BTC

4. Correct the comment of
   a. SDP_ServiceSearchRequest and SDP_ServiceSearchRequest2
   b. l2cu_create_conn_after_switch

5. Correct comment of esp_bt_hf_vra();

6. Fix cpp compilier region
 2020-09-04 14:41:26 +08:00
Hou Chen Yao
aefe9e0b03 remove auto conn case because we do not support this anymore 2020-09-04 03:32:19 +00:00
wangcheng
8acffd2931 components/bt: Fixed the state not synchronized between controller and host when disconnected. 2020-09-02 21:45:26 +08:00
Shubham Kulkarni
101c1a953a esp_https_ota.c: Add fix to return failure if (-1) is returned from esp_http_client_read 
Closes https://github.com/espressif/esp-idf/issues/4960
 2020-09-02 12:30:51 +00:00
Shubham Kulkarni
b9edf4783c esp_http_client.c: In esp_http_client_read, add fix to return (-1) if esp_transport_read fails 2020-09-02 12:30:51 +00:00
Island
da669efa0c Merge branch 'bugfix/btdm_blufi_data_sequence_not_reset_after_disconnect_v4.1' into 'release/v4.1' 
component/bt: fix Blufi sends data after disconnect the seq still increase(backport v4.1)

See merge request espressif/esp-idf!10240
 2020-09-02 14:20:44 +08:00
XieWenxiang
1f54e90bb4 component/bt: fix Blufi sends data after disconnect the seq still increase(backport v4.1) 2020-09-02 11:15:27 +08:00
Michael (XIAO Xufeng)
444b5582a7 driver test: disable the spi master performance test when psram is used 2020-09-02 00:58:20 +08:00
weitianhua
645715c1b0 Enable PCM config in controller 2020-09-01 16:35:07 +08:00
weitianhua
887f5040da Enable PCM config in host 2020-09-01 16:35:07 +08:00
Marius Vikhammer
1d4b8a742d MQTT: Update submodule reference 
SSL: add config option for skipping common name check
esp-mqtt commit: 5e8950e681)
Closes https://github.com/espressif/esp-mqtt/issues/158

SSL: add support for tls with secure element (ATECC608A)
esp-mqtt commit: a7ff9afa3f)
Closes https://github.com/espressif/esp-mqtt/issues/156

Websocket: Allow the query part of the uri to be a part of the path
esp-mqtt commit: 40b06deb10)
Closes https://github.com/espressif/esp-mqtt/issues/161

Config: Add check for consistency between config settings
esp-mqtt commit: 8a412c147d)

Add IDF version check for secure element feature
esp-mqtt commit: db4bce01ab)

Fix esp_mqtt_client_stop deadlock
esp-mqtt commit: 5e17dcaeb2)
Closes https://github.com/espressif/esp-mqtt/issues/163

Add dispatch error event for read errors
esp-mqtt commit: d4aaec08ff
Closes https://github.com/espressif/esp-idf/issues/5704

Cleanup expired messages when offline
esp-mqtt commit: bdadd77c6e
Closes https://github.com/espressif/esp-idf/issues/5668

esp_mqtt_client_publish now returns msg id for QoS > 0 when offline
esp-mqtt commit: f7325bfa10
 2020-09-01 16:00:49 +08:00
Marius Vikhammer
d28f1682fc Websocket client: avoid deadlock if stop called from event handler 2020-09-01 15:38:12 +08:00
Island
85e3c733ff Merge branch 'bugfix/ble_mesh_client_msg_optimize_v4.1' into 'release/v4.1' 
Bugfix/ble mesh client msg optimize (v4.1)

See merge request espressif/esp-idf!10214
 2020-09-01 09:34:09 +08:00
David Čermák
f6517cf4e7 Merge branch 'bugfix/ppp_netif_up_after_new_v4.1' into 'release/v4.1' 
esp-netif: ppp netif to use netif_is_link_up() to update interface state (v4.1)

See merge request espressif/esp-idf!9425
 2020-08-31 21:14:04 +08:00
David Čermák
636a719f4d Merge branch 'feature/pin_ethernet_task_to_core_v4.1' into 'release/v4.1' 
ethernet: support pin emac task to core (v4.1)

See merge request espressif/esp-idf!9037
 2020-08-31 21:13:39 +08:00
lly
92ce5c1f23 ble_mesh: stack: Client model related code clean 2020-08-31 17:33:12 +08:00
lly
df1c6fd95c ble_mesh: stack: Rename cfg & health client status recv func 2020-08-31 17:33:11 +08:00
lly
bbe75af7a3 ble_mesh: stack: Check client msg result in common func 2020-08-31 17:33:11 +08:00
lly
4634ad6fa4 ble_mesh: stack: Fix no events for some error conditions 2020-08-31 17:33:10 +08:00
lly
5ccf6cd381 ble_mesh: stack: Move client role set to the msg function 2020-08-31 17:33:10 +08:00
lly
259d1924cb ble_mesh: stack: Remove some not used client parameters 2020-08-31 17:33:09 +08:00
lly
1bd4fe1f50 ble_mesh: stack: Remove some not used variables & functions 2020-08-31 17:33:09 +08:00
lly
62458dbb90 ble_mesh: stack: Update client model msg send 2020-08-31 17:33:08 +08:00
Island
d81dbd48ed Merge branch 'bugfix/ble_mesh_health_current_status_recv_v4.1' into 'release/v4.1' 
ble_mesh: stack: Fix recv health current status incorrectly (v4.1)

See merge request espressif/esp-idf!10208
 2020-08-31 17:30:10 +08:00
David Čermák
2973114938 Merge branch 'bugfix/eth_insert_min_hw_reset_time_v4.1' into 'release/v4.1' 
ethernet: insert min assert time for PHY HW reset (v4.1)

See merge request espressif/esp-idf!9580
 2020-08-31 14:41:10 +08:00
David Čermák
2222f842d6 Merge branch 'bugfix/esp_netif_restart_dhcpc_v4.1' into 'release/v4.1' 
esp_netif: Remove restarting DHCP client/server if it has already been started (backport v4.1)

See merge request espressif/esp-idf!10000
 2020-08-31 14:40:14 +08:00