Commit Graph

1029 Commits

Author SHA1 Message Date
QMK Bot
3b8612dc04 Merge remote-tracking branch 'origin/develop' into xap 2023-12-02 21:51:33 +00:00
Purdea Andrei
b68e89f846
Don't print error message when there are no row pins and no col pins (#20104)
* Don't print error message when there are no row pins and no col pins

This error message could be triggered for example if MATRIX_IO_DELAY is
configured in config.h, but the matrix is a custom one. The custom matrix
can still call back to existing delay functions that make use of the
MATRIX_IO_DELAY macro. In this case 'matrix_pins' in info_data will be true,
but there will be no 'direct' 'cols' or 'rows' in info_data['matrix_pins'],
and without this commit it would trigger an invalid error.

* Update lib/python/qmk/info.py

Co-authored-by: Nick Brassel <nick@tzarc.org>

---------

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-12-02 21:50:34 +00:00
QMK Bot
5c496210ca Merge remote-tracking branch 'origin/develop' into xap 2023-11-30 09:28:55 +00:00
Nick Brassel
024b4070c3
Fixup --no-temp for qmk mass-compile. (#22582) 2023-11-30 20:27:02 +11:00
QMK Bot
0692538254 Merge remote-tracking branch 'origin/develop' into xap 2023-11-29 02:47:36 +00:00
Nick Brassel
b7df75e47f
Fixup compilation with qmk compile -kb zzz -km all. (#22568) 2023-11-29 13:46:10 +11:00
QMK Bot
5c50cb2d37 Merge remote-tracking branch 'origin/develop' into xap 2023-11-28 14:08:30 +00:00
Nick Brassel
049e964e61
Attempt to fix configurator. (#22555) 2023-11-28 14:07:21 +00:00
Nick Brassel
39e7d44c92
Merge remote-tracking branch 'upstream/develop' into xap 2023-11-28 16:02:29 +11:00
Nick Brassel
5501e804ff
QMK Userspace (#22222)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-28 07:53:43 +11:00
Nick Brassel
8fa6fd6d64
Merge remote-tracking branch 'upstream/develop' into xap 2023-11-22 13:27:44 +11:00
Nick Brassel
0fcd13f552
[CLI] Remove duplicates from search results (#22528) 2023-11-22 12:08:26 +11:00
Nick Brassel
46b996a55e
CLI parallel search updates (#22525) 2023-11-22 11:14:34 +11:00
QMK Bot
986ca58e69 Merge remote-tracking branch 'origin/develop' into xap 2023-11-21 15:06:02 +00:00
Sergey Vlasov
7e27d72cbc
Fix qmk find failure due to circular imports (#22523)
There was an import cycle in the Python modules:

  - `qmk.build_targets` imported `qmk.cli.generate.compilation_database`;
  - importing `qmk.cli.generate.compilation_database` requires
    initializing `qmk.cli` first;
  - the initialization of `qmk.cli` imported the modules for all CLI
    commands;
  - `qmk.cli.compile` imported `qmk.build_targets`.

This cycle did not matter in most cases, because `qmk.cli` was imported
first, and in that case importing `qmk.cli.generate.compilation_database`
did not trigger the initialization of `qmk.cli` again.  However, there was
one corner case when `qmk.bulld_targets` was getting imported first:

  - The `qmk find` command uses the `multiprocessing` module.
  - The `multiprocessing` module uses the `spawn` start method on macOS
    and Windows.
  - When the `spawn` method is used, the child processes initialize
    without any Python modules loaded, and the required modules are loaded
    on demand by the `pickle` module when receiving the serialized objects
    from the main process.

The result was that the `qmk find` command did not work properly on macOS
(and probably Windows too); it reported exceptions like this:

    ImportError: cannot import name 'KeyboardKeymapBuildTarget' from partially initialized module 'qmk.build_targets' (most likely due to a circular import)

Moving the offending `qmk.cli.generate.compilation_database` import into
the method which actually uses it fixes the problem.
2023-11-21 15:05:29 +00:00
QMK Bot
8ee25dd9f2 Merge remote-tracking branch 'origin/develop' into xap 2023-11-20 15:42:20 +00:00
Joel Challis
e279c78ba3
Enable linking of encoders to switch within layout macros (#22264) 2023-11-20 15:41:48 +00:00
QMK Bot
a1461fdf05 Merge remote-tracking branch 'origin/develop' into xap 2023-11-18 21:26:30 +00:00
Sergey Vlasov
62cca5c43a
qmk find: Fix failure with multiple filters (#22497)
When multiple `-f FILTER` options were specified, `qmk find` did not
return anything at all instead of printing the list of entries that
matched all of the specified filters.

The problem was that the statement in `_filter_keymap_targets()` that
filled `targets` had a wrong indent and therefore was executed for every
filter instead of only once after applying all filters, and
`valid_keymaps` was actually an iterator and therefore could be used
only once.  Moving the statement outside of the loop fixes the problem.
2023-11-19 08:26:00 +11:00
QMK Bot
b1d9184cab Merge remote-tracking branch 'origin/develop' into xap 2023-11-15 05:25:30 +00:00
Nick Brassel
4938210711
CLI refactoring for common build target APIs (#22221) 2023-11-15 16:24:54 +11:00
Nick Brassel
cc42bb9251
Merge remote-tracking branch 'upstream/develop' into xap 2023-11-11 22:06:56 +11:00
QMK Bot
d8176fb0f2 Merge remote-tracking branch 'origin/master' into develop 2023-11-11 09:51:03 +00:00
Nick Brassel
211fbbd16d
Add qmk license-check developer-level CLI command. (#22075) 2023-11-11 20:50:33 +11:00
QMK Bot
62f92278f8 Merge remote-tracking branch 'origin/develop' into xap 2023-11-01 22:37:48 +00:00
Joel Challis
8ea955c72f
Improve argument handling of c2json (#22170)
* Improve argument handling of c2json

* Add automagic
2023-11-01 22:37:05 +00:00
zvecr
76970e1d98 Add command to produce docs for keyboard/keymap level xap.hjson 2023-11-01 03:04:27 +00:00
QMK Bot
47da199a6e Merge remote-tracking branch 'origin/develop' into xap 2023-11-01 02:12:15 +00:00
Joel Challis
b31426252e
Generate switch statement helpers for keycode ranges (#20059) 2023-11-01 13:11:42 +11:00
QMK Bot
3040d6cf49 Merge remote-tracking branch 'origin/develop' into xap 2023-11-01 01:27:04 +00:00
Joel Challis
fbbb221a31
Implement data driven lighting defaults (#21825) 2023-11-01 01:26:24 +00:00
zvecr
60cf8ba553 Merge remote-tracking branch 'origin/develop' into xap 2023-11-01 01:19:30 +00:00
Joel Challis
a19ae3d784
Add dd mapping for hardware based split handedness (#22369) 2023-11-01 00:55:48 +00:00
Joel Challis
17c3182b1c
Remove use of broken split.main (#22363) 2023-10-30 00:49:56 +00:00
Joel Challis
559450a099
Fix 'to_c' for config.h mappings (#22364) 2023-10-29 23:41:44 +00:00
Joel Challis
98530cad3b
Implement data driven dip switches (#22017)
* Add data driven dip switches

* Autogen weak matrix_mask
2023-10-29 01:09:02 +01:00
QMK Bot
4fd1117fbe Merge remote-tracking branch 'origin/develop' into xap 2023-10-21 00:48:45 +00:00
Joel Challis
e4c54a9612
Support additional split sync items for info.json (#22193) 2023-10-21 01:48:05 +01:00
QMK Bot
612b9c2edf Merge remote-tracking branch 'origin/develop' into xap 2023-10-16 22:45:02 +00:00
QMK Bot
20cefe254d Merge remote-tracking branch 'origin/master' into develop 2023-10-16 22:44:27 +00:00
Nick Brassel
f6c70c40af
Allow for disabling of parallel processing of qmk find and qmk mass-compile. (#22160)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-10-17 09:43:50 +11:00
QMK Bot
b8ff2f8bd1 Merge remote-tracking branch 'origin/develop' into xap 2023-10-08 11:46:23 +00:00
QMK Bot
690792eca9 Merge remote-tracking branch 'origin/master' into develop 2023-10-08 11:45:49 +00:00
Joel Challis
7ca652ce6d
Flag vial keymaps in 'qmk lint' (#22227) 2023-10-08 12:45:13 +01:00
QMK Bot
4c91fc5bf9 Merge remote-tracking branch 'origin/develop' into xap 2023-10-05 23:35:42 +00:00
QMK Bot
0ca60eb759 Merge remote-tracking branch 'origin/master' into develop 2023-10-05 23:35:02 +00:00
Nick Brassel
127560ae22
Add qmk ci-validate-aliases (#22205) 2023-10-06 10:34:23 +11:00
QMK Bot
cc89d98b32 Merge remote-tracking branch 'origin/develop' into xap 2023-09-28 20:49:29 +00:00
QMK Bot
a268437f17 Merge remote-tracking branch 'origin/master' into develop 2023-09-28 20:48:55 +00:00
Nick Brassel
c5706ef791
Allow for qmk mass-compile all:<keymap> (#22116)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-09-29 06:48:20 +10:00
QMK Bot
5bfbb007ef Merge remote-tracking branch 'origin/develop' into xap 2023-09-28 10:50:14 +00:00
QMK Bot
f4677c866e Merge remote-tracking branch 'origin/master' into develop 2023-09-28 10:49:40 +00:00
Nick Brassel
fb0c64a567
Allow inline generation of compile_commands.json while doing a qmk compile, using --compiledb (#21549) 2023-09-28 11:48:58 +01:00
QMK Bot
35079d1fb0 Merge remote-tracking branch 'origin/develop' into xap 2023-09-27 02:58:10 +00:00
Joel Challis
4e86dca49d
Fix parsing/validation for 21939 (#22148) 2023-09-27 03:57:37 +01:00
QMK Bot
1e1dd78cfc Merge remote-tracking branch 'origin/develop' into xap 2023-09-23 03:08:52 +00:00
QMK Bot
ac3a1c3569 Merge remote-tracking branch 'origin/master' into develop 2023-09-23 03:08:19 +00:00
Nick Brassel
73ffa4594d
Fix up qmk mass-compile makefile indenting. (#22115) 2023-09-23 13:07:38 +10:00
QMK Bot
025d8d3739 Merge remote-tracking branch 'origin/develop' into xap 2023-09-22 02:13:27 +00:00
QMK Bot
8ea8b80b85 Merge remote-tracking branch 'origin/master' into develop 2023-09-22 02:12:53 +00:00
Nick Brassel
abd432fd7a
Allow for qmk compile -kb all. (#22022) 2023-09-22 12:12:20 +10:00
QMK Bot
0f8eaab1bb Merge remote-tracking branch 'origin/develop' into xap 2023-09-14 20:39:53 +00:00
QMK Bot
24a922b54b Merge remote-tracking branch 'origin/master' into develop 2023-09-14 20:39:17 +00:00
Andrew Kannan
46d679ab11
qmk format-json: Add an in-place mode to format json command (#21610) 2023-09-14 21:38:42 +01:00
QMK Bot
b7c219b03c Merge remote-tracking branch 'origin/develop' into xap 2023-09-13 00:13:20 +00:00
Joel Challis
de381ad3b7
Generate keymap.json config options more forcefully (#21960) 2023-09-13 01:12:46 +01:00
QMK Bot
c2324ff646 Merge remote-tracking branch 'origin/develop' into xap 2023-08-27 03:00:54 +00:00
Joel Challis
95681b8ff4
Add *_MATRIX_LED_COUNT generation (#21110) 2023-08-27 04:00:14 +01:00
QMK Bot
36fd583581 Merge remote-tracking branch 'origin/develop' into xap 2023-08-01 00:55:02 +00:00
Joel Challis
27ff1d4153
Remove layout aliases from keyboard_aliases.hjson (#21658) 2023-08-01 01:54:28 +01:00
QMK Bot
2fbb797146 Merge remote-tracking branch 'origin/develop' into xap 2023-07-30 23:35:17 +00:00
Ryan
f407d90598
keycode aliases: work around ChibiOS ch.h include guard (#21497) 2023-07-31 09:35:06 +10:00
QMK Bot
44e4897097 Merge remote-tracking branch 'origin/develop' into xap 2023-07-30 23:34:53 +00:00
Ryan
030511ece3
CLI: Improve error messages when layout key matrix row/col is OOB (#21640) 2023-07-31 09:34:19 +10:00
QMK Bot
facac9609e Merge remote-tracking branch 'origin/develop' into xap 2023-07-07 14:48:51 +00:00
Less/Rikki
a0ea7a6b17
feat, docs: WB32 flashing (#21217) 2023-07-08 00:48:45 +10:00
QMK Bot
a7254cc1b1 Merge remote-tracking branch 'origin/develop' into xap 2023-07-07 14:09:30 +00:00
QMK Bot
21263438e5 Merge remote-tracking branch 'origin/master' into develop 2023-07-07 14:08:56 +00:00
Ryan
ef39ecd1b7
Adjust width requirement for big enter (#21470) 2023-07-08 00:08:13 +10:00
QMK Bot
53d38e2ecf Merge remote-tracking branch 'origin/develop' into xap 2023-07-07 12:10:34 +00:00
QMK Bot
8974e056a9 Merge remote-tracking branch 'origin/master' into develop 2023-07-07 12:09:59 +00:00
Pablo Martínez
6bdd8e2782
[Refactor] Python-ify QP's converter code (#20102) 2023-07-07 22:09:17 +10:00
QMK Bot
3992b0745a Merge remote-tracking branch 'origin/develop' into xap 2023-06-28 03:07:50 +00:00
Nick Brassel
c814be0296
STM32H723 support (#21352) 2023-06-28 13:07:14 +10:00
QMK Bot
d3d8f84b98 Merge remote-tracking branch 'origin/develop' into xap 2023-06-20 22:42:23 +00:00
Nick Brassel
ffdc70bf0a
Consolidate KEYBOARD_OUTPUT+KEYMAP_OUTPUT=>INTERMEDIATE_OUTPUT (#21272) 2023-06-21 08:41:49 +10:00
QMK Bot
518c84b3d1 Merge remote-tracking branch 'origin/develop' into xap 2023-06-08 20:09:28 +00:00
Ryan
a9f677b518
Slightly refine g_led_config parsing (#21170) 2023-06-08 21:08:02 +01:00
QMK Bot
e7040fbd6f Merge remote-tracking branch 'origin/develop' into xap 2023-06-02 01:46:27 +00:00
Joel Challis
aa33fb00fd
Revert "Add *_MATRIX_LED_COUNT generation/validation (#19515)" (#21109)
This reverts commit 25c16b3ade.
2023-06-02 02:45:48 +01:00
QMK Bot
36fe36201e Merge remote-tracking branch 'origin/develop' into xap 2023-06-02 01:43:31 +00:00
Joel Challis
25c16b3ade
Add *_MATRIX_LED_COUNT generation/validation (#19515)
* Add *_MATRIX_LED_COUNT parsing/validation

* Disable parsing for now

* Disable complexity check
2023-06-02 02:42:49 +01:00
QMK Bot
669e9138f7 Merge remote-tracking branch 'origin/develop' into xap 2023-05-30 18:25:43 +00:00
Sergey Vlasov
1411c79aef
qmk find: Fix handling of functions in filters (#21090)
Functions in filters did not work properly except when used in the last
(or only) filter.  The problem was caused by the peculiarity of the
`lambda` behavior in Python — any variables from the outer scope are
captured only by reference, therefore any subsequent reassignment of
those variables is propagated to all lambdas created earlier in the same
scope.  Together with the laziness of `filter()` (it returns an iterator
which performs filtering on demand) this resulted in all function
filters using the values of the `key` and `value` variables which
correspond to the last filter in the sequence, therefore the result of
filtering was wrong if some filter with a function was not the last one
in the sequence.

Apparently the shortest way to make a Python lambda capture some
variables by value is to add arguments with default values for such
variables (default values are evaluated when the lambda is created, and
any subsequent reassignments in the outer scope no longer changes them).
This makes filters with functions work properly even when such filters
are not at the last position in the sequence.
2023-05-30 19:24:19 +01:00
QMK Bot
5406b499f2 Merge remote-tracking branch 'origin/develop' into xap 2023-05-27 03:23:47 +00:00
Nick Brassel
5642bd1807
Fix up qmk find when not specifying filters. (#21059) 2023-05-27 13:23:07 +10:00
QMK Bot
5637276bdb Merge remote-tracking branch 'origin/develop' into xap 2023-05-26 02:08:35 +00:00
QMK Bot
5efdc28a86 Merge remote-tracking branch 'origin/master' into develop 2023-05-26 02:07:54 +00:00
Pablo Martínez
1c1bc565de
[Bugfix + Refactor] qmk painter-convert-graphics (#19994) 2023-05-26 03:07:06 +01:00
QMK Bot
d9eb6b197b Merge remote-tracking branch 'origin/develop' into xap 2023-05-24 22:28:34 +00:00
Joel Challis
6e41377824
qmk info - Remove printing of "Keyboard Folder" (#21033) 2023-05-24 23:27:57 +01:00
QMK Bot
9e39e8327c Merge remote-tracking branch 'origin/develop' into xap 2023-05-22 06:04:42 +00:00
Joel Challis
fb056c5437
Update json2c to use dump_lines (#21013) 2023-05-22 07:03:59 +01:00
QMK Bot
3cece05763 Merge remote-tracking branch 'origin/develop' into xap 2023-05-20 21:30:35 +00:00
QMK Bot
9d96bfc5f5 Merge remote-tracking branch 'origin/master' into develop 2023-05-20 21:29:58 +00:00
Nick Brassel
420e35f922
qmk generate-make-dependencies improvements (#21001)
* Recommendations from @sigprof

* Fix CI tests
2023-05-20 22:29:21 +01:00
QMK Bot
a85a446b01 Merge remote-tracking branch 'origin/develop' into xap 2023-05-20 12:16:19 +00:00
Ryan
6d90fa2300
qmk format-json: Expose full key path and respect sort_keys (#20836) 2023-05-20 22:15:05 +10:00
Ryan
102c42b14b
qmk find: usability improvements (#20440) 2023-05-20 22:14:43 +10:00
QMK Bot
26533480d8 Merge remote-tracking branch 'origin/develop' into xap 2023-05-20 12:12:54 +00:00
Peter
7b31c18d46
Fix English word list retrieval in qmk generate-autocorrect-data (#20915) 2023-05-20 22:11:57 +10:00
QMK Bot
fa5990f596 Merge remote-tracking branch 'origin/develop' into xap 2023-05-19 06:06:25 +00:00
Ryan
dc75c23f5c
CLI: Improve keymap folder resolution (#20981) 2023-05-19 16:05:43 +10:00
Nick Brassel
43880efb13
Merge remote-tracking branch 'upstream/develop' into xap 2023-05-15 22:22:10 +10:00
Nick Brassel
433dc60686
Merge remote-tracking branch 'upstream/master' into develop 2023-05-15 22:10:42 +10:00
Nick Brassel
507e32b28c
Generate make dependency file during build for info.json's etc. (#20451) 2023-05-15 21:58:12 +10:00
QMK Bot
179587a8b8 Merge remote-tracking branch 'origin/develop' into xap 2023-05-06 13:01:11 +00:00
Ryan
578102b400
Fix test_json2c_no_json() (#20756) 2023-05-06 14:00:27 +01:00
QMK Bot
82c2f9d560 Merge remote-tracking branch 'origin/develop' into xap 2023-04-29 15:52:32 +00:00
Ryan
998a4d744e
Remove FLIP_HALF layouts and move to data driven (#20588) 2023-04-30 01:51:45 +10:00
QMK Bot
cbf12799ca Merge remote-tracking branch 'origin/develop' into xap 2023-04-15 15:19:29 +00:00
Nick Brassel
c9f619124d
Encodermap direction define. (#20454) 2023-04-15 16:18:44 +01:00
QMK Bot
0a275d7e70 Merge remote-tracking branch 'origin/develop' into xap 2023-04-09 16:42:49 +00:00
QMK Bot
6c172772db Merge remote-tracking branch 'origin/master' into develop 2023-04-09 16:42:12 +00:00
Dasky
6e0acf0548
Add autocomplete to generate-compilation-database (#20387) 2023-04-09 17:41:30 +01:00
QMK Bot
722f4df065 Merge remote-tracking branch 'origin/develop' into xap 2023-04-07 13:09:22 +00:00
QMK Bot
4aa2cd45a1 Merge remote-tracking branch 'origin/master' into develop 2023-04-07 13:08:43 +00:00
Joel Challis
e9b36bebb2
Avoid generating empty ENCODER_RESOLUTION (#20179) 2023-04-07 14:07:59 +01:00
QMK Bot
64fc2959a6 Merge remote-tracking branch 'origin/develop' into xap 2023-04-07 06:38:29 +00:00
QMK Bot
5bc514036b Merge remote-tracking branch 'origin/master' into develop 2023-04-07 06:37:46 +00:00
Nick Brassel
2e766a9c7a
Add Discord webhook at end of each CI run. (#20355) 2023-04-07 16:37:06 +10:00
QMK Bot
d3cf76d984 Merge remote-tracking branch 'origin/develop' into xap 2023-04-04 05:11:19 +00:00
QMK Bot
0e7acb777a Merge remote-tracking branch 'origin/master' into develop 2023-04-04 05:10:36 +00:00
Nick Brassel
687883cf7d
Resolve keyboard names for qmk mass-compile. (#20335) 2023-04-04 15:09:55 +10:00
QMK Bot
16ea347817 Merge remote-tracking branch 'origin/develop' into xap 2023-04-04 00:16:13 +00:00
Ryan
81f321d331
qmk info: account for ISO enter when calculating layout X offset (#20325) 2023-04-04 01:15:35 +01:00
QMK Bot
b3e34b9c29 Merge remote-tracking branch 'origin/develop' into xap 2023-04-03 05:21:14 +00:00
Albert Y
47a51fda5d
Append user variables to the end of make command (#20177) 2023-04-03 15:20:39 +10:00
QMK Bot
a6a268d8e1 Merge remote-tracking branch 'origin/develop' into xap 2023-03-30 21:42:42 +00:00
QMK Bot
8686c527f7 Merge remote-tracking branch 'origin/master' into develop 2023-03-30 21:41:53 +00:00
Nick Brassel
c3c401f91d
[QP] Fix up delta frame boundaries (#20296) 2023-03-31 08:41:11 +11:00
QMK Bot
d3de673bbf Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 12:02:34 +00:00
QMK Bot
66f19518b4 Merge remote-tracking branch 'origin/master' into develop 2023-03-29 12:01:55 +00:00
Joel Challis
f56580404d
Minify content published to API (#20285) 2023-03-29 13:01:16 +01:00
QMK Bot
9e9011b765 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 10:27:31 +00:00
QMK Bot
2026165d8c Merge remote-tracking branch 'origin/master' into develop 2023-03-29 10:26:46 +00:00
Nick Brassel
5bb8f7ae84
Add ability for qmk mass-compile to build specified targets (#20294) 2023-03-29 21:26:05 +11:00
QMK Bot
ad33b072f5 Merge remote-tracking branch 'origin/develop' into xap 2023-03-28 01:54:05 +00:00
Joel Challis
f186abdf29
Reduce _validate complexity (#20274) 2023-03-28 02:53:28 +01:00
QMK Bot
5572a5eb99 Merge remote-tracking branch 'origin/develop' into xap 2023-03-27 19:01:46 +00:00