Tian Hao
5a9801aca7
Merge branch 'master' into feature/btdm_bluedroid
...
# Conflicts:
# components/esp32/cpu_freq.c
# components/esp32/lib
2016-11-29 18:38:37 +08:00
Angus Gratton
01e94998c4
Merge branch 'bugfix/mbedtls_sha384' into 'master'
...
Bugfix mbedtls sha384 clone()
mbedtls_sha512_clone() on a SHA-384 hash caused incorrect digest
Also adds additional mbedtls unit tests into the unit tests project (including one for this bug).
See merge request !252
2016-11-29 03:16:30 +08:00
Wu Jian Gang
db1e86b3d9
Merge branch 'feature/modem_sleep' into 'master'
...
Feature/modem sleep
See merge request !251
2016-11-25 19:32:03 +08:00
Wu Jian Gang
3f27c09728
Merge branch 'feature/wpa2_enterprise' into 'master'
...
Feature/wpa2 enterprise
See merge request !250
2016-11-25 18:46:29 +08:00
Xia Xiaotian
6e3b7f4ea2
wpa2 enterprise: change wpa2 enterprise APIs to esp_wifi_sta_wpa2_ent_XXX
2016-11-25 18:08:21 +08:00
Angus Gratton
88b264cfce
mbedTLS SHA: Fix cloning of SHA-384 digests
...
Hardware unit only reads 384 bits of state for SHA-384 LOAD,
which is enough for final digest but not enough if you plan to
resume digest in software.
2016-11-25 19:26:30 +11:00
Xia Xiaotian
16f2b119eb
Merge branch 'master' into feature/modem_sleep
...
Conflicts:
components/esp32/lib
2016-11-25 15:54:00 +08:00
Xia Xiaotian
0dbc11e37d
wpa2 enterprise: update wpa2 enterprise API comments
2016-11-25 11:03:33 +08:00
Angus Gratton
d0801fdbab
Merge branch 'feature/sha_tls_integration' into 'master'
...
SHA acceleration integrated to mbedTLS incl. TLS sessions
Uses hardware SHA acceleration where available, fails over to software where not available.
Ref TW7112
See merge request !232
2016-11-25 10:12:29 +08:00
Angus Gratton
9f9d92b2df
Merge branch 'bugfix/spi_flash_region' into 'master'
...
spi_flash_erase_range: Allow for 32KB blocks not 64KB blocks
SPI flash hardware sends 52h command, which is a 32KB erase.
There is a matching bug in the ROM SPIEraseArea code, unless
flashchip->block_size is modified first.
See merge request !249
2016-11-25 10:11:51 +08:00
Wang Jia Lin
35ae2cd1a5
Merge branch 'driver_merge_tmp/merge_pcnt' into 'master'
...
driver: PCNT
1. add PCNT module in periph_ctrl.c/.h
2. add description of PCNT status in pcnt_struct.h
3. add PCNT driver code
4. add PCNT example code.
See merge request !229
2016-11-25 00:41:16 +08:00
Xia Xiaotian
1cdd082a9e
wpa2 enterprise: update wifi lib in master branch
2016-11-24 20:41:44 +08:00
Tian Hao
b5f03a36d5
component/bt : fix sw coexit call mistake
2016-11-24 20:09:52 +08:00
Tian Hao
55e0690f69
component/bt : wifi/bt software coexist option
...
1. option of sw coexist
2. cpu set freq function modify
3. update lib
4. ld add static data address
2016-11-24 19:57:47 +08:00
Xia Xiaotian
b649b48eae
Merge branch 'master' into feature/wpa2_enterprise
...
add lib
2016-11-24 19:35:30 +08:00
Tian Hao
7a41ab6982
Merge branch 'master' into feature/btdm_bluedroid
...
1. update bt lib submodule
# Conflicts:
# components/bootloader/src/main/esp32.bootloader.ld
# components/bt/component.mk
# components/esp32/component.mk
# components/esp32/lib
2016-11-24 15:45:04 +08:00
Angus Gratton
be53a6950c
spi_flash_erase_range: Allow for 32KB blocks not 64KB blocks
...
SPI flash hardware sends 52h command, which is a 32KB erase.
There is a matching bug in the ROM SPIEraseArea code, unless
flashchip->block_size is modified first.
2016-11-24 18:05:06 +11:00
Wangjialin
f97f198c9d
driver: improve pulse counter code
...
1. Modify some comments in pcnt.h
2. Modify api/pcnt.rst
3. Improve example code.
4. Add status definitions in pcnt_reg.h
2016-11-24 12:01:21 +08:00
Wangjialin
6db1482cd5
Merge branch 'master' into driver_merge_tmp/merge_pcnt
...
# Conflicts:
# components/driver/include/driver/periph_ctrl.h
2016-11-23 18:15:54 +08:00
Xia Xiaotian
f7aeef7111
Merge branch 'master' into feature/wpa2_enterprise
2016-11-23 16:34:01 +08:00
Xia Xiaotian
f7fb8b264f
wpa2 enterprise: update wpa2 enterprise APIs
2016-11-23 15:29:01 +08:00
Ivan Grokhotkov
df6edb50e9
implement esp_deep_sleep, fix build issues
2016-11-22 21:54:49 +08:00
Ivan Grokhotkov
cf6fc7c741
Add API for random number generator
2016-11-22 21:14:37 +08:00
Ivan Grokhotkov
8b2f933a51
Implement system_* APIs in IDF
2016-11-22 21:14:36 +08:00
Ivan Grokhotkov
2393d829de
remove legacy definitions from esp_types.h
2016-11-22 21:14:36 +08:00
Angus Gratton
dfcb241850
mbedTLS SHA Acceleration: Add missing esp_sha_lock_engine() function
2016-11-22 20:57:01 +11:00
Angus Gratton
2561b68af8
hwcrypto: Fixes for disabling one hardware unit causing reset of a different unit
...
ROM functions reset related units, but this can have problems in a
multithreaded environment.
2016-11-22 20:42:38 +11:00
Angus Gratton
c48612e516
mbedTLS SHA acceleration: Allow concurrent digest calculation, works with TLS
...
SHA hardware allows each of SHA1, SHA256, SHA384&SHA512 to calculate digests
concurrently.
Currently incompatible with AES acceleration due to a hardware reset problem.
Ref TW7111.
2016-11-22 20:42:38 +11:00
Wangjialin
6a1dbc3f1c
add RMT driver and example
2016-11-22 00:57:19 +08:00
Wu Jian Gang
07fc868ea6
Merge branch 'feature/ipv6_api' into 'master'
...
Ipv6 interface:add branch for ipv6 interface
See merge request !199
2016-11-21 19:43:51 +08:00
Wangjialin
1cc1d9d721
driver: Add PCNT code
...
1. add PCNT module in periph_ctrl.c/.h
2. add description of PCNT status in pcnt_struct.h
3. add PCNT driver code
4. add PCNT example code.
2016-11-21 18:17:07 +08:00
Xia Xiaotian
1ca82de638
Merge branch 'master' into feature/wpa2_enterprise
...
Conflicts:
components/esp32/component.mk
components/wpa_supplicant/component.mk
2016-11-21 18:09:13 +08:00
Angus Gratton
7681dbec93
Merge branch 'feature/bignum_rsa' into 'master'
...
hwcryto bignum support for RSA operations
Supporting RSA with hardware bignum directives.
Configurable via menuconfig to enable/disable, and to choose between busywaiting and interrupt driven completion.
May still be some performance tweaks possible.
TW7111
See merge request !92
2016-11-21 17:46:21 +08:00
Xia Xiao Tian
a485af0e2d
wpa2: change "station to sta" in wpa2 API
2016-11-21 14:17:52 +08:00
tzx
a8fb9f2b84
ipv6 interface: add branch for ipv6 interface
2016-11-21 11:06:51 +08:00
Xia Xiao Tian
4dcf3709b0
Merge branch 'master' into feature/modem_sleep
...
Conflicts:
components/nvs_flash/src/nvs_api.cpp
2016-11-18 20:53:59 +08:00
Ivan Grokhotkov
541b142654
phy_init: reduce the amount of hardwired logic, add coexist init
2016-11-18 20:11:17 +08:00
Ivan Grokhotkov
4db29f74a0
add PHY init support
2016-11-18 20:11:16 +08:00
Jeroen Domburg
f3a44aa4db
Merge with master; merge Doxygen config
2016-11-17 20:21:12 +08:00
Xia Xiao Tian
e332407785
modem sleep: delete wifi modem sleep callback in idle task.
2016-11-17 18:08:35 +08:00
Jeroen Domburg
d73448f57f
Make sure task wdt also does the right thing when triggered when flash is disabled
2016-11-17 18:05:47 +08:00
Jeroen Domburg
d116adf260
Add documentation
2016-11-17 12:09:08 +08:00
Ivan Grokhotkov
13d4734399
docs: fix Doxygen warnings, fail CI build on Doxygen warnings
2016-11-16 22:44:22 +08:00
Dong Heng
cf8c9770a0
Merge branch 'master' into feature/bignum_rsa
2016-11-15 16:39:29 +08:00
Jeroen Domburg
0e69a2c446
Merge remote-tracking branch 'origin/master' into feature/better_idle_tick_hook_mechanism
2016-11-15 12:36:15 +08:00
Jeroen Domburg
9a2887c458
Add comments/headers according to merge request comments
2016-11-15 12:10:02 +08:00
Jeroen Domburg
aa81f047f8
Merge remote-tracking branch 'origin/master' into bugfix/workaround_gpio_pullupdown_bug
2016-11-15 11:57:01 +08:00
Xia Xiao Tian
3bf5fb8ae7
Merge branch 'master' into feature/modem_sleep
2016-11-15 11:47:51 +08:00
Jeroen Domburg
64a2f0ee0b
Amend gpio driver to work around SoC bug with some pullups/pulldowns in the GPIO peripheral; mark existing function that does not always work as deprecated
2016-11-15 10:29:52 +08:00
Xia Xiao Tian
c694c5134f
modem sleep: add wifi power save callback to idle task
2016-11-15 10:28:36 +08:00