William Ferguson
be3fc35533
[cxx]: fixed extern "C" declarations
...
* Moving #includes above
#ifdef __cplusplus extern "C" { #endif
So that we can compile with CPP.
Signed-off-by: Jakob Hasse <jakob.hasse@espressif.com>
Merges https://github.com/espressif/esp-idf/pull/6634
2021-03-15 18:42:19 +08:00
Cao Sen Miao
068dfcf1ba
ota: fix ota with flash encryption
2021-03-12 16:45:43 +08:00
Angus Gratton
ce2c615bb3
Merge branch 'bugfix/deepsleep_disable_brownout_s2_v4.2' into 'release/v4.2'
...
deep_sleep: on S2 disable the brown out detector before deep sleeping (v4.2)
See merge request espressif/esp-idf!12500
2021-03-11 10:49:30 +00:00
baohongde
6c2489682f
Fix controller task watchdog in Wi-Fi test
2021-03-11 17:19:16 +08:00
Cao Sen Miao
f80f4cbf2d
ci: move freerom/sdmmc repo to psram3 for saving ram
2021-03-11 13:54:15 +08:00
Cao Sen Miao
54b817a59e
flash_encryption: Quick fixed the issue that block when flash_encryption_write, Related https://github.com/espressif/esp-idf/issues/6322 , Related https://github.com/espressif/esp-idf/issues/6254
2021-03-11 13:52:28 +08:00
Jiang Jiang Jian
fa2c4fe622
Merge branch 'bugfix/fix_a2dp_underrun_issue_4_2' into 'release/v4.2'
...
Fix A2DP Underrun Issue [backport v4.2]
See merge request espressif/esp-idf!12277
2021-03-10 14:30:28 +00:00
Michael (XIAO Xufeng)
00e2f2e880
Merge branch 'feat/spi_flash_override_size_v4.2' into 'release/v4.2'
...
spi_flash: add config option to override flash size in bootloader header (v4.2)
See merge request espressif/esp-idf!12452
2021-03-10 10:13:39 +00:00
Cao Sen Miao
e5830907ca
spi_flash: fix flash issue of ext_flash_fatfs_example
2021-03-09 18:33:30 +08:00
Angus Gratton
32b0264529
Merge branch 'doc/flash_enc_update_v4.2' into 'release/v4.2'
...
docs: update flash encryption docs for S2
See merge request espressif/esp-idf!12324
2021-03-09 06:41:53 +00:00
daiziyan
5b6e62d2c4
update CN translation based on reviewers' comments
2021-03-09 10:34:29 +11:00
daiziyan
fdfef114ae
api-guides: update CN translation for build-system and build-system-legacy,and fix line break in the EN version
2021-03-09 10:33:44 +11:00
Angus Gratton
c8900823d8
doc: Update the link to an example that embeds a file
...
Since we have the CA Certificate Store feature, https_request no longer needs to
embed any certs.
2021-03-09 10:33:44 +11:00
Jiang Jiang Jian
37a8c8ce6c
Merge branch 'bugfix/btdm_crash_when_esp_restart_v4.2' into 'release/v4.2'
...
components/bt: Fix crash in Bluetooth when esp_restart
See merge request espressif/esp-idf!12567
2021-03-05 12:27:43 +00:00
Jiang Jiang Jian
2289d4fcc0
Merge branch 'bugfix/fix_csa_channel_crash_v4.2' into 'release/v4.2'
...
esp_wifi: fix CSA and BAR crash issue(v4.2)
See merge request espressif/esp-idf!12549
2021-03-05 12:24:33 +00:00
Jiang Jiang Jian
e1f1d11b76
Merge branch 'feature/add_init_and_deinit_evt_for_a2dp_4_2' into 'release/v4.2'
...
feature/ Add A2DP Init and Deinit Complete Evt [backport v4.2]
See merge request espressif/esp-idf!12150
2021-03-05 12:19:18 +00:00
Mahavir Jain
24157cc60a
Merge branch 'fix/esp_tls_prevent_freeing_global_CA_store_after_each_request_v4.2' into 'release/v4.2'
...
fix(esp_tls): prevent freeing global CA store after each request (v4.2)
See merge request espressif/esp-idf!12631
2021-03-05 08:52:38 +00:00
Aditya Patwardhan
a2ccb3c0ac
protocomm: Fixed NULL check of allocated memory
...
Fixes one part of - https://github.com/espressif/esp-idf/issues/6440
2021-03-05 10:06:18 +05:30
Aditya Patwardhan
a2e6db19e6
esp_tls: Fix misplaced paranthesis in esp_tls_mbedtls.c
...
Fixes one part of - https://github.com/espressif/esp-idf/issues/6440
2021-03-05 10:06:10 +05:30
Aditya Patwardhan
d66ad18853
Fix esp_tls: Prevent freeing of global ca store after each connection
...
when dynamic ssl buffers are enabled
2021-03-05 09:55:10 +05:30
Michael (XIAO Xufeng)
e7435a75f5
Merge branch 'bugfix/phy_xpd_v4.2' into 'release/v4.2'
...
wifi: add set_xpd_sar override(backport v4.2)
See merge request espressif/esp-idf!11540
2021-03-04 08:41:17 +00:00
Mahavir Jain
10d40bd526
Merge branch 'bugfix/correct_logging_timestamp_format_v4.2' into 'release/v4.2'
...
log: correct timestamp formatting to unsigned integer type (v4.2)
See merge request espressif/esp-idf!12611
2021-03-04 07:39:33 +00:00
liqigan
60b6968e80
add API esp_spp_stop_srv_scn
to stop a specific server
2021-03-04 15:33:47 +08:00
Mahavir Jain
a177897f4d
log: correct timestamp formatting to unsigned integer type
...
Closes https://github.com/espressif/esp-idf/issues/6226
Closes IDFGH-4393
2021-03-04 11:54:30 +05:30
ChenJianxing
1f3b6b2e6d
esp_wifi: fix CSA and BAR crash issue.
2021-03-02 11:51:01 +08:00
Roland Dobai
2c85d01603
tools: Don't count BSS into the total image size
2021-03-01 14:39:42 +01:00
KonstantinKondrashov
33236c9593
doc: update S2 flash encryption & secure boot docs
2021-03-01 17:48:17 +08:00
baohongde
70de8f5158
components/bt: Fix crash in Bluetooth when esp_restart
2021-03-01 14:43:45 +08:00
Mahavir Jain
77a78a22f6
Merge branch 'bugfix/esp_wifi_deinit_v4.2' into 'release/v4.2'
...
esp_wifi_deinit: Return ESP_ERR_WIFI_NOT_STOPPED if wifi is not stopped (v4.2)
See merge request espressif/esp-idf!12540
2021-03-01 05:32:08 +00:00
liaowenhao
8375bb94a4
bugfix/if bta_hf_client_sco_co_out_data is called, it will crash when sco disconnected
2021-03-01 11:34:15 +08:00
Shubham Kulkarni
9689f87887
esp_wifi_deinit: Return ESP_ERR_WIFI_NOT_STOPPED if wifi is not stopped
...
Add test case to test this workflow
2021-02-26 14:53:59 +05:30
David Cermak
66c89f1093
examples, esp_mesh: Fix internal ip mesh example to use transmit wrap function
...
Fixed regression caused by recent refactoring of WiFi Tx. If wasn't defined all transmits end up in a crash.
Closes https://github.com/espressif/esp-idf/issues/6067
2021-02-26 07:50:00 +01:00
baohongde
76b0097103
components/bt: Fix assert without sw coexist enabled
2021-02-26 14:29:34 +08:00
Marius Vikhammer
da809e92b7
docs: update S2 flash encryption docs
2021-02-26 01:42:04 +08:00
Marius Vikhammer
cf87e114cb
deep_sleep: on S2 disable the brown out detector before deep sleeping
...
On S2 the brown out detector would occasionally trigger erroneously during deep sleep.
Disable it before sleeping to circumvent this issue.
Closes https://github.com/espressif/esp-idf/issues/6179
2021-02-25 14:58:50 +08:00
Angus Gratton
af8bc4c436
Merge branch 'bugfix/SECURE_DISABLE_ROM_DL_MODE_does_not_work_v4.2' into 'release/v4.2'
...
bootloader: SECURE_ENABLE_SECURE_ROM_DL_MODE cannot be y when SECURE_DISABLE_ROM_DL_MODE=y (v4.2)
See merge request espressif/esp-idf!12341
2021-02-24 09:40:44 +00:00
liaowenhao
bfb14130ac
bugfix:unhandle event when tg receive set_player_app_value cmd
2021-02-24 07:47:08 +00:00
Michael (XIAO Xufeng)
807e864d7d
Merge branch 'revert-983220e2_v4.2' into 'release/v4.2'
...
ci: enable RS485 related tests again (v4.2)
See merge request espressif/esp-idf!12463
2021-02-24 06:45:58 +00:00
Krzysztof Budzynski
d960752cd9
Merge branch 'docs/remove_rtd_pdf_link_v4.2' into 'release/v4.2'
...
docs: remove rtd pdf link (v4.2)
See merge request espressif/esp-idf!12466
2021-02-23 10:45:37 +00:00
Marius Vikhammer
c0ae1f03a4
docs: remove RTD download PDF links
...
PDF download is available from the version selector menu.
Read the docs links are out of date.
2021-02-23 11:39:33 +08:00
Michael (XIAO Xufeng)
c4fe55d42a
Revert "ci: temporarily disable RS485 related tests"
...
This reverts commit 983220e216
2021-02-23 11:00:37 +08:00
Michael (XIAO Xufeng)
15f406ddb7
spi_flash: add config option to override flash size in bootloader header
...
Sometimes the flash size read from bootloader is not correct. This may
forbid SPI Flash driver from reading the the area larger than the size
in bootloader header.
When the new config option is enabled, the latest configured
ESPTOOLPY_FLAHSIZE in the app header will be used to override the value
read from bootloader header.
2021-02-22 23:18:17 +08:00
Michael (XIAO Xufeng)
e511dd58b3
Merge branch 'bugfix/freemodbus_fix_parity_propagation_issue_v42' into 'release/v4.2'
...
Bugfix/freemodbus fix parity propagation issue (Backport v4.2)
See merge request espressif/esp-idf!12389
2021-02-22 05:23:02 +00:00
Ivan Grokhotkov
af1ebd7e01
Merge branch 'bugfix/eclipse_make_decode_v4.2' into 'release/v4.2'
...
tools: Fix Eclipse build: “UnicodeDecodeError: 'ascii' codec can't decode byte” (v4.2)
See merge request espressif/esp-idf!12358
2021-02-19 15:55:37 +00:00
Ivan Grokhotkov
9ebdeea54e
Merge branch 'feature/prefer_python3_in_installer_v4.2' into 'release/v4.2'
...
tools: Prefer python3 during install and export (v4.2)
See merge request espressif/esp-idf!12377
2021-02-19 15:52:45 +00:00
Mahavir Jain
cbe966135e
Merge branch 'bugfix/fix_enable_reset_provision_cause_device_crash_v4.2' into 'release/v4.2'
...
provisioning: Fix enable CONFIG_EXAMPLE_RESET_PROVISIONED will cause device crash [backport v4.2]
See merge request espressif/esp-idf!12352
2021-02-19 12:57:27 +00:00
yuanjm
9240750bf4
provisioning: Fix enable CONFIG_EXAMPLE_RESET_PROVISIONED will cause device crash
2021-02-19 11:31:51 +00:00
Island
cd9237f871
Merge branch 'bugfix/ignore_null_valued_comb_key_4_2' into 'release/v4.2'
...
Bugfix/ignore null valued comb key 4 2
See merge request espressif/esp-idf!12346
2021-02-18 13:58:25 +00:00
zwj
1b1c917321
add connection parameter check
2021-02-18 09:39:01 +00:00
zwj
171e2c5b1e
fix ble connection maximum latency is 499
2021-02-18 09:39:01 +00:00