Island
fa33addb4a
Merge branch 'bugfix/ble_mesh_remove_assert_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Avoid using assert in mesh stack (v4.2)
See merge request espressif/esp-idf!10358
2020-09-10 10:38:47 +08:00
Island
1f5f72af67
Merge branch 'bugfix/ble_mesh_nimble_ccc_handle_v4.2' into 'release/v4.2'
...
ble_mesh: nimble: Fix updating ccc handle with wrong value (v4.2)
See merge request espressif/esp-idf!10354
2020-09-10 10:37:59 +08:00
David Čermák
96ad552245
Merge branch 'feature/mqtt_sub_update_01594bf1_v4.2' into 'release/v4.2'
...
MQTT: Update submodule reference (Backport v4.2)
See merge request espressif/esp-idf!10230
2020-09-09 20:41:14 +08:00
He Yin Ling
5a23447452
Merge branch 'bugfix/remove_auto_conn_case_v4.2' into 'release/v4.2'
...
test: remove auto conn case because we do not support this anymore (v4.2)
See merge request espressif/esp-idf!9940
2020-09-09 15:54:42 +08:00
lly
1f9d289ee0
ble_mesh: stack: Avoid using assert in mesh stack
2020-09-09 10:57:07 +08:00
Krzysztof Budzynski
8b1e3c01a0
Merge branch 'bugfix/doc_main_readme_build_v4.2' into 'release/v4.2'
...
Fix the setup instructions in the main README (v4.2)
See merge request espressif/esp-idf!10337
2020-09-09 02:44:34 +08:00
lly
4eec2c64ee
ble_mesh: nimble: Fix updating ccc handle with wrong value
2020-09-08 21:01:32 +08:00
Jiang Jiang Jian
b356d41bb1
Merge branch 'bugfix/fix_some_wifi_bugs_0902_v4.2' into 'release/v4.2'
...
Bugfix/fix some wifi bugs 0902 v4.2 (backport v4.2)
See merge request espressif/esp-idf!10246
2020-09-08 18:30:31 +08:00
Roland Dobai
4663b16779
Fix the setup instructions in the main README
2020-09-08 09:54:46 +02:00
Ivan Grokhotkov
2854050835
Merge branch 'bugfix/pip_gdbgui_v4.2' into 'release/v4.2'
...
fix windows incompatibility with gdbgui>=0.14 (v4.2)
See merge request espressif/esp-idf!10326
2020-09-08 00:07:09 +08:00
Marek Ištok
1fef76cbce
tools: fix windows incompatibility with gdbgui>=0.14
...
gdbgui intentionally (https://github.com/cs01/gdbgui/pull/346 ) introduced dependencies that are incompatible with windows, and don't seem to have plans to resolve them anytime soon
Closes https://github.com/espressif/esp-idf/issues/5782
Closes https://github.com/espressif/esp-idf/issues/5787
Merges https://github.com/espressif/esp-idf/pull/5794
2020-09-07 07:55:45 +00:00
Jiang Jiang Jian
ecab1d9b2e
Merge branch 'bugfix/l2cap_link_timeout_llcp_prog_btu_wtd_v4.2' into 'release/v4.2'
...
Bugfix/l2cap link timeout llcp prog btu wtd v4.2
See merge request espressif/esp-idf!10255
2020-09-07 14:11:08 +08:00
David Čermák
87d96b2c29
Merge branch 'bugfix/ws_stop_deadlock_v4.2' into 'release/v4.2'
...
Websocket client: avoid deadlock if stop called from event handler (Backport 4.2)
See merge request espressif/esp-idf!10226
2020-09-04 22:51:46 +08:00
Island
5c8a85e839
Merge branch 'bugfix/ble_mesh_sensor_example_fix_v4.2' into 'release/v4.2'
...
ble_mesh: example: Fix sensor data wrong iteration (v4.2)
See merge request espressif/esp-idf!10273
2020-09-04 16:54:38 +08:00
wangcheng
a7d52dafa6
component/bt: Fixed the watchdog timeout of btu task during multi-connection
2020-09-04 16:27:03 +08:00
lly
8fe75ff3ce
ble_mesh: example: Fix sensor data wrong iteration
2020-09-04 11:54:52 +08:00
David Čermák
b9f0500641
Merge branch 'bugfix/ws_server_async_send_fin_v4.2' into 'release/v4.2'
...
http_server example: WebSocket server to set final flag in async messages (v4.2)
See merge request espressif/esp-idf!10087
2020-09-03 14:11:13 +08:00
wangcheng
12633717f7
components/bt: Fixed the state not synchronized between controller and host when disconnected.
2020-09-02 21:43:57 +08:00
David Cermak
ec2262e5a4
http_server: WebSocket server to set flag in transmitted messages by default
...
Add logic to set `FIN` flag automatically for transmitted WS frames, but
if `fragmented` option set indicating an expert/manual mode, then the
`FIN` flag is set according to the `final` option.
2020-09-02 07:54:29 +00:00
David Cermak
4da38b6769
http_server example: WebSocket server to set final flag in async messages
...
Closes https://github.com/espressif/esp-idf/issues/5405
2020-09-02 07:54:29 +00:00
David Čermák
a0a0d34da6
Merge branch 'bugfix/ethernet_handle_early_rx_interrupt' into 'release/v4.2'
...
Bugfix/ethernet handle early rx interrupt (v4.2)
See merge request espressif/esp-idf!10098
2020-09-02 15:52:18 +08:00
Nachiket Kukade
d17e6a75e0
espnow/pmf: Implement ESPNOW + PMF Co-existance
...
H/W decryption of Mgmt frames was disabled for PMF and done through
S/W. If ESPNOW packets go through this path, it affects backward
compatibility since method of decrypting Mgmt packets is different in H/W.
To address PMF + ESPNOW Co-existance, CCMP decryption method is modified
for ESPNOW packets so that they can be decrypted correctly. Since Tx
of ESPNOW packets can still be done in H/W alongside PMF, no change
required in encryption method in S/W.
Co-Authored-By: Nachiket Kukade <nachiket.kukade@espressif.com>
Co-Authored-By: zhangyanjiao <zhangyanjiao@espressif.com>
Co-Authored-By: kapil.gupta <kapil.gupta@espressif.com>
2020-09-02 15:06:51 +08:00
zhangyanjiao
089b78b916
esp_wifi:
...
1. get primary channel from HT info
2. fix the bug that set_channel doesn't work for softAP when STA connects
2020-09-02 15:04:26 +08:00
aditi_lonkar
ddfb11e1c5
wifi: Fix esp_wifi log levels
...
Closes https://github.com/espressif/esp-idf/issues/5721
2020-09-02 15:02:52 +08:00
kapil.gupta
594a196364
esp_wifi: Fix null pointer dereferences in mgmt rx
2020-09-02 14:55:10 +08:00
xiehang
8757cefeec
esp_wifi: add rf test long short support
2020-09-02 14:54:23 +08:00
liu zhifu
627a05d80e
esp_wifi: optimize WiFi debug log
...
1. Add esp_wifi_statis_dump()
2. Optimize WiFi related debug log
2020-09-02 14:52:49 +08:00
liu zhifu
368d623e1a
esp_wifi: optimize WiFi TX performance
2020-09-02 14:44:45 +08:00
Island
9cd0e2fd1a
Merge branch 'bugfix/btdm_blufi_data_sequence_not_reset_after_disconnect_v4.2' into 'release/v4.2'
...
component/bt: fix Blufi sends data after disconnect the seq still increase(backport v4.2)
See merge request espressif/esp-idf!10241
2020-09-02 14:20:49 +08:00
XieWenxiang
82deea84eb
component/bt: fix Blufi sends data after disconnect the seq still increase(backport v4.2)
2020-09-02 11:18:25 +08:00
Michael (XIAO Xufeng)
fb4a75110a
Merge branch 'bugfix/touch_sensor_denoise_ci_for_esp32s2_backport_v4.2' into 'release/v4.2'
...
[High priority] Bugfix/touch sensor denoise ci for esp32s2 (backport v4.2)
See merge request espressif/esp-idf!10211
2020-09-01 21:50:59 +08:00
Island
73fd3608e0
Merge branch 'bugfix/ble_mesh_example_compile_warn_v4.2' into 'release/v4.2'
...
Bugfix/ble mesh example compile warn (v4.2)
See merge request espressif/esp-idf!10222
2020-09-01 19:16:43 +08:00
Marius Vikhammer
86d8f15a9a
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 15:57:47 +08:00
Marius Vikhammer
70a67439bc
Websocket client: avoid deadlock if stop called from event handler
2020-09-01 15:30:40 +08:00
lly
528747ac4c
ble_mesh: example: Remove some useless included header files
2020-09-01 14:10:27 +08:00
Carlos Sobrinho
840b7f2de7
Fix compilation warnings about portmacro being already define.
2020-09-01 14:09:41 +08:00
Krzysztof Budzynski
a35ce7f959
Merge branch 'doc/local_build_version_note_v4.2' into 'release/v4.2'
...
docs: fix version specific note on local build (backport v4.2)
See merge request espressif/esp-idf!10148
2020-08-31 21:13:53 +08:00
fuzhibo
0f5bb06920
ut: fix touch sensor denoise ci fail
2020-08-31 16:01:50 +08:00
Michael (XIAO Xufeng)
06d1f69d84
Merge branch 'feature/vfs_uart_set_line_ending_v4.2' into 'release/v4.2'
...
feature: support vfs uart set line endings with specified uart number release/v4.2
See merge request espressif/esp-idf!9596
2020-08-30 22:34:47 +08:00
Michael (XIAO Xufeng)
1b0691f29a
Merge branch 'feature/esp32s2_adc_calib_V1_bp4.2' into 'release/v4.2'
...
driver/adc: support for esp32s2 adc calibration scheme (backport 4.2)
See merge request espressif/esp-idf!10064
2020-08-29 23:22:47 +08:00
Angus Gratton
73040c3223
Merge branch 'bugfix/mfg_tool_v4.2' into 'release/v4.2'
...
mfg_util: Update file handling to maintain line endings across various OS (backport v4.2)
See merge request espressif/esp-idf!10174
2020-08-28 18:22:28 +08:00
Island
7d79d9f312
Merge branch 'bugfix/btdm_blufi_send_longer_custom_data_will_congested_v4.2' into 'release/v4.2'
...
component/bt: fix Blufi sends longer customer data will will lead congested(backport v4.2)
See merge request espressif/esp-idf!9948
2020-08-28 13:55:46 +08:00
XieWenxiang
51ff44d96e
component/bt: fix Blufi sends longer customer data will will lead congested(backport v4.2)
2020-08-28 10:20:19 +08:00
Shivani Tipnis
e42742891e
mfg_util: Update file handling to maintain line endings across various OS
...
Fixes: https://github.com/espressif/esp-idf/issues/4888
2020-08-27 11:52:33 +05:30
Jiang Jiang Jian
5f56329f00
Merge branch 'bugfix/fix_udp_tx_performance_issue_v4.2' into 'release/v4.2'
...
lw-ip: fix udp tx packet loss issue (backport v4.2)
See merge request espressif/esp-idf!10017
2020-08-26 12:38:37 +08:00
Jiang Jiang Jian
b498f0aebe
Merge branch 'bugfix/buff_semaphore_not_free_v4.2' into 'release/v4.2'
...
component/bt: Fixed ble memory leak issue, buff_semaphore was not released.
See merge request espressif/esp-idf!9983
2020-08-24 17:30:54 +08:00
Marius Vikhammer
5f09ffce96
docs: fix version specific note on local build
2020-08-24 16:10:28 +08:00
Angus Gratton
a2d20f9412
Merge branch 'bugfix/bootloader_common_get_sha256_of_partition_v4.2' into 'release/v4.2'
...
bootloader_support: Fix bootloader_common_get_sha256_of_partition(), can handle a long image (v4.2)
See merge request espressif/esp-idf!9952
2020-08-24 13:36:09 +08:00
He Yin Ling
22221b073b
Merge branch 'test/merge_ble_mesh_node_and_provioner_in_console_v4.2' into 'release/v4.2'
...
Test:merge ble mesh node and provioner in console
See merge request espressif/esp-idf!9913
2020-08-21 19:59:21 +08:00
Lu Chang Jie
63d2a19925
Test: merge ble mesh node and provioner in console
2020-08-21 19:59:20 +08:00