Angus Gratton
c2bc965c2c
Merge branch 'bugfix/rom_gpio' into 'master'
...
rom/gpio.h: Use new GPIO_PIN0_REG register name
Closes github #12
See merge request !86
2016-09-19 10:41:34 +08:00
Angus Gratton
0c71709b63
Merge branch 'bugfix/windows' into 'master'
...
Fix some Windows build issues
Fix and/or document some issues seen under Windows (especially if git clones with CRLF line endings)
See merge request !87
2016-09-19 10:41:14 +08:00
Ivan Grokhotkov
c72590c1b9
Merge branch 'bugfix/fix_memory_debug_macro_issue' into 'master'
...
freertos: fix memory debug macro issue
When enable memory debug via make menuconfig, we got compile error.
Define configENABLE_MEMORY_DEBUG according to CONFIG_ENABLE_MEMORY_DEBUG
See merge request !89
2016-09-18 20:25:20 +08:00
liuzhifu
4c74ec9415
freertos: fix memory debug macro issue
...
Define configENABLE_MEMORY_DEBUG according to CONFIG_ENABLE_MEMORY_DEBUG
2016-09-18 15:35:42 +08:00
Angus Gratton
6cf5d44b31
build system docs: Add note about no spaces in component names
2016-09-16 18:22:16 +10:00
Angus Gratton
90017397e5
Docs: Add note about unusual submodule messages when cloning on Windows
...
Related to github #11
2016-09-16 18:07:58 +10:00
Angus Gratton
cdd1b95b6e
config system: Support Windows when CRLFs used for eol markers
...
Includes a test in test_build_system.sh to prevent regressions w/
CRLFs in text files.
Fixes Github #10
2016-09-16 18:07:58 +10:00
Angus Gratton
567cabb3f5
docs: Add note about esp-idf not supporting spaces in paths
...
Ref Github #10
2016-09-16 18:07:58 +10:00
Angus Gratton
6cffb5d8b4
rom/gpio.h: Use new GPIO_PIN0_REG register name
...
Closes github #12
2016-09-16 09:43:52 +10:00
Ivan Grokhotkov
7fade89fb6
Merge branch 'bugfix/github_deploy' into 'master'
...
fix deploy to GitHub
Previous change to gitlab-ci.yml moved setting of Gitlab ssh key to global before_script.
This together with the fact that we used `echo >>` instead of `echo >` to write to `id_rsa_base64` file caused wrong key to be used while pushing to GitHub.
Therefore:
- don't run default before_script before push_master_to_github job
- replace echo >> with echo > to avoid mistakes in the future
See merge request !82
2016-09-15 14:08:35 +08:00
Wu Jian Gang
2efaf42253
Merge remote-tracking branch 'origin/feature/mbedtls'
2016-09-14 18:05:56 +08:00
Wu Jian Gang
e04e6b0c7f
Merge branch 'feature/wifi_lib_update' into 'master'
...
esp32/lib: update to 1303c92c
1. support to set vendor ie;
2. fix "mode:" log twice issue; TW7019
3. fix station can not connect to some AP in WEP mode; TW7021
See merge request !85
2016-09-14 17:53:01 +08:00
Wu Jian Gang
8051a8b91e
Merge branch 'bugfix/tw7058_mode_fatal' into 'master'
...
[teamwork7058]It causes fatal when switch wifi mode.
See merge request !84
2016-09-14 17:46:12 +08:00
Wu Jian Gang
6bfe892099
esp32/lib: update to 1303c92c
2016-09-14 16:57:00 +08:00
Wu Jian Gang
6104370ac9
Merge branch 'feature/support_vendor_ie_api' into 'master'
...
esp32: add vendor ie API
1. add esp_wifi_set_vnd_ie
2. add esp_wifi_set_vnd_ie_cb
See merge request !75
2016-09-14 16:53:53 +08:00
Xu Chun Guang
064d2b4ecb
dhcpserver: Fix crash when switching wifi mode
...
See Teamwork 7058.
2016-09-14 16:14:50 +08:00
Angus Gratton
67a26d52ac
mbedtls: Temporarily disable default hardware crypto SHA & bignum
...
Due to limitations referenced in the comments of the changes.
2016-09-14 17:52:39 +10:00
Angus Gratton
f01cabf71d
mbedtls hwcrypto sha512: Fix redirection of function names
2016-09-14 17:52:24 +10:00
Angus Gratton
126a68ca1f
mbedtls upstream tweak: Move mbedtls_sha512_process in sha512.h
...
Function declaration should only be included if MBEDTLS_SHA512_ALT is
not set. This matches sha1.h and sha256.h
This change should be contributed back upstream to mbedTLS project.
2016-09-14 17:51:27 +10:00
qiyueixa
56586a10ac
Format code by using 4 spaces instead
2016-09-14 15:18:06 +08:00
Wu Jian Gang
4d4506954a
Merge branch 'driver_merge_tmp/merge_soc_header' into 'master'
...
Modify headers in idf/soc
Pass compiling under esp-idf-tests/merge_soc_tmp/merge_for_soc_headers branch.(Only changed some names of registers and INUM).
See merge request !83
2016-09-14 14:12:39 +08:00
Wangjialin
f32823ff6c
modify character conversion error and typo
2016-09-14 13:47:28 +08:00
Wangjialin
c13ab62e4c
modify i2s_reg.h, rebase to master
2016-09-14 13:47:28 +08:00
Wangjialin
41d397cf3f
Only modify headers in soc/ .
...
Pass compiling under esp-idf-tests/merge_soc_tmp/merge_for_soc_headers branch.(only change some names of register and INUM).
2016-09-14 13:47:28 +08:00
qiyueixa
f02e5cdec7
Rename vender_ie_type_t and vendor_ie_id_t to wifi_vendor_ie_type_t and wifi_vendor_ie_id_t respectively
2016-09-14 13:39:30 +08:00
qiyueixa
d866fe84a4
modify arguments for vendor ie APIs by using enum instead
2016-09-14 13:39:30 +08:00
Wu Jian Gang
fb64393f63
Merge branch 'feature/adjust_task_priority' into 'master'
...
task priority: adjust task priority of lwip/event/wifi task
1. Modify lwip core task priority to configMAX_PRIORITIES-7
2. Modify wifi startup task priority to configMAX_PRIORITIES-7
3. Modify event task priority to configMAX_PRIORITIES-4
See merge request !42
2016-09-14 13:28:50 +08:00
Wu Jian Gang
01cc811ee0
esp32: fix typo
2016-09-14 13:26:17 +08:00
Wu Jian Gang
c1a874fb9e
esp32: fix kconfig
2016-09-14 12:55:41 +08:00
liuzhifu
d2d231de29
define lwip task priority in esp_task.h
2016-09-14 12:00:46 +08:00
liuzhifu
8ed5010356
components: esp32 - fix build error
2016-09-14 12:00:46 +08:00
liuzhifu
4a98027242
components: lwip - Modify lwip task priority and stack definition method
...
lwip task priority and stack size defintion should not depends on esp_task.h, define it
in lwipopts.h directly
2016-09-14 12:00:46 +08:00
liuzhifu
2a15eda8bc
components: esp32
...
Remove priority/stack definition of task that is freertos/lwip/app
2016-09-14 12:00:46 +08:00
liuzhifu
109691f9bc
components: esp32
...
add missing file esp_task.h
2016-09-14 12:00:46 +08:00
liuzhifu
9cf997a6fc
components: esp32/lwip
...
Add esp_task.h for placing all task priority/stack size macro definition
2016-09-14 12:00:46 +08:00
liuzhifu
56a684d9eb
task priority: modify lwip/wifi/event task priority
...
1. Modify lwip core task priority to configMAX_PRIORITIES-7
2. Modify wifi startup task priority to configMAX_PRIORITIES-7
3. Modify event task priority to configMAX_PRIORITIES-4
2016-09-14 11:59:25 +08:00
Wu Jian Gang
058a411786
Merge branch 'feature/add_wifi_api_comments' into 'master'
...
Feature/add wifi api comments
Add wifi API comments
See merge request !63
2016-09-14 11:17:29 +08:00
Angus Gratton
d7cfe08b13
Merge branch 'bugfix/add_tx_flowcontrol' into 'master'
...
lwip: add socket tx flow control
This fix is used to solve wifi q full issue:
1. When wifi tx q is full, set tx_enable to false
2. When wifi tx q decrease 1/2 max length, set tx_enable to true again
3. esp_wifi_tx_enable return whether tx_enable is true
4. If esp_wifi_tx_enable return false, socket will be blocked
See merge request !62
2016-09-14 09:01:42 +08:00
Angus Gratton
66b6a4c642
Merge branch 'feature/esptool_upstream'
2016-09-14 10:28:41 +10:00
Ivan Grokhotkov
d7f7c36af0
gitlab-ci: fix setting GitHub deploy key
...
- don't run default before_script before push_master_to_github job
- replace echo >> with echo > to avoid mistakes in the future
2016-09-13 21:24:57 +08:00
Wu Jian Gang
ed8e8848e3
fix typos
2016-09-13 20:54:20 +08:00
Ivan Grokhotkov
ab12f6e9c1
Merge branch 'bugfix/spi_flash_unlock_once' into 'master'
...
components/spi_flash: call SPIUnlock once
This fixes the performance impact for spi_flash_write and spi_flash_erase.
With this change, NVS init in single core mode takes about 50ms (compared to >2seconds before that).
For dual core mode, we still spend on average 2ms for each spi_flash_ operation due to synchronization between CPUs, so NVS startup time is about 2 seconds in dual core mode.
See merge request !80
2016-09-13 18:14:22 +08:00
Wu Jian Gang
b56098a612
Merge remote-tracking branch 'origin/master' into feature/mbedtls
2016-09-13 16:31:48 +08:00
Wu Jian Gang
bf5e83a6ed
callback: add a void* pointer with each callback
...
also format event.c/wifi.c/esp_event.h/esp_wifi.h
2016-09-13 16:20:29 +08:00
Wu Jian Gang
c56a790f64
header: callbacks use "void *" as arguments
2016-09-13 16:19:09 +08:00
Wu Jian Gang
c5f8396df4
header: format and fix typos
...
SYSTEM_EVENT_STA_GOTIP to SYSTEM_EVENT_STA_GOT_IP
2016-09-13 16:17:41 +08:00
liuzhifu
ded5df7513
add wifi api comments
2016-09-13 16:17:41 +08:00
liuzhifu
b86e060647
add wifi api comments
2016-09-13 16:17:41 +08:00
Ivan Grokhotkov
9027be98d1
Merge branch 'bugfix/ci_update_for_wifi_revision' into 'master'
...
update ci: build ssc with idf submodule wifi lib
update CI build SSC part according to the discussion in MR bugfix/wifi_revision
See merge request !76
2016-09-13 16:05:17 +08:00
Ivan Grokhotkov
29c6eab6dc
components/spi_flash: call SPIUnlock only once
...
This fixes the performance impact for spi_flash_write and spi_flash_erase.
With this change, NVS init in single core mode takes about 50ms (compared to >2seconds before that).
2016-09-13 15:16:36 +08:00