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

Merge branch 'bugfix/confgen_expr_value' into 'master'

Browse Source 
confgen: Fix bug with JSON metadata conditional range generation

See merge request idf/esp-idf!4402
This commit is contained in:
Angus Gratton 2019-03-13 13:54:17 +08:00
commit 5107f9f9b2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/kconfig_new/confgen.py
View File

@ -221,9 +221,9 @@ def write_json_menus(config, filename):
greatest_range = None greatest_range = None
if len(sym.ranges) > 0: if len(sym.ranges) > 0:
# Note: Evaluating the condition using kconfiglib's expr_value # Note: Evaluating the condition using kconfiglib's expr_value
# should have one result different from value 0 ("n"). # should have one condition which is true
for min_range, max_range, cond_expr in sym.ranges: for min_range, max_range, cond_expr in sym.ranges:
if kconfiglib.expr_value(cond_expr) != "n": if kconfiglib.expr_value(cond_expr):
greatest_range = [min_range, max_range] greatest_range = [min_range, max_range]
new_json["range"] = greatest_range new_json["range"] = greatest_range
@ -232,9 +232,9 @@ def write_json_menus(config, filename):
greatest_range = None greatest_range = None
if len(sym.ranges) > 0: if len(sym.ranges) > 0:
# Note: Evaluating the condition using kconfiglib's expr_value # Note: Evaluating the condition using kconfiglib's expr_value
# should have one result different from value 0 ("n"). # should have one condition which is true
for min_range, max_range, cond_expr in sym.ranges: for min_range, max_range, cond_expr in sym.ranges:
if kconfiglib.expr_value(cond_expr) != "n": if kconfiglib.expr_value(cond_expr):
greatest_range = [int(min_range.str_value), int(max_range.str_value)] greatest_range = [int(min_range.str_value), int(max_range.str_value)]
new_json = { new_json = {