Michael Balzer
e97f72ea24
Merge remote-tracking branch 'upstream/release/v3.3'
...
# Conflicts:
# .gitlab-ci.yml
# components/bootloader/project_include.cmake
# components/bootloader_support/include/bootloader_common.h
# components/bootloader_support/src/bootloader_common.c
# components/bt/Kconfig
# components/bt/bluedroid/btc/profile/std/include/btc_gap_ble.h
# components/bt/bluedroid/stack/btm/btm_ble_gap.c
# components/bt/bluedroid/stack/btm/btm_devctl.c
# components/bt/bluedroid/stack/include/stack/hcidefs.h
# components/bt/bluedroid/stack/smp/smp_act.c
# components/bt/bt.c
# components/bt/lib
# components/driver/Kconfig
# components/driver/include/driver/rmt.h
# components/driver/test/test_spi_master.c
# components/driver/uart.c
# components/esp32/CMakeLists.txt
# components/esp32/Kconfig
# components/esp32/ld/esp32.project.ld.in
# components/esp32/ld/esp32.spiram.rom-functions-dram.ld
# components/esp32/ld/esp32.spiram.rom-functions-iram.ld
# components/esp32/lib
# components/esp32/spiram.c
# components/esp32/spiram_psram.c
# components/esp32/test/test_wifi.c
# components/esp32/wifi_init.c
# components/esp_http_server/include/esp_http_server.h
# components/esp_http_server/src/esp_httpd_priv.h
# components/esp_http_server/src/httpd_parse.c
# components/esp_http_server/src/httpd_sess.c
# components/esp_http_server/src/httpd_txrx.c
# components/esp_http_server/src/httpd_uri.c
# components/esp_http_server/test/test_http_server.c
# components/esp_https_ota/src/esp_https_ota.c
# components/ethernet/emac_main.c
# components/freemodbus/Kconfig
# components/idf_test/include/idf_performance.h
# components/idf_test/integration_test/TC_IT_BLUEDROID_SMP.yml
# components/lwip/Kconfig
# components/newlib/test/test_time.c
# components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
# components/spi_flash/Kconfig
# components/ulp/cmake/CMakeLists.txt
# components/ulp/component_ulp_common.cmake
# components/vfs/vfs.c
# docs/conf_common.py
# docs/en/api-reference/provisioning/wifi_provisioning.rst
# examples/mesh/internal_communication/main/Kconfig.projbuild
# examples/protocols/aws_iot/subscribe_publish/main/CMakeLists.txt
# examples/protocols/aws_iot/thing_shadow/main/CMakeLists.txt
# examples/protocols/coap_client/README.md
# examples/protocols/coap_server/README.md
# examples/protocols/modbus_slave/main/Kconfig.projbuild
# examples/protocols/mqtt/ssl/mqtt_ssl_example_test.py
# examples/protocols/mqtt/tcp/main/Kconfig.projbuild
# examples/protocols/mqtt/ws/mqtt_ws_example_test.py
# examples/protocols/mqtt/wss/mqtt_wss_example_test.py
# examples/wifi/iperf/components/iperf/iperf.c
# requirements.txt
# tools/ci/build_examples.sh
# tools/ci/test_build_system_cmake.sh
# tools/cmake/idf_functions.cmake
# tools/cmake/kconfig.cmake
# tools/cmake/scripts/expand_requirements.cmake
# tools/esp_prov/README.md
# tools/esp_prov/esp_prov.py
# tools/esp_prov/transport/ble_cli.py
# tools/idf.py
# tools/kconfig_new/confgen.py
# tools/mass_mfg/docs/README.rst
# tools/mass_mfg/samples/sample_config.csv
# tools/tiny-test-fw/DUT.py
# tools/tiny-test-fw/IDF/IDFApp.py
# tools/tiny-test-fw/IDF/IDFDUT.py
# tools/tiny-test-fw/TinyFW.py
# tools/unit-test-app/tools/UnitTestParser.py
# tools/unit-test-app/unit_test.py
2019-07-20 22:11:10 +02:00
Michael Balzer
40f01ec30a
Merge remote-tracking branch 'upstream/release/v3.2'
2019-07-20 15:22:14 +02:00
chenjianqiang
43561a40d2
bugfix(psram): make sure the psram_io struct is initialized and make unknown psram package version more obvious
2019-07-02 14:15:55 +08:00
chenjianqiang
55f5c2e08d
feat(psram): config SPI psram pins based on efuse value
2019-07-02 14:15:55 +08:00
liu zhifu
d10dec358d
esp32/lwip: fix wpa2-enterprise vulnerability and support lwip window scale
...
1. Fix WiFi wpa2-enterprise vulnerability bug
2. Support LWIP window scale
2019-07-01 11:34:35 +08:00
chenjianqiang
93c9c07e22
bugfix(psram): make sure the psram_io struct is initialized and make unknown psram package version more obvious
2019-06-14 10:34:56 +08:00
chenjianqiang
cb2e328c5f
feat(psram): config SPI psram pins based on efuse value
2019-06-13 16:07:21 +08:00
liu zhifu
6d4adb46f3
esp_wifi/lwip: support TCP window scale
...
Support enable/disable TCP Window scale feature via menuconfig
2019-06-04 14:03:37 +08:00
XiaXiaotian
5059c7fac3
Decouple WiFi and BT with coexist to reduce bin size
...
1. Do not link WiFi code when only BT or BLE is used and WiFi is not
used.
2. Do not link coexist code when CONFIG_SW_COEXIST_ENABLE is disabled.
2019-04-17 16:59:24 +08:00
zhangyanjiao
de6b7d6520
fix wifi scan and connect bugs:
...
1. fix the bug block scan tiemout before scan finish
2. make menuconfig can set the WiFi mgmt short buffer num
3. modify wifi reason code
4. fix the bug PMK recal too long
2019-04-15 18:59:52 +08:00
Jiang Jiang Jian
f8597be435
Merge branch 'bugfix/wifi_modify_wifi_kconfig_v3.2' into 'release/v3.2'
...
esp32: modify WiFi Kconfig in order to achieve better compatility and performance (bakcport v3.2)
See merge request idf/esp-idf!4386
2019-04-12 23:11:24 +08:00
Jiang Jiang Jian
9778549759
Merge branch 'bugfix/tw28146_make_wifi_iram_optimization_configurable_v3.2' into 'release/v3.2'
...
esp32: make WiFi IRAM optimization configurable (backport v3.2)
See merge request idf/esp-idf!4040
2019-04-11 18:44:19 +08:00
maojianxin
ce3d20dcd2
Fix external start fail
2019-04-02 12:54:08 +11:00
maojianxin
f85294b058
Fix external start fail
2019-04-02 12:52:58 +11:00
Liu Zhi Fu
76c20ab9b3
esp32: make WiFi IRAM optimization configurable
...
With this feature, the WiFi IRAM optimization can be disabled/enabled via menuconfig.
2019-03-20 13:45:54 +00:00
Ivan Grokhotkov
d474018725
Merge branch 'feature/gdbstub_task_list' into 'master'
...
Add support for listing tasks to gdb in gdbstub
Closes IDFGH-498
See merge request idf/esp-idf!4357
2019-03-06 11:12:46 +08:00
Ivan Grokhotkov
c22e572ad0
gdbstub: minor cleanup
...
1. Add Kconfig options to control task listing support.
2. Convert magic values (-1, -2) to named constants.
3. Convert spaces to tabs to match the rest of the file.
4. Rename getAllTasksHandle to getTaskInfo to reflect its purpose.
5. Add some curly braces for single line statements.
2019-03-05 12:11:45 +08:00
XiaXiaotian
b9b401ee39
Decouple WiFi and BT with coexist to reduce bin size
...
1. Do not link WiFi code when only BT or BLE is used and WiFi is not
used.
2. Do not link coexist code when CONFIG_SW_COEXIST_ENABLE is disabled.
2019-03-05 10:38:14 +08:00
XiaXiaotian
ae69a8adc0
esp32: modify WiFi Kconfig in order to achieve better compatility
...
and performance
2019-02-28 16:57:56 +08:00
XiaXiaotian
34f1c208a8
esp32: modify WiFi Kconfig in order to achieve better compatility
...
and performance
2019-02-28 10:07:13 +08:00
zhangyanjiao
4ea4d4744c
wifi:
...
1. make menuconfig can set the WiFi mgmt short buffer num
2. fix several scan bugs
2019-02-27 18:31:32 +08:00
Angus Gratton
42f64e9a93
Merge branch 'bugfix/tw28146_make_wifi_iram_optimization_configurable' into 'master'
...
esp32: make WiFi IRAM optimization configurable
See merge request idf/esp-idf!4037
2019-02-27 16:33:05 +08:00
Angus Gratton
56694fb4b6
cmake: Fix psram workaround compiler flag application
...
Previously, this compiler flag was not being applied
regardless of CONFIG_SPIRAM_CACHE_WORKAROUND setting.
Explanation: add_compile_options() only applies to
source files added after the function is run, or in
subdirectories added after the function is run. In
this case, no new source files were being added after
this function was run.
2019-02-27 16:38:29 +11:00
Liu Zhi Fu
711173b3d6
esp32: make WiFi IRAM optimization configurable
...
With this feature, the WiFi IRAM optimization can be disabled/enabled via menuconfig.
2019-02-26 19:55:57 +08:00
Angus Gratton
da390618c2
cmake: Fix psram workaround compiler flag application
...
Previously, this compiler flag was not being applied
regardless of CONFIG_SPIRAM_CACHE_WORKAROUND setting.
Explanation: add_compile_options() only applies to
source files added after the function is run, or in
subdirectories added after the function is run. In
this case, no new source files were being added after
this function was run.
2019-02-26 04:07:51 +00:00
Angus Gratton
a7f826750b
Merge branch 'revert-00d10688' into 'release/v3.2'
...
Revert "Merge branch 'bugfix/external_rtc_start_fail_3.2' into 'release/v3.2'"
See merge request idf/esp-idf!4293
2019-02-20 15:09:59 +08:00
Jiang Jiang Jian
3b5bba1812
Merge branch 'bugfix/fix_psram_eid_v3.2' into 'release/v3.2'
...
bugfix(psram): fix psram size acquisition method, support esp32-pico chips (backport v3.2)
See merge request idf/esp-idf!4254
2019-02-20 02:13:47 +08:00
Ivan Grokhotkov
509884c5ac
Revert "Merge branch 'bugfix/external_rtc_start_fail_3.2' into 'release/v3.2'"
...
This reverts merge request !4272
2019-02-19 12:47:44 +08:00
maojianxin
9a229f4077
soc/rtc: fix RTC_TOUCH_TRIG_EN or RTC_ULP_TRIG_EN should keep RTC_PERIPH power on
2019-02-15 10:58:14 +08:00
chenjianqiang
8f2e1471af
bugfix(psram): made some modifcations to support the psram driver backport
2019-02-13 16:06:38 +08:00
chenjianqiang
a159e58ead
feature(psram): add psram support for esp32-pico chip
...
1. esp32-pico use standard spi driver to access psram
2. for esp32-pico, flash and psram share the clock
3. for esp32-pico, psram cs io can be overwrite via menuconfig
2019-02-13 14:27:44 +08:00
aleks
10fe158f67
coredump: improvements refactoring
...
Move existing core dump files into espcoredump component folder
Add KConfig, linker.lf, make and CMakeList.txt for new component
Existing functionality separated into core_dump_common, core_dump_flash, core_dump_uart
Update test_core_dump.c and make files to link it as unit test
Update according to review:
Move target and RTOS related functionality into separated file (core_dump_port.c).
2019-02-12 10:22:33 +00:00
Roland Dobai
80cb4a1a18
tools: Don't use backslashes in Kconfigs and ignore long lines to avoid errors
...
Closes https://github.com/espressif/esp-idf/issues/3012
2019-02-01 11:33:41 +01:00
Roland Dobai
37126d3451
Correct Kconfigs according to the coding style
2019-01-29 13:37:01 +01:00
Wang Jia Lin
a62cbfec9a
Merge branch 'bugfix/fix_psram_eid' into 'master'
...
bugfix(psram): fix psram size acquisition method, support esp32-pico chips
See merge request idf/esp-idf!3750
2019-01-15 17:44:51 +08:00
chenjianqiang
bd8733f74f
feature(psram): add psram support for esp32-pico chip
...
1. esp32-pico use standard spi driver to access psram
2. for esp32-pico, flash and psram share the clock
3. for esp32-pico, psram cs io can be overwrite via menuconfig
2019-01-09 10:49:07 +08:00
zhangyanjiao
e621e0af8b
wifi: add code for setting wifi log level and module
2018-11-30 15:24:22 +08:00
Alexey Gerenkov
181a40ae30
esp32: Adds menuconfig option for max tasks number in core dump
2018-11-15 06:13:48 +00:00
Alexey Gerenkov
a55cc99f50
esp32: Replaces magic numbers with CRC for core dump in flash
2018-11-15 06:13:48 +00:00
Ivan Grokhotkov
ccfa134533
build system: support for multiple targets
2018-11-11 21:46:02 +08:00
Michael (XIAO Xufeng)
20a666fe03
esp32: support to use hspi to output clock for 4MB PSRAM
...
Resolves https://github.com/espressif/esp-idf/issues/2128 .
2018-10-29 20:22:44 +08:00
Jakob Löw
f2fbfeca87
Merge branch 'master' of github.com:espressif/esp-idf
2018-10-20 23:32:01 +02:00
Jeroen Domburg
81e35a142a
Spiram: Add option to reserve MMU banks; add himem API to make use of those banks
2018-10-15 14:32:58 +08:00
Angus Gratton
31cf117404
Merge branch 'feature/bss_seg_in_external_memory' into 'master'
...
memory: support .bss segment can be in psram
See merge request idf/esp-idf!2236
2018-10-10 14:40:21 +08:00
Ivan Grokhotkov
5ebf4f7022
Merge branch 'feature/move_rtc_data_rtc_rodata_to_RTC_FAST_seg' into 'master'
...
esp32: Add option to place .rtc_data and .rtc_rodata into the RTC_FAST segment
See merge request idf/esp-idf!2128
2018-09-27 13:05:06 +08:00
TianZhongXing
01308df8a6
doc: update document of external memory
2018-09-26 10:39:57 +08:00
qiyueixa
9c4cc55012
mesh: bugfix
...
1. suppport mesh type, mesh ID, router and IE crypt func&key at any time after mesh is initalized.
2. support modify parent at any time after mesh is configured.
3. modify manual networking example.
4. update header file.
5. fix issues in root conflicts handling.
6. add max length of beacon to menuconfig.
7. fix issue when received a beacon without DSSS.
2018-09-23 21:11:02 +08:00
TianZhongXing
974112378b
feature: allow .bss segment in external memory
2018-09-21 16:20:26 +08:00
Alex Lisitsyn
ec5eb1e5c2
esp32: Add option to place.rtc_data and .rtc_rodata into the RTC_FAST segment
...
Changes:
KConfig: The option CONFIG_ESP32_RTCDATA_IN_FAST_MEM is added in Kconfig file for esp32 component.
esp32.common.ld: added support of RTC_DATA_ATTR, RTC_RODATA_ATTR data placement into appropriate segment according to Kconfig option.
esp32.ld: linker script is modified to set alias for memory segment selected by Kconfig option to place data. The segments for force placement are added for RTC_FAST_ATTR, RTC_SLOW_ATTR attributes.
esp_attr.h: added new attributes RTC_FAST_ATTR, RTC_SLOW_ATTR for force placement into fest/slow memory.
test_rtc_fast.c: Added unit test cases to check data placement into appropriate memory segment.
Updated documentation for RTC_DATA_ATTR, RTC_FAST_ATTR, RTC_SLOW_ATTR in deep_sleep_stub.rst file.
TW#18001
Closes https://github.com/espressif/esp-idf/issues/1553
2018-09-12 09:25:13 +02:00
zhangyanjiao
5425979932
when brownout reset occurs,set the phy TX Power to the lowest
2018-08-30 14:22:03 +08:00