mirror/pico-sdk
1
0
Fork 0
mirror of https://github.com/raspberrypi/pico-sdk.git synced 2025-12-10 07:14:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Slight tweak to the config-extraction scripts. (#2070)

Browse source 
* Slight tweak to the config-extraction scripts.
A small logic bug meant they were reporting more false-positive warnings than they should have been.

* Small code tidy-up
This commit is contained in:
Andrew Scheller 2024-11-20 22:41:28 +00:00 • committed by GitHub
parent 54d4f3a8f7
commit d3080e777f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/extract_build_defines.py
View file

@ -99,7 +99,7 @@ def ValidateAttrs(config_name, config_attrs, file_path, linenum):
_default = config_attrs.get('default', None) _default = config_attrs.get('default', None)
if _default is not None: if _default is not None:
if '/' not in _default: 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'])) logger.info('{} at {}:{} has non-integer default value "{}"'.format(config_name, file_path, linenum, config_attrs['default']))
elif _type == 'string': elif _type == 'string':
@ -185,6 +185,10 @@ for dirpath, dirnames, filenames in os.walk(scandir):
all_configs[config_name] = {'attrs': config_attrs, 'filename': os.path.relpath(file_path, scandir), 'line_number': linenum, 'description': config_description} 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 applicable, all_configs in chips_all_configs.items():
for config_name, config_obj in all_configs.items(): for config_name, config_obj in all_configs.items():
file_path = os.path.join(scandir, config_obj['filename']) file_path = os.path.join(scandir, config_obj['filename'])

6
tools/extract_cmake_configs.py
View file

@ -99,7 +99,7 @@ def ValidateAttrs(config_name, config_attrs, file_path, linenum):
_default = config_attrs.get('default', None) _default = config_attrs.get('default', None)
if _default is not None: if _default is not None:
if '/' not in _default: 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'])) logger.info('{} at {}:{} has non-integer default value "{}"'.format(config_name, file_path, linenum, config_attrs['default']))
elif _type == 'string': elif _type == 'string':
@ -185,6 +185,10 @@ for dirpath, dirnames, filenames in os.walk(scandir):
all_configs[config_name] = {'attrs': config_attrs, 'filename': os.path.relpath(file_path, scandir), 'line_number': linenum, 'description': config_description} 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 applicable, all_configs in chips_all_configs.items():
for config_name, config_obj in all_configs.items(): for config_name, config_obj in all_configs.items():
file_path = os.path.join(scandir, config_obj['filename']) file_path = os.path.join(scandir, config_obj['filename'])

8
tools/extract_configs.py
View file

@ -105,7 +105,7 @@ def ValidateAttrs(config_name, config_attrs, file_path, linenum):
_default = config_attrs.get('default', None) _default = config_attrs.get('default', None)
if _default is not None: if _default is not None:
if '/' not in _default: 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'])) logger.info('{} at {}:{} has non-integer default value "{}"'.format(config_name, file_path, linenum, config_attrs['default']))
elif _type == 'enum': elif _type == 'enum':
@ -217,11 +217,15 @@ for dirpath, dirnames, filenames in os.walk(scandir):
all_defines[name][value] = set() all_defines[name][value] = set()
all_defines[name][value] = (file_path, linenum) 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 # Check for defines with missing PICO_CONFIG entries
chips_resolved_defines = defaultdict(dict) chips_resolved_defines = defaultdict(dict)
for applicable, all_defines in chips_all_defines.items(): for applicable, all_defines in chips_all_defines.items():
for d in all_defines: 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)) logger.warning("Potential unmarked PICO define {}".format(d))
resolved_defines = chips_resolved_defines[applicable] 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) # 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)