Jiang Jiang Jian
093214c86f
Merge branch 'feature/add_psram_workaround_option_3.2' into 'release/v3.2'
...
make psram workaround depend on chip revison (v3.2)
See merge request espressif/esp-idf!6304
2019-10-14 21:45:34 +08:00
Angus Gratton
f55cb56380
Merge branch 'feature/handle_icy_uris_v32' into 'release/v3.2'
...
Modified http_parser to handle ICY uris (Backport v3.2)
See merge request espressif/esp-idf!6326
2019-10-14 18:56:01 +08:00
Angus Gratton
f612a39127
Merge branch 'bugfix/freertos_xTaskNotifyGive_v3.2' into 'release/v3.2'
...
freertos: remove semicolon in xTaskNotifyGive (v3.2)
See merge request espressif/esp-idf!6271
2019-10-14 11:20:41 +08:00
suda-morris
ae2cec834e
ethernet: add kconfig help for GPIO0 output mode
...
1. add kconfig help for GPIO0 output mode
2. fix a bug when select gpio0 output mode and initialize psram
3. make default config to official development board
4. fix wrong LAN8720 register index
2019-10-14 10:50:49 +08:00
Vikram Dattu
31c720602d
Modified http_parser to handle ICY uris.
...
ICY URIs e.g `http://uk1.internet-radio.com/proxy/vombat?mp=/ ;` need to
be handled differently.
For basic use case, these URIs are similar to HTTP with exception that they reply with `ICY 200` etc in place of `HTTP/1.1 200`.
In http_parser, we now also parse ICY URIs to be able to handle these similar to HTTP.
Signed-off-by: Vikram Dattu <vikram.dattu@espressif.com>
2019-10-11 16:24:31 +05:30
Jiang Jiang Jian
0b4faeb781
Merge branch 'bugfix/btdm_backports_v3.2_0903' into 'release/v3.2'
...
Bugfix/btdm backports v3.2 0903
See merge request espressif/esp-idf!5987
2019-10-11 18:34:31 +08:00
suda-morris
ef796860d7
bootloader: shrink bin size
...
1. write a bootloader version of "getting chip revision" function.
2. reduce wordy log.
2019-10-10 12:08:34 +08:00
suda-morris
9742acc33d
make psram workaround depend on chip revison
...
Since ESP32 revision 3, the PSRAM workaround is not needed.
2019-10-10 11:55:16 +08:00
Ivan Grokhotkov
83c87764f4
Merge branch 'bugfix_kconfig_deps_missing_v3.2' into 'release/v3.2'
...
kconfig: Add -MP option so .d files include empty targets (v3.2)
See merge request espressif/esp-idf!5848
2019-10-09 23:53:08 +08:00
Per-Olov Jernberg
0afad4c7a7
idf_monitor: Exit with CTRL+X in menu
...
Currently, the only way of exiting the idf_monitor program is to hit the CTRL+] button, if your keyboard doesn't have that key unless you hit another modifier key, it's not super trivial to exit.
This change adds the option to exit with CTRL+T (for menu) then hitting X (or CTRL+X) for exiting.
Closes https://github.com/espressif/esp-idf/pull/4167
Closes https://github.com/espressif/esp-idf/issues/4129
2019-10-09 10:56:56 +02:00
Jiang Jiang Jian
dc20fa029d
Merge branch 'feature/bluedroid_min_encr_key_size_backport_v3.2' into 'release/v3.2'
...
BT/Bluedroid : Add support to set min encryption key requirement (Backport v3.2)
See merge request espressif/esp-idf!6257
2019-10-09 16:19:48 +08:00
Prasad Alatkar
cf26a8b0f0
BT/Bluedroid : Add support to set min encryption key requirement (Backport v3.2)
...
- Backport(v3.2) of IDF MR!6122
- Modifies `smp_utils.c` to add check on encryption key size received from
peer.
- Modifies `esp_ble_gap_set_security_param` API to add minimum encryption key
size requirement.
2019-10-09 16:19:48 +08:00
Angus Gratton
fe83420144
Merge branch 'bugfix/check_for_new_cmakecache_vars_v3.2' into 'release/v3.2'
...
idf.py: Add check for new cmake cache values (backport v3.2)
See merge request espressif/esp-idf!5930
2019-10-09 13:54:09 +08:00
Angus Gratton
14098b4832
Merge branch 'fix/add_parentheses_to_spi_swap_data_tx_3.2' into 'release/v3.2'
...
spi: Put argument of macro SPI_SWAP_DATA_TX/RX in parentheses (backport v3.2)
See merge request espressif/esp-idf!6110
2019-10-09 12:51:55 +08:00
suda-morris
5088758640
freertos: remove semicolon in xTaskNotifyGive
2019-10-08 12:39:28 +08:00
baohongde
ca824d0ddf
components/bt: backports release/v3.2 0903
...
Remove xtensa/xruntime.h
Fix sending Lmp_feature_req_ext in a loop
Fix 2 bugs in r_ld_fm_sket_isr
fix data loss and send same pkt twice sometimes
fix adv data error in air sometimes
fix adv start/stop crash sometimes
2019-09-23 17:53:29 +08:00
Angus Gratton
d3e562907f
Merge branch 'feature/add_chip_min_revision_3.2' into 'release/v3.2'
...
support esp32 eco revision 2 and 3 (v3.2)
See merge request espressif/esp-idf!6133
2019-09-20 18:13:58 +08:00
suda-morris
eb4c8d9991
support esp32 eco revision 2 and 3
2019-09-19 17:05:08 +08:00
Martin Thierer
d56892b563
spi: Put argument of macro SPI_SWAP_DATA_TX/RX in parentheses
...
Close https://github.com/espressif/esp-idf/pull/3996
2019-09-16 17:40:40 +08:00
Angus Gratton
b1ee664367
Merge branch 'bugfix/bootloader_factory_reset_with_wake_up_from_deep_sleep_v3.2' into 'release/v3.2'
...
bootloader: Blocking the Factory reset during wake up from deep sleep (v3.2)
See merge request espressif/esp-idf!6024
2019-09-16 15:11:38 +08:00
Angus Gratton
ee5604cad0
Merge branch 'bugfix/dis_interrupts_up_to_6_level_for_dport_wa_v3.2' into 'release/v3.2'
...
esp32: Dis interrupts up to 5 lvl for DPORT (v3.2)
See merge request espressif/esp-idf!5714
2019-09-16 15:11:33 +08:00
Angus Gratton
88d8e93223
Merge branch 'update/cjson_v1_7_12_v3.2' into 'release/v3.2'
...
Update cJSON to v1.7.12 (v3.2)
See merge request espressif/esp-idf!5852
2019-09-16 08:20:59 +08:00
Angus Gratton
43def55de8
Merge branch 'bugfix/use_local_kconfiglib_v3.2' into 'release/v3.2'
...
Use kconfiglib from $IDF_PATH/tools/kconfig_new (v3.2)
See merge request espressif/esp-idf!6081
2019-09-13 14:48:04 +08:00
Mahavir Jain
62f201b4bd
Merge branch 'bugfix/http_header_parser_resolution_v3.2' into 'release/v3.2'
...
(backport v3.2) esp_http_server : Bugfix in parsing of empty header values
See merge request espressif/esp-idf!6040
2019-09-13 13:42:16 +08:00
KonstantinKondrashov
2b22f3e853
app_update: Fix UTs for FACTORY_RESET and APP_TEST
2019-09-12 22:07:05 +08:00
KonstantinKondrashov
70954c0b3e
bootloader: Factory reset not for deep sleep
...
Closes: https://github.com/espressif/esp-idf/issues/3800
Closes: IDFGH-1536
2019-09-12 22:07:05 +08:00
Konstantin Kondrashov
69be477885
esp32: Add UTs for DPORT and Hi-interrupt
2019-09-12 13:47:48 +00:00
Konstantin Kondrashov
76f97f3abd
esp32: Dis interrupts up to 5 lvl for DPORT
...
Disable interrupts for both DPORT workarounds up to 5 lvl.
Closes: https://esp32.com/viewtopic.php?f=2&t=10981&sid=d125cec233070ed4d2c5410bf5d3d74a
Closes: IDF-728
2019-09-12 13:47:48 +00:00
chenyudong
d0bfde2ceb
test: fix test case MESH_EST_2403
2019-09-12 02:51:06 +00:00
Roland Dobai
544e9831e8
Use kconfiglib from $IDF_PATH/tools/kconfig_new
2019-09-11 14:40:57 +02:00
zhangyanjiao
b937de7df2
fix the bug that ESP32 sends broadcast to phone after smartconfig is done
2019-09-11 11:50:58 +08:00
Chinmay
fa952e5d30
esp_http_server : Bugfix in parsing of empty header values
...
This MR is intended to fix incorrect parsing of HTTP requests when empty header values are present.
The issue is was due to asymmetric behavior of `http_parser` library, which in case of:
* non-empty header values : invokes callbacks with the pointer to the start of a value
* empty header values : invokes callbacks with pointer to the start of next header or section
Since HTTP server relies on this pointer (along with length of the value) to locate the end of a value, and replace the line terminators (CRLFs) with null characters, the second case needed to be handled correctly.
Closes IDFGH-1539
Closes https://github.com/espressif/esp-idf/issues/3803
Backports !5663
2019-09-09 08:57:29 +00:00
Jiang Jiang Jian
ca1e5e5bc5
Merge branch 'bugfix/fix_the_bug_for_WPA_WPA2_PSK_connection_fail_v3.2' into 'release/v3.2'
...
fix the bug for WPA_WPA2_PSK connection fail(backport v3.2)
See merge request espressif/esp-idf!6007
2019-09-06 11:44:09 +08:00
zhangyanjiao
23b3d97099
1. fix the bug that STA fails to connect WPA_WPA2_PSK Apple AP
...
2. fix the bug for softAP set authmode
2019-09-05 20:08:52 +08:00
Angus Gratton
0a0f5a3bdc
Merge branch 'bugfix/flash_encryption_disable_plaintext_v3.2' into 'release/v3.2'
...
flash encryption: Add config option to disable any plaintext reflashes (v3.2)
See merge request espressif/esp-idf!5998
2019-09-05 17:26:04 +08:00
Angus Gratton
ec331b3979
flash encryption: Add config option to disable any plaintext reflashes
...
Enabled by default when Secure Boot is on, so Flash Encryption protection
is always available in case of a Secure Boot bypass.
2019-09-05 18:54:29 +10:00
Angus Gratton
73e040e584
Merge branch 'test/use_correct_config_for_nvs_compatible_case_v3.2' into 'release/v3.2'
...
test: fix nvs compatible case error (backport v3.2)
See merge request espressif/esp-idf!5893
2019-09-05 16:51:30 +08:00
Angus Gratton
d1f40c15ac
Merge branch 'bugfix/fix_i2s_channels_swapped_issue_v3.2' into 'release/v3.2'
...
Bugfix(i2s): fixed i2s left/right channels swapped issue for release/v3.2.
See merge request espressif/esp-idf!5898
2019-09-03 13:36:29 +08:00
Jiang Jiang Jian
7718234acc
Merge branch 'bugfix/coex_bb_reset_lock_v3.2' into 'release/v3.2'
...
fix bug that wifi start/stop may cause crash
See merge request espressif/esp-idf!5969
2019-09-02 14:26:03 +08:00
Tian Hao
01cd149cb7
fix bug that wifi start/stop may cause crash
...
1. fix bug bb reset lock flag to avoid bb reset lock unhandle,
may cause assert in vPortCPUReleaseMutexIntsDisabledInternal.
2. fix bug wifi reset mac cause task watch dog timeout
3. fix bug wifi reset mac position
2019-08-30 22:13:01 +08:00
Angus Gratton
7dd4923190
Merge branch 'bugfix/httpd_sess_close_v3.2' into 'release/v3.2'
...
httpd_sess_close: Check for session validity before closing (v3.2)
See merge request espressif/esp-idf!5744
2019-08-29 10:29:41 +08:00
Sergei Silnov
0b9fc36e62
idf.py: Add check for new cmake cache values
2019-08-27 18:33:03 +02:00
Nachiket Kukade
151ddb4cda
wps: Relax the check on older config methods in case of WPS2.0 (backport v3.2)
...
Some APs incorrectly advertize newer WPS2.0 config method bits
without setting bits for the corresponding older methods. This
results in failures during 8-way handshake. Add a workaround to
relax this check so that WPS handshake can proceed.
2019-08-27 14:10:43 +05:30
Jiang Jiang Jian
1fab985f63
Merge branch 'bugfix/btdm_security_vulnerability_on_encryption_key_size_v3.2' into 'release/v3.2'
...
components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link
See merge request espressif/esp-idf!5873
2019-08-26 18:01:01 +08:00
redchenjs
548844b5cc
Bugfix(i2s): fixed i2s left/right channels swapped issue for release/v3.2.
...
The right channel data is in the high position, so the I2S_TX_MSB_RIGHT & I2S_RX_MSB_RIGHT bits should be set.
2019-08-26 14:02:27 +08:00
He Yin Ling
9bc71370b7
test: fix integration test jobs not executed:
...
naming rule for parallel test job config file is different.
rename test job config file to make it unified.
2019-08-26 14:01:34 +08:00
He Yin Ling
66118ab580
test: fix nvs compatible case error:
...
use new env for nvs compatible test case and update test config
2019-08-26 09:36:32 +08:00
wangmengyang
fae3bad007
components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link for preventing KNOB attack.
...
This patch is to address the CVE-2019-9506 vulnerability.
2019-08-23 08:30:23 +08:00
Ivan Grokhotkov
48e5dcd9b5
Merge branch 'power_management/i2s+i2c-v3.2' into 'release/v3.2'
...
Power management/i2s+i2c (backport v3.2)
See merge request espressif/esp-idf!5863
2019-08-22 23:29:52 +08:00
Angus Gratton
d609daf0cd
Merge branch 'fix/sdio_slave_reset_infloop_leak_3.2' into 'release/v3.2'
...
sdio_slave: fix the send_flush infinite loop issue (backport v3.2)
See merge request espressif/esp-idf!5835
2019-08-22 13:38:12 +08:00