Skip to content

Commit

Permalink
Slight tweak to the config-extraction scripts.
Browse files Browse the repository at this point in the history
A small logic bug meant they were reporting more false-positive warnings than they should have been.
  • Loading branch information
lurch committed Nov 20, 2024
1 parent c4b55f6 commit 95a67e4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
6 changes: 5 additions & 1 deletion tools/extract_build_defines.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def ValidateAttrs(config_name, config_attrs, file_path, linenum):
_default = config_attrs.get('default', None)
if _default is not None:
if '/' not in _default:
if (_default.lower() != '0') and (config_attrs['default'].lower() != '1') and ( _default not in all_configs):
if (_default.lower() != '0') and (config_attrs['default'].lower() != '1') and ( _default not in all_config_names):
logger.info('{} at {}:{} has non-integer default value "{}"'.format(config_name, file_path, linenum, config_attrs['default']))

elif _type == 'string':
Expand Down Expand Up @@ -185,6 +185,10 @@ def ValidateAttrs(config_name, config_attrs, file_path, linenum):
all_configs[config_name] = {'attrs': config_attrs, 'filename': os.path.relpath(file_path, scandir), 'line_number': linenum, 'description': config_description}


all_config_names = set()
for all_configs in chips_all_configs.values():
all_config_names.update(all_configs.keys())

for applicable, all_configs in chips_all_configs.items():
for config_name, config_obj in all_configs.items():
file_path = os.path.join(scandir, config_obj['filename'])
Expand Down
6 changes: 5 additions & 1 deletion tools/extract_cmake_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def ValidateAttrs(config_name, config_attrs, file_path, linenum):
_default = config_attrs.get('default', None)
if _default is not None:
if '/' not in _default:
if (_default.lower() != '0') and (config_attrs['default'].lower() != '1') and (_default not in all_configs):
if (_default.lower() != '0') and (config_attrs['default'].lower() != '1') and (_default not in all_config_names):
logger.info('{} at {}:{} has non-integer default value "{}"'.format(config_name, file_path, linenum, config_attrs['default']))

elif _type == 'string':
Expand Down Expand Up @@ -185,6 +185,10 @@ def ValidateAttrs(config_name, config_attrs, file_path, linenum):
all_configs[config_name] = {'attrs': config_attrs, 'filename': os.path.relpath(file_path, scandir), 'line_number': linenum, 'description': config_description}


all_config_names = set()
for all_configs in chips_all_configs.values():
all_config_names.update(all_configs.keys())

for applicable, all_configs in chips_all_configs.items():
for config_name, config_obj in all_configs.items():
file_path = os.path.join(scandir, config_obj['filename'])
Expand Down
8 changes: 6 additions & 2 deletions tools/extract_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def ValidateAttrs(config_name, config_attrs, file_path, linenum):
_default = config_attrs.get('default', None)
if _default is not None:
if '/' not in _default:
if (_default.lower() != '0') and (config_attrs['default'].lower() != '1') and ( _default not in all_configs):
if (_default.lower() != '0') and (config_attrs['default'].lower() != '1') and ( _default not in all_config_names):
logger.info('{} at {}:{} has non-integer default value "{}"'.format(config_name, file_path, linenum, config_attrs['default']))

elif _type == 'enum':
Expand Down Expand Up @@ -221,14 +221,18 @@ def ValidateAttrs(config_name, config_attrs, file_path, linenum):
chips_resolved_defines = defaultdict(dict)
for applicable, all_defines in chips_all_defines.items():
for d in all_defines:
if d not in all_configs and d.startswith("PICO_"):
if d not in chips_all_configs[applicable] and d.startswith("PICO_"):
logger.warning("Potential unmarked PICO define {}".format(d))
resolved_defines = chips_resolved_defines[applicable]
# resolve "nested defines" - this allows e.g. USB_DPRAM_MAX to resolve to USB_DPRAM_SIZE which is set to 4096 (which then matches the relevant PICO_CONFIG entry)
for val in all_defines[d]:
if val in all_defines:
resolved_defines[d] = all_defines[val]

all_config_names = set()
for all_configs in chips_all_configs.values():
all_config_names.update(all_configs.keys())

for applicable, all_configs in chips_all_configs.items():
all_defines = chips_all_defines[applicable]
for config_name, config_obj in all_configs.items():
Expand Down

0 comments on commit 95a67e4

Please sign in to comment.