Michael (XIAO Xufeng)
d75888a5df
Merge branch 'bugfix/mcpwm_period_error_v4.0' into 'release/v4.0'
...
bugfix(mcpwm_period_error): fix the issue of wrong period (backport v4.0)
See merge request espressif/esp-idf!8312
2020-11-11 15:07:33 +08:00
Krzysztof Budzynski
9b1f47df1d
Merge branch 'bugfix/remove_shortcut_to_build_instructions_v4.0' into 'release/v4.0'
...
doc: Getting Started Guide, remove shortcuts to 'build toolchain from scratch' instructions (v4.0)
See merge request espressif/esp-idf!10608
2020-11-11 11:02:15 +08:00
Angus Gratton
8a78522aad
Merge branch 'bugfix/ldgen_unicode_path_v4.0' into 'release/v4.0'
...
tools/ldgen: Parse paths with Unicode characters in archives & fix parsing of section names on Windows (v4.0)
See merge request espressif/esp-idf!10966
2020-11-11 10:50:55 +08:00
Angus Gratton
7aef4fbec9
Merge branch 'bugfix/adjtime_return_outdelta_before_new_delta_set_v4.0' into 'release/v4.0'
...
newlib: Fix adjtime, returns the amount of time remaining from any previous adjustment (v4.0)
See merge request espressif/esp-idf!9973
2020-11-11 10:46:38 +08:00
Angus Gratton
d690e3d1ab
Merge branch 'bugfix/get_component_requirements_v4.0' into 'release/v4.0'
...
cmake: fix getting component requirements (v4.0)
See merge request espressif/esp-idf!10661
2020-11-11 10:44:43 +08:00
Angus Gratton
74870e7e22
Merge branch 'bugfix/err_to_name_paths_windows_v4.0' into 'release/v4.0'
...
tools: fix path handling errors in gen_esp_err_to_name.py for Windows (v4.0)
See merge request espressif/esp-idf!10897
2020-11-11 10:44:33 +08:00
Angus Gratton
a2fe59464e
Merge branch 'bugfix/returns_correct_flash_encryption_mode_v4.0' into 'release/v4.0'
...
bootloader: Fix esp_get_flash_encryption_mode() (v4.0)
See merge request espressif/esp-idf!10714
2020-11-11 10:43:25 +08:00
Angus Gratton
d5ae1d10d9
Merge branch 'bugfix/embed_file_symbol_names_v4.0' into 'release/v4.0'
...
cmake: fix C identifier generation from embedded file (v4.0)
See merge request espressif/esp-idf!10666
2020-11-11 10:43:14 +08:00
Angus Gratton
8acea045a7
Merge branch 'bugfix/bootloader_anti_rollback_mmap_v4.0' into 'release/v4.0'
...
bootloader_support: fix issue in memory mapping for getting app descriptor (v4.0)
See merge request espressif/esp-idf!10736
2020-11-11 10:42:42 +08:00
Angus Gratton
36f3845331
Merge branch 'bugfix/bootloader_common_get_sha256_of_partition_v4.0' into 'release/v4.0'
...
bootloader_support: Fix bootloader_common_get_sha256_of_partition(), can handle a long image (v4.0)
See merge request espressif/esp-idf!9954
2020-11-11 10:42:28 +08:00
Island
134b21c5b2
Merge branch 'bugfix/ble_mesh_autorsp_description_v4.0' into 'release/v4.0'
...
esp_ble_mesh: api: fixed comment about autoresp (v4.0)
See merge request espressif/esp-idf!10890
2020-11-10 16:42:50 +08:00
Island
1214f343ab
Merge branch 'optimize/ble_mesh_make_buf_config_invisible_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Make mesh buf debug option invisible (v4.0)
See merge request espressif/esp-idf!10796
2020-11-10 16:42:34 +08:00
Island
fb9df6388f
Merge branch 'bugfix/fix_node_test_func_not_set_role_v4.0' into 'release/v4.0'
...
ble_mesh: test: Fix node test function not update role flag (v4.0)
See merge request espressif/esp-idf!11042
2020-11-10 16:42:22 +08:00
He Yin Ling
2be6197714
Merge branch 'bugfix/example_test_import_error_4.0' into 'release/v4.0'
...
bugfix: import error in example tests (4.0)
See merge request espressif/esp-idf!11038
2020-11-09 19:18:59 +08:00
Ivan Grokhotkov
31e0866561
Merge branch 'bugfix/ut_ext_win_open_file_v4.0' into 'release/v4.0'
...
Tools: Close temporary file before invoking external tools accessing it
See merge request espressif/esp-idf!9832
2020-11-09 17:16:25 +08:00
Ivan Grokhotkov
c535031c2f
Merge branch 'bugfix/bootloader_skip_verify_jtag_v4.0' into 'release/v4.0'
...
bootloader_support: don't check signature when JTAG is attached (v4.0)
See merge request espressif/esp-idf!10380
2020-11-09 16:52:13 +08:00
Ivan Grokhotkov
a4d7f15625
Merge branch 'gdb/bt_on_invalid_pc_v4.0' into 'release/v4.0'
...
gdb: Modify PC in case of invalid PC (v4.0)
See merge request espressif/esp-idf!8980
2020-11-09 16:48:46 +08:00
Ivan Grokhotkov
f02e2c5e09
Merge branch 'init_priority_fix_v4.0' into 'release/v4.0'
...
CXX: make __attribute__((init_priority(n))) work (v4.0)
See merge request espressif/esp-idf!8445
2020-11-09 16:47:22 +08:00
Ivan Grokhotkov
5738a833fa
Merge branch 'bugfix/idf_monitor_baudrate_arg_crash_v4.0' into 'release/v4.0'
...
idf monitor: fix crash when monitor baudrate argument set (Backport v4.0)
See merge request espressif/esp-idf!9761
2020-11-09 16:47:08 +08:00
Ivan Grokhotkov
34f3403c3a
Merge branch 'feature/nvs_erase_check_init_4.0' into 'release/v4.0'
...
NVS Flash: prevent erasing initialized partition (backport v4.0)
See merge request espressif/esp-idf!10066
2020-11-09 16:44:31 +08:00
Ivan Grokhotkov
f9e85a78f6
Merge branch 'bugfix/mfg_tool_v4.0' into 'release/v4.0'
...
mfg_util: Update file handling to maintain line endings across various OS (backport v4.0)
See merge request espressif/esp-idf!10173
2020-11-09 16:42:23 +08:00
Ivan Grokhotkov
c705befd58
Merge branch 'bugfix/parttool_example_test_fail_v4.0' into 'release/v4.0'
...
examples/parttool: fix the test to work on parallel test runner (backport v4.0)
See merge request espressif/esp-idf!10375
2020-11-09 16:42:19 +08:00
Ivan Grokhotkov
927a5cd46b
Merge branch 'bugfix/ulp_as_version_v4.0' into 'release/v4.0'
...
ulp: fix ULP assembler version detection for localized systems (v4.0)
See merge request espressif/esp-idf!10395
2020-11-09 16:41:14 +08:00
Ivan Grokhotkov
11f4a09ce2
Merge branch 'bugfix/eclipse_make_py3_v4.0' into 'release/v4.0'
...
tools: Fix Python 3 incompatibility for building with Eclipse on Windows (v4.0)
See merge request espressif/esp-idf!10400
2020-11-09 16:40:30 +08:00
Ivan Grokhotkov
10094b3151
Merge branch 'bugfix/log-error-run-esptool_v4.0' into 'release/v4.0'
...
parttool.py: Add file stream parameter and log stdout and stderr to same stream (v4.0)
See merge request espressif/esp-idf!10518
2020-11-09 16:40:23 +08:00
Ivan Grokhotkov
5e8cb9f734
Merge branch 'bugfix/ci_clone_https_v4.0' into 'release/v4.0'
...
ci: use HTTPS for cloning in IT jobs (v4.0)
See merge request espressif/esp-idf!11097
2020-11-09 16:38:56 +08:00
David Čermák
8acd6f41aa
Merge branch 'feature/lwip_tcp_isn_hook_v4.0' into 'release/v4.0'
...
lw-ip: enable TCP ISN hook (v4.0)
See merge request espressif/esp-idf!11064
2020-11-09 15:53:34 +08:00
David Čermák
247fffe062
Merge branch 'bugfix/openss_strict_verify_mode_4.0' into 'release/v4.0'
...
openssl: made verification mode conversion to mbetls modes more strict (v4.0)
See merge request espressif/esp-idf!10501
2020-11-09 15:45:05 +08:00
David Čermák
4effed59cf
Merge branch 'feature/mqtt_sub_update_01594bf1_v4.0' into 'release/v4.0'
...
MQTT: Update submodule reference (Backport v4.0)
See merge request espressif/esp-idf!10233
2020-11-09 15:44:44 +08:00
David Čermák
e8516af6f9
Merge branch 'bugfix/ws_stop_deadlock_v4.0' into 'release/v4.0'
...
Websocket client: avoid deadlock if stop called from event handler (Backport 4.0)
See merge request espressif/esp-idf!10228
2020-11-09 15:43:51 +08:00
David Čermák
3f5cbe4e30
Merge branch 'bugfix/ethernet_handle_early_rx_interrupt_v4.0' into 'release/v4.0'
...
Bugfix/ethernet handle early rx interrupt (v4.0)
See merge request espressif/esp-idf!10100
2020-11-09 15:43:09 +08:00
Island
85b71109d0
Merge branch 'bugfix/ble_mesh_nimble_ccc_handle_v4.0' into 'release/v4.0'
...
ble_mesh: nimble: Fix updating ccc handle with wrong value (v4.0)
See merge request espressif/esp-idf!10356
2020-11-09 14:35:47 +08:00
Island
87ddc09a81
Merge branch 'bugfix/ble_mesh_remove_assert_v4.0' into 'release/v4.0'
...
ble_mesh: stack: Avoid using assert in mesh stack (v4.0)
See merge request espressif/esp-idf!10360
2020-11-09 14:35:19 +08:00
Island
9b087d3ba4
Merge branch 'bugfix/ble_mesh_example_compile_warn_v4.0' into 'release/v4.0'
...
Bugfix/ble mesh example compile warn (v4.0)
See merge request espressif/esp-idf!10224
2020-11-09 14:34:37 +08:00
lly
b8470fba75
ble_mesh: stack: Avoid using assert in mesh stack
2020-11-09 02:20:19 +00:00
lly
0f7a42cfbb
ble_mesh: nimble: Fix updating ccc handle with wrong value
2020-11-09 02:17:46 +00:00
lly
3bfe5f130b
ble_mesh: example: Remove some useless included header files
2020-11-09 02:09:01 +00:00
Carlos Sobrinho
82bfe2ae5d
Fix compilation warnings about portmacro being already define.
2020-11-09 02:09:01 +00:00
Krzysztof Budzynski
8007eb9a31
Merge branch 'bugfix/doc_main_readme_build_v4.0' into 'release/v4.0'
...
Fix the setup instructions in the main README (v4.0)
See merge request espressif/esp-idf!10339
2020-11-06 08:32:47 +08:00
Krzysztof Budzynski
a6e65a47a8
Merge branch 'feature/guide_change_for_catalina_v4.0' into 'release/v4.0'
...
docs: Add profile file name used by zsh shell (v4.0)
See merge request espressif/esp-idf!10774
2020-11-06 08:29:45 +08:00
Krzysztof Budzynski
43736e073a
Merge branch 'feature/docs-add-python-clean_v4.0' into 'release/v4.0'
...
docs: Add solution for ImportError in idf.py into the documentation (v4.0)
See merge request espressif/esp-idf!10632
2020-11-06 08:22:53 +08:00
shenjun
16ccf29a74
esp_wifi_mesh: update wifi mesh libs
...
1. Fix FIX-ROOT does not reconnect to router when disconnect reason is too many
2. Add API esp_mesh_print_scan_result
3. Modify not to reset mesh_xonseq of self and children when flush_upstream_packets
4. Fix not arm parent monitor when a parent candidate is cleared without sending an event to mesh layer
5. Fix the new voted root does not reconnect to router if rssi is weak
2020-11-05 23:54:45 +08:00
Mahavir Jain
b3c39b2d25
Merge branch 'bugfix/esp_idf_version_v4.0' into 'release/v4.0'
...
Add __ASSEMBLER__ flag in esp_idf_version.h to fix build failure with assembly files (v4.0)
See merge request espressif/esp-idf!10901
2020-11-05 12:44:50 +08:00
Angus Gratton
92d755d48c
Merge branch 'update/version_4_0_2' into 'release/v4.0'
...
Update version to 4.0.2
See merge request espressif/esp-idf!11117
2020-11-05 11:58:26 +08:00
He Yin Ling
e5f754b26c
versions: Update version to 4.0.2
2020-11-05 09:38:34 +08:00
Ivan Grokhotkov
b70d209586
ci: use HTTPS for cloning in IT jobs
2020-11-03 19:32:06 +08:00
mathiasbredholt
e9b6d40b97
lwip: Changed to C linkage for fixing bug when using mixed C/C++ code
...
Merges https://github.com/espressif/esp-idf/pull/5900
2020-11-03 08:42:57 +01:00
Jiang Jiang Jian
4904606461
Merge branch 'bugfix/scan_issue_sha256_ap_v4.0' into 'release/v4.0'
...
scan: Fix scan issue with PSK-SHA256 AP's (Backport v4.0)
See merge request espressif/esp-idf!11070
2020-11-02 22:01:42 +08:00
Mahavir Jain
8265966974
esp_netif: initialize TCP ISN hook if enabled in configuration
2020-11-02 14:30:43 +05:30
Mahavir Jain
4dd7cfbeb7
lwip: provide configuration option to enable TCP ISN hook
2020-11-02 14:30:43 +05:30