Island
ece24128da
Merge branch 'bugfix/ble_mesh_rework_prov_pdu_len_check_v4.0' into 'release/v4.0'
...
ble_mesh: Rework prov pdu length check (v4.0)
See merge request espressif/esp-idf!9004
2020-06-03 15:10:52 +08:00
Jiang Jiang Jian
695ad84654
Merge branch 'bugfix/fix_some_wifi_bugs_0522_v4.0' into 'release/v4.0'
...
feature: optimize some wifi API (backport v4.0)
See merge request espressif/esp-idf!8878
2020-06-02 17:39:15 +08:00
Island
1ab23bfd3d
Merge branch 'bugfix/ble_mesh_local_model_sub_v4.0' into 'release/v4.0'
...
Bugfix/ble mesh local model sub (v4.0)
See merge request espressif/esp-idf!8984
2020-06-02 10:58:40 +08:00
lly
073b8daa6e
ble_mesh: Rework prov pdu length check
2020-06-02 10:14:50 +08:00
Angus Gratton
6a844f3737
Merge branch 'bugfix/kconfig_hex_values_v4.0' into 'release/v4.0'
...
kconfig: Fix two cases of hex values being handled incorrectly (v4.0)
See merge request espressif/esp-idf!8788
2020-06-01 14:48:16 +08:00
ronghulin
b571992626
feature: optimize some wifi API
...
1. optimization esp_wifi_set_max_tx_power description
2. Add API esp_wifi_ap_get_sta_aid
2020-06-01 11:07:49 +08:00
lly
cd40f3ad52
ble_mesh: Local model (un)subscribes group address
2020-06-01 09:11:27 +08:00
lly
11cfb44e58
ble_mesh: Define a macro for invalid company id
2020-06-01 09:11:26 +08:00
Jiang Jiang Jian
c00fe4c53c
Merge branch 'bugfix/wpa3_auth_coex_issue_v4.0' into 'release/v4.0'
...
Fix WPA3 Auth issue in coex scenario (backport v4.0)
See merge request espressif/esp-idf!8838
2020-05-29 18:05:43 +08:00
He Yin Ling
64114efdaf
Merge branch 'bugfix/ci_push_to_github_on_label_v4.0' into 'release/v4.0'
...
ci: Don't push to Github or deploy docs on customized pipelines (v4.0)
See merge request espressif/esp-idf!8938
2020-05-29 14:04:26 +08:00
Jiang Jiang Jian
569575b404
Merge branch 'bugfix/fix_spi_flash_clock_config_error_v4.0' into 'release/v4.0'
...
flash: fix spi flash clock config error (backport v4.0)
See merge request espressif/esp-idf!8515
2020-05-29 12:46:04 +08:00
Angus Gratton
2f15eacdeb
Merge branch 'bugfix/heap_psram_fill_v4.0' into 'release/v4.0'
...
heap: Only fill new heaps with FREE_FILL_PATTERN if Comprehensive poisoning is on (v4.0)
See merge request espressif/esp-idf!8491
2020-05-29 12:43:45 +08:00
Jiang Jiang Jian
193e9c0d5a
Merge branch 'bugfix/add_so_linger_to_menuconfig_for_4.0' into 'release/v4.0'
...
lw-ip:add so linger to menuconfig for 4.0(backport4.0)
See merge request espressif/esp-idf!8759
2020-05-29 11:15:26 +08:00
Jiang Jiang Jian
5c2ed3af0e
Merge branch 'bugfix/fix_memleak_in_wpa3_feature_v4.0' into 'release/v4.0'
...
fix(wpa_supplicant): fix memleak in wpa3 feature (backport v4.0)
See merge request espressif/esp-idf!8655
2020-05-29 11:14:36 +08:00
Jiang Jiang Jian
6b5c89b684
Merge branch 'bugfix/ble_mesh_check_timer_init_v4.0' into 'release/v4.0'
...
ble_mesh: Check the result of creating timer (v4.0)
See merge request espressif/esp-idf!8959
2020-05-28 15:27:21 +08:00
Jiang Jiang Jian
a5ffd527ab
Merge branch 'nimble/update_nimble_submodule_v4.0' into 'release/v4.0'
...
NimBLE: Include upstream fixes and use macros for log level filtering (backport v4.0)
See merge request espressif/esp-idf!8795
2020-05-28 15:24:45 +08:00
lly
792605e8fd
ble_mesh: Check the result of creating timer
2020-05-28 10:27:25 +08:00
Island
59e11421bf
Merge branch 'bugfix/ble_mesh_sync_zephyr_fixes_v4.0' into 'release/v4.0'
...
Bugfix/ble mesh sync zephyr fixes (v4.0)
See merge request espressif/esp-idf!8949
2020-05-28 10:16:52 +08:00
Island
a90e8d67e9
Merge branch 'bugfix/ble_mesh_not_use_same_private_key_v4.0' into 'release/v4.0'
...
ble_mesh: Not using pre-initialized private key (v4.0)
See merge request espressif/esp-idf!8946
2020-05-28 10:14:45 +08:00
Island
a192095a5e
Merge branch 'bugfix/ble_mesh_comp_data_store_restore_v4.0' into 'release/v4.0'
...
ble_mesh: Same func for storing/restoring comp data (v4.0)
See merge request espressif/esp-idf!8943
2020-05-28 10:13:44 +08:00
Nachiket Kukade
9e21c09a11
esp_wifi: Update wifi lib
...
Fix WPA3 Auth issue in coex scenario
2020-05-27 19:44:39 +05:30
lly
63c83730c2
ble_mesh: Transport tx fields overflow [Zephyr]
...
The transport segmented TX nack and seg_pending fields must be at least
6 bits to avoid overflow for 32 segment messages. This change rearranges
the seg_tx fields to gather all state flag fields in one byte, while
making the counter fields whole bytes.
2020-05-27 17:45:55 +08:00
lly
f781c6edac
ble_mesh: Friend with unknown appkey [Zephyr]
...
Ensures that friend messages are enqueued, even if the packet is
received with an appkey is unknown to the friend. Previously, sdu_recv
would return EINVAL if the appkey was unknown, which would prevent the
lower transport layer from adding the packet to the friend queue. This
is irrelevant for the logic in lower transport, and should not be
returned as an error.
2020-05-27 17:45:49 +08:00
lly
7078065980
ble_mesh: Not using pre-initialized private key
2020-05-27 17:39:35 +08:00
lly
a8afd951dc
ble_mesh: Same func for storing/restoring comp data
2020-05-27 17:31:01 +08:00
Island
652e5352ee
Merge branch 'bugfix/ble_mesh_uses_deprecated_config_v4.0' into 'release/v4.0'
...
ble_mesh: Fix using old config for duplicate scan (v4.0)
See merge request espressif/esp-idf!8901
2020-05-27 17:24:26 +08:00
Angus Gratton
2ea5f522f3
ci: Don't push to Github or deploy docs on customized pipelines
...
BOT_TRIGGER_WITH_LABEL must be empty (meaning all tests are running).
2020-05-27 19:06:30 +10:00
Jiang Jiang Jian
20c34cac2d
Merge branch 'bugfix/fix_some_wifi_bugs_0427_v4.0' into 'release/v4.0'
...
Bugfix/fix some wifi bugs 0427 (v4.0)
See merge request espressif/esp-idf!8571
2020-05-27 14:45:04 +08:00
chenjianqiang
e0a70b0675
flash: fix spi flash clock config error
...
Closes https://github.com/espressif/esp-idf/issues/5099
2020-05-27 04:38:40 +00:00
Angus Gratton
90eccf7cba
Merge branch 'ci/test_jobs_v4.0' into 'release/v4.0'
...
ci: Increase target test runnner count
See merge request espressif/esp-idf!8930
2020-05-27 10:10:12 +08:00
Angus Gratton
d1107a5234
ci: Increase target test runnner count
2020-05-27 11:17:52 +10:00
Angus Gratton
43c32f878a
Merge branch 'bugfix/ci_partition_table_detection_v4.0' into 'release/v4.0'
...
CI: Fix partition table detection if "partition" is in the project name (v4.0)
See merge request espressif/esp-idf!8432
2020-05-27 07:51:54 +08:00
Angus Gratton
6059992efd
Merge branch 'feature/ldgen_output_determinism_v4.0' into 'release/v4.0'
...
ldgen: determinism in mapping rule order (v4.0)
See merge request espressif/esp-idf!8663
2020-05-27 07:50:11 +08:00
Angus Gratton
90f6c9652e
Merge branch 'doc/openocd_security_features_v4.0' into 'release/v4.0'
...
doc: Add caveats about using JTAG debugging with hardware security features (v4.0)
See merge request espressif/esp-idf!8464
2020-05-27 07:49:44 +08:00
Angus Gratton
fa527dc6b3
Merge branch 'bugfix/make_to_cmake_msys_py3_v4.0' into 'release/v4.0'
...
tools: Make Unicode from subprocess result in the CMake convert script (v4.0)
See merge request espressif/esp-idf!8544
2020-05-27 07:49:34 +08:00
Angus Gratton
e93405c3a7
Merge branch 'bugfix/heap_trace_invalid_addr_v4.0' into 'release/v4.0'
...
heap: fix backtrace termination (v4.0)
See merge request espressif/esp-idf!8420
2020-05-27 07:49:01 +08:00
Angus Gratton
1d7765eeea
Merge branch 'bugfix/ci_unterminated_sdkconfig_defaults_v4.0' into 'release/v4.0'
...
CI: Add EOL to sdkconfig.defaults before adding sdkconfig.ci (v4.0)
See merge request espressif/esp-idf!8457
2020-05-27 07:48:43 +08:00
Mahavir Jain
798cc4deb7
Merge branch 'bugfix/pthread_tcb_cleanup_wrapper_v4.0' into 'release/v4.0'
...
Fix linking for vPortCleanUpTCB wrapper (v4.0)
See merge request espressif/esp-idf!8702
2020-05-26 11:48:42 +08:00
Mahavir Jain
254967eea5
Merge branch 'bugfix/wifi_prov_not_stopping_v4.0' into 'release/v4.0'
...
wifi_provisioning: Catch the Wi-Fi events even after Connection errors (v4.0)
See merge request espressif/esp-idf!8608
2020-05-26 11:48:15 +08:00
Angus Gratton
457e1160bc
Merge branch 'task/update_idf_version_v401' into 'release/v4.0'
...
version: Update to v4.0.1
See merge request espressif/esp-idf!8887
2020-05-26 07:38:09 +08:00
David Čermák
d6a2f9841d
Merge branch 'feature/config_mqtt_task_prio_v4.0' into 'release/v4.0'
...
esp_mqtt: configure task priority, esp_mqtt_abort_connection race condition, clenaup logs and docs (v4.0)
See merge request espressif/esp-idf!8473
2020-05-26 03:37:13 +08:00
David Čermák
d9f4cb89a4
Merge branch 'bugfix/ws_client_fragmented_send_v4.0' into 'release/v4.0'
...
ws_client: fix fragmented send setting proper opcodes (v4.0)
See merge request espressif/esp-idf!8691
2020-05-25 17:19:42 +08:00
David Čermák
76d79dff7c
Merge branch 'bugfix/ipv6_examples_4.0' into 'release/v4.0'
...
socket-examples: IPv6 related update for examples to set correct scoped id (v4.0)
See merge request espressif/esp-idf!8582
2020-05-25 17:18:59 +08:00
lly
9d5ea68c61
ble_mesh: Fix using old config for duplicate scan
2020-05-25 16:54:03 +08:00
Michael (XIAO Xufeng)
1ab129891a
Merge branch 'bugfix/erase_with_vtaskdelay_v4.0' into 'release/v4.0'
...
spi_flash: Add vTaskDelay while a long erasing (v4.0)
See merge request espressif/esp-idf!8599
2020-05-25 14:29:26 +08:00
Angus Gratton
a748457a70
version: Update to v4.0.1
2020-05-25 14:05:55 +10:00
xueyunfei
15916dfbec
add LINGER to menuconfig
2020-05-25 11:31:38 +08:00
Island
c18ffa8604
Merge branch 'example/ble_mesh_structural_adjust_v4.0' into 'release/v4.0'
...
Example/ble mesh structural adjust (v4.0)
See merge request espressif/esp-idf!8871
2020-05-22 19:14:58 +08:00
Island
57932baef3
Merge branch 'bugfix/ble_mesh_provisioner_fail_to_pub_v4.0' into 'release/v4.0'
...
ble_mesh: Fix Provisioner failed to publish (v4.0)
See merge request espressif/esp-idf!8874
2020-05-22 19:14:26 +08:00
Island
4c5fd2be70
Merge branch 'bugfix/ble_mesh_friend_init_flag_v4.0' into 'release/v4.0'
...
Bugfix/ble mesh friend init flag (v4.0)
See merge request espressif/esp-idf!8869
2020-05-22 19:13:42 +08:00