summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-11-05 08:55:55 +1100
committerNick Brassel <nick@tzarc.org>2021-11-05 08:55:55 +1100
commit92e9bbd9b9c83553f5c9060cbcdb5c44e9eddb79 (patch)
tree2ccfc6ff2317d94d02e2a3f25db0ec383de32032
parent84ea77ead663624a6d8ae451ca3d4318008d9d41 (diff)
parentc8da63382c7d2cc0de13559c10b5fde0f436f9e3 (diff)
Merge remote-tracking branch 'upstream/master' into develop
-rw-r--r--docs/cli_commands.md62
-rw-r--r--lib/python/qmk/cli/__init__.py1
-rwxr-xr-xlib/python/qmk/cli/cd.py46
-rw-r--r--lib/python/qmk/info.py12
4 files changed, 117 insertions, 4 deletions
diff --git a/docs/cli_commands.md b/docs/cli_commands.md
index 9113e3b025..520da06c41 100644
--- a/docs/cli_commands.md
+++ b/docs/cli_commands.md
@@ -118,6 +118,68 @@ This command lets you configure the behavior of QMK. For the full `qmk config` d
qmk config [-ro] [config_token1] [config_token2] [...] [config_tokenN]
```
+## `qmk cd`
+
+This command opens a new shell in your `qmk_firmware` directory.
+
+Note that if you are already somewhere within `QMK_HOME` (for example, the `keyboards/` folder), nothing will happen.
+
+To exit out into the parent shell, simply type `exit`.
+
+**Usage**:
+
+```
+qmk cd
+```
+
+## `qmk console`
+
+This command lets you connect to keyboard consoles to get debugging messages. It only works if your keyboard firmware has been compiled with `CONSOLE_ENABLE=yes`.
+
+**Usage**:
+
+```
+qmk console [-d <pid>:<vid>[:<index>]] [-l] [-n] [-t] [-w <seconds>]
+```
+
+**Examples**:
+
+Connect to all available keyboards and show their console messages:
+
+```
+qmk console
+```
+
+List all devices:
+
+```
+qmk console -l
+```
+
+Show only messages from clueboard/66/rev3 keyboards:
+
+```
+qmk console -d C1ED:2370
+```
+
+Show only messages from the second clueboard/66/rev3:
+
+```
+qmk console -d C1ED:2370:2
+```
+
+Show timestamps and VID:PID instead of names:
+
+```
+qmk console -n -t
+```
+
+Disable bootloader messages:
+
+```
+qmk console --no-bootloaders
+```
+
## `qmk doctor`
This command examines your environment and alerts you to potential build or flash problems. It can fix many of them if you want it to.
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 094ea80b8d..edf351d628 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -31,6 +31,7 @@ safe_commands = [
subcommands = [
'qmk.cli.bux',
'qmk.cli.c2json',
+ 'qmk.cli.cd',
'qmk.cli.cformat',
'qmk.cli.chibios.confmigrate',
'qmk.cli.clean',
diff --git a/lib/python/qmk/cli/cd.py b/lib/python/qmk/cli/cd.py
new file mode 100755
index 0000000000..c62c3f56c6
--- /dev/null
+++ b/lib/python/qmk/cli/cd.py
@@ -0,0 +1,46 @@
+"""Open a shell in the QMK Home directory
+"""
+import sys
+import os
+
+from milc import cli
+
+from qmk.path import under_qmk_firmware
+
+
+@cli.subcommand('Go to QMK Home')
+def cd(cli):
+ """Go to QMK Home
+ """
+ if not sys.stdout.isatty():
+ cli.log.error("This command is for interactive usage only. For non-interactive usage, 'cd $(qmk env QMK_HOME)' is more robust.")
+ sys.exit(1)
+
+ if not under_qmk_firmware():
+ # Only do anything if the user is not under qmk_firmware already
+ # in order to reduce the possibility of starting multiple shells
+ cli.log.info("Spawning a subshell in your QMK_HOME directory.")
+ cli.log.info("Type 'exit' to get back to the parent shell.")
+ if not cli.platform.lower().startswith('windows'):
+ # For Linux/Mac/etc
+ # Check the user's login shell from 'passwd'
+ # alternatively fall back to $SHELL env var
+ # and finally to '/bin/bash'.
+ import getpass
+ import pwd
+ shell = pwd.getpwnam(getpass.getuser()).pw_shell
+ if not shell:
+ shell = os.environ.get('SHELL', '/bin/bash')
+ # Start the new subshell
+ os.execl(shell, shell)
+ else:
+ # For Windows
+ # Check the $SHELL env var
+ # and fall back to '/usr/bin/bash'.
+ qmk_env = os.environ.copy()
+ # Set the prompt for the new shell
+ qmk_env['MSYS2_PS1'] = qmk_env['PS1']
+ # Start the new subshell
+ cli.run([os.environ.get('SHELL', '/usr/bin/bash')], env=qmk_env)
+ else:
+ cli.log.info("Already within qmk_firmware directory.")
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index d81f30438a..dc42fdd4d9 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -25,6 +25,13 @@ def _valid_community_layout(layout):
return (Path('layouts/default') / layout).exists()
+def _remove_newlines_from_labels(layouts):
+ for layout_name, layout_json in layouts.items():
+ for key in layout_json['layout']:
+ if '\n' in key['label']:
+ key['label'] = key['label'].split('\n')[0]
+
+
def info_json(keyboard):
"""Generate the info.json data for a specific keyboard.
"""
@@ -100,10 +107,7 @@ def info_json(keyboard):
_check_matrix(info_data)
# Remove newline characters from layout labels
- for layout_name, layout_json in layouts.items():
- for key in layout_json['layout']:
- if '\n' in key['label']:
- key['label'] = key['label'].split('\n')[0]
+ _remove_newlines_from_labels(layouts)
return info_data