alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,816 Commits 20 Branches 148 Tags 384 MiB
e673817530
Commit Graph

57 Commits

Author SHA1 Message Date
Roland Dobai
84d5cc1c17 Generate source files for kconfiglib from the build system 2019-11-15 15:25:09 +00:00
Roland Dobai
01887f71e7 Update kconfiglib to upstream version and replace mconf-idf 
Special thanks to @ulfalizer for the helpful suggestions regarding
kconfiglib.

"rsource" option is available for relative path includes
Closes https://github.com/espressif/esp-idf/issues/4064
 2019-10-29 10:40:04 +01:00
Angus Gratton
496ede9bcd Merge branch 'master' into feature/esp32s2beta_merge 2019-10-15 14:59:27 +11:00
Roland Dobai
15857d9cbb Handle deprecated values in sdkconfig.defaults 
The issue was pointed out also in
https://github.com/espressif/esp-idf/issues/4092
 2019-10-02 16:29:25 +00:00
Angus Gratton
438d513a95 Merge branch 'master' into feature/esp32s2beta_merge 2019-09-16 16:18:48 +10:00
Roland Dobai
1dcdc56a7f Use kconfiglib from $IDF_PATH/tools/kconfig_new 2019-09-11 14:30:31 +02:00
Angus Gratton
0a0bb09585 Merge 'master' into feature/esp32s2beta_update 2019-08-20 13:55:23 +10:00
Angus Gratton
6990a7cd54 Merge branch 'master' into feature/esp32s2beta_update 2019-08-19 15:03:43 +10:00
Angus Gratton
423fb9573b confserver: Fix NamedTemporaryFile use on Windows 
Can't have the file open twice, so need to close and delete after reopening.
 2019-08-16 19:24:37 +10:00
Angus Gratton
24d26fccde Merge branch 'master' into feature/esp32s2beta_update 2019-08-08 13:44:24 +10:00
Roland Dobai
bd21960955 tools: Support sdkconfig.rename files from outside IDF in confgen.py 2019-07-16 20:18:19 +02:00
Roland Dobai
f3d6219c46 tools: Fix indentation in confgen.py 2019-07-06 09:17:31 +02: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
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
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
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
Anton Maklakov
442b57b3ee ci: Adjust more 'spawn' settings in test_confserver 2019-06-19 20:50:53 +07:00
Ivan Grokhotkov
8cfa574ad6 Merge branch 'bugfix/ci_test_confserver_timeout' into 'master' 
ci: Adjust the test_confserver timeout to 2 seconds

See merge request idf/esp-idf!5184
 2019-06-12 13:48:19 +08:00
Ivan Grokhotkov
73b30af2b3 confgen.py: don't output compatibility definitions for options which are not defined 
For example, if a renamed option CONFIG_NEW is a bool with value "n", kconfiglib will not generate a define for it in the Kconfig file. The define (#define CONFIG_NEW 1) will only be generated if the option is "y" or "m".
However the compatibility definition was always generated: #define CONFIG_OLD CONFIG_NEW. This broke the #ifdef checks which depended on the old option names.
 2019-06-11 13:07:37 +08:00
Angus Gratton
e08b787d79 ci: Adjust the test_confserver timeout to 2 seconds 
On a VM, it seems like 500ms is sometimes a very short time...
 2019-06-11 10:16:15 +10:00
Ivan Grokhotkov
912c75372c confgen.py: don't output compatibility definitions for options which are not defined 
For example, if a renamed option CONFIG_NEW is a bool with value “n”,
kconfiglib will not generate a define for it in the Kconfig file. The
define (#define CONFIG_NEW 1) will only be generated if the option is
“y” or “m”. However the compatibility definition was always
generated: #define CONFIG_OLD CONFIG_NEW. This broke the #ifdef
checks which depended on the old option names.

This commit wraps each compatibility definition:

    #ifdef CONFIG_NEW
    #define CONFIG_OLD CONFIG_NEW
    #endif

so that the CONFIG_OLD definition is only generated if CONFIG_NEW is
defined.
 2019-06-10 06:56:07 +00:00
Roland Dobai
5b15686e29 docs: Kconfig formatting rules and backward compatibility of options 2019-05-29 14:56:23 +02:00
Roland Dobai
979e1e32cb tools: Ignore sdkconfig.rename files from the example directory 2019-05-21 09:09:01 +02:00
Roland Dobai
254c1c1085 Confgen: link config options to parent choices in the docs 2019-05-21 09:09:01 +02:00
Roland Dobai
30ca5c7a88 Confgen: Fix prefix removal to work for exact match only 2019-05-21 09:09:01 +02:00
Renz Christian Bagaporo
c6dc47b3e2 cmake: build system changes 2019-05-13 19:57:39 +08:00
Roland Dobai
23ee93ea76 Rename deprecated Kconfig options in a backward compatible way 2019-04-24 12:53:02 +02:00
Angus Gratton
a44f43c2ea confserver: Send an error response if JSON request is malformatted 2019-03-15 14:31:45 +11:00
Angus Gratton
6897dab2de confserver: In protocol V2, a "load" should only send back changes not all items 2019-03-15 14:31:45 +11:00
Angus Gratton
02802a5113 confserver: Add support for new V2 protocol 
V2 adds:
* Independent result for visibility (showing/hiding menus)
* Includes adding IDs for all items (menus & symbols) in kconfig_menus.json

Still backwards compatible with V1, with some small changes (menu items now listed in results).

Also added some protocol docs, changed the "listening on stdin" message to come after any kconfiglib warnings
 2019-03-15 14:31:45 +11:00
Angus Gratton
673441aba0 confgen: Fix bug with JSON metadata conditional range generation 
When generating JSON metadata for ranges where there are conditional ranges (ie different allowed range
depending on another config setting), the JSON metadata would always have the last named range as
the expression was not evaluated properly.

Thanks to ulfalizer on GitHub for pointing this out.

Closes https://github.com/espressif/esp-idf/issues/2195
 2019-03-01 15:38:23 +11:00
Angus Gratton
0a2b54d2e3 Merge branch 'bugfix/correct_kconfigs' into 'master' 
Correct Kconfigs according to the coding style

See merge request idf/esp-idf!4172
 2019-01-30 09:24:22 +08:00
Roland Dobai
4d156fd734 tools: replace absolute URLs in Kconfig docs 2019-01-29 16:27:02 +01:00
Roland Dobai
37126d3451 Correct Kconfigs according to the coding style 2019-01-29 13:37:01 +01:00
Renz Christian Bagaporo
00e53f447a confgen: disable config override warnings 2019-01-29 11:17:02 +08:00
Renz Christian Bagaporo
178bbfad43 kconfiglib: allow disabling of config override warnings 
Patches ESP-IDF copy of kconfiglib.py with modifications in commit
b65baa47f69ae4c3993876a7edf0da0075aa70ff from kconfiglib repository.
 2019-01-29 11:16:25 +08:00
Renz Christian Bagaporo
5a4fe0bac8 confgen: disable redundant assignment warning 2019-01-25 18:35:58 +08:00
Renz Christian Bagaporo
d6b5f43ea0 kconfiglib: allow disabling of redundant definition warnings 
Patches ESP-IDF copy of kconfiglib.py with modifications in commit
94c63de77c7a3422347e59e168b05174d0b9e84d from kconfiglib repository.
 2019-01-25 18:35:58 +08:00
Renz Christian Bagaporo
61329f60c3 confgen: base config creation on output type args 2019-01-16 08:16:09 +08:00
Roland Dobai
bfa9610f58 tools: Fix the Python coding style 2018-12-19 11:56:24 +01:00
Ivan Grokhotkov
e2ca285fae confgen.py: allow multiple defaults files 2018-11-11 21:44:35 +08:00
Ivan Grokhotkov
ea7e6bd8f6 Merge branch 'feature/py23_kconfig_new' into 'master' 
tools: Make kconfig_new Python3-compatible and enable Python3 in idf.py

See merge request idf/esp-idf!3304
 2018-09-27 11:26:32 +08:00
Angus Gratton
9421f6611f doc: Render config items "Found in:" as a set of links to menus 2018-09-21 11:05:13 +10:00
Angus Gratton
9add51bc6d doc: Re-add summaries of what children each menu item has 
Slightly different to the original version of this, but same goal.
 2018-09-19 17:27:48 +10:00
Roland Dobai
173e6aab3e tools: Make kconfig_new Python3-compatible and enable Python3 in idf.py 2018-09-19 08:38:09 +02:00
Angus Gratton
a56b3abf84 kconfiglib: Allow CONFIG_xxx= to disable booleans 
But replace all sdkconfig.defaults to use the explicit =n (more correct)
 2018-08-29 19:39:17 +08:00
Angus Gratton
191557db02 docs: Copy CMake docs to a separate set of directories 
Required first step before merging back to mainline.
 2018-08-13 15:37:03 +10:00