Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
10204 commits 10 branches 75 tags 114 MiB
Commit graph

145 commits

Author SHA1 Message Date
Michael Balzer 7124a32fed Merge branch 'release/v3.3' of https://github.com/espressif/esp-idf.git 2020-11-08 11:07:45 +01:00
Renz Bagaporo b94c309fd9 cmake: fix C identifier generation from embedded file 2020-10-15 21:29:24 +08:00
Angus Gratton b64b375234 version: Update to v3.3.4 2020-09-18 19:42:21 +10:00
Angus Gratton 07942e3991 Merge branch 'bugfix/cmake_bugfixes_v3.3' into 'release/v3.3' 
CMake-related bugfixes (v3.3)

See merge request espressif/esp-idf!8069
 2020-07-20 08:43:52 +08:00
Michael Balzer 0137aef471 Merge branch 'release/v3.3' of https://github.com/espressif/esp-idf.git into release/v3.3 
# Conflicts:
#	components/bt/include/esp_bt.h
 2020-07-15 12:08:17 +02:00
Roland Dobai b4bddbb22f tools: Make Unicode from subprocess result in the CMake convert script 
Fixes an issue with Python 3 in MSYS where it fails while trying to join
paths where one part is Unicode (default string on Python3) and the
second part are bytes (returned by the subprocess call).

Closes https://github.com/espressif/esp-idf/issues/5189
 2020-04-28 15:22:44 +02:00
Angus Gratton ad5e4236b4 idf: Bump ESP-IDF version to v3.3.2 
Feature was merged after v3.3.2 release.
 2020-04-27 15:45:47 +10:00
Ivan Grokhotkov ca6b009c26 esp_common: add version definitions in code and build system 
Closes https://github.com/espressif/esp-idf/issues/4679
 2020-04-03 01:24:33 +02:00
Renz Christian Bagaporo 2d28fd2563 cmake: fix build failure when git repo is initialized but no first commit 
Closes https://github.com/espressif/esp-idf/issues/3920
 2020-03-23 13:12:49 +08:00
Renz Christian Bagaporo 9d0e3501c5 cmake: fix extra component dirs ordering 2020-02-20 12:31:23 +05:00
Shubham Kulkarni 781bd398dc cmake: set build dir for mconf-idf 
Fixes an issue where if idf_build_process is called in a CMake
    subdirectory, menuconfig looks for the mconf-idf binary in the wrong
    place (in the subdirectory build dir instead of root binary dir).
 2019-12-13 16:10:01 +05:30
Renz Christian Bagaporo 3a291da164 cmake: fix variable scope issues 2019-09-13 01:32:50 +00:00
Angus Gratton ebfa74310c Merge branch 'bugfix/link_test_components_to_executable_directly' into 'release/v3.3' 
cmake: link test components to executable directly

See merge request espressif/esp-idf!5739
 2019-08-15 14:59:56 +08:00
Angus Gratton 3be1c70d46 Merge branch 'bugfix/cmake_extra_component_dirs_v3.3' into 'release/v3.3' 
CI: additional CMake build system tests wrt EXTRA_COMPONENT_DIRS (v3.3)

See merge request espressif/esp-idf!5109
 2019-08-12 12:44:19 +08:00
Renz Christian Bagaporo dbd05d8986 cmake: link test components to executable directly 2019-08-09 15:18:06 +08:00
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
Renz Christian Bagaporo d7569b5862 cmake: refactor finding components 2019-07-10 16:50:23 +08:00
Renz Christian Bagaporo 81139df91e cmake: error out when component is not found 
Closes https://github.com/espressif/esp-idf/issues/3637
 2019-07-10 11:56:47 +08:00
Renz Christian Bagaporo f5d33fa889 cmake: set variables set by project call 
ESP-IDF overrides project() definition for user convenience. This
redefinition lacks setting the variables documented at
the project command documentation
https://cmake.org/cmake/help/v3.5/command/project.html in the parent
scope.

This commit sets those variables.

Closes https://github.com/espressif/esp-idf/issues/3611.
 2019-07-10 11:51:17 +08:00
Renz Christian Bagaporo e9786e3038 cmake: make COMPONENT_TARGET available in components 2019-06-25 13:05:46 +08:00
Renz Christian Bagaporo 0af6d8ffe3 cmake: error out when component is not found 
Closes https://github.com/espressif/esp-idf/issues/3637
 2019-06-20 12:10:41 +08:00
Renz Christian Bagaporo 6132d7bce3 cmake: restore ccache use when present 
Closes https://github.com/espressif/esp-idf/issues/3116
 2019-06-04 23:27:18 +08:00
Jiang Jiang Jian c4f39094d3 Merge branch 'bugfix/cmake_component_path_v3.2' into 'release/v3.2' 
cmake: Set COMPONENT_PATH during early expansion of dependencies (v3.2)

See merge request idf/esp-idf!4594
 2019-04-14 02:57:16 +08:00
Renz Christian Bagaporo 84a534a4a0 cmake: Fix for Python files executed directly, not via PYTHON variable 2019-03-25 11:41:00 +08:00
Angus Gratton 2c91bc7a50 cmake: Set COMPONENT_PATH during early expansion of dependencies 
Works around bug where components/soc/CMakeLists.txt was testing "EXISTS
${COMPONENT_PATH}/${SOC_NAME}" and this test could pass during early
expansion if COMPONENT_PATH was empty and a directory /esp32 exists
on Windows.

Closes https://github.com/espressif/esp-idf/issues/3195
 2019-03-22 10:12:15 +11:00
Angus Gratton 4f62227030 cmake: Set COMPONENT_PATH during early expansion of dependencies 
Works around bug where components/soc/CMakeLists.txt was testing "EXISTS
${COMPONENT_PATH}/${SOC_NAME}" and this test could pass during early
expansion if COMPONENT_PATH was empty and a directory /esp32 exists
on Windows.

Closes https://github.com/espressif/esp-idf/issues/3195
 2019-03-22 10:12:06 +11:00
Konstantin Kondrashov cc7e91e1a3 cmake: Trim IDF_VER to fit a 32-bit field 2019-03-14 15:49:03 +08:00
Renz Christian Bagaporo d0b2d5ec95 cmake: Fix for Python files executed directly, not via PYTHON variable 
A problem if the Python interpreter used for idf.py (or set via PYTHON
variable) didn't match
"/usr/bin/env python" (or the associated executable for .py files, on
Windows).

Closes https://github.com/espressif/esp-idf/issues/3160
Possibly also fix for https://github.com/espressif/esp-idf/issues/2936

Adds build system test to catch any future direct execution of Python in
the standard build process.
 2019-03-12 13:31:44 +08:00
morris 9297b07a97 cmake: add spaces2list for COMPONENT_SRCS 
According to ESP-IDF Cmake build system document, COMPONENT_SRCS should support using spaces to sperate source files.

Closes https://github.com/espressif/esp-idf/issues/3130
 2019-03-06 20:55:38 +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
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
Renz Christian Bagaporo 24284b3afd ldgen: remove resolution of template includes 2019-02-22 08:25:56 +08:00
Renz Christian Bagaporo acd0be8239 cmake,make: add dependencies on template included scripts 2019-02-14 18:58:48 +08:00
Renz Christian Bagaporo eb6dbeb15a cmake: only generate sdkconfig on top level project 2019-01-25 14:11:35 +08:00
KonstantinKondrashov 187f9945bc tools: Add --always option to git describe for Cmake 
Fixed differences in getting of the project version for Make and Cmake.
 2019-01-24 12:06:55 +08:00
Angus Gratton 58acac883d Merge branch 'bugfix/regenerate_sdkconfig_fails' into 'master' 
Fix issues with regenerating sdkconfig on modification

Closes #58

See merge request idf/esp-idf!4115
 2019-01-24 11:56:52 +08:00
Sagar Bijwe 05220d9cda CMake: Make IDF_PATH available to Kconfiglib when not explicitly set. 
When IDF_PATH is not set by the user, cmake infers the same through
other means and sets it as an environment variable. However, some
sub-invocation of cmake may not see this variable as it is not set
in the parent. This change adds a custom command for exporting IDF_PATH
just before invoking ldgen so that IDF_PATH can be used in Kconfig
without any errors.
 2019-01-21 17:02:31 +05:30
Renz Christian Bagaporo 08f472ad1e cmake: only generate sdkconfig on top level project 2019-01-16 08:16:09 +08:00
Angus Gratton 6578673ed4 Merge branch 'feature/esp_platform_cmake_pr2601' into 'master' 
cmake: Add ESP_PLATFORM in CMake build (PR 2601)

See merge request idf/esp-idf!3823
 2019-01-02 14:03:52 +08:00
Renz Christian Bagaporo 50fa7c5a89 cmake: fix unable to start confserver on windows 2018-12-23 19:52:58 +08:00
Angus Gratton 849088d467 cmake: Add ESP_PLATFORM in idf_set_variables() as well 
(Handles case where idf.py is not being used.)

Ref https://github.com/espressif/esp-idf/pull/2601
 2018-12-21 18:59:28 +11:00
Per Malmberg 25333b59c2 Add ESP_PLATFORM to build environment. 
Merges https://github.com/espressif/esp-idf/pull/2601
 2018-12-21 18:59:28 +11:00
Ivan Grokhotkov 88dc626fd7 Merge branch 'feature/example_defconfig_ci' into 'master' 
ci, examples: use sdkconfig.ci as an extra defaults file, if present

See merge request idf/esp-idf!3934
 2018-12-21 12:14:57 +08:00
Angus Gratton 16854e1f40 Merge branch 'bugfix/cmake_list_component_config_alphabetically' into 'master' 
List menuconfig component config items alphabetically via component name

See merge request idf/esp-idf!3939
 2018-12-21 07:50:31 +08:00
Angus Gratton 78487123bf Merge branch 'feature/cut_len_for_header_struct' into 'master' 
build: Add trimming PROJECT_VER and PROJECT_NAME vars

See merge request idf/esp-idf!3927
 2018-12-21 07:45:22 +08:00
Renz Christian Bagaporo 16c88bf320 cmake: list items in component config via alphabetical component name 2018-12-20 19:08:00 +08:00
Roland Dobai bfa9610f58 tools: Fix the Python coding style 2018-12-19 11:56:24 +01:00
Konstantin Kondrashov 7b68e346fa build: Fix a warning from git describe 
Fixed a fatal message when run `git describe`.
 2018-12-18 15:58:22 +08:00
Ivan Grokhotkov da2116f55c Merge branch 'bugfix/build_system_test_fixes_windows' into 'master' 
Various fixes for build tests on Windows

See merge request idf/esp-idf!3944
 2018-12-14 20:19:51 +08:00
Renz Christian Bagaporo 5d6e21795b tools: fix makefile converter windows path issue 2018-12-13 18:20:51 +08:00