Commit Graph

101 Commits

Author SHA1 Message Date
Erovia
bad0b20fe5 CLI: Udev related fixes and improvements (#10736) 2021-01-12 22:43:34 -08:00
Zach White
781cc0ed51 New command: qmk lint (#10761)
* Basic qmk lint command

* check for keymap readme

* change the workflow from qmk info to qmk lint

* add a strict mode

* parsing -> parse

* document qmk lint

* small info logging cleanup

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

* honor --strict in more places

* change the job name to lint

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-12 22:43:34 -08:00
Ryan
4a2c2a8e8a CLI: Add qmk clean (#10785) 2021-01-12 22:43:33 -08:00
Ryan
d5a353b263 qmk info: Add --ascii flag (#10793)
* `qmk info`: Add `--ascii` flag

* Fix typo

* Force ASCII for Windows/MSYS2

* Make it gooder

* Remove redundant windows check

* ...And this too

* Make pytest work on Windows
2021-01-12 22:43:33 -08:00
Ryan
2e58be9e14 c2json: Fix TypeError on MSYS2 (#10709) 2021-01-12 22:43:32 -08:00
Ryan
6a285785f2 Fix CLI warning for Massdrop udev rule (#10691) 2021-01-12 22:43:32 -08:00
Ryan
aab7d18bcb [CLI] Remove check for Input Club boards (#10636) 2021-01-12 22:43:32 -08:00
Erovia
b6dbef77e2 CLI: Fix stripping of ANY from Configurator exports (#10585)
058737f broke it ¯\_(ツ)_/¯
2021-01-12 22:43:31 -08:00
Ryan
9daa7dcb37 CLI: Fix MCU lists for qmk info (#10574) 2021-01-12 22:43:31 -08:00
Erovia
5af121f815 [CLI] Add c2json (#8817)
* Basic keymap parsing finally works

* Add 'keymap.json' creation to the qmk.keymap module

* Add tests and fix formatting

* Fix/exclude flake8 errors

* Convert keymap.c to valid keymap.json

* Fix some errors

* Add tests

* Finalize keymap.json creation, add json template

* Add docs

* Move pygments to the standard requirements

* Add support for nameless layers, fix tests

* Fix things after rebase

* Add missing 'keymap' value.

* Fix missing layer numbers from advanced keycodes

Buckwich noticed that if the advanced keycode / layer toggling key
contains a number, it goes missing.
Now we properly handle them.
Thx for noticing!

* Apply suggestions from code review

* fixup tests

Co-authored-by: Zach White <skullydazed@drpepper.org>
Co-authored-by: skullY <skullydazed@gmail.com>
2021-01-12 22:43:31 -08:00
Ryan
ae5ee61e7b CLI: update subcommands to use return instead of exit() (#10323) 2021-01-12 22:43:31 -08:00
Ryan
cce4f22e3a Improve LAYOUT macro searching (#9530)
* Improve LAYOUT macro searching

* Apply suggestions from code review

Co-authored-by: Zach White <skullydazed@users.noreply.github.com>

* Adjust signature

* Try to copy the makefile's handling of DEFAULT_FOLDER

* Move it further up, into `info_json()`

* Move it even further up so that keyboard_folder is correct

* Update lib/python/qmk/info.py

Co-authored-by: Zach White <skullydazed@drpepper.org>

* Update lib/python/qmk/info.py

Co-authored-by: Zach White <skullydazed@drpepper.org>

Co-authored-by: Zach White <skullydazed@users.noreply.github.com>
Co-authored-by: Zach White <skullydazed@drpepper.org>
2021-01-12 22:43:30 -08:00
Ryan
63d73fdb02 Add STM32F401/F411 to ARM_PROCESSORS (#10362) 2021-01-12 22:43:29 -08:00
Ryan
47559f7960 Consolidate udev wules into a single file 2021-01-12 22:43:28 -08:00
Drashna Jael're
12207daaff Update QMK CLI to be inline with upstream 2020-09-07 13:28:27 -07:00
Ryan
43dadc79ff Parse version better in qmk doctor GCC version checks (#9324) 2020-08-08 21:16:44 -07:00
Erovia
15cc75be6f CLI: Add ATmega328 and ATtiny85 to supported CPUs (#9371)
* CLI: Add ATmega328 to supported CPUs

Support for ATmega328 was added in #9043.

* Update lib/python/qmk/constants.py
2020-08-08 21:07:30 -07:00
Zach White
51912a8efc Fix running qmk info without any arguments (#9218) 2020-08-08 20:33:17 -07:00
Zach White
e85a5f04f8 Fix the path for generated keymaps (#9213) 2020-08-08 20:32:02 -07:00
Zach White
583c2cead2 Fix compiling json files (#9210) 2020-08-08 20:31:26 -07:00
Zach White
ec8c10ac1b [CLI] Add a subcommand for getting information about a keyboard (#8666)
You can now use `qmk info` to get information about keyboards and keymaps.

Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2020-08-08 20:31:13 -07:00
Erovia
5ea1cd3526 CLI: fix json2c subcommand and add/fix tests (#9206)
Co-authored-by: Zach White <skullydazed@users.noreply.github.com>
2020-08-08 20:29:03 -07:00
Erovia
e73966e6c2 CLI: Rework submodule checking (#9162) 2020-06-12 17:00:27 +09:00
Erovia
7a685cf795 Fix submodule check (#9155) 2020-06-12 17:00:27 +09:00
codecoffeecode
c5ec960a11 Adding unit tests for list-keymaps command (#7711)
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: Erovia <Erovia@users.noreply.github.com>
2020-06-12 17:00:27 +09:00
Erovia
dc99dab283 CLI: Tune doctor's udev rule checking to match #8750 2020-06-12 17:00:27 +09:00
Keenan Brock
d4dd4d4864 [kle2info] Trim the code in kle2xy (#8955)
* [kle2jinfo] use min/max instead of if

This is a slight change.
Before, the key_skel would keep the invalid value for future keys.
I think this is what was actually intended.

* [kle2info] calculate x

x is the current_x * key_size + (key_size/2)
y is the current_y * key_size + (key_size/2)

no reason to track both
2020-06-12 17:00:27 +09:00
Keenan Brock
2b10d303d4 kle2info: trim down x and y output
fixes quirks with float implementation.

before:
{"label":"Esc", "x":0.66, "y":1.45}, {"label":"!", "x":1.6600000000000001, "y":1.45}

after:
{"label":"Esc", "x":0.66, "y":1.45}, {"label":"!", "x":1.66, "y":1.45}
2020-06-12 17:00:27 +09:00
Keenan Brock
df51ac1db1 kle2json: fix invocation error
resolves an issue while finding the file path

TypeError: unsupported operand type(s) for +: 'PosixPath' and 'str'
2020-06-12 17:00:27 +09:00
skullydazed
1dfe06affc Move everything to Python 3.6 (#8835) 2020-06-12 17:00:27 +09:00
skullydazed
107ceb3d39 MILC: Fix setting config values for store_true and store_false (#8813) 2020-06-12 17:00:27 +09:00
Pete Johanson
470be280d4 CLI: Fix doctor error when can't run bin/qmk --version. (#8796) 2020-06-12 17:00:27 +09:00
Pete Johanson
27e43567d7 CLI: Use shutil.which to detect gmake, instead of OS check. 2020-06-12 17:00:27 +09:00
Pete Johanson
84562a4465 CLI: Invoke gmake on FreeBSD when using qmk compile.
* Current makefiles aren't portable, so invoke gmake on FreeBSD.
2020-06-12 17:00:27 +09:00
Erovia
dcad318105 Don't hide for devs... 2020-06-12 17:00:27 +09:00
Erovia
874a6c9076 Rebase on master, hide some other subcommands
The list of hidden subcommands were approved by @skullydazed ;)
Currently hidden if 'user.developer' is not True:

  - cformat
  - docs
  - kle2json
  - pyformat
  - pytest
2020-06-12 17:00:27 +09:00
Erovia
2137d51432 CLI: Add development mode support
Hide development specific options and don't require dev modules unless
`user.developer` is set to `True`.
2020-06-12 17:00:27 +09:00
skullY
1709da86ad Correctly handle json keymaps with ANY() 2020-06-12 17:00:27 +09:00
Ryan
50b109c133 Doctor: Add avrdude/dfu-util/dfu-programmer version printing (#8678)
* Doctor: Add avrdude/dfu-util/dfu-programmer version printing

* Extra newline

* Iterate through version checking functions
2020-06-12 17:00:27 +09:00
skullY
b1f674ca8c minor tweaks 2020-06-12 17:00:27 +09:00
Ross Baquir
e5af14f7cc Fix saving output from avrdude and dfu-programmer 2020-06-12 17:00:27 +09:00
Ross Baquir
3b2ecdedde Use version_arg in ESSENTIAL_BINARIES dict 2020-06-12 17:00:27 +09:00
Ross Baquir
0a76aa88b9 Fixes #8541 by getting version from -dumpversion then --version as fallback 2020-06-12 17:00:27 +09:00
Erovia
b656b61e58 CLI: More MSYS2 fixes (#8577)
* CLI: More MSYS2 fixes

Now I can fully setup and work with qmk_firmware on an MSYS2
installation without any errors or exceptions.

* Apply suggestions from code review

Co-Authored-By: skullydazed <skullydazed@users.noreply.github.com>

* Some improvements

* Remove unnecessary import

* Remove slow, unused code

Getting the version from GIT was slow on both Windows and Docker.
Until we find a better, faster way, this is removed.

* remove unused imports

* Implement @vomindoraan's suggestions

* refine how we pick the shell to use

* Apply @fauxpark's suggestions

fauxpark investigated the topic of shells in MSYS2 a bit and we come to the conclusion that the safest bet was to just use the user's shell.
Anything more just opens up more edge-cases than it solves.

Co-Authored-By: Ryan <fauxpark@gmail.com>

* Use `platform_id` in doctor

This will bring it in line with the new code.

Co-authored-by: skullydazed <skullydazed@users.noreply.github.com>
Co-authored-by: skullY <skullydazed@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-06-12 17:00:27 +09:00
Erovia
0fcb6ef6d5 CLI: Hide json-keymap subcommand, as it's been deprecated. 2020-06-12 17:00:27 +09:00
skullydazed
6eb6e4669a Add decorators for determining keyboard and keymap based on current directory (#8191)
* Use pathlib everywhere we can

* Improvements based on @erovia's feedback

* rework qmk compile and qmk flash to use pathlib

* style

* Remove the subcommand_name argument from find_keyboard_keymap()

* add experimental decorators

* Create decorators for finding keyboard and keymap based on current directory.

Decorators were inspired by @Erovia's brilliant work on the proof of concept.
2020-06-12 17:00:27 +09:00
skullY
248655eedc use qmk.path.normpath to locate the output file. 2020-06-12 17:00:27 +09:00
skullydazed
ae57cdc97a Rename qmk json-keymap to qmk json2c (#8372) 2020-06-12 17:00:27 +09:00
skullydazed
928cb8ef92 Add gcc version detection to qmk doctor (#8338) 2020-06-12 17:00:27 +09:00
skullydazed
74bcafa2de Use pathlib everywhere we can (#7872)
* Use pathlib everywhere we can

* Update lib/python/qmk/path.py

Co-Authored-By: Erovia <Erovia@users.noreply.github.com>

* Update lib/python/qmk/path.py

Co-Authored-By: Erovia <Erovia@users.noreply.github.com>

* Improvements based on @erovia's feedback

* rework qmk compile and qmk flash to use pathlib

* style

* Remove the subcommand_name argument from find_keyboard_keymap()

Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2020-06-12 17:00:27 +09:00