diff options
| author | Radomir Dopieralski <openstack@sheep.art.pl> | 2020-01-21 22:03:47 +0100 |
|---|---|---|
| committer | Radomir Dopieralski <openstack@sheep.art.pl> | 2020-01-21 22:03:47 +0100 |
| commit | e1840f6abcca0e2ef085332663fc7c0f42c41829 (patch) | |
| tree | 8a8bf87b2a95610728b6bd8fb6ddd4676b763c78 /docs | |
| parent | 59ded1131f5d247ffb64b86d99f3297e75fe6fe5 (diff) | |
Fix entry overrides in support matrix generation
Fix #2539
The entries in the board's mpconfigboard.mk override any other entries.
Also, fixed a warning for bad use of backslash in a string.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/shared_bindings_matrix.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py index ba0ec0e4f..1e631c469 100644 --- a/docs/shared_bindings_matrix.py +++ b/docs/shared_bindings_matrix.py @@ -185,7 +185,7 @@ def get_excluded_boards(base): board_is_excluded = True # check if module is specifically disabled for this board - re_pattern = "CIRCUITPY_{}\s=\s(\w)".format(module.upper()) + re_pattern = r"CIRCUITPY_{}\s=\s(\w)".format(module.upper()) find_module = re.search(re_pattern, contents) if not find_module: if base[module]["default_value"].isdigit(): @@ -204,9 +204,7 @@ def get_excluded_boards(base): ]): check_dependent_modules[module] = base[module]["default_value"] else: - if (find_module.group(1) == "0" and - find_module.group(1) != base[module]["default_value"]): - board_is_excluded = True + board_is_excluded = find_module.group(1) == "0" if board_is_excluded: if board_chip in base[module]["excluded"]: |