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
..
scripts	cmake: error out when component is not found	2019-07-10 11:56:47 +08:00
third_party	tools: Add --always option to git describe for Cmake	2019-01-24 12:06:55 +08:00
component_utils.cmake	cmake: error out when component is not found	2019-06-20 12:10:41 +08:00
components.cmake	Merge remote-tracking branch 'upstream/release/v3.3'	2019-07-20 22:11:10 +02:00
convert_to_cmake.py	tools: Fix the Python coding style	2018-12-19 11:56:24 +01:00
crosstool_version_check.cmake	cmake: Add a compatible old GCC flag, fix the cmake example building	2018-09-20 18:53:15 +08:00
git_submodules.cmake	cmake: Use cmake_lint project, tidy up all CMake source files	2018-04-30 09:59:20 +10:00
idf_functions.cmake	cmake: Trim IDF_VER to fit a 32-bit field	2019-03-14 15:49:03 +08:00
kconfig.cmake	cmake: Fix for Python files executed directly, not via PYTHON variable	2019-03-25 11:41:00 +08:00
ldgen.cmake	cmake: Fix for Python files executed directly, not via PYTHON variable	2019-03-12 13:31:44 +08:00
project.cmake	cmake: set variables set by project call	2019-07-10 11:51:17 +08:00
project_description.json.in	cmake: separate app from idf lib project	2018-11-27 13:59:24 +08:00
run_cmake_lint.sh	Merge branch 'master' into feature/cmake	2018-08-16 17:14:17 +10:00
targets.cmake	cmake: separate app from idf lib project	2018-11-27 13:59:24 +08:00
toolchain-esp32.cmake	build system: support for multiple targets	2018-11-11 21:46:02 +08:00
utilities.cmake	cmake: Fix psram workaround compiler flag application	2019-02-27 16:38:29 +11:00