diff options
| author | Zach White <skullydazed@gmail.com> | 2021-02-27 12:00:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-27 12:00:50 -0800 |
| commit | 1581ea48dcd48d0d3f42cc09b388c468aedec45d (patch) | |
| tree | 2d028036a4bf80c2e47b952931544f95ba2174e9 /lib/python/qmk/cli/generate | |
| parent | 23ed6c4ec0bfb27612da8a7b78d1b484acc23f3f (diff) | |
| download | qmk_firmware-1581ea48dcd48d0d3f42cc09b388c468aedec45d.tar.gz qmk_firmware-1581ea48dcd48d0d3f42cc09b388c468aedec45d.zip | |
Fix develop (#12039)
Fixes file encoding errors on Windows, and layouts not correctly merging into info.json.
* force utf8 encoding
* correctly merge layouts and layout aliases
* show what aliases point to
Diffstat (limited to 'lib/python/qmk/cli/generate')
| -rwxr-xr-x | lib/python/qmk/cli/generate/layouts.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/python/qmk/cli/generate/layouts.py b/lib/python/qmk/cli/generate/layouts.py index b7baae065..15b289522 100755 --- a/lib/python/qmk/cli/generate/layouts.py +++ b/lib/python/qmk/cli/generate/layouts.py | |||
| @@ -82,6 +82,10 @@ def generate_layouts(cli): | |||
| 82 | layouts_h_lines.append(rows) | 82 | layouts_h_lines.append(rows) |
| 83 | layouts_h_lines.append('}') | 83 | layouts_h_lines.append('}') |
| 84 | 84 | ||
| 85 | for alias, target in kb_info_json.get('layout_aliases', {}).items(): | ||
| 86 | layouts_h_lines.append('') | ||
| 87 | layouts_h_lines.append('#define %s %s' % (alias, target)) | ||
| 88 | |||
| 85 | # Show the results | 89 | # Show the results |
| 86 | layouts_h = '\n'.join(layouts_h_lines) + '\n' | 90 | layouts_h = '\n'.join(layouts_h_lines) + '\n' |
| 87 | 91 | ||