Jiang Jiang Jian
f7177095cf
Merge branch 'bugfix/name_conflict_esp32_project_ld_v3.3' into 'release/v3.3'
...
esp32: Rename esp32.common.ld to esp32.project.ld to avoid build errors when downgrading (v3.3)
See merge request idf/esp-idf!4732
2019-04-14 10:29:39 +08:00
Jiang Jiang Jian
0e89436769
Merge branch 'bugfix/increase_block_scan_timeout_value_v3.3' into 'release/v3.3'
...
esp32: increase WiFi block scan timeout value (backport v3.3)
See merge request idf/esp-idf!4696
2019-04-12 23:32:55 +08:00
Angus Gratton
40067fb50f
Merge branch 'bugfix/bootloader_flash_crypt_cnt_ff_v3.3' into 'release/v3.3'
...
flash encryption: reduce FLASH_CRYPT_CNT bit width to 7 bits (v3.3)
See merge request idf/esp-idf!4727
2019-04-12 13:42:19 +08:00
Angus Gratton
167c21b987
Merge branch 'bugfix/remove_second_sha_enable_v3.3' into 'release/v3.3'
...
esp32/sha: Remove second enabling in esp_sha_lock_engine_common (backport v3.3)
See merge request idf/esp-idf!4747
2019-04-12 13:28:39 +08:00
Konstantin Kondrashov
a2f00b0adf
esp32/sha: Remove second enabling in esp_sha_lock_engine_common
2019-04-10 20:49:27 +08:00
Angus Gratton
feecafeb0e
Merge branch 'feature/mfg_util_v3.3' into 'release/v3.3'
...
mfg_util: Add changes to mfg_util as per changes in nvs_util (backport v3.3)
See merge request idf/esp-idf!4706
2019-04-10 15:32:05 +08:00
Angus Gratton
7bbbf2d4b3
Merge branch 'bugfix/httpd_accept_conn_v3.3' into 'release/v3.3'
...
esp_http_server : Only accept new connections if server has capacity to handle more (backport v3.3)
See merge request idf/esp-idf!4720
2019-04-10 13:47:09 +08:00
Angus Gratton
21fb5085bd
Merge branch 'bugfix/prov_fix_conn_id_v3.3' into 'release/v3.3'
...
(backport v3.3) Unified Provisioning: Miscellaneous fixes in BLE
See merge request idf/esp-idf!4735
2019-04-10 13:38:40 +08:00
Hrishikesh Dhayagude
82a80005b9
Unified Provisioning: Miscellaneous fixes in BLE
...
1. Pass the correct conn_id to protocomm_req_handle
In transport_simple_ble_write(), passing param->exec_write.conn_id would
be invalid. Instead param->write.conn_id should be passed
Similar change in transport_simple_ble_exec_write() to use
param->exec_write.conn_id
2. simple_ble_start() assumes that the mode is BLE only and enables
Bluetooth controller accordingly. For, cases having BT + BLE like Alexa
(Provisioning over BLE + Audio over classic BT), this assumption should
be removed.
2019-04-09 11:30:54 +05:30
Angus Gratton
b354c11db7
esp32: Rename esp32.common.ld to esp32.project.ld to avoid build errors when downgrading
...
Linker script generator produces build/esp32/esp32.common.ld from
components/esp32/ld/esp32.common.ld.in
This works fine until IDF is downgraded to V3.1 which uses components/esp32/ld/esp32.common.ld and
doesn't track build/esp32/esp32.common.ld at all.
At this point, the linker runs in the build/esp32 directory and "-T esp32.common.ld" picks up the
linker script generated .ld file, which causes mis-builds.
As reported on forums: https://esp32.com/viewtopic.php?f=13&t=9684&p=40105
2019-04-09 10:20:33 +10:00
Angus Gratton
e5672e5d7f
efuse/flash encryption: Reduce FLASH_CRYPT_CNT to a 7 bit efuse field
...
8th bit is not used by hardware.
As reported https://esp32.com/viewtopic.php?f=2&t=7800&p=40895#p40894
2019-04-09 09:57:18 +10:00
liu zhifu
3e972a3ffe
esp32: increase WiFi block scan timeout value
...
Increase WiFi block scan internal timeout value.
2019-04-08 20:02:14 +08:00
Anurag Kar
8bd09fb0a5
esp_http_server : Test added to check limit on max_open_sockets config option
2019-04-08 11:22:12 +05:30
Anurag Kar
e90c90d1f6
esp_http_server : Only accept new connections if server has capacity to handle more
...
This fix prevents HTTP server from accepting new connections when the total count of connected
sockets has reached the max_open_sockets limit set during configuration. The pending connections
are kept in backlog until atleast one of the connected sockets is closed. The maximum number of
connection requests that can kept in backlog is specified as backlog_conn configuration option.
Note that this modification has no effect when LRU purge is enabled.
Also added sanity check on setting for max_open_sockets during configuration.
Solution suggested by jimparis https://github.com/espressif/esp-idf/issues/3183#issue-421234265
Closes https://github.com/espressif/esp-idf/issues/3183
2019-04-08 11:21:44 +05:30
Renz Christian Bagaporo
2f72645320
ldgen: allow combining mapping fragment definitions
2019-04-05 13:12:32 +08:00
Shivani Tipnis
4be28a798f
mfg_util: Add support for comments in input config csv file only
2019-04-04 18:25:03 +05:30
Jiang Jiang Jian
eed94b87e2
Merge branch 'bugfix/coex_bt_disconn_v3.3' into 'release/v3.3'
...
components/coex: Fix BT disconnecting due to too many reset BB
See merge request idf/esp-idf!4680
2019-04-04 20:53:15 +08:00
Jiang Jiang Jian
a218d4b925
Merge branch 'bugfix/btdm_fix_warning_when_disable_logs_v3.3' into 'release/v3.3'
...
components/bt: Fix warning when disable debug logs or in release mode and improve the code structure
See merge request idf/esp-idf!4619
2019-04-04 18:45:31 +08:00
Jiang Jiang Jian
015f523939
Merge branch 'bugfix/btdm_disconn_with_apple_device_v3.3' into 'release/v3.3'
...
components/bt: Fix disconnect with apple device(backport 3.3)
See merge request idf/esp-idf!4666
2019-04-04 18:45:13 +08:00
Jiang Jiang Jian
7196573605
Merge branch 'bugfix/heap_caps_int_overflows_v3.3' into 'release/v3.3'
...
heap: Add integer overflow checks on MALLOC_CAP_32BIT & MALLOC_CAP_EXEC (v3.3)
See merge request idf/esp-idf!4570
2019-04-04 17:59:40 +08:00
Jiang Jiang Jian
4a698ffb75
Merge branch 'bugfix/external_rtc_start_fail_v3.3' into 'release/v3.3'
...
Bugfix/external rtc start fail (v3.3)
See merge request idf/esp-idf!4663
2019-04-04 17:59:24 +08:00
Shivani Tipnis
3368783bf0
mfg_util: Add changes to mfg_util as per changes in nvs_util
...
revert changeson this file
Update README for mfg util
Update to correct coding style of script
(cherry picked from commit a88b4048
)
2019-04-04 13:46:39 +05:30
baohongde
7e0e514127
components/coex: Fix BT disconnecting due to too many reset BB
...
Update coex version to 1.1.6
2019-04-04 11:47:45 +08:00
Jiang Jiang Jian
541c267af3
Merge branch 'bugfix/fix_some_sta_certification_issues_v3.3' into 'release/v3.3'
...
esp32: fix some STA certification issues (backport v3.3)
See merge request idf/esp-idf!4667
2019-04-04 10:27:36 +08:00
baohongde
bbfe9f4efa
components/bt: Fix disconnect with apple device(backport 3.3)
...
1. Fix disconnect with apple device
2. Fix hci_refresh_enc_key_cmd will be ignored
3. Fix hci_refresh_enc_key_cmd will crash
2019-04-03 17:24:52 +08:00
Angus Gratton
9bd172356e
Merge branch 'feature/nvs_partition_util_v3.3' into 'release/v3.3'
...
Add support to include comments in csv file (backport v3.3)
See merge request idf/esp-idf!4670
2019-04-03 11:15:27 +08:00
Shivani Tipnis
1b8dd9f173
nvs_util: Add support to include comments in csv file
...
Closes https://github.com/espressif/esp-idf/issues/2965
(cherry picked from commit 66e38e9bac
)
2019-04-02 12:39:44 +05:30
Liu Zhi Fu
dd33cec716
esp32: fix some STA certification issues
...
Fix following STA WFA certification issues:
1. STA HT2040 coexist
2. Disallow WEP/TKIP with HT rates
3. WPA2 improvement
4. Minor refactor for WiFi internal global variable auth_type
2019-04-02 14:48:43 +08:00
Angus Gratton
1cb29ac446
Merge branch 'feature/nvs_part_util_3.3' into 'release/v3.3'
...
Add support as per encryption and multipage blob changes in NVS Partition Utility (backport v3.3)
See merge request idf/esp-idf!4626
2019-04-02 13:31:57 +08:00
Angus Gratton
7b368fc211
Merge branch 'bugfix/esp_prov_ble_rw_except_backport_v3d3' into 'release/v3.3'
...
esp_prov : Catch DBus exception when reading/writing to BLE GATT characteristic (backport v3.3)
See merge request idf/esp-idf!4659
2019-04-02 12:20:15 +08:00
Angus Gratton
d6ceb4a31a
Merge branch 'bugfix/http_server_lf_term_hdr_backport_v3d3' into 'release/v3.3'
...
HTTP Server : Fix for tolerating LF terminated headers (backport v3.3)
See merge request idf/esp-idf!4658
2019-04-02 12:19:05 +08:00
Angus Gratton
d5f9eb65e9
Merge branch 'bugfix/ldgen_type_1_fails_on_windows_v3.3' into 'release/v3.3'
...
Fix library path parsing in windows (backport v3.3)
See merge request idf/esp-idf!4609
2019-04-02 11:47:18 +08:00
maojianxin
ce3d20dcd2
Fix external start fail
2019-04-02 12:54:08 +11:00
Zhang Jun Yi
1dc461ba80
soc/rtc: Bypass touchpad current to external 32k crystal oscillator
2019-04-02 12:54:08 +11:00
Jiang Jiang Jian
f03382b0ff
Merge branch 'feature/btdm_add_mesh_adv_type_and_srv_uuid_for_dup_scan_except_v3.3' into 'release/v3.3'
...
Component/bt: add mesh beacon adv and svc uuid for duplicate scan exceptional list (backport v3.3)
See merge request idf/esp-idf!4605
2019-04-01 21:49:29 +08:00
Jiang Jiang Jian
2ecd007974
Merge branch 'bugfix/btdm_modify_HCI_GET_CMD_BUF_v3.3' into 'release/v3.3'
...
Component/bt: modify HCI_GET_CMD_BUF (backport v3.3)
See merge request idf/esp-idf!4598
2019-04-01 21:18:18 +08:00
Jiang Jiang Jian
c6e32c1a61
Merge branch 'bugfix/increase_block_scan_time_v3.3' into 'release/v3.3'
...
wifi: increase the block scan time( backport v3.3)
See merge request idf/esp-idf!4652
2019-04-01 20:54:56 +08:00
Anurag Kar
2f26bb2e65
esp_prov : Catch DBus exception when reading/writing to BLE GATT characteristic
...
This is useful in the context of provisioning when server initiates disconnection if secure session establishment fails.
2019-04-01 15:43:50 +05:30
Anurag Kar
3be2b430d1
HTTP Server : Added example tests for verifying parser behavior on arbitrary HTTP terminations (LF, CRLF, etc.)
2019-04-01 15:39:15 +05:30
Anurag Kar
ff01bcfd88
HTTP Server : Fix for tolerating LF terminated headers
...
List of changes:
* When parsing requests, count termination from LF characters only
* Correct memcpy() length parameter in httpd_unrecv() (pointed out by jimparis in GitHub issue thread)
* Use ssize_t to store results of length subtractions during parsing
* Modify some comments to reduce ambiguity
Closes https://github.com/espressif/esp-idf/issues/3182
2019-04-01 15:38:59 +05:30
zhangyanjiao
8442255ccc
wifi: increase the block scan time because of changing channel will take at 30ms when BT/WiFi coexist
2019-04-01 14:49:33 +08:00
Jiang Jiang Jian
c92e677da4
Merge branch 'bugfix/modify_wifi_reason_code_v3.3' into 'release/v3.3'
...
wifi: modify wifi reason code (backport v3.3)
See merge request idf/esp-idf!4648
2019-04-01 14:26:56 +08:00
zhangyanjiao
6d2faf4172
wifi: modify wifi reason code
2019-04-01 11:29:29 +08:00
zhiweijian
826146e985
Component/bt: add mesh beacon adv and svc uuid for duplicate scan exceptional list
2019-03-28 11:13:30 +08:00
Shivani Tipnis
2faf3c9c34
nvs_util: Add support for creation of unique encryption keys
...
(cherry picked from commit e1f466e708c2c1b825e955ec28b70dc3058f9262)
2019-03-27 18:28:42 +05:30
Shivani Tipnis
3fedc3eb28
nvs_util: Add support for creation of unique encryption keys
...
(cherry picked from commit 8b88b3303d83f5f03249e7b3410f6ecabaa00396)
2019-03-26 16:14:31 +05:30
Shivani Tipnis
4148beca50
nvs_util: Fix to support write of multiple singlepage big blob data
...
Closes https://github.com/espressif/esp-idf/issues/3011
(cherry picked from commit 60b5cdde20
)
2019-03-26 16:13:15 +05:30
Shivani Tipnis
c71b38c467
nvs_util: Fix to support write of multiple singlepage big blob data
...
Closes https://github.com/espressif/esp-idf/issues/3011
(cherry picked from commit ce4944edf01b2a4c997eafe36b66d71f98f2fe29)
(cherry picked from commit 76e4ea7f68
)
2019-03-26 16:11:38 +05:30
Shivani Tipnis
8e2b189252
nvs_util: Fix to support write of multiple singlepage big blob data Closes https://github.com/espressif/esp-idf/issues/3011
...
(cherry picked from commit 21688e3bffee80ddfbef5364a44dd1821e28c776)
(cherry picked from commit 3ec0f415a5
)
2019-03-26 16:10:18 +05:30
baohongde
dca83700f2
components/bt: Fix warning when disable debug logs or in release mode and improve the code structure
2019-03-26 14:46:36 +08:00