alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
8,271 Commits 20 Branches 148 Tags 384 MiB
a218d4b925
Commit Graph

8271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jiang Jiang Jian
37e131f76b Merge branch 'mesh/decouple_addition_v3.3' into 'release/v3.3' 
Decouple Wifi and ESP-Mesh to reduce bin size (backport v3.3)

See merge request idf/esp-idf!4521
 2019-03-26 11:04:25 +08:00
Ivan Grokhotkov
c76f00373f Merge branch 'bugfix/cmake_component_path_v3.3' into 'release/v3.3' 
cmake: Set COMPONENT_PATH during early expansion of dependencies (v3.3)

See merge request idf/esp-idf!4595
 2019-03-25 11:24:42 +08:00
Renz Christian Bagaporo
24a713b3c4 ldgen: fix library path parsing in windows 
Closes https://github.com/espressif/esp-idf/issues/3173
 2019-03-25 10:12:00 +08:00
zhiweijian
88fe438524 Component/bt: modify HCI_GET_CMD_BUF 2019-03-22 14:59:11 +08:00
chenyudong
7f1fd0b8d3 Decouple Wifi and ESP-Mesh to reduce bin size 
Do not link mesh code when mesh is not used
 2019-03-22 13:01:11 +08:00
Angus Gratton
2c91bc7a50 cmake: Set COMPONENT_PATH during early expansion of dependencies 
Works around bug where components/soc/CMakeLists.txt was testing "EXISTS
${COMPONENT_PATH}/${SOC_NAME}" and this test could pass during early
expansion if COMPONENT_PATH was empty and a directory /esp32 exists
on Windows.

Closes https://github.com/espressif/esp-idf/issues/3195
 2019-03-22 10:12:15 +11:00
Ivan Grokhotkov
3cec8d0122 Merge branch 'bugfix/error_in_bootloader_loadprohibited_v3.3' into 'release/v3.3' 
esp_tool: Exclude elf-sha256 from bootloader (backport v3.3)

See merge request idf/esp-idf!4560
 2019-03-21 18:22:24 +08:00
Jiang Jiang Jian
6381817006 Merge branch 'bugfix/mesh_memory_leak_v3.3' into 'release/v3.3' 
mesh: fix memory leak and group send (backport v3.3)

See merge request idf/esp-idf!4517
 2019-03-21 11:45:34 +08:00
Jiang Jiang Jian
14a6b33d5e Merge branch 'bugfix/sphinx_build_failure_on_rtd_v3.3' into 'release/v3.3' 
docs: Upgraded sphinx package version to prevent build failures on readthedocs…

See merge request idf/esp-idf!4553
 2019-03-21 11:44:01 +08:00
Jiang Jiang Jian
6505f82a80 Merge branch 'bugfix/btdm_fix_no_adv_report_when_scaning_with_sleep_enable_v3.3' into 'release/v3.3' 
Component/bt: fix no adv report when scaning with sleep enable (backport v3.3)

See merge request idf/esp-idf!4536
 2019-03-20 21:40:28 +08:00
Jiang Jiang Jian
c05a0ae6c3 Merge branch 'bugfix/btdm_fix_build_warning_when_bluedroid_disable_log_v3.3' into 'release/v3.3' 
Component/bt: fix build warning when bluedroid disable log (backport V3.3)

See merge request idf/esp-idf!4565
 2019-03-20 21:22:33 +08:00
Jiang Jiang Jian
2a9555f5dd Merge branch 'bugfix/btdm_fix_blufi_prepare_write_crash_v3.3' into 'release/v3.3' 
Component/bt: fix blufi prepare write crash (backport v3.3)

See merge request idf/esp-idf!4562
 2019-03-20 18:21:10 +08:00
Angus Gratton
f72df315f7 heap: Add integer overflow checks on MALLOC_CAP_32BIT & MALLOC_CAP_EXEC 2019-03-20 18:30:25 +11:00
chenyudong
e7a263938b mesh: fix memory leak and group send 
fix a bug in group send
fix esp_mesh_set_router when router_t not initialized
fix mesh memory leak with invalid option
 2019-03-20 15:13:28 +08:00
zhiweijian
3ed0f8e113 Component/bt: fix build warning when bluedroid disable log 2019-03-20 15:02:57 +08:00
zhiweijian
7e1ccb56a7 Component/bt: fix blufi prepare write crash 2019-03-20 14:23:11 +08:00
Konstantin Kondrashov
50a0b00afa esp_tool: Exclude elf-sha256 from bootloader 
Closes: IDFGH-690
 2019-03-20 12:19:23 +08:00
Jiang Jiang Jian
be8f34065d Merge branch 'bugfix/fix_the_bug_cal_PMK_too_long_v3.3' into 'release/v3.3' 
wifi: fix the bug that calculate PMK too long (backport v3.3)

See merge request idf/esp-idf!4530
 2019-03-20 11:29:35 +08:00
krzychb
d0eab0f3ee docs: Upgraded sphinx package version to prevent build failures on readthedocs site. Upgraded versions of other packages that are used during documentation build. (backport v3.3) 2019-03-19 17:24:32 +01:00