]> granicus.if.org Git - esp-idf/log
esp-idf
7 years agocomponents/nvs: avoid reading just-erased page
Ivan Grokhotkov [Tue, 20 Sep 2016 10:00:49 +0000 (18:00 +0800)]
components/nvs: avoid reading just-erased page

7 years agoMerge branch 'feature/wifi_lib_update' into 'master'
Wu Jian Gang [Wed, 21 Sep 2016 09:22:39 +0000 (17:22 +0800)]
Merge branch 'feature/wifi_lib_update' into 'master'

bugfix: reboot halt and deep sleep crash

1. Fix reboot halt bug, TW7355
2. Fix system crash when calling system_deep_sleep(), TW7356

See merge request !104

7 years agoesp32/lib: update to 9f26b9a1
Wu Jian Gang [Wed, 21 Sep 2016 08:49:30 +0000 (16:49 +0800)]
esp32/lib: update to 9f26b9a1

1. Fix reboot halt bug, TW7355
2. Fix system crash when calling system_deep_sleep(), TW7356

7 years agoesp32: wait uart tx finish before cpu freq change
Wu Jian Gang [Wed, 21 Sep 2016 08:15:42 +0000 (16:15 +0800)]
esp32: wait uart tx finish before cpu freq change

7 years agoesp32/lib: update to 9403d944
Wu Jian Gang [Wed, 21 Sep 2016 03:37:10 +0000 (11:37 +0800)]
esp32/lib: update to 9403d944

7 years agoMerge branch 'bugfix/macos_build' into 'master'
Angus Gratton [Tue, 20 Sep 2016 11:28:20 +0000 (19:28 +0800)]
Merge branch 'bugfix/macos_build' into 'master'

fix kconfig build on macOS

macOS version of sed doesn't recognize \r as special character.
Replacing with \x0D substitution which works everywhere.

See merge request !96

7 years agoMerge branch 'feature/menuconfig_cpu_frequency_option' into 'master'
Ivan Grokhotkov [Tue, 20 Sep 2016 09:45:46 +0000 (17:45 +0800)]
Merge branch 'feature/menuconfig_cpu_frequency_option' into 'master'

Add CPU frequency selection in menuconfig

See merge request !81

7 years agoMerge branch 'feature/lwip_add_debug_code' into 'master'
Ivan Grokhotkov [Tue, 20 Sep 2016 09:22:22 +0000 (17:22 +0800)]
Merge branch 'feature/lwip_add_debug_code' into 'master'

lwip: add debug code to show udp/tcp pcbs

Add code to show all tcp/udp pcbs, these kind of debug info is helpful for lwip issue debugging.

See merge request !98

7 years agoMerge branch 'master' into feature/menuconfig_cpu_frequency_option
Ivan Grokhotkov [Tue, 20 Sep 2016 09:22:18 +0000 (17:22 +0800)]
Merge branch 'master' into feature/menuconfig_cpu_frequency_option

* master: (57 commits)
  components/lwip: fix grammar
  components/lwip: make SO_REUSE configurable via menuconfig
  bootloader: remove trailing newlines from log messages
  components/freertos: override per-task __cleanup handler to close stdin, stdout, stderr
  components/esp32: move peripheral symbols to separate ld script
  components/log: regroup macros for better readability
  gitlab-ci: allow running tests for branches, triggered via API
  components/log: fix timestamp calculation
  components/log: set default runtime log level to ESP_LOG_VERBOSE
  components/log: fix error when using ESP_LOGx from C++ code
  components/log: fix bugs, add options to override log level for files, components, and bootloader
  fix ledc and spi typo
  remove prefix and postfix
  Enable SO_REUSEADDR in LWIP
  freertos: fix memory debug macro issue Define configENABLE_MEMORY_DEBUG according to CONFIG_ENABLE_MEMORY_DEBUG
  peripheral structure headers: move volatile keyword from members to typedef
  Adding -fstrict-volatile-bitfields to the CFLAGS/CXXFLAGS. Without this, gcc tries to access bitfields using the smallest possible methods (eg l8i to grab an 8-bit field from a 32-bit). Our hardware does not like that. This flag tells gcc that if a bitfield is volatile, it should always use the type the field is defined at (uint32_t in our case) to size its access to the field. This fixes accessing the hardware through the xxx_struct.h headers.
  add peripheral  module struct headers
  build system docs: Add note about no spaces in component names
  Docs: Add note about unusual submodule messages when cloning on Windows
  ...

# Conflicts:
# components/esp32/cpu_start.c
# components/esp32/include/soc/cpu.h

7 years agoMerge branch 'feature/logging' into 'master'
Ivan Grokhotkov [Tue, 20 Sep 2016 09:16:41 +0000 (17:16 +0800)]
Merge branch 'feature/logging' into 'master'

Add logging library

Logging library, intended to be used across other components.
Uses design similar to Android NDK logging APIs and allows for both compile time and run time filters, similar to logcat.

Also includes cleanup of cpu_startup.c — i was changing some logging output in this file so decided to re-format it and reduce code duplication.

Ref TW6703

See merge request !68

7 years agoMerge branch 'bugfix/lwip_so_reuse' into 'master'
Ivan Grokhotkov [Tue, 20 Sep 2016 09:13:09 +0000 (17:13 +0800)]
Merge branch 'bugfix/lwip_so_reuse' into 'master'

make SO_REUSE configurable via menuconfig

SSC expects SO_REUSE to be off by default.
Trivial change, moving this option to menuconfig.
This should also (finally!) fix failing tests in master.

See merge request !99

7 years agocomponents/lwip: fix grammar
Ivan Grokhotkov [Tue, 20 Sep 2016 08:53:56 +0000 (16:53 +0800)]
components/lwip: fix grammar

7 years agoMerge branch 'master' into bugfix/lwip_so_reuse
Ivan Grokhotkov [Tue, 20 Sep 2016 08:24:21 +0000 (16:24 +0800)]
Merge branch 'master' into bugfix/lwip_so_reuse

* branch 'master':
  components/freertos: override per-task __cleanup handler to close stdin, stdout, stderr
  gitlab-ci: allow running tests for branches, triggered via API

7 years agocomponents/lwip: make SO_REUSE configurable via menuconfig
Ivan Grokhotkov [Tue, 20 Sep 2016 07:36:55 +0000 (15:36 +0800)]
components/lwip: make SO_REUSE configurable via menuconfig

Not all environments need or can work with SO_REUSE enabled, so making this option configurable.

7 years agolwip: add license and add lwip_debug.h
liuzhifu [Tue, 20 Sep 2016 07:36:49 +0000 (15:36 +0800)]
lwip: add license and add lwip_debug.h

7 years agolwip: add debug code to show udp/tcp pcbs
liuzhifu [Tue, 20 Sep 2016 06:51:03 +0000 (14:51 +0800)]
lwip: add debug code to show udp/tcp pcbs

7 years agobootloader: remove trailing newlines from log messages
Ivan Grokhotkov [Tue, 20 Sep 2016 06:18:23 +0000 (14:18 +0800)]
bootloader: remove trailing newlines from log messages

7 years agoMerge branch 'feature/ci_test_trigger' into 'master'
Ivan Grokhotkov [Tue, 20 Sep 2016 06:11:24 +0000 (14:11 +0800)]
Merge branch 'feature/ci_test_trigger' into 'master'

allow running test suite for branches, triggered via API

One line change to run testing step for branches, if the build is triggered via API.

See merge request !91

7 years agoMerge branch 'bugfix/newlib_fd_memory_leak' into 'master'
Ivan Grokhotkov [Tue, 20 Sep 2016 04:12:06 +0000 (12:12 +0800)]
Merge branch 'bugfix/newlib_fd_memory_leak' into 'master'

override per-task __cleanup handler to close stdin, stdout, stderr

Default _cleanup_r function (called from _reclaim_reent) calls _fclose_r for all file descriptors related to a particular instance of struct _reent.
It does that by calling _fwalk_reent, which iterates over __sglue list in struct _reent and calls _fclose_r for each member. But _stdin, _stdout, and _stderr are not in this list, so _fclose_r is not called for them. Which leads to a memory leak.
The easy way to fix this is to reset __cleanup member of struct _reent to our new “patched” version, which first calls the original version (_cleanup_r) and then does _fclose_r for each of the stdin, stdout, and stderr.

See merge request !94

7 years agokconfig: fix build on macOS
Ivan Grokhotkov [Tue, 20 Sep 2016 03:20:31 +0000 (11:20 +0800)]
kconfig: fix build on macOS

macOS version of sed doesn't recognize \r as special character.
Replacing with \x0D substitution which works everywhere.

7 years agocomponents/freertos: override per-task __cleanup handler to close stdin, stdout,...
Ivan Grokhotkov [Mon, 19 Sep 2016 11:28:36 +0000 (19:28 +0800)]
components/freertos: override per-task __cleanup handler to close stdin, stdout, stderr

Default _cleanup_r doesn't do that, which leaks these three file descriptors.

7 years agoMerge branch 'driver_merge_tmp/merge_struct_header' into 'master'
Ivan Grokhotkov [Mon, 19 Sep 2016 07:34:37 +0000 (15:34 +0800)]
Merge branch 'driver_merge_tmp/merge_struct_header' into 'master'

add peripheral modules struct headers

See merge request !88

7 years agocomponents/esp32: move peripheral symbols to separate ld script
Ivan Grokhotkov [Mon, 19 Sep 2016 07:05:32 +0000 (15:05 +0800)]
components/esp32: move peripheral symbols to separate ld script

8 years agoMerge branch 'features/lwip-SO_REUSEADDR' into 'master'
Jeroen Domburg [Mon, 19 Sep 2016 02:42:35 +0000 (10:42 +0800)]
Merge branch 'features/lwip-SO_REUSEADDR' into 'master'

Enable SO_REUSEADDR in LWIP

Daniel initially asked me why this wasn't enabled, and I don't think I got any reasons against enabling this. If any, it makes porting existing software easier. Tuan needs it for UDP multicast as well.

Code changes are by Tuan: basically the enable for SO_REUSEADDR in LWIP as well as a bugfix in a bit of mbedTLS that gets enabled.

See merge request !90

8 years agoMerge branch 'bugfix/rom_gpio' into 'master'
Angus Gratton [Mon, 19 Sep 2016 02:41:34 +0000 (10:41 +0800)]
Merge branch 'bugfix/rom_gpio' into 'master'

rom/gpio.h: Use new GPIO_PIN0_REG register name

Closes github #12

See merge request !86

8 years agoMerge branch 'bugfix/windows' into 'master'
Angus Gratton [Mon, 19 Sep 2016 02:41:14 +0000 (10:41 +0800)]
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

8 years agocomponents/log: regroup macros for better readability
Ivan Grokhotkov [Mon, 19 Sep 2016 00:53:09 +0000 (08:53 +0800)]
components/log: regroup macros for better readability

8 years agogitlab-ci: allow running tests for branches, triggered via API
Ivan Grokhotkov [Sun, 18 Sep 2016 15:12:50 +0000 (23:12 +0800)]
gitlab-ci: allow running tests for branches, triggered via API

8 years agocomponents/log: fix timestamp calculation
Ivan Grokhotkov [Sun, 18 Sep 2016 13:06:43 +0000 (21:06 +0800)]
components/log: fix timestamp calculation

8 years agocomponents/log: set default runtime log level to ESP_LOG_VERBOSE
Ivan Grokhotkov [Sun, 18 Sep 2016 13:01:28 +0000 (21:01 +0800)]
components/log: set default runtime log level to ESP_LOG_VERBOSE

With this change, it is possible to use LOG_LOCAL_LEVEL to raise debug level for given file/component

8 years agocomponents/log: fix error when using ESP_LOGx from C++ code
Ivan Grokhotkov [Sun, 18 Sep 2016 12:51:57 +0000 (20:51 +0800)]
components/log: fix error when using ESP_LOGx from C++ code

8 years agoMerge branch 'bugfix/fix_memory_debug_macro_issue' into 'master'
Ivan Grokhotkov [Sun, 18 Sep 2016 12:25:20 +0000 (20:25 +0800)]
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

8 years agocomponents/log: fix bugs, add options to override log level for files, components...
Ivan Grokhotkov [Sun, 18 Sep 2016 12:24:31 +0000 (20:24 +0800)]
components/log: fix bugs, add options to override log level for files, components, and bootloader

8 years agofix ledc and spi typo
Wangjialin [Sun, 18 Sep 2016 11:24:43 +0000 (19:24 +0800)]
fix ledc and spi typo

8 years agoremove prefix and postfix
Wangjialin [Sun, 18 Sep 2016 11:05:37 +0000 (19:05 +0800)]
remove prefix and postfix

8 years agoEnable SO_REUSEADDR in LWIP
Jeroen Domburg [Sun, 18 Sep 2016 08:43:48 +0000 (16:43 +0800)]
Enable SO_REUSEADDR in LWIP

8 years agofreertos: fix memory debug macro issue
liuzhifu [Sun, 18 Sep 2016 07:35:42 +0000 (15:35 +0800)]
freertos: fix memory debug macro issue
Define configENABLE_MEMORY_DEBUG according to CONFIG_ENABLE_MEMORY_DEBUG

8 years agoperipheral structure headers: move volatile keyword from members to typedef
Ivan Grokhotkov [Sun, 18 Sep 2016 04:36:33 +0000 (12:36 +0800)]
peripheral structure headers: move volatile keyword from members to typedef

8 years agoAdding -fstrict-volatile-bitfields to the CFLAGS/CXXFLAGS. Without this, gcc tries...
Jeroen Domburg [Sun, 18 Sep 2016 04:10:01 +0000 (12:10 +0800)]
Adding -fstrict-volatile-bitfields to the CFLAGS/CXXFLAGS. Without this, gcc tries to access bitfields using the smallest possible methods (eg l8i to
grab an 8-bit field from a 32-bit). Our hardware does not like that. This flag tells gcc that if a bitfield is volatile, it should always use the type
the field is defined at (uint32_t in our case) to size its access to the field. This fixes accessing the hardware through the xxx_struct.h headers.

8 years agoadd peripheral module struct headers
Wangjialin [Sat, 17 Sep 2016 19:14:18 +0000 (03:14 +0800)]
add peripheral  module struct headers

8 years agobuild system docs: Add note about no spaces in component names
Angus Gratton [Fri, 16 Sep 2016 08:22:16 +0000 (18:22 +1000)]
build system docs: Add note about no spaces in component names

8 years agoDocs: Add note about unusual submodule messages when cloning on Windows
Angus Gratton [Fri, 16 Sep 2016 08:05:52 +0000 (18:05 +1000)]
Docs: Add note about unusual submodule messages when cloning on Windows

Related to github #11

8 years agoconfig system: Support Windows when CRLFs used for eol markers
Angus Gratton [Fri, 16 Sep 2016 07:56:50 +0000 (17:56 +1000)]
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

8 years agodocs: Add note about esp-idf not supporting spaces in paths
Angus Gratton [Fri, 16 Sep 2016 04:31:46 +0000 (14:31 +1000)]
docs: Add note about esp-idf not supporting spaces in paths

Ref Github #10

8 years agorom/gpio.h: Use new GPIO_PIN0_REG register name
Angus Gratton [Thu, 15 Sep 2016 23:43:52 +0000 (09:43 +1000)]
rom/gpio.h: Use new GPIO_PIN0_REG register name

Closes github #12

8 years agoMerge branch 'bugfix/github_deploy' into 'master'
Ivan Grokhotkov [Thu, 15 Sep 2016 06:08:35 +0000 (14:08 +0800)]
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

8 years agocomponents/esp32,bootloader: fix build
Ivan Grokhotkov [Wed, 14 Sep 2016 18:37:54 +0000 (02:37 +0800)]
components/esp32,bootloader: fix build

esp32: use new register name in cpu_start
bootloader: EXTRA_CFLAGS don't work any more, set global CFLAGS in Makefile.projbuild

8 years agofix whitespace after merge
Ivan Grokhotkov [Wed, 14 Sep 2016 18:17:08 +0000 (02:17 +0800)]
fix whitespace after merge

8 years agoMerge branch 'master' into feature/logging
Ivan Grokhotkov [Wed, 14 Sep 2016 18:15:50 +0000 (02:15 +0800)]
Merge branch 'master' into feature/logging

* master: (45 commits)
  esp32/lib: update to 1303c92c
  dhcpserver: Fix crash when switching wifi mode
  mbedtls: Temporarily disable default hardware crypto SHA & bignum
  mbedtls hwcrypto sha512: Fix redirection of function names
  mbedtls upstream tweak: Move mbedtls_sha512_process in sha512.h
  Format code by using 4 spaces instead
  modify  character conversion error and typo
  modify i2s_reg.h, rebase to master
  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).
  Rename vender_ie_type_t and vendor_ie_id_t to wifi_vendor_ie_type_t and wifi_vendor_ie_id_t respectively
  modify arguments for vendor ie APIs by using enum instead
  esp32: fix typo
  esp32: fix kconfig
  define lwip task priority in esp_task.h
  components: esp32 - fix build error
  components: lwip - Modify lwip task priority and stack definition method
  components: esp32
  components: esp32
  components: esp32/lwip
  task priority: modify lwip/wifi/event task priority
  ...

# Conflicts:
# components/bootloader/src/main/bootloader_start.c
# components/bootloader/src/main/flash_encrypt.c
# components/bootloader/src/main/secure_boot.c
# components/esp32/cpu_start.c

8 years agocomponents/esp32: clean up cpu_start
Ivan Grokhotkov [Wed, 14 Sep 2016 17:59:42 +0000 (01:59 +0800)]
components/esp32: clean up cpu_start

Move CPU region protection setup into soc/cpu.h
change tabs to spaces
remove unused extern declarations
use RTC_WDTCONFIG0 instead of numeric address (still need to fix BB reg)

8 years agocomponents/log: add implementation, update a few components to use it
Ivan Grokhotkov [Wed, 14 Sep 2016 16:53:33 +0000 (00:53 +0800)]
components/log: add implementation, update a few components to use it

This also removes logging implementation from bootloader and replaces it
with the one provided by the log component. Some occurrences of printf
and ets_printf have been changed to ESP_LOGx APIs.

8 years agoMerge remote-tracking branch 'origin/feature/mbedtls'
Wu Jian Gang [Wed, 14 Sep 2016 10:05:56 +0000 (18:05 +0800)]
Merge remote-tracking branch 'origin/feature/mbedtls'

8 years agoesp32/lib: update to 3372298f
Wu Jian Gang [Wed, 14 Sep 2016 09:51:51 +0000 (17:51 +0800)]
esp32/lib: update to 3372298f

remove freq change in system_init

8 years agocomponents/esp32: use APB_CLK_FREQ instead of a number
Ivan Grokhotkov [Tue, 13 Sep 2016 12:53:25 +0000 (20:53 +0800)]
components/esp32: use APB_CLK_FREQ instead of a number

8 years agocomponents/esp32: add CPU frequency selection in menuconfig
Ivan Grokhotkov [Tue, 13 Sep 2016 10:10:58 +0000 (18:10 +0800)]
components/esp32: add CPU frequency selection in menuconfig

Note that with WiFi stack enabled, system_init will reset frequency to 240MHz.
To make this setting useful, esp32-wifi-libs submodule needs to be updated.

8 years agoMerge branch 'feature/wifi_lib_update' into 'master'
Wu Jian Gang [Wed, 14 Sep 2016 09:53:01 +0000 (17:53 +0800)]
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

8 years agoMerge branch 'bugfix/tw7058_mode_fatal' into 'master'
Wu Jian Gang [Wed, 14 Sep 2016 09:46:12 +0000 (17:46 +0800)]
Merge branch 'bugfix/tw7058_mode_fatal' into 'master'

[teamwork7058]It causes fatal when switch wifi mode.

See merge request !84

8 years agoesp32/lib: update to 1303c92c
Wu Jian Gang [Wed, 14 Sep 2016 08:57:00 +0000 (16:57 +0800)]
esp32/lib: update to 1303c92c

8 years agoMerge branch 'feature/support_vendor_ie_api' into 'master'
Wu Jian Gang [Wed, 14 Sep 2016 08:53:53 +0000 (16:53 +0800)]
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

8 years agodhcpserver: Fix crash when switching wifi mode
Xu Chun Guang [Wed, 14 Sep 2016 08:14:50 +0000 (16:14 +0800)]
dhcpserver: Fix crash when switching wifi mode

See Teamwork 7058.

8 years agombedtls: Temporarily disable default hardware crypto SHA & bignum
Angus Gratton [Wed, 14 Sep 2016 07:52:39 +0000 (17:52 +1000)]
mbedtls: Temporarily disable default hardware crypto SHA & bignum

Due to limitations referenced in the comments of the changes.

8 years agombedtls hwcrypto sha512: Fix redirection of function names
Angus Gratton [Wed, 14 Sep 2016 07:52:24 +0000 (17:52 +1000)]
mbedtls hwcrypto sha512: Fix redirection of function names

8 years agombedtls upstream tweak: Move mbedtls_sha512_process in sha512.h
Angus Gratton [Wed, 14 Sep 2016 07:51:27 +0000 (17:51 +1000)]
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.

8 years agoFormat code by using 4 spaces instead
qiyueixa [Wed, 14 Sep 2016 06:42:17 +0000 (14:42 +0800)]
Format code by using 4 spaces instead

8 years agoMerge branch 'driver_merge_tmp/merge_soc_header' into 'master'
Wu Jian Gang [Wed, 14 Sep 2016 06:12:39 +0000 (14:12 +0800)]
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

8 years agomodify character conversion error and typo
Wangjialin [Wed, 14 Sep 2016 05:16:34 +0000 (13:16 +0800)]
modify  character conversion error and typo

8 years agomodify i2s_reg.h, rebase to master
Wangjialin [Tue, 13 Sep 2016 18:34:24 +0000 (02:34 +0800)]
modify i2s_reg.h, rebase to master

8 years agoOnly modify headers in soc/ .
Wangjialin [Tue, 13 Sep 2016 15:02:03 +0000 (23:02 +0800)]
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).

8 years agoRename vender_ie_type_t and vendor_ie_id_t to wifi_vendor_ie_type_t and wifi_vendor_i...
qiyueixa [Wed, 14 Sep 2016 03:30:19 +0000 (11:30 +0800)]
Rename vender_ie_type_t and vendor_ie_id_t to wifi_vendor_ie_type_t and wifi_vendor_ie_id_t respectively

8 years agomodify arguments for vendor ie APIs by using enum instead
qiyueixa [Tue, 13 Sep 2016 09:11:53 +0000 (17:11 +0800)]
modify arguments for vendor ie APIs by using enum instead

8 years agoMerge branch 'feature/adjust_task_priority' into 'master'
Wu Jian Gang [Wed, 14 Sep 2016 05:28:50 +0000 (13:28 +0800)]
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

8 years agoesp32: fix typo
Wu Jian Gang [Wed, 14 Sep 2016 05:26:17 +0000 (13:26 +0800)]
esp32: fix typo

8 years agoesp32: fix kconfig
Wu Jian Gang [Wed, 14 Sep 2016 04:55:41 +0000 (12:55 +0800)]
esp32: fix kconfig

8 years agoMerge branch master into feature/logging
Ivan Grokhotkov [Wed, 14 Sep 2016 04:19:43 +0000 (12:19 +0800)]
Merge branch master into feature/logging

* branch master: (51 commits)
  fix typos
  callback: add a void* pointer with each callback
  header: callbacks use "void *" as arguments
  header: format and fix typos
  add wifi api comments
  add wifi api comments
  components/spi_flash: call SPIUnlock only once
  components/spi_flash: improve comments and readability
  esp32 cpu_start: Include rom/uart.h, remove inline ROM function declarations
  bootloader: Add bootloader Kconfig
  Fix bug where nesting vTaskEnterCritical calls would not re-enable interrupts after vTaskExitCritical sections.
  installed gitlab key in global before_script, don't need to overwrite in template before_script
  ci: Use github repo for wifi libraries on master branch, gitlab repo otherwise
  components/esp32,spi_flash: update some comments
  components/esp32: remove dependency of WIFI_ENABLED on FREERTOS_UNICORE
  esp32/lib: Bump WiFi revision
  update ci: build ssc with idf submodule wifi lib
  components/esp32: add inter-processor call API and implement spi_flash through it
  add MACRO to get flash pad number from efuse value
  add comments to register read/write operations
  ...

8 years agodefine lwip task priority in esp_task.h
liuzhifu [Wed, 14 Sep 2016 01:36:54 +0000 (09:36 +0800)]
define lwip task priority in esp_task.h

8 years agocomponents: esp32 - fix build error
liuzhifu [Thu, 1 Sep 2016 07:48:59 +0000 (15:48 +0800)]
components: esp32 - fix build error

8 years agocomponents: lwip - Modify lwip task priority and stack definition method
liuzhifu [Thu, 1 Sep 2016 06:48:12 +0000 (14:48 +0800)]
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

8 years agocomponents: esp32
liuzhifu [Thu, 1 Sep 2016 06:37:19 +0000 (14:37 +0800)]
components: esp32

Remove priority/stack definition of task that is freertos/lwip/app

8 years agocomponents: esp32
liuzhifu [Thu, 1 Sep 2016 06:18:16 +0000 (14:18 +0800)]
components: esp32

add missing file esp_task.h

8 years agocomponents: esp32/lwip
liuzhifu [Thu, 1 Sep 2016 06:09:21 +0000 (14:09 +0800)]
components: esp32/lwip

Add esp_task.h for placing all task priority/stack size macro definition

8 years agotask priority: modify lwip/wifi/event task priority
liuzhifu [Wed, 31 Aug 2016 11:38:43 +0000 (19:38 +0800)]
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

8 years agoMerge branch 'feature/add_wifi_api_comments' into 'master'
Wu Jian Gang [Wed, 14 Sep 2016 03:17:29 +0000 (11:17 +0800)]
Merge branch 'feature/add_wifi_api_comments' into 'master'

Feature/add wifi api comments

Add wifi API comments

See merge request !63

8 years agoMerge branch 'bugfix/add_tx_flowcontrol' into 'master'
Angus Gratton [Wed, 14 Sep 2016 01:01:42 +0000 (09:01 +0800)]
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

8 years agoMerge branch 'feature/esptool_upstream'
Angus Gratton [Wed, 14 Sep 2016 00:28:41 +0000 (10:28 +1000)]
Merge branch 'feature/esptool_upstream'

8 years agogitlab-ci: fix setting GitHub deploy key
Ivan Grokhotkov [Tue, 13 Sep 2016 13:24:57 +0000 (21:24 +0800)]
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

8 years agofix typos
Wu Jian Gang [Tue, 13 Sep 2016 12:54:20 +0000 (20:54 +0800)]
fix typos

8 years agoMerge branch 'bugfix/spi_flash_unlock_once' into 'master'
Ivan Grokhotkov [Tue, 13 Sep 2016 10:14:22 +0000 (18:14 +0800)]
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

8 years agoMerge remote-tracking branch 'origin/master' into feature/mbedtls
Wu Jian Gang [Tue, 13 Sep 2016 08:31:48 +0000 (16:31 +0800)]
Merge remote-tracking branch 'origin/master' into feature/mbedtls

8 years agocallback: add a void* pointer with each callback
Wu Jian Gang [Tue, 13 Sep 2016 07:57:11 +0000 (15:57 +0800)]
callback: add a void* pointer with each callback

also format event.c/wifi.c/esp_event.h/esp_wifi.h

8 years agoheader: callbacks use "void *" as arguments
Wu Jian Gang [Mon, 12 Sep 2016 09:25:51 +0000 (17:25 +0800)]
header: callbacks use "void *" as arguments

8 years agoheader: format and fix typos
Wu Jian Gang [Mon, 12 Sep 2016 08:43:32 +0000 (16:43 +0800)]
header: format and fix typos

SYSTEM_EVENT_STA_GOTIP to SYSTEM_EVENT_STA_GOT_IP

8 years agoadd wifi api comments
liuzhifu [Wed, 7 Sep 2016 12:33:13 +0000 (20:33 +0800)]
add wifi api comments

8 years agoadd wifi api comments
liuzhifu [Wed, 7 Sep 2016 09:29:08 +0000 (17:29 +0800)]
add wifi api comments

8 years agoMerge branch 'bugfix/ci_update_for_wifi_revision' into 'master'
Ivan Grokhotkov [Tue, 13 Sep 2016 08:05:17 +0000 (16:05 +0800)]
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

8 years agocomponents/spi_flash: call SPIUnlock only once
Ivan Grokhotkov [Tue, 13 Sep 2016 07:16:36 +0000 (15:16 +0800)]
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).

8 years agoMerge branch 'feature/bootloader_config' into 'master'
Angus Gratton [Tue, 13 Sep 2016 06:31:18 +0000 (14:31 +0800)]
Merge branch 'feature/bootloader_config' into 'master'

Add bootloader menuconfig entries

Adds log verbosity & ANSI coloring to menuconfig, also some cleanup in cpu_start.c

See merge request !79

8 years agoMerge branch 'feature/dualcore_spi_flash_api' into 'master'
Ivan Grokhotkov [Tue, 13 Sep 2016 05:58:54 +0000 (13:58 +0800)]
Merge branch 'feature/dualcore_spi_flash_api' into 'master'

Dual core compatible spi flash APIs

Implementation of spi flash APIs which work in dual core mode.

This also includes other changes:
- fixes to FreeRTOS tasks.c made by Jeroen and me — these were originally made to fix issues with high priority tasks seen in WiFi stack, but were required to get stuff in ipc.c working as well
- initial base idea with two high-priority tasks was separated into a separate API — esp_ipc.h. That API allows one to run a function on the other CPU from a high-priority task. Because we don't have preemption across CPUs, this is currently not very fast: it requires on average half a tick until the second CPU switches to the high priority task. Currently that API can be either blocking, or non-blocking with queue length of 1. I haven't yet found a use case for arbitrary sized queue of IPC requests. Anyone who needs that can trivially add that later by replacing a binary semaphore with a generic queue.

With these changes i can run application with WiFi stack and NVS on both cores.

See merge request !25

8 years agocomponents/spi_flash: improve comments and readability
Ivan Grokhotkov [Tue, 13 Sep 2016 04:47:21 +0000 (12:47 +0800)]
components/spi_flash: improve comments and readability

8 years agoesp32 cpu_start: Include rom/uart.h, remove inline ROM function declarations
Angus Gratton [Tue, 13 Sep 2016 03:48:28 +0000 (13:48 +1000)]
esp32 cpu_start: Include rom/uart.h, remove inline ROM function declarations

8 years agobootloader: Add bootloader Kconfig
Angus Gratton [Tue, 13 Sep 2016 03:46:51 +0000 (13:46 +1000)]
bootloader: Add bootloader Kconfig

Allow debug level & colour highlighting to be configured