Commit Graph

20042 Commits

Author SHA1 Message Date
qiyueixa
d866fe84a4 modify arguments for vendor ie APIs by using enum instead 2016-09-14 13:39:30 +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
Ivan Grokhotkov
2fc60ba938 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
  ...
2016-09-14 12:19:43 +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
Wu Jian Gang
ed8e8848e3 fix typos 2016-09-13 20:54:20 +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
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
Angus Gratton
b6b83c33be 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
2016-09-13 14:31:18 +08:00
Ivan Grokhotkov
f9013d9ff8 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
2016-09-13 13:58:54 +08:00
Ivan Grokhotkov
ce2153c447 components/spi_flash: improve comments and readability 2016-09-13 12:47:21 +08:00
Angus Gratton
7ba471d531 esp32 cpu_start: Include rom/uart.h, remove inline ROM function declarations 2016-09-13 14:18:17 +10:00
Angus Gratton
3061ae40c0 bootloader: Add bootloader Kconfig
Allow debug level & colour highlighting to be configured
2016-09-13 14:18:17 +10:00
Jeroen Domburg
174a0e3f8b Fix bug where nesting vTaskEnterCritical calls would not re-enable interrupts after vTaskExitCritical sections. 2016-09-13 11:47:22 +08:00
Ivan Grokhotkov
23d5c7579b components/esp32,spi_flash: update some comments 2016-09-12 20:02:51 +08:00
Ivan Grokhotkov
1b6022bd07 components/esp32: remove dependency of WIFI_ENABLED on FREERTOS_UNICORE 2016-09-12 19:53:38 +08:00
Wu Jian Gang
4598f9fc88 esp32/lib: Bump WiFi revision 2016-09-12 19:32:05 +08:00
Ivan Grokhotkov
e9f2645b21 components/esp32: add inter-processor call API and implement spi_flash through it
With this change, flash operations can run on both cores.
NVS and WiFi stack can also run in dual core mode now.
2016-09-12 18:54:45 +08:00
Wu Jian Gang
19f9ca0200 Merge branch 'bugfix/wifi_revision' into 'master'
esp32/lib: Bump WiFi revision



See merge request !72
2016-09-12 18:52:40 +08:00
Jack
bd8febe58c add MACRO to get flash pad number from efuse value 2016-09-12 17:47:50 +08:00
Jack
d0442602c7 add comments to register read/write operations 2016-09-12 17:47:50 +08:00
Wu Jian Gang
04b53643ef header files: clean up
1. format;
2. Slow RTC memory reverse 2KB;
2016-09-12 17:47:50 +08:00
jack
24011ddd05 header files: modify rom code and soc header files
1. timer reg file for both time group 0 and time group 1, not only timer group 0
2. fix bug that io mux header file mismatch with chip
3. fix bug that some BASE address not correct
4. add some static function to eagle.fpga32.rom.addr.v7.ld
5. add interrupts usage table
6. add some comments for rom code functions
2016-09-12 17:47:49 +08:00
Jeroen Domburg
fe3380d32e Merge branch 'bugfix/realloc' into 'master'
modify realloc behaves

 modify realloc behaves just like malloc when pass a null pointer for ptr.

See merge request !66
2016-09-12 17:08:57 +08:00
Angus Gratton
fcf278848d Merge branch 'master' into feature/esptool_upstream 2016-09-12 18:02:10 +10:00
Angus Gratton
5810dbef05 make: Add macro to test for & try to fix up files required for submodules
Now applied to both esptool.py & esp32 wifi libs
2016-09-12 18:00:20 +10:00
Angus Gratton
f293d530f8 esp32/lib: Bump WiFi revision 2016-09-12 17:31:43 +10:00
Angus Gratton
9c51f8a7a3 Merge branch 'master' into feature/mbedtls 2016-09-12 17:30:11 +10:00
xiaxiaotian
7c607e4d63 Change the enum of wifi_storage_t to be the same as that in wifi lib. 2016-09-12 11:38:13 +08:00
Ivan Grokhotkov
1c6859573b freertos: protect calls to prvAddTaskToReadyList with xTaskQueueMutex 2016-09-09 17:59:37 +08:00
liuzhifu
32f01c61a2 add comments about current tx flow control 2016-09-09 17:58:21 +08:00
liuzhifu
e38c4b0365 modify esp32_tx_flow_ctrl to static function and move extern api to header file 2016-09-09 17:58:21 +08:00
liuzhifu
19c8476344 modify macro ESP32_TX_FLOW_CTRL to inline function 2016-09-09 17:58:21 +08:00
liuzhifu
a28ef1776e lwip: add socket tx flow control 2016-09-09 17:58:21 +08:00
Jeroen Domburg
9664de6867 Add working portASSERT_IF_IN_ISR function, fix enter_critical thing even better. 2016-09-09 17:15:50 +08:00
Jeroen Domburg
128bb77c5a Fix prev code to not crash horribly when scheduler is not running yet 2016-09-09 17:15:49 +08:00
Jeroen Domburg
08ec33c6a2 Make vTaskEnterCritical callable from ISR 2016-09-09 17:15:12 +08:00
Ivan Grokhotkov
be4dfed822 Merge branch 'master' into feature/dualcore_spi_flash_api
* master: (130 commits)
  lwip: Define LWIP_ESP8266 in port lwipopts.h not gcc command line
  CI: Build the esp-idf-template with the matching branch name, if it exists
  README: Add Resources section with some links
  Rename README.buildenv to docs/build_system.rst and ReST-ify it
  Eclipse docs: Easier to just replace entire PATH, msys32 has everything we need to build/flash
  test_build_system: Print ESP_IDF_TEMPLATE_GIT for easier debugging
  Name component makefiles component.mk instead of Makefile
  Eclipse doc: Add troubleshooting note about Makefile directories
  eclipse_make.sh: Fix printing of make directory
  Move bin/eclipse_windows_make.sh to tools/windows_eclipse_make.sh
  Eclipse docs: Prepend IDF paths to beginning of PATH
  Set default SPI flash access mode to DIO
  FreeRTOS: temporary solution for memory canaries and memory debug
  tcpip_adapter: fix dhcp client work flow
  event: not post got ip event if static is invalid
  tcpip_adapter: typedef clean up
  event: post got ip event when use static ip
  tcpip_adapter: use dhcp callback to post got ip event
  dhcp: add dhcp callback
  lwip: remove netif_reg_addr_change_cb
  ...
2016-09-09 17:14:16 +08:00
liuhan
47db66e495 esp32: modify realloc behaves just like malloc when pass a null pointer for ptr. 2016-09-09 15:06:56 +10:00
Angus Gratton
46a9754b8e hwcrypto sha: Fix initialisation of SHA hardware in esp_shaX_start functions
Problem exposed by previous commit.
2016-09-09 14:27:53 +10:00
Angus Gratton
eb47a25012 mbedtls: Revert changes to upstream library sources.
This reverts part of commit 0f83831c74.
2016-09-09 14:10:44 +10:00
Angus Gratton
6f006c25fb json & expat: Update component.mk after merging from master 2016-09-09 14:07:45 +10:00
Angus Gratton
264b115eb0 mbedtls: Move esp_config.h file to port directory 2016-09-09 14:06:14 +10:00
Angus Gratton
1d355b93df lwip: Define LWIP_ESP8266 in port lwipopts.h not gcc command line 2016-09-09 13:53:38 +10:00
Angus Gratton
a939c15723 mbedtls networking: Remove WIN32 parts, minor cleanup 2016-09-09 11:24:35 +10:00
Angus Gratton
7c58c1e06b Build system: Allow components to add to the global CFLAGS via Makefile.projbuild
Used by mbedTLS to set MBEDTLS_CONFIG_FILE in all components.

This change sets CFLAGS/etc at the project level and then exports those
variables for components, rather than setting them independently each time
a component Makefile is invoked.
2016-09-09 11:08:19 +10:00
Angus Gratton
31e6b2cdb4 Merge branch 'master' into feature/mbedtls 2016-09-09 10:29:19 +10:00
Angus Gratton
add32cbc9a Merge branch 'bugfix/docs_eclipse' into 'master'
Eclipse fixes, including renaming component Makefiles to component.mk

Some changes after following up some Eclipse problems with @nilay .

Biggest thing is renaming all component Makefiles to component.mk. This requires changes to all esp-idf projects, ie:
* https://github.com/espressif/esp-idf-template/compare/bugfix/docs_eclipse?expand=1
* http://gitlab.espressif.cn/idf/esp-idf-tests/tree/update/component_makefiles

... this fixes Eclipse weirdness and also means the only "Makefile"s in the project are the ones you should run make against.

If this MR is merged then I'll also merge these, email all developers about the breaking change and post on esp32.com.

See merge request !34
2016-09-09 07:41:32 +08:00
Ivan Grokhotkov
7268f0a60a components/log: add API header for logging library
TW6703
2016-09-08 20:02:26 +08:00
Wu Jian Gang
95defc7d32 mbedtls: Use hardware accelerated AES, SHA, bignum 2016-09-08 17:41:43 +08:00
Angus Gratton
2211759cc0 hwcrypto aes: Fix bugs w/ ECB decrypt, CFB modes 2016-09-08 17:02:52 +08:00
Jeroen Domburg
99b64c82d1 Merge branch 'bugfix/default_dio_spiflashmode' into 'master'
Set default SPI flash access mode to DIO

We have a bunch of boards out there (the NodeMCU-lookalike, breadboardable boards) in the hands of early reviewers. Because the flash chips on these boards have a different command to go into QIO mode, ESP-IDF will break on these boards out of the box. Eventually, we need some nifty way to autodetect this or something, but for now, the quick fix is to make DIO the default access mode.

Once this is merged, I will also modify the default in the template apps sdkconfig.

See merge request !65
2016-09-08 16:58:34 +08:00
Angus Gratton
d951ab2661 hwcrypto aes: Performance tweak, only write key to hardware once
Shaves ~10% off time to compute AES-CBC
2016-09-08 16:47:37 +08:00
Angus Gratton
a32e954f67 hwcrypto sha: Feed one block at a time to hardware SHA implementation
Fixes a bug where some longer block sizes produced incorrect results.
2016-09-08 16:47:34 +08:00
Angus Gratton
0a970e3a25 hwcrypto: Match API completely to mbedTLS naming conventions 2016-09-08 16:47:31 +08:00
Angus Gratton
2580c07ae6 esp32 hwcrypto: Make SHA-224 an obvious no-op for now
This is not the long term solution...
2016-09-08 16:47:28 +08:00
Angus Gratton
2bee84062a esp32: Add comment to ROM crypto functions recommending they not be used directly 2016-09-08 16:47:24 +08:00
Angus Gratton
0647d1e922 esp32 hwcrypto: Rework hardware crypto locking
Should protect against concurrent use of hardware crypto primitives,
with good performance.

Not necessary to call esp_aes_acquire_hardware(),
esp_sha_acquire_hardware(), etc when using these APIs. These are
provided for external users calling the hardware crypto hardware
directly, to coexist with this implementation.
2016-09-08 16:47:13 +08:00
Angus Gratton
4167b68eef esp32: Move hardware crypto implementation/headers to hwcrypto directories 2016-09-08 16:46:28 +08:00
Wu Jian Gang
fc2bfc1f49 mbedtls: just format related files
method from !46
2016-09-08 16:46:25 +08:00
liuhan
f4ff32977d components/mbedtls: modify MBEDTLS net feature
modify get the connection's 'errno' info by calling getsockopt function.
2016-09-08 16:46:21 +08:00
Angus Gratton
09aa6ebc85 lwip Makefile: Add POSIX headers to include path to #include <sys/sockets.h>, etc, works. 2016-09-08 16:45:57 +08:00
liuhan
1900c50d3b components/mbedtls: modify hardware encryption feature
rename "flag" and "keybites" in aes file,
rename "xxx_starts" and add license in sha file.
2016-09-08 16:45:51 +08:00
liuhan
2d80fada70 components/mbedtls: MBEDTLS Handshake result check
modify esp_config.h add some feature for support http2.0 protocol, TLS Handshake OK.
2016-09-08 16:45:44 +08:00
liuhan
0f83831c74 1. multi thread verify bignum AES and SHA 2016-09-08 16:45:23 +08:00
liuhan
98021903a2 recompile crypto and bignum function 2016-09-08 16:45:16 +08:00
liuhan
d9b660f6d4 1. add lock function for every function
2. modify some function for crypto
2016-09-08 16:44:58 +08:00
liuhan
30be5f6eb5 [t6001]: chip Use hardware acceleration of Encryption 2016-09-08 16:44:53 +08:00
Angus Gratton
3b1c3dab4b Name component makefiles component.mk instead of Makefile
Fixes problems with Eclipse trying to build in directories it shouldn't.

This is a breaking change for existing repositories, they need to rename
any component Makefiles to component.mk and rename their references to
$(IDF_PATH)/make/component.mk to $(IDF_PATH)/make/component_common.mk
2016-09-08 13:41:19 +10:00
Angus Gratton
42357990aa Merge branch 'feature/mbedtls_upstream_source' into 'master'
Add mbedtls release version 2.3.0



See merge request !56
2016-09-08 11:32:02 +08:00
Angus Gratton
e9b73e5c0d Merge branch 'feature/memory_canaries_temp' into 'master'
FreeRTOS: temporary solution for memory canaries and memory debug

1. This is just a temporary solution, it will be removed when umm_malloc is ready
2. Support memory canaries mechanism
2. Add debug code to show allocated memory info

See merge request !64
2016-09-08 11:20:17 +08:00
Jeroen Domburg
5a0e374a46 Set default SPI flash access mode to DIO 2016-09-08 10:22:15 +08:00
Wu Jian Gang
28ca0b0526 Merge branch 'bugfix/got_ip_event' into 'master'
tcpip_adapter: got ip event stuff

Include:
1. add dhcp callback;
2. post got ip event in dhcp callback when dhcp bind;
3. tcpip_adapter typedef clean;
4. post got ip event in station connected event handler when use valid static ip;

TW6926

See merge request !61
2016-09-08 09:44:48 +08:00
liuzhifu
b21d2dfa6b FreeRTOS: temporary solution for memory canaries and memory debug
1. This is just a temporary solution, it will be removed when umm_malloc is ready
2. Support memory canaries mechanism
2. Add debug code to show allocated memory info
2016-09-07 21:52:24 +08:00
Angus Gratton
1a6e63feef Merge branch 'feature/config_spi_flash_params_menuconfig' into 'master'
Feature/config spi flash params menuconfig

Simple menuconfig option for flash speed and access mode.

See merge request !59
2016-09-07 10:16:59 +08:00
Wu Jian Gang
c97aa4a709 tcpip_adapter: fix dhcp client work flow 2016-09-06 19:36:03 +08:00
Wu Jian Gang
80d60270bb event: not post got ip event if static is invalid 2016-09-06 19:36:03 +08:00
Wu Jian Gang
df53d1588a tcpip_adapter: typedef clean up 2016-09-06 19:36:03 +08:00
Wu Jian Gang
1588d1aa6e event: post got ip event when use static ip
TW6926
2016-09-06 19:32:34 +08:00
Wu Jian Gang
c3af6e51d7 tcpip_adapter: use dhcp callback to post got ip event 2016-09-06 19:32:34 +08:00
Wu Jian Gang
3cf377b06e dhcp: add dhcp callback
The callback has no parameter now.
TODO: add a parameter to show dhcp status if needed.
2016-09-06 19:32:33 +08:00
Wu Jian Gang
ef23607a67 lwip: remove netif_reg_addr_change_cb 2016-09-06 19:32:33 +08:00
xiaxiaotian
43d441d0f4 Change the type of authmode 2016-09-06 16:47:03 +08:00
xiaxiaotian
8622fda764 Change the type of authmode 2016-09-06 16:47:03 +08:00
xiaxiaotian
035a48f102 Post station's auth mode event after it is connected to AP. 2016-09-06 16:47:02 +08:00
xiaxiaotian
c764683542 Add get station auth mode 2016-09-06 16:47:02 +08:00
Jeroen Domburg
669e85758c Add flash freq selection to menuconfig 2016-09-06 14:24:28 +08:00
Jeroen Domburg
4272996ebe Add QIO/QOUT/DIO/DOUT select for esptool.py 2016-09-06 14:24:14 +08:00
Angus Gratton
fe53b96634 Merge feature/lwip_sntp into feature/lwip_sntp_master 2016-09-06 11:49:06 +10:00
Angus Gratton
b8fc0c9511 FreeRTOS thread local storage config: If using WiFi this must be >0 2016-09-06 11:15:28 +10:00
Angus Gratton
4fb3f2c27e mbedtls: Fix component Makefile 2016-09-05 15:08:30 +10:00
Wu Jian Gang
ef91702100 Add mbedtls release version 2.3.0 2016-09-05 12:03:39 +10:00
Angus Gratton
166d876d90 Temporarily restrict WiFi stack to only run in single core more
See github #6.
2016-09-05 12:02:11 +10:00
Angus Gratton
587f90929c Minor comment cleanup 2016-09-05 11:50:53 +10:00
Angus Gratton
44ef108fd8 Bump WiFi libraries to latest 2016-09-05 10:54:43 +10:00
Angus Gratton
412fbffeae Makefiles: Fix case where updating the WiFi libraries directory didn't trigger a re-link 2016-09-05 10:49:12 +10:00
Angus Gratton
cb6bd109f2 Merge wifi commit '87977b92f3e12cfca74cf2e4dea87dc8d60b26fc' into feature/wifi-stage-two 2016-09-05 10:42:17 +10:00
Wu Jian Gang
25e1a7bf1a sntp: fix author name 2016-09-02 16:26:06 +08:00
Angus Gratton
66956dbb7c Update WiFi library version.
This version compiles but does not startup with WiFi component enabled.
2016-09-02 11:59:21 +10:00
Angus Gratton
314dbc0b61 Minor comment cleanup
Remove old commented code, etc.
2016-09-02 11:33:53 +10:00
Angus Gratton
be77601098 tcpip_adapter: Fix typo STOPED->STOPPED 2016-09-02 11:29:27 +10:00
liuzhifu
dddb9ace2e components: esp32
remove debug info in event.c/wifi.c
2016-09-02 11:16:37 +10:00
Angus Gratton
2f54d0e425 Merge wifi branch commit '588d384393536a040f899b382890316c56061b6a' into feature/wifi-stage-one 2016-09-02 11:14:27 +10:00
liuhan
37d817b6f9 components/lwip: modify sntp function
delete sntp_time.c file, move sntp head file.
2016-09-01 19:56:51 +08:00
liuhan
1e3f9fbda3 components/lwip/apps/sntp: modify SNTP function feature
modify makefile for compile SNTP function in lwip, see sntp file.
2016-09-01 19:22:36 +08:00
liuhan
380f5635b6 components/lwip: add SNTP function feature
Develop and Compile SNTP function based on LWIP core code, see lwip/apps/sntp file.
2016-09-01 19:22:36 +08:00
Wu Jian Gang
87977b92f3 lwip: format dhcpserver.c 2016-09-01 19:05:50 +08:00
liuhan
f5df40e2d1 lwip: fix a mistake in parse_msg of dhcpserver.c
TW6872
2016-09-01 18:13:58 +08:00
Wu Jian Gang
7ee4ec0d18 Merge branch 'bugfix/adapter_dhcp' into 'wifi'
Fix adapter dhcp

Fix some bugs when call adapter dhcpc/s API to test dhcp start/stop, from QA, TW6803 & TW6804.

See merge request !45
2016-09-01 17:19:28 +08:00
Angus Gratton
96852d49c2 Load esptool.py from submodule, currently WIP esptool.py v2.0
More details at https://github.com/themadinventor/esptool/pull/121
2016-09-01 18:45:10 +10:00
Angus Gratton
d793d23b94 Remove bin/ directory in favour of an add_path.sh script that can be sourced
Remaining file in bin/ will be moved out as part of !34
2016-09-01 18:45:10 +10:00
Angus Gratton
fb87346864 Merge branch 'feature/newlib_locking' into 'master'
newlib locking support

Has matching tests here: http://gitlab.espressif.cn/idf/esp-idf-tests/commits/feature/newlib_locking_tests

This is ready, the "bug" I saw was me not understanding how newlib stream locking works (I still don't understand why it works like it does, but that's less important for now.)

See merge request !17
2016-09-01 16:17:22 +08:00
liuzhifu
1e9fc9f8f1 components: lwip - modify HEAP_HIGHWAT from 6K to 20K
Since esp32 has much more memory than esp31B, modify the HEAP_HIGHWAT from
6K to 20K.
Notes: HEAP_HIGHWAT is used for tcp/udp tx flow control, if socket task detects
that the free heap memory is less than HEAP_HIGHWAT, it stops to trasmitting until
the free heap memory is greater than HEAP_HIGHWAT
2016-09-01 15:17:50 +08:00
Wu Jian Gang
861a976eee tcpip_adapter: fix a typo 2016-09-01 15:11:23 +08:00
xiaxiaotian
869fe1647d WIFI API: esp_err_t esp_wifi_set_storage(wifi_storage_t storage);
1. Add the parameter type of api esp_wifi_set_storage.
2. WIFI_STORAGE_RAM means storing profiles in ram. WIFI_STORAGE_FLASH means storing profiles in flash.
2016-09-01 15:09:00 +08:00
Angus Gratton
6367268f99 Merge branch 'bugfix/md5_rom_header_types' into 'master'
md5_hash.h: Replace outdated use of c_types.h with stdint



See merge request !44
2016-09-01 11:22:22 +08:00
Wu Jian Gang
e2b4421629 tcpip_adapter: fix a mistake in tcpip_adapter_dhcpc_stop
TW6803
2016-09-01 10:44:09 +08:00
Wu Jian Gang
a19b03611c tcpip_adapter: adjust some function sequence, fix ip info log 2016-09-01 10:44:08 +08:00
Wu Jian Gang
7a13eda78f tcpip_adapter: modify dhcpc status, fix static ip issue
TW6804 supplement
2016-09-01 10:44:08 +08:00
Wu Jian Gang
7bea025b56 tcpip_adapter: not allow to set ip if dhcpc/s not stoped
TW6804
2016-09-01 10:44:08 +08:00
Angus Gratton
a825fe8703 md5_hash.h: Replace outdated use of c_types.h with stdint 2016-09-01 08:58:29 +10:00
Wu Jian Gang
b56ca86571 wifi_lib: update to fbb084da 2016-08-31 23:25:29 +08:00
Jeroen Domburg
0f42f017e2 Merge branch 'bugfix/ocd_stop_on_unhandled_exception' into 'master'
Fix: Return after setting breakpoint when ocd is detected instead of continuing …

…into the panic routine

Made a small thinko when refactoring the panic handler code. This fixes it.

See merge request !36
2016-08-31 12:15:04 +08:00
xiaxiaotian
8fe9347de2 Merge branch 'wifi' of ssh://gitlab.espressif.cn:27227/idf/esp-idf into wifi 2016-08-30 18:10:30 +08:00
xiaxiaotian
e6d45cc91f 1. Add api ssc cmd "ap -K -a aid" to kick out connected station.
The parameter aid followed -a is aid of the connected station. If aid is 0, kick out all of the connected stations.
2. Add block parameter to api esp_wifi_scan_start.
   If block is true, the api blocks before scan done or returns directly.
2016-08-30 18:09:48 +08:00
liuzhifu
77caf256c6 components: lwip - enable PERF macro for debug reason 2016-08-30 18:06:37 +08:00
liuzhifu
68bc7b4476 set sta gotip default event handler 2016-08-30 18:05:32 +08:00
liuzhifu
5068ff2be8 TW6785 - add sta auto connect api 2016-08-30 18:04:22 +08:00
Jeroen Domburg
c6394ed2ce Fix: Return after setting breakpoint when ocd is detected instead of continuing into the panic routine 2016-08-30 17:55:20 +08:00
liuzhifu
a68ad74459 components:esp32 - notify wifi driver when sta got ip 2016-08-30 14:04:12 +08:00
Liu Han
13022ceff6 Merge branch 'feature/json' into 'master'
components/json: add JSON parse feature

Develop and Compile JSON Parse function, can test by running list,  see test_json file.

See merge request !33
2016-08-30 13:54:16 +08:00
Liu Han
f9bf9b3269 Merge branch 'feature/expat' into 'master'
components/expat: add XML parse feature

Develop and Compile XML Parse based on XMPP protocol, can test from unity running list, see expat file.

See merge request !32
2016-08-30 13:52:51 +08:00
liuzhifu
e23a012dac components: lwip - adjust ip print 2016-08-30 13:52:44 +08:00
liuzhifu
f94a7a4d20 components: esp32 - notify wifi when got sta ip 2016-08-30 13:51:41 +08:00
liuzhifu
c144feb2dd remove unnecessary print in sys_arch.c 2016-08-30 09:48:08 +08:00
Wu Jian Gang
23cc3c0f90 components/lwip: use newlib errno 2016-08-29 15:35:44 +08:00
liuzhifu
bae976ae0e components:lwip
disable debug info of lwip
2016-08-29 14:32:38 +08:00
rudi ;-)
fa310016dd Update aes.h
found small mistake in it

we have:

PROVIDE ( ets_aes_crypt = 0x4005c9b8 );
PROVIDE ( ets_aes_disable = 0x4005c8f8 );
PROVIDE ( ets_aes_enable = 0x4005c8cc );
PROVIDE ( ets_aes_set_endian = 0x4005c928 );
PROVIDE ( ets_aes_setkey_dec = 0x4005c994 );
PROVIDE ( ets_aes_setkey_enc = 0x4005c97c );

Signed-off-by: Ivan Grokhotkov <ivan@espressif.com>
2016-08-27 22:17:23 +08:00
liuzhifu
be87f38532 rename wifi_set_promiscuous_rx_cb wifi esp_wifi_set_promiscuous_rx_cb 2016-08-27 18:10:01 +08:00
Wu Jian Gang
f31ba138e1 Merge remote-tracking branch 'origin/bugfix/TW6738' into wifi 2016-08-26 19:06:39 +08:00
Wu Jian Gang
588d384393 tcpip_adpater: set ip to zero in tcpip_adapter_down
In some cases, there will have "ip unchanged", and have no event posted
when station reconnected.
2016-08-26 19:06:38 +08:00
liuzhifu
c65030b8ab disable log info in tcpip_adapter layer 2016-08-26 19:06:38 +08:00
Wu Jian Gang
7d0c139fdc tcpip_adapter: code clean up 2016-08-26 19:06:38 +08:00
Wu Jian Gang
cb33a0fb9b tcpip_adapter: clean up dhcpc status
only auto start dhcpc in init status
2016-08-26 19:06:38 +08:00
liuzhifu
ee8a0079bd components: esp32
remove debug info in event.c/wifi.c
2016-08-26 19:06:38 +08:00
liuhan
62c891735b recompile DHCP server function
modify DHCP data parameter type in calling DHCP interface.
2016-08-26 19:06:38 +08:00
Wu Jian Gang
f81535a840 system api: clean unsupported system apis 2016-08-26 19:06:38 +08:00
liuhan
aec816520c TW6738: fix DHCP -L issue
recompile DHCP server function, only support start, stop and option interface.
2016-08-26 19:06:38 +08:00
Wu Jian Gang
ec1869d43b add esp_intr.h 2016-08-26 19:06:38 +08:00
liuzhifu
65cccfe89f components: lwip
Implement lwip per-thread-sem with:
vTaskSetThreadLocalStoragePointerAndDelCallback/pvTaskGetThreadLocalStoragePointer
register sys_thread_tls_free to free per-thread-sem when the thread is terminated.
Also let lwip use index CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX
2016-08-26 19:06:38 +08:00
liuzhifu
ad188c3854 Remove the workaround that erase flash before calling nvs_flash_init 2016-08-26 19:06:33 +08:00
liuzhifu
2ca1b738d3 modify APB_CLK_FREQ from 40M to 80M 2016-08-26 19:03:51 +08:00
liuzhifu
ebfb8547d2 Implement ETS_INTR_ENABLE/ETS_INTR_DISABLE with xt_ints_on/xt_ints_off 2016-08-26 19:03:51 +08:00
liuzhifu
dcc998c92f components: lwip/tcpip_adapter/freertos/esp32
Replace os_printf with printf
2016-08-26 19:03:51 +08:00
liuzhifu
cb3d46786d enable sys_arch_protect/sys_arch_unprotect with portENTER_CRITICAL/portEXIT_CRITICAL 2016-08-26 19:03:51 +08:00
liuzhifu
52953851f4 component: lwip
1. add lock version print for lwip (workaround)
2. add debug info into sys_arch.c to debug xQueueReceive issue
2016-08-26 19:03:51 +08:00
xiaxiaotian
ef0cd1cde3 1. Remove ip member of struct station_info
2. Add struct station_list into tcpip_adapter layer
3. When ap -L cmd is received, get mac address from mac layer first and then search ip address based on mac address on dhcp layer.
2016-08-26 19:03:50 +08:00
xiaxiaotian
c35b57ac7b 1. Move the structure pointer into the respective case statement. 2016-08-26 19:03:50 +08:00
xiaxiaotian
3ba06efd7d Merge branch 'wifi' of ssh://gitlab.espressif.cn:27227/idf/esp-idf into wifi 2016-08-26 19:03:50 +08:00
xiaxiaotian
ccd60408b3 Fix the bug that the query reault is 'connected' when station is disconnected by input 'sta -D' 2016-08-26 19:03:50 +08:00
liuzhifu
91135da190 impact components: lwip/freertos
1. Remove xTaskGetPerTaskData
2. Implement lwip per thread semaphore with vTaskSetThreadLocalStoragePointer
   and pvTaskGetThreadLocalStoragePointer
3. Add sys_thread_sem_get/sys_thread_sem_init/sys_thread_sem_deinit
2016-08-26 19:03:50 +08:00
xiaxiaotian
1325a761e9 add got ip event handler 2016-08-26 19:03:50 +08:00
liuzhifu
6f122928f0 fix socket compile error 2016-08-26 19:03:50 +08:00
liuzhifu
e4722e6143 modify tcpip_dep_dhcpc_stop to tcpip_adapter_dhcpc_stop 2016-08-26 19:03:50 +08:00
liuzhifu
34ac96994b add debug info to wifi.c 2016-08-26 19:03:50 +08:00
liuhan
fbb6c2db08 components/json: add JSON parse feature
Develop and Compile JSON Parse function, see json file.
2016-08-25 17:04:14 +08:00
Angus Gratton
00ea21f736 FreeRTOS: Convert portMUX_DEBUG to a configuration item 2016-08-25 16:43:59 +08:00
Angus Gratton
96b9649aa4 newlib locking: Fix bug w/ _lock_close not clearing semaphore handle 2016-08-25 16:43:55 +08:00
liuhan
6e0bf01f25 components/expat: add XML parse feature
Develop and Compile XML Parse based on XMPP protocol, see expat file.
2016-08-25 16:40:23 +08:00
Wu Jian Gang
f4b3820ecd Merge branch 'feature/ld_change' into 'master'
update ld and heap region

Divide origin fpga ld to several lds,  choose specific ld for normal/BT/Trace by menuconfig, change iram/dram len in ld to full use hardware ram region.

See merge request !28
2016-08-25 15:52:11 +08:00
Angus Gratton
e6bc527dfb Merge branch 'master' into feature/newlib_locking 2016-08-25 12:09:21 +08:00
Wu Jian Gang
62296d9dfd mem: add comments for knock out 0x3ffe0000~0x3ffe8000
TODO: this region should be checked later
2016-08-25 11:59:29 +08:00
Wu Jian Gang
28865fcb0d mem: knock out bt/trace data region if configed in menuconfig 2016-08-25 11:35:06 +08:00
Wu Jian Gang
c72248193b ld: fix ld for bootloader 2016-08-25 11:35:06 +08:00
Wu Jian Gang
ef36779bd3 ld: add ld for bt/trace, choose different ld by menuconfig 2016-08-25 11:34:21 +08:00
Angus Gratton
580fd635e5 FreeRTOS: Change tskNO_AFFINITY value to not match CPU 1 when UNICORE is set 2016-08-25 11:30:24 +08:00
Angus Gratton
9e703612a7 Merge branch 'master' into feature/newlib_locking 2016-08-25 11:25:05 +08:00
Angus Gratton
a04b510a21 Merge branch 'master' into feature/newlib_locking 2016-08-25 11:11:35 +08:00
Wu Jian Gang
3e8bb67e75 ld: fix ld to use ram as much as possible, rearrange heap_alloc area 2016-08-25 11:07:53 +08:00
Wu Jian Gang
c3102e8fb2 ld: seperate/rename eagle.xxx.ld to esp32.xxx.ld 2016-08-25 11:07:53 +08:00
Ivan Grokhotkov
842bc53549 Merge branch 'bugfix/dualcore_startup' into 'master'
Fix dualcore startup

This MR includes:
- a workaround for a hardware bug with cache initialization
- fix of `#if CONFIG_WIFI_ENABLED` block in cpu_start.c for the case when WiFi is disabled.
- removal of miscellaneous delays in cpu_start.c

See merge request !22
2016-08-25 11:07:21 +08:00
Angus Gratton
8369d328ed Merge remote-tracking branch 'origin/bugfix/dualcore_startup' into feature/newlib_locking 2016-08-25 10:29:36 +08:00
Ivan Grokhotkov
2cd1da31f9 Merge branch 'bugfix/dram_attr' into 'master'
fix DRAM_ATTR attribute

Variables marked with DRAM_ATTR were not placed in any specific section and were appended to the last section, causing some errors at binary file generation stage.
This change places contents of .dram1 section into .dram0.data.
Also removes .iram1pro/.iram1app/.dram1pro/.dram1app which weren't used anywhere.

See merge request !23
2016-08-25 10:19:17 +08:00
Angus Gratton
700dbca4db newlib locking: Remove lock table, much simpler implementation. 2016-08-24 20:59:02 +08:00
Ivan Grokhotkov
7ba0d90df2 Merge branch 'bugfix/bootloader_incremental_build' into 'master'
Make: fix incremental builds, add build tests

Four semi-related build changes in one:
* Add basic tests for make system sanity (can be expanded as we find corner cases)
* Fix incremental building of bootloader when source files change
* Don't regenerate component libraries or re-link the ELF file if nothing changed
* Rename `$(vecho)` to  `$(summary)` and add a new `$(details)` macro to echo some helpful build details when V=1.


See merge request !20
2016-08-24 20:24:33 +08:00
Jeroen Domburg
95f547025b Undo two empty lines 2016-08-24 18:34:04 +08:00
Jeroen Domburg
b1ad6a16e9 Undo submodule commit 2016-08-24 18:31:37 +08:00
Angus Gratton
f5715ac28d FreeRTOS: Add xQueueGetMutexHolder support
Enables it as a config option, but there's no overhead at all if the
function is not called anywhere.
2016-08-24 18:13:10 +08:00
Angus Gratton
4b281af0f7 newlib locking: Turns out the "hack" is the way to make stdout thread-safe in newlib 2016-08-24 18:13:10 +08:00
Angus Gratton
93c92f7a5b FreeRTOS: Configure configASSERT fail behaviour, abort() by default 2016-08-24 18:13:10 +08:00
Ivan Grokhotkov
dec846a953 components/spi_flash: make spi_flash APIs dual-core-compatible
See esp_spi_flash.c for implementation notes.
2016-08-24 18:06:33 +08:00
Jeroen Domburg
bdf4b27e38 Add symbol needed for OpenOCD to detect FreeRTOS, add feature to break execution when the scheduler is initially started. 2016-08-24 17:32:20 +08:00
Jeroen Domburg
a44c45e63e Add files I forgot (FreeRTOS-openocd.c and panic.h) 2016-08-24 17:30:53 +08:00
Ivan Grokhotkov
9e57466c96 components/esp32: fix DRAM_ATTR attribute
This change places contents of .dram1 section into .dram0.data.
Also removes .iram1pro/.iram1app/.dram1pro/.dram1app which weren't used anywhere.
2016-08-24 17:20:00 +08:00
Ivan Grokhotkov
4d1084120c components/bootloader: fix enabling cache for APP CPU
This is a workaround for a hardware bug with cache initialization.
Only two lines of code related to DPORT_APP_CACHE_MMU_IA_CLR were added around mmu_init(1); call,
and two lines at the end of comment block.
I reformatted surrounding lines to use spaces for indentation, like the rest of the code in this file does.
2016-08-24 16:25:04 +08:00
Ivan Grokhotkov
be112daa71 components/esp32: fix and clean up dual core startup
This change removes various delays in PRO and APP CPU startup paths.
Also some unused code and ets_printf statements are cleaned up or removed.
2nd CPU now communicates that it has started through a global variable.
2016-08-24 16:21:28 +08:00
Angus Gratton
94104f0fe8 Add hack of explicitly locking stdout
This shouldn't be necessary as stdout is already locked by libc (see
comment.) Not sure which part isn't working.
2016-08-24 13:49:17 +08:00
Angus Gratton
bd2f9e03f0 Add newlib libc locking using FreeRTOS primitives 2016-08-24 13:49:17 +08:00
Angus Gratton
9921e60f55 freertos: Change variable name in comment 2016-08-24 13:49:17 +08:00
Angus Gratton
3b508c8b37 esp32 syscalls.c: Use rom/uart.h for uart_tx_one_char prototype 2016-08-24 13:49:17 +08:00
Jeroen Domburg
29c2e58c75 'Merge branch 'thread_local_storage_delete_callbacks' into 'master'
The thread-local-storage feature in FreeRTOS attaches an application-usable array of pointers to a thread control block. These pointers usually point to a structure the thread allocates. When a thread gets (voluntarily or involuntarily) destroyed, this memory can leak. This merge adds a matching second array of user-settable pointers to destructor routines. As soon as the task gets cleaned up (which happens in the idle thread), the destructors get called and the memory can be freed.

See merge request !19
2016-08-24 13:30:30 +08:00
Angus Gratton
a278c51d3e Make: Building the bootloader depends on syncing its sdkconfig from the top-level project 2016-08-24 13:25:06 +08:00
Angus Gratton
1fd22c5748 make bootloader: Always recurse into bootloader directory to check source dependencies 2016-08-24 13:25:06 +08:00
Jeroen Domburg
553b08cd5e Merge branch 'feature/configurable_add_lf_after_cr_printf' into 'master'
Add cr after a lf is printed (configurable)

Small menuconfig option to make the newlib stdout functions replicate the behaviour of ets_printf e.a. by sending out a \r before every \n.

See merge request !14
2016-08-23 15:09:13 +08:00
Jeroen Domburg
d579040e32 Add cr after a lf is printed (configurable)
Formatting
2016-08-23 15:20:03 +08:00
Ivan Grokhotkov
9ef827ae20 components/nvs: strlcpy is not available on Linux, replace with strncpy and terminate strings explicitly 2016-08-23 15:14:13 +08:00
Ivan Grokhotkov
3df4130eb7 components/nvs: run small number of tests as part of CI builds 2016-08-23 12:56:10 +08:00
Ivan Grokhotkov
b783e2ffab components/nvs: fix typos in readme 2016-08-23 12:08:00 +08:00
Ivan Grokhotkov
a65e019451 components/nvs: fix host build with GCC 4.9, add coverage report generation 2016-08-23 12:08:00 +08:00
Ivan Grokhotkov
7998b6ca2e components/nvs: handle more cases where sudden power off may happen
This commit fixes several issues with state handling in nvs::Page. It also adds extra consistency checks in nvs::PageManger initialization.
These changes were verified with a new long-running test ("test recovery from sudden poweroff"). This test works by repeatedly performing same pseudorandom sequence of calls to nvs_ APIs. Each time it repeats the sequence, it introduces a failure into one of flash operations (write or erase). So if one iteration of this test needs, say, 25000 flash operations, then this test will run 25000 iterations, each time introducing the failure point at different location.
2016-08-23 12:08:00 +08:00
Ivan Grokhotkov
7447d08605 components/nvs: clear handles list on init, fix returning *length in nvs_get_{str,blob} 2016-08-23 12:08:00 +08:00
Ivan Grokhotkov
35d50643bc components/nvs: fix infinite loop when loading namespaces 2016-08-23 12:08:00 +08:00
Ivan Grokhotkov
f04c894123 components/nvs: add debugging facilities and runtime checks
Extra runtime sanity checks run when compiled for the host (i.e. with no ESP_PLATFORM define)
2016-08-23 12:08:00 +08:00
Ivan Grokhotkov
3ce433cfd1 components/nvs: make some methods const 2016-08-23 12:08:00 +08:00
Angus Gratton
aa4c31f3b0 esptool.py & Makefile: Fix compressed upload support (enabled by default) 2016-08-22 18:44:46 +08:00
Angus Gratton
eeb0811088 Merge branch 'default_freq' into 'master'
rtos: change XT_CLOCK_FREQ from 13MHz to 80MHz

Freq has been change to `80MHz` in system_init, otherwise system tick will not be accurate now.

Maybe we can config freq by menuconfig.

See merge request !8
2016-08-22 17:38:00 +08:00
Jeroen Domburg
f34110009a Add C99-style named field in initialisation struct 2016-08-22 17:45:46 +08:00
Jeroen Domburg
609f75a8c0 Oops, left in a debugging break.n. Removed. 2016-08-22 17:41:55 +08:00
Jeroen Domburg
925fbb587e Add static initializers for muxes, add mutex init to vPortCPUAcquireMutex 2016-08-22 17:36:32 +08:00
Wu Jian Gang
893ce242a1 rtos: change XT_CLOCK_FREQ from 13MHz to 80MHz
Freq has been change to 80MHz in system_init
2016-08-22 12:04:14 +08:00
Angus Gratton
f853f94335 Use IDF_PATH instead of SDK_PATH for the environment variable pointing to esp-idf
This will require a matching change in all projects using ESP-IDF.
2016-08-19 15:01:49 +08:00
Angus Gratton
9ec0e1545d Standardise remaining uses of SDK to ESP-IDF 2016-08-19 15:01:15 +08:00
Angus Gratton
fffba81bd3 Make: Add some "magic" to try and pull git submodules if missing 2016-08-19 15:01:15 +08:00
Angus Gratton
b0f530d004 Makefile: bootloader-clean shouldn't clean config or partition table
Also don't build config for 'make help', and remove some redundant
clearing of variables.
2016-08-19 14:04:51 +08:00
Angus Gratton
14eb490bb3 make: 'make all' default target builds everything, 'make flash' flashes everything
Also added 'make help' target which prints some useful usage summary.
2016-08-18 21:42:37 +08:00
Angus Gratton
9552b0e6f0 Fix 'make bootloader' not printing instructions 2016-08-18 21:42:37 +08:00
Angus Gratton
45d1baa24b Make: Fix make bootloader, make bootloader-flash, cleaning of bootloader
Should resolve TW6610
2016-08-18 21:15:47 +08:00
Ivan Grokhotkov
bd6ea4393c Initial public version 2016-08-17 23:08:22 +08:00