Angus Gratton
e1b03f08af
Merge branch 'bugfix/doc_macro_definitions_v4.2' into 'release/v4.2'
...
doc: Fix macro definitions for different targets (v4.2)
See merge request espressif/esp-idf!9566
2020-07-20 08:25:33 +08:00
Island
73ec4d0c1d
Merge branch 'bugfix/ble_mesh_health_current_status_recv_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Fix recv health current status incorrectly (v4.2)
See merge request espressif/esp-idf!9664
2020-07-17 16:14:25 +08:00
lly
b39eaf61b5
ble_mesh: stack: Fix recv health current status incorrectly
2020-07-17 14:05:18 +08:00
Island
d26405df96
Merge branch 'bugfix/ble_mesh_misc_updates_v4.2' into 'release/v4.2'
...
Bugfix/ble mesh misc updates (v4.2)
See merge request espressif/esp-idf!9641
2020-07-16 14:03:27 +08:00
lly
49145856a2
ble_mesh: ci: Enable friend & low power in build check
2020-07-16 11:02:25 +08:00
lly
2e01297603
ble_mesh: stack: Only keep func pointer for very common log
...
Currently only keep func pointer for the followings:
- Invalid parameter (mesh btc & mesh stack)
- Out of memory (mesh btc & mesh stack)
- Unknown act (mesh btc)
- Invalid model user data (mesh stack)
- BT_DBG("%s", __func__) (mesh btc & mesh stack)
- A few other specific situations (buf ref debug, send status check)
2020-07-16 11:02:24 +08:00
lly
5fceac92ee
ble_mesh: stack: Make proxy server & client functions clear
2020-07-16 11:02:24 +08:00
Island
d8c657c6f0
Merge branch 'bugfix/ble_mesh_add_misc_check_v4.2' into 'release/v4.2'
...
Bugfix/ble mesh add misc check (v4.2)
See merge request espressif/esp-idf!9630
2020-07-16 10:52:26 +08:00
Angus Gratton
a60bfb8cdc
Merge branch 'feature/reassign_example_test_runners_v4.2' into 'release/v4.2'
...
ci: Modify some dut-unrelated example tests env tag from Example_WIFI to Example_GENERIC (backport v4.2)
See merge request espressif/esp-idf!9634
2020-07-16 03:29:31 +08:00
Fu Hanxi
a73b0c3eb6
ci: Modify some dut-unrelated example tests env tag from Example_WIFI to Example_GENERIC
2020-07-15 16:54:03 +08:00
David Čermák
001c673f4e
Merge branch 'bugfix/eth_insert_min_hw_reset_time_v4.2' into 'release/v4.2'
...
ethernet: insert min assert time for PHY HW reset (v4.2)
See merge request espressif/esp-idf!9579
2020-07-15 16:35:46 +08:00
lly
fc99963376
ble_mesh: stack: Add proxy cfg pdu length check
2020-07-15 16:10:48 +08:00
lly
1846def7ac
ble_mesh: stack: Rework using dev flag to check scan status
...
Different bluetooth host has different behaviors, so it's better
to maintain a scan check mechanism of BLE Mesh itself.
Fixes an issue when only PB-GATT is enabled for node, which will
output a scan error log when the device is provisioned.
2020-07-15 16:10:48 +08:00
lly
cf5b69389e
ble_mesh: example: Add result check during mesh init
2020-07-15 16:10:48 +08:00
lly
37322ce93f
ble_mesh: stack: Add more checks about input prov bearers
2020-07-15 16:10:48 +08:00
Island
daf8098a00
Merge branch 'feat/ble_mesh_use_iram_for_mem_alloc_v4.2' into 'release/v4.2'
...
Feat/ble mesh use iram for mem alloc (v4.2)
See merge request espressif/esp-idf!9614
2020-07-15 16:06:47 +08:00
Mahavir Jain
c59b27b417
Merge branch 'bugfix/cleanup_bt_reference_from_esp32s2_ld_v4.2' into 'release/v4.2'
...
esp32s2: cleanup bt reference from esp32s2 ld (v4.2)
See merge request espressif/esp-idf!9613
2020-07-14 22:52:11 +08:00
lly
a6dcfb4a5a
ble_mesh: stack: Rename mesh adv queue and relay queue
2020-07-14 21:19:32 +08:00
lly
efcd9ee4a8
ble_mesh: stack: Use macros for adv task name & prio
2020-07-14 21:19:32 +08:00
lly
e58d982903
ble_mesh: ci: Add iram & psram configurations
2020-07-14 21:19:32 +08:00
lly
6abfc2a8f7
ble_mesh: stack: Make freertos static allocation visible
2020-07-14 21:19:32 +08:00
lly
c0db196464
ble_mesh: stack: Add a option of using IRAM for memory allocation
2020-07-14 21:19:32 +08:00
Mahavir Jain
a9d8d8ea99
esp32s2: remove bt references from esp32s2 ld script
2020-07-14 18:04:28 +05:30
Jiang Jiang Jian
452ce608fe
Merge branch 'bugfix/fix_erro_in_ag_api_4.2' into 'release/v4.2'
...
Fix error of AG API return line v4.2
See merge request espressif/esp-idf!9605
2020-07-14 19:54:17 +08:00
weitianhua
b716800000
Fix error of AG API return line
...
Closes https://github.com/espressif/esp-idf/issues/5554
2020-07-14 14:43:15 +08:00
Mahavir Jain
38e75dca1d
Merge branch 'bugfix/enable_mbedtls_renegotiation_v4.2' into 'release/v4.2'
...
esp-tls: enable TLS renegotiation using explicit API call (v4.2)
See merge request espressif/esp-idf!9590
2020-07-14 12:05:02 +08:00
Mahavir Jain
c57f9b76cb
Merge branch 'bugfix/ota_ci_failures_v4.2' into 'release/v4.2'
...
Increse receive timeout in OTA Example tests to fix CI failures (v4.2)
See merge request espressif/esp-idf!9588
2020-07-13 23:01:23 +08:00
Ivan Grokhotkov
31121e5af1
Merge branch 'bugfix/rs485_test_temp_disable_v42' into 'release/v4.2'
...
Bugfix/rs485 test temp disable (backport v4.2)
See merge request espressif/esp-idf!9525
2020-07-13 20:41:42 +08:00
Mahavir Jain
40a29866f6
esp-tls: enable TLS renegotiation using explicit API call
...
mbedTLS stack does not keep TLS renegotiation enabled even if
relevant config option is turned on, it needs explicit API call
`mbedtls_ssl_conf_renegotiation` to do so.
This issue was observed in case of Azure IoT, where keys needs to
be refreshed periodically to keep TLS connection intact.
2020-07-13 15:32:41 +05:30
Shubham Kulkarni
1f16f5cf22
Increse receive timeout in sdkconfig.ci to fix CI failures
2020-07-13 10:15:01 +05:30
morris
49c1d40b2d
ethernet: insert min assert time for PHY HW reset
...
Closes https://github.com/espressif/esp-idf/issues/5528
2020-07-13 11:05:38 +08:00
Jiang Jiang Jian
1f8c5b2b64
Merge branch 'docs/fix_event_typo_backport_v4.2' into 'release/v4.2'
...
docs/fix event typo backport v4.2
See merge request espressif/esp-idf!9382
2020-07-12 21:24:03 +08:00
Mahavir Jain
d6553232cb
Merge branch 'bugfix/issues_with_vanilla_freertos_v4.2' into 'release/v4.2'
...
Fix build issues with Vanilla FreeRTOS (v4.2)
See merge request espressif/esp-idf!9576
2020-07-12 16:39:20 +08:00
Shubham Kulkarni
07abd9092a
Include header file soc/cpu.h in memprot.c and system_api.c
...
This fixes build issues with Vanilla FreeRTOS
2020-07-10 18:21:20 +05:30
Jiang Jiang Jian
897e950e21
Merge branch 'bugfix/add_api_to_get_internal_heap_v4.2' into 'release/v4.2'
...
esp_wifi: Add API to get available internal heap size (backport v4.2)
See merge request espressif/esp-idf!9516
2020-07-10 16:54:38 +08:00
Island
86c197a8db
Merge branch 'bugfix/ble_mesh_update_send_ttl_v4.2' into 'release/v4.2'
...
Bugfix/ble mesh update send ttl v4.2
See merge request espressif/esp-idf!9562
2020-07-10 14:06:12 +08:00
Angus Gratton
21b123a925
Merge branch 'feature/sphinx_idf_theme_pip_v4.2' into 'release/v4.2'
...
docs: update build system to use sphinx_idf_theme pip package (v4.2)
See merge request espressif/esp-idf!9478
2020-07-10 12:56:43 +08:00
Angus Gratton
c44a433b8b
driver: Fix some doxygen warnings
2020-07-10 14:53:16 +10:00
Angus Gratton
e3664e297b
docs: Redirect all of Doxygen stderr to the warnings log
...
Some errors (for example the errors caused by macro values, as fixed in previous
commit) get logged to stderr even if WARN_LOGFILE is set, but Doxygen succeeds.
2020-07-10 14:53:16 +10:00
Angus Gratton
db5d659762
docs: Log the full list of macros, remove code-style macros to prevent Doxygen errors
2020-07-10 14:53:15 +10:00
Angus Gratton
2b270bccbf
doc: Fix passing of build macros to Doxygen
...
Regression in fbb54184ef
, the dictionary
passed to generate_doxygen function was still the project_description
structure.
2020-07-10 14:53:15 +10:00
Michael (XIAO Xufeng)
b39a0be9d2
Merge branch 'bugfix/fix_adc_dac_conflict_backportv4.2' into 'release/v4.2'
...
Driver(adc): Disable the synchronization operation function of ADC1 and DAC (backport v4.2)
See merge request espressif/esp-idf!9360
2020-07-10 11:05:00 +08:00
lly
615d64b6f9
ble_mesh: stack: Add two application macros for TTL
2020-07-10 09:13:53 +08:00
lly
1ec2f98691
ble_mesh: stack: Update send_ttl in btc when recv a msg
...
Update send_ttl mainly for server models. When a server model
receives a message, and the status is required to be replied
by the application, we need to set send_ttl to the msg context.
If send_ttl is not updated in btc, and the applcation does not
set the TTL either, then the status will be replied with TTL=0,
which may cause the client side (e.g. the phone App) failed to
receive the status.
Closes https://github.com/espressif/esp-idf/issues/5300
2020-07-10 09:13:53 +08:00
Jiang Jiang Jian
f52c35258c
Merge branch 'bugfix/fix_16mbit_psram_id_read_error_v4.2' into 'release/v4.2'
...
psram: fix 16mbit psram id read error (backport v4.2)
See merge request espressif/esp-idf!9424
2020-07-09 15:27:23 +08:00
Jiang Jiang Jian
d58bb32f95
Merge branch 'bugfix/fix_build_err_in_cpp_backport_v4.2' into 'release/v4.2'
...
ble_hid_device_demo: fix build if building with c++ backport v4.2
See merge request espressif/esp-idf!9230
2020-07-09 15:25:51 +08:00
Krzysztof Budzynski
9eab094658
Merge branch 'doc/broken_readme_links_v4.2' into 'release/v4.2'
...
Docs: Fix broken README links (v4.2)
See merge request espressif/esp-idf!9499
2020-07-08 23:53:03 +08:00
Krzysztof Budzynski
f7c5e49504
Merge branch 'doc/check_docs_multi_builder_v4.2' into 'release/v4.2'
...
docs: fix check_docs not working for multiple builders (v4.2)
See merge request espressif/esp-idf!9480
2020-07-08 23:50:36 +08:00
Jiang Jiang Jian
ccc4f1337b
Merge branch 'doc/add_UUID_description_in_gattc_demo_backport_v4.2' into 'release/v4.2'
...
docs:add 128-bit UUID description backport v4.2
See merge request espressif/esp-idf!9224
2020-07-08 16:14:45 +08:00
Angus Gratton
0cb87f67da
Merge branch 'feature/console_repl_over_uart_v4.2' into 'release/v4.2'
...
console_repl over UART (v4.2)
See merge request espressif/esp-idf!9422
2020-07-08 16:10:37 +08:00