Angus Gratton
ebb9384681
Merge branch 'bugfix/various_cmake_fixes_v4.0' into 'release/v4.0'
...
CMake: Various backports
See merge request espressif/esp-idf!5933
2019-09-02 12:46:40 +08:00
Jiang Jiang Jian
0d3fde04ff
Merge branch 'bugfix_kconfig_deps_missing_v4.0' into 'release/v4.0'
...
kconfig: Add -MP option so .d files include empty targets (v4.0)
See merge request espressif/esp-idf!5845
2019-09-02 12:43:28 +08:00
Roland Dobai
64bece146c
Fix path in the Efuse table test
2019-08-29 09:50:38 +02:00
Renz Christian Bagaporo
e71e4da388
cmake: check include directories
2019-08-28 10:28:17 +08:00
Renz Christian Bagaporo
3f1ec39a8d
cmake: fix issue with checking build process args
2019-08-28 10:28:17 +08:00
Renz Christian Bagaporo
f62798cb8b
cmake: make default version 1
2019-08-28 10:28:17 +08:00
Renz Christian Bagaporo
b6c89984a9
cmake: fix build failure when git repo is initialized but no first commit
...
Closes https://github.com/espressif/esp-idf/issues/3920
2019-08-28 10:28:17 +08:00
Per Malmberg
b669495d97
Make sure ESP_PLATFORM is defined when processing CMake files.
2019-08-28 10:28:17 +08:00
Renz Christian Bagaporo
8778c551eb
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-08-28 10:28:17 +08:00
Renz Christian Bagaporo
4c9f30a869
cmake: set component properties
2019-08-27 13:35:21 +08:00
Mahavir Jain
b72ff61899
cmake: fix issue with handling of EXCLUDE_SRCS
2019-08-26 11:49:30 +05:30
Angus Gratton
2264ea7714
kconfig: Add -MP option so .d files include empty targets
...
Prevents make-level errors when switching IDF versions, as headers may be removed.
Similar to some mentioned here:
https://github.com/espressif/esp-idf/issues/712
2019-08-21 18:20:47 +10:00
Angus Gratton
79afd2d580
confserver: Fix NamedTemporaryFile use on Windows
...
Can't have the file open twice, so need to close and delete after reopening.
2019-08-19 17:44:18 +10:00
Roland Dobai
a8e8919bbf
tools: Support sdkconfig.rename files from outside IDF in confgen.py
2019-08-19 17:44:18 +10:00
suda-morris
5c07acad46
idf_tool: fix unicode decode error
...
Closes https://github.com/espressif/esp-idf/issues/3841
2019-08-07 21:27:29 +08:00
Angus Gratton
8dbe1f024e
Merge branch 'bugfix/pthread_fixes' into 'master'
...
pthread fixes
Closes IDFGH-1437
See merge request espressif/esp-idf!5646
2019-07-30 09:41:31 +08:00
Angus Gratton
477c7bb789
Merge branch 'feature/idf_tools_installer_ci' into 'master'
...
Build Windows tools installer in CI
Closes IDF-201
See merge request espressif/esp-idf!5583
2019-07-29 19:16:18 +08:00
Ivan Grokhotkov
b1bb90a596
Merge branch 'bugfix/partition_tables_update_note' into 'master'
...
global: update note in the partition tables
See merge request espressif/esp-idf!5636
2019-07-29 19:00:44 +08:00
Ivan Grokhotkov
6cff19adb6
ci: add jobs to build idf_exe, cmdlinerunner, tools installer
2019-07-29 06:13:52 +02:00
Ivan Grokhotkov
3c63f49591
examples: remove non-existent options from sdkconfig.defaults
2019-07-29 04:57:38 +02:00
Ivan Grokhotkov
e9de7b1df3
pthread: remove ESP32_ prefix from Kconfig options
...
pthread implementation is not chip-specific, so this prefix is not
needed.
2019-07-29 04:43:49 +02:00
Ivan Grokhotkov
3e17c69e4f
tools: idf_tools.py: allow downloading for a different platform
2019-07-28 07:27:00 +02:00
Ivan Grokhotkov
26800ed71e
global: update note in the partition tables
...
The build system automatically determines offsets of partitions from
the partition table, so no manual changes are needed. Instead, add a
note that partition offsets may need to be updated when increasing
the bootloader size.
2019-07-27 10:28:16 +02:00
Ivan Grokhotkov
842432fb65
Merge branch 'bugfix/dont_rerun_reconfig_on_tests' into 'master'
...
Don't re-run reconfig on tests executed with same parameters
Closes IDF-732
See merge request espressif/esp-idf!5335
2019-07-25 12:24:03 +08:00
Ivan Grokhotkov
80ad09f230
tools: installer: allow changing installation path
...
Installation path can now be changed in a subsequent install,
without uninstalling and logging out.
The default value of the installation path is set to
IDF_TOOLS_PATH environment variable, if it was already set by the
previous installation, or by the user.
Closes https://github.com/espressif/esp-idf/issues/3806
2019-07-24 06:44:30 +02:00
Sergei Silnov
e36a76d940
idf_ext.py: don't rerun reconfig for tests when possible
2019-07-23 16:15:33 +02:00
Ivan Grokhotkov
1271008dd8
tools: tools.json: don't require ulp-binutils and openocd on x86 Linux
...
Fixes https://esp32.com/viewtopic.php?f=13&t=11540
2019-07-23 06:57:36 +02:00
Ivan Grokhotkov
b70ac4deb7
tools: idf_tools.py: improve error message when no downloads found
...
...for the given platform.
Previously would raise AssertionError.
2019-07-23 06:55:30 +02:00
Ivan Grokhotkov
9c5284e7b5
tools: installer: verify that IDF_PATH doesn't contain spaces
2019-07-22 09:29:49 +02:00
Ivan Grokhotkov
aaf3dcbda0
tools: installer: fix quoting of IDF_TOOLS_PATH
...
IDF_TOOLS_PATH may contain spaces, so needs to be properly quoted.
Closes https://github.com/espressif/esp-idf/issues/3807
2019-07-22 09:29:49 +02:00
Ivan Grokhotkov
024176c509
ci: build IDF docker image in CI
2019-07-18 06:18:04 +00:00
Ivan Grokhotkov
dd443f61e8
tools: add Dockerfile
2019-07-18 06:18:04 +00:00
Angus Gratton
56afdedf7c
Merge branch 'bugfix/do_not_require_new_target_link_library_signature' into 'master'
...
CMake: Do not force use of new target_link_libraries signature
See merge request espressif/esp-idf!5471
2019-07-16 13:36:35 +08:00
Renz Christian Bagaporo
d3e814fe19
cmake: set COMPONENT_DIR in early expansion
...
Gives same treatment to COMPONENT_DIR as COMPONENT_PATH in
https://gitlab.espressif.cn:6688/espressif/esp-idf/merge_requests/4557
Closes https://github.com/espressif/esp-idf/issues/3771
2019-07-12 16:22:18 +08:00
Ivan Grokhotkov
1ea68e6093
Merge branch 'feature/build_example_make_on_trigger' into 'master'
...
ci: don't build examples with Make in regular jobs
See merge request espressif/esp-idf!5498
2019-07-11 13:59:15 +08:00
He Yin Ling
663ed11509
unit-test-app: use stripped config name in test case ID:
...
We could split cases of same config into multiple binaries as we have limited rom space. So we should regard those configs like `default` and `default_2` as the same config.
2019-07-11 10:01:05 +08:00
Ivan Grokhotkov
edd7f90b77
ci: don't build examples with Make on pushes
...
Still build the examples with make on:
- triggered pipelines
- master, release branches, tags
- scheduled and manual (web) pipelines
2019-07-10 17:16:53 +02:00
Ivan Grokhotkov
56e3f2780d
ci: add unit test job
2019-07-10 22:44:11 +08:00
Ivan Grokhotkov
41b6811f45
unit-test-app: split default, release, single_core configs
2019-07-10 22:44:11 +08:00
Ivan Grokhotkov
847e00d17b
Merge branch 'bugfix/idf_exe_crash' into 'master'
...
tools: fix idf.py.exe crash on Windows 7
Closes IDFGH-1471
See merge request espressif/esp-idf!5484
2019-07-10 16:20:13 +08:00
Ivan Grokhotkov
e6e1792946
tools: update idf_exe to 1.0.1
2019-07-09 14:15:09 +02:00
Ivan Grokhotkov
15bcb79712
idf_exe: bump version to 1.0.1
2019-07-09 14:15:09 +02:00
Ivan Grokhotkov
76dc87e9ad
idf_exe: fix NULL pointer passed to WriteFile
...
For an unknown reason, passing NULL pointer instead of &written worked
on Windows 10 and on Windows 7 when stdout is not redirected.
Closes https://github.com/espressif/esp-idf/issues/3740
2019-07-09 14:15:09 +02:00
Ivan Grokhotkov
896d675248
idf_tools.py: add another platform string to handle Windows x86
2019-07-09 14:11:19 +02:00
Angus Gratton
222146845c
docs: Make CMake build system default, mark GNU Make as legacy option
...
All `-cmake` suffixes are removed
Where a GNU Make option is renamed, the `-legacy` suffix is used
2019-07-09 14:32:26 +10:00
Renz Christian Bagaporo
2a5b02097b
cmake: do not force use of new signature for target_link_libraries
2019-07-08 19:43:57 +08:00
Angus Gratton
47bbb107a8
build system: Use CMake-based build system as default when describing commands
2019-07-08 17:31:27 +10:00
Angus Gratton
c3cc096af0
Merge branch 'ci/cmake_examples_multichip_support' into 'master'
...
ci: multichip build support for examples
See merge request espressif/esp-idf!5384
2019-07-08 12:29:25 +08:00
Roland Dobai
f3d6219c46
tools: Fix indentation in confgen.py
2019-07-06 09:17:31 +02:00
Mahavir Jain
46c8497f01
Merge branch 'bugfix/prov_tool_desc_readme' into 'master'
...
esp_prov : Minor refactoring in argument dependent logic and other changes
See merge request espressif/esp-idf!5430
2019-07-05 17:18:32 +08:00
Michael (XIAO Xufeng)
181fd70a9a
ci: multichip build support for examples
2019-07-05 17:06:25 +08:00
Anton Maklakov
c9cf0afb6e
tools: Add a script for switching to real submodules in forks
2019-07-05 11:12:06 +07:00
Shivani Tipnis
cc75721f9c
mfg_util: Optimise by adding subparser changes w.r.t similar changes in nvs util changes
2019-07-05 01:13:27 +00:00
Shivani Tipnis
bfd1eeefa2
Add NimBLE bleprph,blecent,blehr example tests
2019-07-05 08:14:04 +08:00
Ivan Grokhotkov
cd89182458
Merge branch 'bugfix/confgen_avoid_write_to_conf' into 'master'
...
tools: avoid using directly _write_to_conf from Kconfiglib
Closes IDFGH-1246
See merge request espressif/esp-idf!5423
2019-07-04 22:36:23 +08:00
Ivan Grokhotkov
564dbabf49
Merge branch 'bugfix/confgen_hex_value' into 'master'
...
tools: Fix hex parsing in confgen.py
Closes IDFGH-1273
See merge request espressif/esp-idf!5439
2019-07-04 22:35:54 +08:00
Anurag Kar
61923d37b6
esp_prov : Minor refactoring in argument dependent logic
...
Other changes:
* Command line argument name and descriptions updated and formatted
* Some exception messages updated for clarity
* READMEs updated for tool and all provisioning examples
* Minor update in example test scripts due to change in esp_prov.get_transport() API
* Transport_HTTP now forces connect on initialization
2019-07-04 15:02:07 +05:30
Roland Dobai
510042160d
tools: avoid using directly _write_to_conf from kconfiglib
...
Closes https://github.com/espressif/esp-idf/issues/3543
2019-07-04 10:35:34 +02:00
Roland Dobai
3bd4003e98
tools: Fix hex parsing in confgen.py
...
Closes https://github.com/espressif/esp-idf/issues/3568
2019-07-04 10:35:03 +02:00
He Yin Ling
a626061f3c
tools: fix exception in checkout ref script:
...
decode bytes before searching with RegEx
2019-07-04 16:31:35 +08:00
He Yin Ling
9ecd0436f5
tools: fix idf_tools.py exception with python3
...
use `subprocess.Popen` when catch TypeError:
```
Traceback (most recent call last):
File "tools/idf_tools.py", line 1249, in <module>
main(sys.argv[1:])
File "tools/idf_tools.py", line 1245, in main
action_func(args)
File "tools/idf_tools.py", line 1038, in action_install
tool_obj.find_installed_versions()
File "tools/idf_tools.py", line 468, in find_installed_versions
ver_str = self.check_version()
File "tools/idf_tools.py", line 426, in check_version
version_cmd_result = run_cmd_check_output(cmd, None, extra_paths)
File "tools/idf_tools.py", line 176, in run_cmd_check_output
result = subprocess.run(cmd, capture_output=True, check=True, input=input_text)
File "/opt/pyenv/pyenv-1.2.6/versions/3.5.5/lib/python3.5/subprocess.py", line 383, in run
with Popen(*popenargs, **kwargs) as process:
TypeError: __init__() got an unexpected keyword argument 'capture_output'
```
2019-07-04 15:06:00 +08:00
Angus Gratton
533c080bc1
Merge branch 'bugfix/cmake_mconf_build' into 'master'
...
cmake: Fix some bugs building mconf-idf from scratch
See merge request espressif/esp-idf!5413
2019-07-04 13:38:20 +08:00
Ivan Grokhotkov
b293518ec7
Merge branch 'feature/optimize_ci_config_file' into 'master'
...
CI: use features from latest Gitlab in CI config file
See merge request idf/esp-idf!4896
2019-07-04 10:56:45 +08:00
Mahavir Jain
28f1cdf5ed
Merge branch 'feature/local_ctrl_no_sec' into 'master'
...
ESP Local Ctrl Feature Added
See merge request idf/esp-idf!5348
2019-07-04 00:45:29 +08:00
Anurag Kar
b75f8b1b20
ESP Local Control Feature Added
...
List of changes:
* New component esp_local_ctrl added
* Example added under examples/protocols/esp_local_ctrl
* Documentation added under protocols/esp_local_ctrl
* Demo client side app esp_local_ctrl.py added under examples/protocols/esp_local_ctrl/scripts
* protocomm_ble : protocomm_ble_config_t given struct name for allowing forward declaration
* esp_prov/transport_softap renamed to transport_http
* transport_http module supports verification of server certificate
* transport_http module performs name resolution before connection
2019-07-03 21:31:04 +05:30
He Yin Ling
e390dd3eab
CI: use include
to split large CI config file
2019-07-03 16:59:50 +08:00
He Yin Ling
6eca80a989
CI: try to use the correct branch of other projects used in CI:
...
1. revision defined in bot message
2. branch name (or tag name) of current IDF
3. CI_MERGE_REQUEST_TARGET_BRANCH_NAME
4. branch name parsed from `git describe`
5. default branch
2019-07-03 16:53:34 +08:00
He Yin Ling
81dd9d4e27
CI: use parallel attribute in CI config file
2019-07-03 16:53:34 +08:00
Angus Gratton
2639d5b6c3
cmake: Fix some bugs building mconf-idf from scratch
...
- Makefile didn't quite work with out-of-tree build unless there was already an in-tree build done.
- CMake needs to delete some of the in-tree build artifacts or they're used instead of the correct
files.
2019-07-03 18:40:55 +10:00
Sergei Silnov
b7ca18edcd
idf.py Run reconfigure on ccache option change.make --no-ccache default
2019-07-02 13:37:55 +02:00
Ivan Grokhotkov
22dfac7405
mconf-idf: update to v4.6.0.0-idf-20190603
2019-07-01 18:08:02 +02:00
Ivan Grokhotkov
4f5f30d37d
tools: add fallback tools.json for IDF v3.x
2019-07-01 18:08:02 +02:00
Ivan Grokhotkov
04d24c750a
tools: new installer for Windows
2019-07-01 18:08:02 +02:00
Ivan Grokhotkov
12b6da0388
tools: {install,export}.{bat,sh} tools
2019-07-01 14:51:44 +02:00
Ivan Grokhotkov
3d866694c9
tools.json: add idf.py.exe
2019-07-01 14:51:44 +02:00
Ivan Grokhotkov
916c0c5754
idf.py.exe wrapper program for Windows
2019-07-01 14:51:43 +02:00
Ivan Grokhotkov
1a2bf4d8ff
idf_tools: print additional info when download verification fails
2019-07-01 14:51:43 +02:00
Angus Gratton
f8d2188e93
Merge branch 'bugfix/win_flash_app_cmd' into 'master'
...
tools: Accept CTRL-T + A for app-flash in idf_monitor
Closes IDF-736
See merge request idf/esp-idf!5376
2019-07-01 15:51:44 +08:00
Angus Gratton
9ef37270f6
Merge branch 'bugfix/make_ccache_opt_in' into 'master'
...
cmake: make use of ccache opt-in
See merge request idf/esp-idf!5368
2019-07-01 15:48:31 +08:00
Angus Gratton
f1e07663c4
cmake: Use environment variables file for all config binaries
2019-07-01 15:54:27 +10:00
Angus Gratton
26db058339
cmake kconfig: Pass environment variables to confgen.py via a file
...
Works around "command line too long" errors when using Windows
and CMake < 3.11
Closes IDF-711
2019-07-01 15:54:10 +10:00
Angus Gratton
bd69998516
mconf-idf: Use same 'simple expand' logic, same as kconfig-frontends
...
Previously, wordexp() was used. However for providing Windows builds
of mconf-idf we can't use wordexp() so we use this simplified
environment variable expansion code instead.
The reasoning here is to make the behaviour consistent across Windows
(CMake vs GNU Make), Linux & macOS mconf.
2019-07-01 00:38:55 +00:00
Renz Christian Bagaporo
72a5762525
cmake: make use of ccache opt-in
2019-06-29 00:22:57 +00:00
Ivan Grokhotkov
39a5fbdfee
Merge branch 'bugfix/idf_py_fix_subcommand_options' into 'master'
...
idf.py: Fix subcommand options
Closes IDF-740
See merge request idf/esp-idf!5386
2019-06-29 00:15:13 +08:00
Ivan Grokhotkov
dcd5e9cf08
Merge branch 'bugfix/ci_fix_mirror-submodule-update' into 'master'
...
tools: Keep script behaviour
See merge request idf/esp-idf!5362
2019-06-28 23:57:14 +08:00
Sergei Silnov
56db269fb5
idf.py: Fix subcommand options
2019-06-28 10:07:38 +02:00
Angus Gratton
265d7dc4e5
Merge branch 'bugfix/fix_secure_boot_support' into 'master'
...
Fixes to secure boot support in CMake
See merge request idf/esp-idf!4977
2019-06-28 15:38:59 +08:00
Angus Gratton
d9ca915fa4
Merge branch 'bugfix/cmake_project_vars_not_set_by_redefinition' into 'master'
...
cmake: set variables set by project call
See merge request idf/esp-idf!5187
2019-06-28 15:31:10 +08:00
Anton Maklakov
e5de1991d4
tools: Keep script behaviour
2019-06-28 10:05:31 +07:00
Renz Christian Bagaporo
67909fe2a0
ci: test fail on build time works
2019-06-28 10:54:21 +08:00
Renz Christian Bagaporo
e4a4063e4c
cmake: fix issue with fail at build time
...
Fix issue that next build retry does not succeed once the requirement is
satisfied.
2019-06-28 10:54:21 +08:00
Roland Dobai
f56b7d4a1d
tools: Accept CTRL-T + A for app-flash in idf_monitor
...
"CTRL-A" cannot be captured in Windows command line, so "A" can be used
instead.
2019-06-27 12:21:09 +02:00
Sergei Silnov
aecd0f9ae4
Add subcomand options that become global
2019-06-26 10:00:21 +02:00
Sergei Silnov
afc30b09bc
idf.py: Add positional arguments to subcommands
2019-06-26 10:00:21 +02:00
Anurag Kar
9c0ee28670
wifi_provisioning : Added Wi-Fi Scan list feature to Provisioning Manager
...
List of changes in components/wifi_provisioning:
* Manager version is now v1.1
* .proto files and protocomm handler added for sending Wi-Fi scan command and receiving scan results
* Implemented handlers for wifi_scan protocomm endpoint
* Update manager context data structure to hold scan state and results
* scheme_softap now runs Wi-Fi in APSTA mode
* Wi-Fi is started in AP mode when provisioning is started. This is necessary for scan list to work
* Docs updates with information about new wifi_scan endpoint
List of changes in tools/esp_prov:
* Added functions for sending and receiving protobuf messages compatible with wifi_scan protocomm endpoint
* Added feature to display/refresh scan results and accept user selection at runtime
* New functions:
* get_version() : only returns the protocol version string
* has_capability() : check is a capability is present according to proto-ver response
* wifi_scan feature is provided only if the `wifi_scan` capability is present
Other changes:
* Replace recursive mutex with plain mutex
* assert on return value of mutex give / take calls
* replace all calls with macros ACQUIRE_LOCK and RELEASE_LOCK
* some checks added in scanning related private APIs
* free and nullify scanning context and state if service is stopped while ongoing scan
2019-06-26 05:24:20 +00:00
Angus Gratton
12f4541f19
Merge branch 'bugfix/stdoutflush' into 'master'
...
Stdoutflush: Flushing stdout to avoid issues with 64k char limits
See merge request idf/esp-idf!4698
2019-06-26 10:07:41 +08:00
Angus Gratton
2c26eb2213
Merge branch 'feature/flash_encryption' into 'master'
...
Change flash encryption workflow to development / release
See merge request idf/esp-idf!4125
2019-06-26 09:04:03 +08:00
Kondal Kolipaka
9550176f83
Addressing PR comments
2019-06-26 00:42:13 +00:00
Kondal Kolipaka
bc48a9c92f
Stdoutflush: Flushing stdout to avoid issues with 64k char limits
2019-06-26 00:42:13 +00:00
Hemal Gujarathi
a68c7c21e1
Improve flash encryption documentation and add Development & Release modes
...
This MR improves existing flash encryption document to provide simplified steps
Adds two new modes for user: Development & Release
Adds a simple example
Supports encrypted write through make command
2019-06-25 23:41:18 +00:00