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
..
catch	move Catch framework header into tools directory	2017-04-17 11:01:18 +08:00
ci	Merge branch 'bugfix/fix_build_cmake_example_failing_v3.3' into 'release/v3.3'	2019-06-11 09:05:42 +08:00
cmake	Merge remote-tracking branch 'upstream/release/v3.3'	2019-07-20 22:11:10 +02:00
esp_app_trace	tools: Fix the Python coding style	2018-12-19 11:56:24 +01:00
esp_prov	esp_prov : Minor refactoring in argument dependent logic	2019-07-07 12:45:06 +05:30
kconfig	Merge remote-tracking branch 'upstream/release/v3.3'	2019-07-20 22:11:10 +02:00
kconfig_new	Merge branch 'feature/confserver_v2_v3.3' into 'release/v3.3'	2019-06-07 06:31:41 +08:00
ldgen	Merge branch 'feature/allow_multiple_fragment_definitions_for_library' into 'release/v3.3'	2019-05-20 13:58:25 +08:00
mass_mfg	mfg_util: Fix unnecessary csv files creation for values with REPEAT tags	2019-05-31 13:55:03 +05:30
test_idf_monitor	tools: Test IDF Monitor after it is ready to receive data	2019-02-25 10:35:09 +01:00
test_idf_size	tools: Fix the Python coding style	2018-12-19 11:56:24 +01:00
tiny-test-fw	Merge remote-tracking branch 'upstream/release/v3.3'	2019-07-20 22:11:10 +02:00
unit-test-app	unit-test-app: freertos_compliance config added	2019-06-25 04:33:32 +00:00
windows	Merge branch 'feature/pystyle_tools' into 'master'	2018-12-20 10:36:01 +08:00
check_kconfigs.py	tools: Don't use backslashes in Kconfigs and ignore long lines to avoid errors	2019-02-01 11:33:41 +01:00
check_python_dependencies.py	python: Add check if current python is inside virtual environment	2019-01-10 09:37:21 +01:00
eclipse-code-style.xml	tools: add code formatter rules for Eclipse	2016-11-03 18:41:00 +08:00
findcp2102.py	Allow configuring serial port as USB location ID	2018-02-18 16:29:05 -08:00
format-minimal.sh	docs: add style guide	2016-11-03 18:41:00 +08:00
format.sh	esp32: ReformatReformat panic.c (remove tabs, etc)	2016-12-07 13:25:56 -08:00
gen_esp_err_to_name.py	tools: Fix the Python coding style	2018-12-19 11:56:24 +01:00
idf.py	Merge branch 'bugfix/idf_py_windows_relpath_v3.3' into 'release/v3.3'	2019-06-13 13:53:07 +08:00
idf_monitor.py	tools: Print useful error message from idf_monitor when toolchain isn't available	2018-12-13 22:03:25 +01:00
idf_size.py	tools: Fix the Python coding style	2018-12-19 11:56:24 +01:00
test_check_kconfigs.py	tools: Don't use backslashes in Kconfigs and ignore long lines to avoid errors	2019-02-01 11:33:41 +01:00
toolchain_versions.mk	docs: generate toolchain download links	2018-09-20 18:53:14 +08:00