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
..
include	Merge branch 'master' of github.com:espressif/esp-idf	2018-10-20 23:32:01 +02:00
test	heap: Add integer overflow checks on MALLOC_CAP_32BIT & MALLOC_CAP_EXEC	2019-03-20 18:30:25 +11:00
test_multi_heap_host	multi_heap: Fix bug when start of heap is unaligned	2018-12-21 19:03:12 +11:00
CMakeLists.txt	mbedtls: align CMake build with corresponding component.mk	2018-11-29 16:23:06 +05:30
component.mk	tools: implement linker script generation	2018-11-16 12:42:02 +08:00
esp_heap_debug.c	Add esp_heap_debug_dump_totals() to monitor heap usage	2018-01-10 09:06:50 -08:00
heap_caps.c	Merge remote-tracking branch 'upstream/release/v3.2'	2019-07-20 15:22:14 +02:00
heap_caps_init.c	heap: Add integer overflow checks on MALLOC_CAP_32BIT & MALLOC_CAP_EXEC	2019-03-20 18:30:25 +11:00
heap_private.h	heap: Add integer overflow checks on MALLOC_CAP_32BIT & MALLOC_CAP_EXEC	2019-03-20 18:30:25 +11:00
heap_task_info.c	heap: Add task tracking option for heap usage monitoring	2018-02-20 10:32:06 +11:00
heap_trace.c	linker: When using section type attributes, create unique sections	2018-12-19 04:42:04 +00:00
Kconfig	Correct Kconfigs according to the coding style	2019-01-29 13:37:01 +01:00
linker.lf	tools: implement linker script generation	2018-11-16 12:42:02 +08:00
multi_heap.c	multi_heap: Fix bug when start of heap is unaligned	2018-12-21 19:03:12 +11:00
multi_heap_config.h	Try to merge tail with next block when splitting	2018-04-03 12:30:52 +10:00
multi_heap_internal.h	heap: Add task tracking option for heap usage monitoring	2018-02-20 10:32:06 +11:00
multi_heap_platform.h	heap: fix build failure due to missing header	2018-04-26 11:08:58 +05:30
multi_heap_poisoning.c	heap: When verifying & swapping a fill pattern, stop swapping if verification fails	2018-07-31 14:53:24 +10:00