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.

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

Remove handling of keyboard level keymap templates #24234

Merged
merged 1 commit into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Remove handling of keyboard level keymap templates
  • Loading branch information
zvecr committed Aug 3, 2024
commit b9560994f820bccc2a89e73f0d366700916e5fae
39 changes: 2 additions & 37 deletions lib/python/qmk/keymap.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,41 +126,6 @@ def _generate_macros_function(keymap_json):
return macro_txt


def template_json(keyboard):
"""Returns a `keymap.json` template for a keyboard.

If a template exists in `keyboards/<keyboard>/templates/keymap.json` that text will be used instead of an empty dictionary.

Args:
keyboard
The keyboard to return a template for.
"""
template_file = Path('keyboards/%s/templates/keymap.json' % keyboard)
template = {'keyboard': keyboard}
if template_file.exists():
template.update(json.load(template_file.open(encoding='utf-8')))

return template


def template_c(keyboard):
"""Returns a `keymap.c` template for a keyboard.

If a template exists in `keyboards/<keyboard>/templates/keymap.c` that text will be used instead of an empty dictionary.

Args:
keyboard
The keyboard to return a template for.
"""
template_file = Path('keyboards/%s/templates/keymap.c' % keyboard)
if template_file.exists():
template = template_file.read_text(encoding='utf-8')
else:
template = DEFAULT_KEYMAP_C

return template


def _strip_any(keycode):
"""Remove ANY() from a keycode.
"""
Expand Down Expand Up @@ -279,7 +244,7 @@ def generate_json(keymap, keyboard, layout, layers, macros=None):
macros
A sequence of strings containing macros to implement for this keyboard.
"""
new_keymap = template_json(keyboard)
new_keymap = {'keyboard': keyboard}
new_keymap['keymap'] = keymap
new_keymap['layout'] = layout
new_keymap['layers'] = layers
Expand All @@ -306,7 +271,7 @@ def generate_c(keymap_json):
macros
A sequence of strings containing macros to implement for this keyboard.
"""
new_keymap = template_c(keymap_json['keyboard'])
new_keymap = DEFAULT_KEYMAP_C
layer_txt = _generate_keymap_table(keymap_json)
keymap = '\n'.join(layer_txt)
new_keymap = new_keymap.replace('__KEYMAP_GOES_HERE__', keymap)
Expand Down
10 changes: 0 additions & 10 deletions lib/python/qmk/tests/test_qmk_keymap.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
import qmk.keymap


def test_template_c_pytest_basic():
templ = qmk.keymap.template_c('handwired/pytest/basic')
assert templ == qmk.keymap.DEFAULT_KEYMAP_C


def test_template_json_pytest_basic():
templ = qmk.keymap.template_json('handwired/pytest/basic')
assert templ == {'keyboard': 'handwired/pytest/basic'}


def test_generate_c_pytest_basic():
keymap_json = {
'keyboard': 'handwired/pytest/basic',
Expand Down