zvecr
05911e9908
bodge 'qmk xap -l' for windows
2022-03-29 18:36:08 +01:00
zvecr
7262333857
Use generic 'dump_lines'
2022-03-28 21:18:17 +01:00
zvecr
ff1bb76537
basic info.json handling
2022-03-28 21:06:16 +01:00
QMK Bot
fc45ff1f07
Merge remote-tracking branch 'origin/develop' into xap
2022-03-27 20:29:43 +00:00
QMK Bot
03f9b8db15
Merge remote-tracking branch 'origin/master' into develop
2022-03-27 20:29:09 +00:00
Erovia
8c0198334c
CLI: Lint non-data driven macros in info.json ( #16739 )
...
* CLI: Lint non-data driven macros in info.json
Macros in info.json should either have the "matrix" key with the matrix
data or should should be also present in <keyboard>.h
* Add verification of matrix data
* Use generic '<keyboard>.h' in output
* Add keyboard name to output
* Make C layout macro finding more robust
The old code missed C macros if they had whitespace between '#' and
'define' or had whitespace before '#'.
2022-03-27 21:28:36 +01:00
Drashna Jael're
80102c0e83
Merge remote-tracking branch 'origin/develop' into xap
2022-03-26 13:37:01 -07:00
QMK Bot
05ac5727f2
Merge remote-tracking branch 'origin/master' into develop
2022-03-26 19:15:58 +00:00
Erovia
55e5daa868
Fix bug when 'info.json' lookup escapes keyboard dir ( #16734 )
2022-03-26 19:15:25 +00:00
Drashna Jael're
15e0964108
Merge remote-tracking branch 'origin/develop' into xap
2022-03-26 10:32:27 -07:00
QMK Bot
2957f60dc1
Merge remote-tracking branch 'origin/master' into develop
2022-03-24 20:14:36 +00:00
Erovia
efc9c525b1
CLI: Add 'via2json' subcommand ( #16468 )
2022-03-24 21:13:40 +01:00
QMK Bot
728305e961
Merge remote-tracking branch 'origin/develop' into xap
2022-03-22 10:48:49 +00:00
Joel Challis
23f365f8bc
Ignore transport defaults if SPLIT_KEYBOARD is unset ( #16706 )
...
* Ignore transport defaults if SPLIT_KEYBOARD is unset
* keep exists check
2022-03-22 10:48:13 +00:00
zvecr
e31c605bf7
revert split logic
2022-03-22 00:04:12 +00:00
zvecr
f872fbea7e
Merge remote-tracking branch 'origin/develop' into xap
2022-03-21 12:46:36 +00:00
Joel Challis
4f8cc32cf5
Extend 'qmk info' to handle keymap level overrides ( #16702 )
2022-03-21 11:57:41 +01:00
zvecr
b365cbce15
Merge in keymap level to XAP info.json payload
2022-03-20 01:25:04 +00:00
QMK Bot
29f349b90b
Merge remote-tracking branch 'origin/develop' into xap
2022-03-19 20:59:36 +00:00
QMK Bot
729d7c2b2e
Merge remote-tracking branch 'origin/master' into develop
2022-03-19 20:59:03 +00:00
Ryan
2f095b8925
qmk.path.FileType: fix argument handling ( #16693 )
...
* qmk.path.FileType: pass in mode as first argument
* Better solution
* Grammar...
2022-03-19 20:58:30 +00:00
zvecr
4d4b013e5b
Fixup after merge
2022-03-18 17:03:54 +00:00
zvecr
5bb6173cc7
Fixup after merge
2022-03-18 17:01:02 +00:00
zvecr
e5e1e54f39
Merge remote-tracking branch 'origin/develop' into xap
2022-03-18 16:57:34 +00:00
QMK Bot
3a08deb7fe
Merge remote-tracking branch 'origin/master' into develop
2022-03-18 16:02:57 +00:00
Joel Challis
ed773ab73c
Relocate CLI git interactions ( #16682 )
2022-03-18 16:02:24 +00:00
zvecr
72602a3443
Fixup after merge
2022-03-18 01:53:39 +00:00
zvecr
2e8db66201
Merge remote-tracking branch 'origin/develop' into xap
2022-03-18 01:20:16 +00:00
zvecr
bffb209eee
Merge remote-tracking branch 'origin/master' into develop
2022-03-18 01:15:23 +00:00
Joel Challis
e5823b5650
[CLI] Add common util for dumping generated content ( #16674 )
2022-03-18 01:09:29 +00:00
zvecr
31c4864705
Crude CLI device discovery
2022-03-16 19:45:42 +00:00
zvecr
9fd4db1fc7
fix up for pytest - remove fstring escaping
2022-03-16 10:58:21 +00:00
zvecr
52d3b9dcc5
fix up for pytest
2022-03-16 00:10:40 +00:00
zvecr
2b4724bd83
Convert info_json_gz.h generation to CLI
2022-03-15 17:59:12 +00:00
zvecr
b96b862ef9
Merge remote-tracking branch 'origin/develop' into xap
2022-03-15 13:27:35 +00:00
QMK Bot
31eb82c911
Merge remote-tracking branch 'origin/master' into develop
2022-03-10 21:34:11 +00:00
Erovia
b75f6691a1
CLI: Fix 'cd' subcommand on Windows ( #16610 )
...
The 'cd' subcommand was failing as the current shell's Windows path was
mangled while milc processed it.
Using 'subprocess' directly avoids this issue and an extra layer of
subshell.
2022-03-10 21:33:41 +00:00
Nick Brassel
c3ac89d1c9
qmk format-c, qmk format-python
2022-03-09 20:01:20 +11:00
Nick Brassel
575d8c19fc
Merge remote-tracking branch 'upstream/develop' into xap
2022-03-09 19:47:31 +11:00
Nick Brassel
8d5eacb7dd
Add support for encoder mapping. ( #13286 )
2022-03-09 19:29:00 +11:00
QMK Bot
49bc3b530b
Merge remote-tracking branch 'origin/master' into develop
2022-03-08 20:46:24 +00:00
Ryan
b593cfccbd
qmk info: Nicer rendering of big-ass enter (#16541 )
...
* `qmk info`: Nicer rendering of big-ass enter
* Formatting...
2022-03-08 20:45:47 +00:00
Ryan
75544d9127
Move Doxygen docs to subdirectory ( #16561 )
2022-03-07 11:22:22 +00:00
QMK Bot
f7512d61bd
Merge remote-tracking branch 'origin/master' into develop
2022-03-05 22:55:11 +00:00
Ryan
8e9d45d270
qmk info: nicer rendering of ISO enter (#16466 )
2022-03-05 22:54:32 +00:00
Ryan
7d41639d54
Map data driven DESCRIPTION as string literal ( #16523 )
2022-03-05 00:20:34 +00:00
Ryan
ace0603f4f
Change data driven "str" type to represent a quoted string literal ( #16516 )
...
* Change data driven "str" type to represent a quoted string literal
* Update docs
2022-03-04 13:25:24 +00:00
QMK Bot
36e47cb3aa
Merge remote-tracking branch 'origin/master' into develop
2022-02-28 20:03:22 +00:00
Erovia
fbfd5312b9
CLI: Validate JSON keymap input ( #16261 )
...
* Fix schema validator
It should use the passed schema.
* Add required attributes to keymap schema
* Rework subcommands to validate the JSON keymaps
The 'compile', 'flash' and 'json2c' subcommands were reworked to add
JSON keymap validation so error is reported for non-JSON and
non-compliant-JSON inputs.
* Fix required fields in keymap schema
* Add tests
* Fix compiling keymaps directly from keymap directory
* Schema should not require version for now.
2022-02-28 20:02:39 +00:00
QMK Bot
3c7c9bdd86
Merge remote-tracking branch 'origin/master' into develop
2022-02-27 12:40:01 +00:00
