Angus Gratton
7f50bb7e7f
Merge branch 'release/v3.1' into feature/cmake_v3.1
2018-08-17 14:14:10 +10:00
Ivan Grokhotkov
53509c7bfd
Merge branch 'bugfix/mdns_any_type_share_v3.1' into 'release/v3.1'
...
mdns: Fix a portion of the queries are issued with the wildcard query type (backport v3.1)
See merge request idf/esp-idf!3008
2018-08-15 06:40:24 +08:00
Liu Han
1bbe9538ef
mdns: Fix a portion of the queries are issued with the wildcard query type
2018-08-14 18:34:40 +10:00
Jiang Jiang Jian
39dd71d958
Merge branch 'bugfix/btdm_ecdh_public_key_not_check_v3.1' into 'release/v3.1'
...
Bugfix/btdm ecdh public key not check v3.1 (backport v3.1)
See merge request idf/esp-idf!2991
2018-08-14 13:20:22 +08:00
Jiang Jiang Jian
2dfe58e1b3
Merge branch 'bugfix/tw24252_fix_nonblocking_tcp_close_issue_v3.1' into 'release/v3.1'
...
lwip: fix nonblocking tcp close issue (backport v3.1)
See merge request idf/esp-idf!2938
2018-08-14 13:20:08 +08:00
Angus Gratton
2e60a4b751
Merge branch 'bugfix/gpio_reset_bitmask_v3.1' into 'release/v3.1'
...
gpio: Bitmask overflow fix in gpio_reset_pin (backport v3.1)
See merge request idf/esp-idf!3005
2018-08-14 11:29:15 +08:00
Angus Gratton
fc18d2cea5
Merge branch 'bugfix/ulp_fixes_v3.1' into 'release/v3.1'
...
ULP fixes (backport v3.1)
See merge request idf/esp-idf!3001
2018-08-14 11:25:14 +08:00
Taavi Hein
8b6060e24e
gpio: Bitmask overflow fix in gpio_reset_pin
...
For pins 32 and up the BIT(nr) macro used here overflowed,
causing undetermined GPIO pins to be reset.
Example: freeing SPI device/bus where CS is on pin 33
caused debug UART to cease communication, TXD0 was
disabled.
Fixed as BIT64(nr) macro, to be used elsewhere as needed.
For example in definitions like GPIO_SEL_32..GPIO_SEL_39.
2018-08-14 04:23:56 +03:00
Ivan Grokhotkov
640f690def
docs: update esp32ulp-binutils download link
2018-08-13 23:23:55 +03:00
Ivan Grokhotkov
cce9fa970e
ulp: add documentation for JUMPS instruction conditions
...
Hardware implements conditions LE, LT, GE, and conditions EQ and GT
are implemented in the assembler by emitting two JUMPS instructions
with other conditions.
2018-08-13 23:23:55 +03:00
Ivan Grokhotkov
f63ab0792b
ulp: add tests for jumps instruction
2018-08-13 23:23:55 +03:00
Ivan Grokhotkov
f4c8df2635
ulp: fix ULP binary format documentation
...
Fix incorrect offset value (4+2+2+2+2=12) of arbitrary data in ULP
binary format.
Closes https://github.com/espressif/esp-idf/issues/1705 .
2018-08-13 23:23:55 +03:00
Ivan Grokhotkov
db5c542e96
ulp: use += instead of := when setting component vars
...
Component which includes component_ulp_common.mk may also need to set
some of the same COMPONENT_XXX variables. Logically, we should combine
the lists of files to embed, ldflags, extra include dirs, etc.
Fixes https://github.com/espressif/esp-idf/issues/2157 .
2018-08-13 23:23:55 +03:00
Ivan Grokhotkov
bb8ecf8a7b
ulp: fix missing include in esp32/ulp.h header
...
ulp.h uses some register base addresses, so needs to include soc.h
2018-08-13 23:23:55 +03:00
Ivan Grokhotkov
c2e424e7af
ulp: fix calculation or ulp_run argument
...
The argument to ulp_run should be expressed in 32-bit words. Both the
address of ulp_entry and RTC_SLOW_MEM already are uint32_t*, so their
difference is the difference in addresses divided by sizeof(uint32_t).
Therefore the extra division by sizeof(uint32_t) is not needed.
2018-08-13 23:23:54 +03:00
Ivan Grokhotkov
a0191b28b2
docs: fix line endings of ULP docs
2018-08-13 23:23:29 +03:00
yulong
fa8dc32800
component/bt: Fixed the vulnerability released by Bluetooth org when using public key not check in the process of ECDH encryption.
...
1. Add the 100 times test when the private key is generated by the random number;
2. Add the bt components to the unit-test-app/config directory.
3. Added the bt unit test case to CI.
2018-08-13 19:47:02 +08:00
Angus Gratton
cf3e89c1b2
Merge branch 'bugfix/doc_generated_sections_v3.1' into 'release/v3.1'
...
docs: Move version-related includes to run in sphinx-build not make (backport v3.1)
See merge request idf/esp-idf!2989
2018-08-13 15:48:59 +08:00
Angus Gratton
810aa5427c
Merge branch 'feature/cmake_separate_docs' into 'feature/cmake'
...
docs: Copy CMake docs to a separate set of directories
See merge request idf/esp-idf!2959
2018-08-13 15:47:07 +08:00
Angus Gratton
08b9551494
docs: Add gen-version-specific-includes.py to executables list
2018-08-13 16:01:20 +10:00
Angus Gratton
92b29923cb
docs: Move version-related includes to run in sphinx-build not make
...
Means they show up on ReadTheDocs(!)
2018-08-13 16:01:20 +10:00
Angus Gratton
48bd67524d
cmake: Only rewrite componend_depends.cmake if it changes
2018-08-13 15:37:03 +10:00
Angus Gratton
70288f864e
cmake: Expand components relative to PROJECT_PATH correctly
2018-08-13 15:37:03 +10:00
Angus Gratton
04238fa5e5
docs: Python 3 Sphinx compatibility
2018-08-13 15:37:03 +10:00
Angus Gratton
191557db02
docs: Copy CMake docs to a separate set of directories
...
Required first step before merging back to mainline.
2018-08-13 15:37:03 +10:00
Angus Gratton
695d95c983
Merge branch 'bugfix/http_client_null_auth_header_v3.1' into 'release/v3.1'
...
esp_http_client: Fixed exception on 401 without Www-Authenticate header (backport v3.1)
See merge request idf/esp-idf!2978
2018-08-13 11:48:26 +08:00
Angus Gratton
d91c425178
Merge branch 'bugfix/unit-test-build-fix_v3.1' into 'release/v3.1'
...
unit-test-app: don’t include project.mk for ut- targets (backport v3.1)
See merge request idf/esp-idf!2850
2018-08-13 11:42:43 +08:00
Jiang Jiang Jian
0da8e99580
Merge branch 'bugfix/btdm_fix_get_bond_list_error_when_connection_with_no_bond_v3.1' into 'release/v3.1'
...
Component/bt: fix get bond list error when connection with no bond (backport v3.1)
See merge request idf/esp-idf!2981
2018-08-13 10:20:12 +08:00
Angus Gratton
c6b4fa5a9a
Merge branch 'doc/versions_v3.1' into 'release/v3.1'
...
docs: Add version-specific include files, version documentation (backport v3.1)
See merge request idf/esp-idf!2974
2018-08-13 09:54:13 +08:00
zhiweijian
281877ada5
Component/bt: fix get bond list error when connection with no bond
2018-08-10 21:00:56 +08:00
Tuan PM
9a273863ba
esp_http_client: Fixed exception on 401 without Www-Authenticate header
...
Closes https://github.com/espressif/esp-idf/issues/2246
2018-08-10 14:23:19 +07:00
Angus Gratton
abbc13af62
freertos: Remove either one or two assertions from "fast path" of vPortCPUReleaseMutex()
...
Saves a few cycles by only testing the count validity once, and never for the common case where the
mutex was not recursively locked.
2018-08-10 16:53:17 +10:00
Liu Zhi Fu
9fb746824a
lwip: fix nonblocking tcp close issue
...
Fix assert issue causes by closing nonblocking tcp socket.
2018-08-10 06:21:56 +00:00
Angus Gratton
8a1adb0d50
Merge branch 'bugfix/spi_flash_mmap_malloc_internal_v3.1' into 'release/v3.1'
...
spi_flash: allocate mmap pages array in internal memory (backport v3.1)
See merge request idf/esp-idf!2961
2018-08-10 13:43:55 +08:00
Angus Gratton
ddb2570849
Merge branch 'mesh/bugfix_parent_switch_backport_v3.1' into 'release/v3.1'
...
mesh: modify parent switch mechanism (backport3.1)
See merge request idf/esp-idf!2977
2018-08-10 13:42:32 +08:00
Jiang Jiang Jian
7f4b77ca5b
Merge branch 'bugfix/add_mutex_for_some_touchpad_apis_v3.1' into 'release/v3.1'
...
fix(touch): add_mutex_for_some_touchpad_apis (backport v3.1)
See merge request idf/esp-idf!2963
2018-08-10 12:18:33 +08:00
qiyuexia
d421663d3f
mesh: modify parent switch mechanism
...
1. modify parent switch mechanism.
2. fix non-root doesn't clear the layer value in nvs.
3. fix retransmit the remove announcement packets.
4. add API esp_mesh_flush_upstream_packets().
5. automatically adjust passsive scan time based on the change of beacon interval.
2018-08-10 11:45:11 +08:00
Jiang Jiang Jian
c455d6f2a0
Merge branch 'feature/nvs_version_check_v3.1' into 'release/v3.1'
...
nvs_flash: Version compatibility check for nvs storage (backport 3.1)
See merge request idf/esp-idf!2958
2018-08-10 11:36:39 +08:00
Jiang Jiang Jian
b3eee7d58f
Merge branch 'bugfix/btdm_hfp_invalid_sco_param_v3.1' into 'release/v3.1'
...
component/bt: modify the invalid retransmission setting for SCO link in HFP(backport v3.1)
See merge request idf/esp-idf!2956
2018-08-10 11:10:55 +08:00
Jiang Jiang Jian
271e2f9419
Merge branch 'bugfix/backport_several_bugfix_to_v3.1' into 'release/v3.1'
...
esp32: backport several WiFi bug fixes to v3.1
See merge request idf/esp-idf!2955
2018-08-10 11:09:35 +08:00
Angus Gratton
70f15bd28e
docs: Combine the common en/zh_CN Makefiles to one common file
2018-08-10 00:28:13 +00:00
Michael (XIAO Xufeng)
607a1abefd
docs: translate the version include script to Chinese
2018-08-10 00:28:13 +00:00
Angus Gratton
8122f7162c
README: Add version-specific links
...
Make it clearer how the README fits in with the docs.
2018-08-10 00:28:13 +00:00
Angus Gratton
cd31a5e3c6
docs: Add version-specific include files, version documentation
...
* "git clone" command and a small version header are generated
depending on git properties.
* Add Versions page with details about each version
* Make it clear using master branch is living on the "bleeding
edge"
2018-08-10 00:28:13 +00:00
Jiang Jiang Jian
8a6c1df041
esp32: backport several WiFi bug fixes to v3.1
...
Backport following bug fixes to v3.1:
1. Bug fix of may connect to wrong AP in all channel scan
2. Station state machine change and fix ap loss
3. Add compatible to ccmp encryption
4. Update libphy.a to v3960:
4.1 Decrease phy_init time from 900us to 347us in sleep wakeup
4.2 Fix RX STBC initialization
4.3 Modify set_chan function to fix interrupt watchdog issue
5. Fix several wpa2 enterprise issues
5.1 Fix heap corrupted bug
5.2 Fix memory leak bug
5.3 Make wpa2 enterprise thread-safe
Closes https://github.com/espressif/esp-idf/issues/1569
6. Bugfix of coex wifi pm
2018-08-09 13:24:16 +00:00
He Yin Ling
7e02cd3498
Merge branch 'bugfix/remove_check_for_reason_assoc_expire_backport_v3.1' into 'release/v3.1'
...
test: remove check for REASON_ASSOC_EXPIRE (backport v3.1)
See merge request idf/esp-idf!2953
2018-08-09 21:23:21 +08:00
Angus Gratton
ef30229e52
Merge branch 'feature/http_firmware_upgrade_v3.1' into 'release/v3.1'
...
esp_https_ota: Add esp_https_ota component (Backport v3.1)
See merge request idf/esp-idf!2954
2018-08-09 08:20:33 +08:00
fuzhibo
6ee884c861
fix(touch): add_mutex_for_some_touchpad_apis
2018-08-08 20:06:54 +08:00
Jitin George
002189cd1a
esp_http_client: Add support for getting transport type
2018-08-08 14:55:35 +05:30
Jitin George
fbe792f33f
esp_https_ota: Add support for HTTPS based ota feature
2018-08-08 14:55:22 +05:30