Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Slight tweak to the config-extraction scripts. #2070

Merged
merged 2 commits into from
Nov 20, 2024
Merged

Slight tweak to the config-extraction scripts. #2070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e77ab70
Slight tweak to the config-extraction scripts.
lurch Nov 20, 2024
e56fa8c
Small code tidy-up
lurch Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion tools/extract_build_defines.py
View file
Open in desktop
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 not in ('0', '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
View file
Open in desktop
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 not in ('0', '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
View file
Open in desktop
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 not in ('0', '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 @@ -217,11 +217,15 @@ def ValidateAttrs(config_name, config_attrs, file_path, linenum):
all_defines[name][value] = set()
all_defines[name][value] = (file_path, linenum)

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

# Check for defines with missing PICO_CONFIG entries
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 all_config_names 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)
Expand Down
Loading