Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

CLI: fix json2c subcommand and add/fix tests (#9206)

Browse source 
Co-authored-by: Zach White <skullydazed@users.noreply.github.com>
This commit is contained in:
Erovia 2020-05-26 17:43:33 +02:00 committed by GitHub
parent af2ca13604
commit 6501377070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
keyboards/handwired/onekey/keymaps/default_json/keymap.json Normal file
View file

@ -0,0 +1,9 @@
{
"keyboard":"handwired/onekey/pytest",
"keymap":"default_json",
"layout":"LAYOUT",
"layers":[["KC_A"]],
"author":"qmk",
"notes":"This file is a keymap.json file for handwired/onekey/pytest",
"version":1
}

1
keyboards/handwired/onekey/pytest/templates/keymap.c
View file

@ -1 +1,2 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};

14
lib/python/qmk/cli/json2c.py
View file

@ -18,19 +18,19 @@ def json2c(cli):
This command uses the `qmk.keymap` module to generate a keymap.c from a configurator export. The generated keymap is written to stdout, or to a file if -o is provided.
"""
# Error checking
if not cli.args.filename.exists():
cli.log.error('JSON file does not exist!')
cli.print_usage()
exit(1)
if cli.args.filename.name == '-':
if cli.args.filename and cli.args.filename.name == '-':
# TODO(skullydazed/anyone): Read file contents from STDIN
cli.log.error('Reading from STDIN is not (yet) supported.')
cli.print_usage()
exit(1)
if not cli.args.filename.exists():
cli.log.error('JSON file does not exist!')
cli.print_usage()
exit(1)
# Environment processing
if cli.args.output.name == ('-'):
if cli.args.output and cli.args.output.name == '-':
cli.args.output = None
# Parse the configurator json

6
lib/python/qmk/tests/test_cli_commands.py
View file

@ -84,3 +84,9 @@ def test_list_keymaps_no_keyboard_found():
result = check_subcommand('list-keymaps', '-kb', 'asdfghjkl')
assert result.returncode == 0
assert 'does not exist' in result.stdout
def test_json2c():
result = check_subcommand('json2c', 'keyboards/handwired/onekey/keymaps/default_json/keymap.json')
assert result.returncode == 0
assert result.stdout == '#include QMK_KEYBOARD_H\nconst uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {\t[0] = LAYOUT(KC_A)};\n\n'

4
lib/python/qmk/tests/test_qmk_keymap.py
View file

@ -8,12 +8,12 @@ def test_template_onekey_proton_c():
def test_template_onekey_pytest():
templ = qmk.keymap.template('handwired/onekey/pytest')
assert templ == 'const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};\n'
assert templ == '#include QMK_KEYBOARD_H\nconst uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};\n'
def test_generate_onekey_pytest():
templ = qmk.keymap.generate('handwired/onekey/pytest', 'LAYOUT', [['KC_A']])
assert templ == 'const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT(KC_A)};\n'
assert templ == '#include QMK_KEYBOARD_H\nconst uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {\t[0] = LAYOUT(KC_A)};\n'
# FIXME(skullydazed): Add a test for qmk.keymap.write that mocks up an FD.