aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/cli
diff options
context:
space:
mode:
authorskullydazed <skullydazed@users.noreply.github.com>2019-07-15 12:14:27 -0700
committerGitHub <noreply@github.com>2019-07-15 12:14:27 -0700
commita25dd58bc56b0c4010673723ac44eaff914979bb (patch)
treee4c08289df1b72db4ef8447ab7fdc13f604cffac /lib/python/qmk/cli
parent7ba82cb5b751d69dda6cc77ec8877c89defad3e4 (diff)
downloadqmk_firmware-a25dd58bc56b0c4010673723ac44eaff914979bb.tar.gz
qmk_firmware-a25dd58bc56b0c4010673723ac44eaff914979bb.zip
QMK CLI and JSON keymap support (#6176)
* Script to generate keymap.c from JSON file. * Support for keymap.json * Add a warning about the keymap.c getting overwritten. * Fix keymap generating * Install the python deps * Flesh out more of the python environment * Remove defunct json2keymap * Style everything with yapf * Polish up python support * Hide json keymap.c into the .build dir * Polish up qmk-compile-json * Make milc work with positional arguments * Fix a couple small things * Fix some errors and make the CLI more understandable * Make the qmk wrapper more robust * Add basic QMK Doctor * Clean up docstrings and flesh them out as needed * remove unused compile_firmware() function
Diffstat (limited to 'lib/python/qmk/cli')
-rw-r--r--lib/python/qmk/cli/compile/__init__.py0
-rwxr-xr-xlib/python/qmk/cli/compile/json.py44
-rwxr-xr-xlib/python/qmk/cli/doctor.py47
-rwxr-xr-xlib/python/qmk/cli/hello.py13
-rw-r--r--lib/python/qmk/cli/json/__init__.py0
-rwxr-xr-xlib/python/qmk/cli/json/keymap.py54
6 files changed, 158 insertions, 0 deletions
diff --git a/lib/python/qmk/cli/compile/__init__.py b/lib/python/qmk/cli/compile/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/lib/python/qmk/cli/compile/__init__.py
diff --git a/lib/python/qmk/cli/compile/json.py b/lib/python/qmk/cli/compile/json.py
new file mode 100755
index 000000000..89c16b206
--- /dev/null
+++ b/lib/python/qmk/cli/compile/json.py
@@ -0,0 +1,44 @@
1"""Create a keymap directory from a configurator export.
2"""
3import json
4import os
5import sys
6import subprocess
7
8from milc import cli
9
10import qmk.keymap
11import qmk.path
12
13
14@cli.argument('filename', help='Configurator JSON export')
15@cli.entrypoint('Compile a QMK Configurator export.')
16def main(cli):
17 """Compile a QMK Configurator export.
18
19 This command creates a new keymap from a configurator export, overwriting an existing keymap if one exists.
20
21 FIXME(skullydazed): add code to check and warn if the keymap already exists
22 """
23 # Error checking
24 if cli.args.filename == ('-'):
25 cli.log.error('Reading from STDIN is not (yet) supported.')
26 exit(1)
27 if not os.path.exists(qmk.path.normpath(cli.args.filename)):
28 cli.log.error('JSON file does not exist!')
29 exit(1)
30
31 # Parse the configurator json
32 with open(qmk.path.normpath(cli.args.filename), 'r') as fd:
33 user_keymap = json.load(fd)
34
35 # Generate the keymap
36 keymap_path = qmk.path.keymap(user_keymap['keyboard'])
37 cli.log.info('Creating {fg_cyan}%s{style_reset_all} keymap in {fg_cyan}%s', user_keymap['keymap'], keymap_path)
38 qmk.keymap.write(user_keymap['keyboard'], user_keymap['keymap'], user_keymap['layout'], user_keymap['layers'])
39 cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap'])
40
41 # Compile the keymap
42 command = ['make', ':'.join((user_keymap['keyboard'], user_keymap['keymap']))]
43 cli.log.info('Compiling keymap with {fg_cyan}%s\n\n', ' '.join(command))
44 subprocess.run(command)
diff --git a/lib/python/qmk/cli/doctor.py b/lib/python/qmk/cli/doctor.py
new file mode 100755
index 000000000..9ce765a4b
--- /dev/null
+++ b/lib/python/qmk/cli/doctor.py
@@ -0,0 +1,47 @@
1"""QMK Python Doctor
2
3Check up for QMK environment.
4"""
5import shutil
6import platform
7import os
8
9from milc import cli
10
11
12@cli.entrypoint('Basic QMK environment checks')
13def main(cli):
14 """Basic QMK environment checks.
15
16 This is currently very simple, it just checks that all the expected binaries are on your system.
17
18 TODO(unclaimed):
19 * [ ] Run the binaries to make sure they work
20 * [ ] Compile a trivial program with each compiler
21 * [ ] Check for udev entries on linux
22 """
23
24 binaries = ['dfu-programmer', 'avrdude', 'dfu-util', 'avr-gcc', 'arm-none-eabi-gcc']
25
26 cli.log.info('QMK Doctor is Checking your environment')
27
28 ok = True
29 for binary in binaries:
30 res = shutil.which(binary)
31 if res is None:
32 cli.log.error('{fg_red}QMK can\'t find ' + binary + ' in your path')
33 ok = False
34
35 OS = platform.system()
36 if OS == "Darwin":
37 cli.log.info("Detected {fg_cyan}macOS")
38 elif OS == "Linux":
39 cli.log.info("Detected {fg_cyan}linux")
40 test = 'systemctl list-unit-files | grep enabled | grep -i ModemManager'
41 if os.system(test) == 0:
42 cli.log.warn("{bg_yellow}Detected modem manager. Please disable it if you are using Pro Micros")
43 else:
44 cli.log.info("Assuming {fg_cyan}Windows")
45
46 if ok:
47 cli.log.info('{fg_green}QMK is ready to go')
diff --git a/lib/python/qmk/cli/hello.py b/lib/python/qmk/cli/hello.py
new file mode 100755
index 000000000..bc0cb6de1
--- /dev/null
+++ b/lib/python/qmk/cli/hello.py
@@ -0,0 +1,13 @@
1"""QMK Python Hello World
2
3This is an example QMK CLI script.
4"""
5from milc import cli
6
7
8@cli.argument('-n', '--name', default='World', help='Name to greet.')
9@cli.entrypoint('QMK Hello World.')
10def main(cli):
11 """Log a friendly greeting.
12 """
13 cli.log.info('Hello, %s!', cli.config.general.name)
diff --git a/lib/python/qmk/cli/json/__init__.py b/lib/python/qmk/cli/json/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/lib/python/qmk/cli/json/__init__.py
diff --git a/lib/python/qmk/cli/json/keymap.py b/lib/python/qmk/cli/json/keymap.py
new file mode 100755
index 000000000..35fc8f9c0
--- /dev/null
+++ b/lib/python/qmk/cli/json/keymap.py
@@ -0,0 +1,54 @@
1"""Generate a keymap.c from a configurator export.
2"""
3import json
4import os
5import sys
6
7from milc import cli
8
9import qmk.keymap
10
11
12@cli.argument('-o', '--output', help='File to write to')
13@cli.argument('filename', help='Configurator JSON file')
14@cli.entrypoint('Create a keymap.c from a QMK Configurator export.')
15def main(cli):
16 """Generate a keymap.c from a configurator export.
17
18 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.
19 """
20 # Error checking
21 if cli.args.filename == ('-'):
22 cli.log.error('Reading from STDIN is not (yet) supported.')
23 cli.print_usage()
24 exit(1)
25 if not os.path.exists(qmk.path.normpath(cli.args.filename)):
26 cli.log.error('JSON file does not exist!')
27 cli.print_usage()
28 exit(1)
29
30 # Environment processing
31 if cli.args.output == ('-'):
32 cli.args.output = None
33
34 # Parse the configurator json
35 with open(qmk.path.normpath(cli.args.filename), 'r') as fd:
36 user_keymap = json.load(fd)
37
38 # Generate the keymap
39 keymap_c = qmk.keymap.generate(user_keymap['keyboard'], user_keymap['layout'], user_keymap['layers'])
40
41 if cli.args.output:
42 output_dir = os.path.dirname(cli.args.output)
43
44 if not os.path.exists(output_dir):
45 os.makedirs(output_dir)
46
47 output_file = qmk.path.normpath(cli.args.output)
48 with open(output_file, 'w') as keymap_fd:
49 keymap_fd.write(keymap_c)
50
51 cli.log.info('Wrote keymap to %s.', cli.args.output)
52
53 else:
54 print(keymap_c)