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
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
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
Island
7a60ae4bc8
Merge branch 'bugfix/ble_mesh_remove_patch_v4.0' into 'release/v4.0'
...
ble_mesh: Remove patch for the bug of an App (v4.0)
See merge request espressif/esp-idf!8868
2020-05-22 19:13:24 +08:00
Island
7f049cd5dc
Merge branch 'bugfix/ble_mesh_fix_typos_v4.0' into 'release/v4.0'
...
ble_mesh: Fix typos (v4.0)
See merge request espressif/esp-idf!8867
2020-05-22 19:13:05 +08:00
lly
699270e09e
ble_mesh: Fix Provisioner failed to publish
2020-05-22 15:48:49 +08:00
lly
59187b0921
ble_mesh: Fix tutorial links in examples README.md
2020-05-22 14:30:12 +08:00
lly
ec6ebf7d4e
ble_mesh: Rename esp_fast_prov_* to ble_mesh_fast_prov_*
2020-05-22 14:30:05 +08:00
lly
bcc1eb916b
ble_mesh: Rename the folders ble_mesh_fast_prov_* to fast_prov_*
2020-05-22 14:28:38 +08:00
lly
9891045018
ble_mesh: Rename ble mesh example main & init files
...
- Rename ble_mesh_demo_main.c to main.c
- Rename ble_mesh_demo_init.* to ble_mesh_example_init.*
2020-05-22 14:22:39 +08:00
lly
009878f02d
ble_mesh: Move the example init to the common_components
2020-05-22 14:21:43 +08:00
David Cermak
ee51d336d3
mqtt: clenaup logs and docs, esp_mqtt_abort_connection race condition
...
esp_mqtt_abort_connection: Fixed an issue which could result in a race condition and subsequent crash
esp_mqtt: Change an error print to use ESP_LOGE instead of ESP_LOGI
Move Sending MQTT connect message log from Info to Debug level
docs: Makes clear that publish API could block
Change the message printed after MQTT connection failure
2020-05-22 06:21:25 +00:00
Simon Brélivet
d7310ae008
esp_mqtt: add option to configure mqtt task priority.
...
Merges https://github.com/espressif/esp-idf/pull/4947
2020-05-22 06:21:25 +00:00
lly
8bbee15932
ble_mesh: Move the button component to common_components
2020-05-22 14:20:56 +08:00
lly
d15735c71f
ble_mesh: Change the EXTRA_COMPONENT_DIRS used by examples
2020-05-22 14:20:41 +08:00
lly
b63abd2069
ble_mesh: Rename common_vendor_models to common_components
...
Since the scripts of CI will bypass common_components when
trying to get ALL_EXAMPLES, and these BLE Mesh components
will only be used by other mesh examples, i.e. no need to
be compiled as a single example, so we rename the folder
to common_componnets.
2020-05-22 14:20:21 +08:00
David Cermak
acf1478a51
socket-examples: IPv6 related update for examples to set correct scoped id
...
The scope id must be present when connecting to IPv6 Local Link
address.
2020-05-22 06:19:49 +00:00
David Cermak
55dd3c8b77
ws_client: fix fragmented send setting proper opcodes
...
Previous implementation violated the RFC by having both the actual opcode and WS_FIN flag set for all fragments of a message.
Fixed by setting the opcode only for the first fragment and WS_FIN for the last one
Closes IDFGH-2938
Closes https://github.com/espressif/esp-idf/issues/4974
2020-05-22 06:11:44 +00:00
David Čermák
7b01509b19
Merge branch 'bugfix/stop_mac_can_be_controlled_by_user_v4.0' into 'release/v4.0'
...
Bugfix/stop mac can be controlled by user v4.0
See merge request espressif/esp-idf!8762
2020-05-22 14:07:48 +08:00
KonstantinKondrashov
754f59fba7
spi_flash(new driver): Add a Kconfig option - Bypass a block erase and always do sector erase
...
Closes: IDF-1561
2020-05-22 05:07:20 +00:00
KonstantinKondrashov
9926b875d8
spi_flash(LEGACY_IMPL): Add a Kconfig option - Bypass a block erase and always do sector erase
...
Closes: IDF-1561
2020-05-22 05:07:20 +00:00
KonstantinKondrashov
79831e64fd
spi_flash: Add into sim/stubs the esp_timer
2020-05-22 05:07:20 +00:00
KonstantinKondrashov
a128eae7b8
spi_flash(new driver): Add vTaskDelay while a long erasing
2020-05-22 05:07:20 +00:00
KonstantinKondrashov
98ac272a3f
spi_flash(LEGACY_IMPL): Add vTaskDelay while a long erasing
...
Added Kconfig options to enable yield operation during flash erase
Closes: https://github.com/espressif/esp-idf/issues/2083
Closes: https://github.com/espressif/esp-idf/issues/4916
Closes: IDFGH-261
2020-05-22 05:07:20 +00:00
lly
13167a7579
ble_mesh: Clear two more vars during proxy server deinit
2020-05-22 11:39:51 +08:00
lly
acf41f93a9
ble_mesh: Add missing sdkconfig.h
2020-05-22 11:39:51 +08:00
lly
470c959b04
ble_mesh: Init device name during proxy server init
...
Device name will be reset when deinit mesh stack. If not
initializing device name during the next mesh stack init,
it will fail to set the device name when using bluedroid.
2020-05-22 11:39:50 +08:00
lly
dd7c98d6c2
ble_mesh: Add init flag for friend init/deinit
...
Since bt_mesh_friend_init() will only be invoked when
a device is provisioned or Provisioner is enabled, so
we add a flag to indicate if the friend functionality
is initialized in case deinit before initialization.
2020-05-22 11:39:49 +08:00
lly
90aa79fd2b
ble_mesh: Remove patch for the bug of an App
2020-05-22 11:37:30 +08:00
lly
97c1a4b5c6
ble_mesh: Fix typos
2020-05-22 11:34:07 +08:00
Island
5897354d7f
Merge branch 'bugfix/sync_zephyr_bt_mesh_bugfix_v4.0' into 'release/v4.0'
...
Bugfix/sync zephyr bt mesh bugfix (v4.0)
See merge request espressif/esp-idf!8853
2020-05-22 10:50:39 +08:00
Island
6c99fdceb2
Merge branch 'bugfix/ble_mesh_node_old_version_to_new_v4.0' into 'release/v4.0'
...
ble_mesh: Fix mesh node device role restore (v4.0)
See merge request espressif/esp-idf!8854
2020-05-22 10:50:09 +08:00
Island
1340e600c2
Merge branch 'doc/ble_mesh_fix_v4.0' into 'release/v4.0'
...
ble_mesh: Doc miscellaneous fixes (v4.0)
See merge request espressif/esp-idf!8859
2020-05-22 10:49:39 +08:00
lly
cdd35648b7
ble_mesh: Doc miscellaneous fixes
...
- Update ble mesh architecture
2020-05-21 17:48:21 +08:00
Michael (XIAO Xufeng)
6fe46c1798
Merge branch 'bugfix/timer_group_intr_enable_v4.0' into 'release/v4.0'
...
Fix timer group intr enable (backport v4.0)
See merge request espressif/esp-idf!8530
2020-05-21 17:42:02 +08:00
lly
d2bcb5c7ff
ble_mesh: A specific fix for compile warning in idf4.0
...
Compared with the latest idf, idf4.0 defines BIT(nr) in
the "esp_bit_defs.h" without the pre-condition "#ifndef BIT",
which will cause compile warning when using mesh. So we
include the header file "soc/soc.h" in "mesh_util.h",
which can bypass the definition of "BIT" in "mesh_util.h"
when compiling.
2020-05-21 16:50:09 +08:00