Commit Graph

560 Commits

Author SHA1 Message Date
Ivan Grokhotkov
b1ac144874 Merge branch 'driver_merge_tmp/merge_struct_header' into 'master'
add peripheral modules struct headers



See merge request !88
2016-09-19 15:34:37 +08:00
Ivan Grokhotkov
ff2750ab07 components/esp32: move peripheral symbols to separate ld script 2016-09-19 15:05:32 +08:00
Jeroen Domburg
dfab57cd93 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
2016-09-19 10:42:35 +08:00
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
14e003fcf2 components/log: regroup macros for better readability 2016-09-19 08:53:09 +08:00
Ivan Grokhotkov
d9338e64e5 gitlab-ci: allow running tests for branches, triggered via API 2016-09-18 23:12:50 +08:00
Ivan Grokhotkov
1188bdfc68 components/log: fix timestamp calculation 2016-09-18 21:06:43 +08:00
Ivan Grokhotkov
26bf85bad6 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
2016-09-18 21:01:28 +08:00
Ivan Grokhotkov
3cdefd9923 components/log: fix error when using ESP_LOGx from C++ code 2016-09-18 20:51:57 +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
Ivan Grokhotkov
69278b28bf components/log: fix bugs, add options to override log level for files, components, and bootloader 2016-09-18 20:24:31 +08:00
Wangjialin
015ae7e0d0 fix ledc and spi typo 2016-09-18 19:24:43 +08:00
Wangjialin
94bcb14bcc remove prefix and postfix 2016-09-18 19:05:37 +08:00
Jeroen Domburg
4d4c6a3694 Enable SO_REUSEADDR in LWIP 2016-09-18 16:43:48 +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
Ivan Grokhotkov
9938f512f3 peripheral structure headers: move volatile keyword from members to typedef 2016-09-18 12:36:33 +08:00
Jeroen Domburg
f703acd344 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.
2016-09-18 12:10:01 +08:00
Wangjialin
489b4f31a9 add peripheral module struct headers 2016-09-18 03:14:18 +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
Ivan Grokhotkov
b0683b0bb4 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
2016-09-15 02:37:54 +08:00
Ivan Grokhotkov
90e37d9eda fix whitespace after merge 2016-09-15 02:17:08 +08:00
Ivan Grokhotkov
cf22e4445a 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
2016-09-15 02:15:50 +08:00
Ivan Grokhotkov
0290a34b55 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)
2016-09-15 02:03:55 +08:00
Ivan Grokhotkov
716cec5ded 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.
2016-09-15 00:53:33 +08:00
Wu Jian Gang
2efaf42253 Merge remote-tracking branch 'origin/feature/mbedtls' 2016-09-14 18:05:56 +08:00
Wu Jian Gang
b3e671e725 esp32/lib: update to 3372298f
remove freq change in system_init
2016-09-14 17:54:34 +08:00
Ivan Grokhotkov
066f3358a7 components/esp32: use APB_CLK_FREQ instead of a number 2016-09-14 17:54:34 +08:00
Ivan Grokhotkov
5ab769516d 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.
2016-09-14 17:54:34 +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