Commit Graph

1072 Commits

Author SHA1 Message Date
QMK Bot
7a4b14da11 Merge remote-tracking branch 'origin/develop' into xap 2023-12-06 07:00:39 +00:00
QMK Bot
8ba46dcf61 Merge remote-tracking branch 'origin/master' into develop 2023-12-06 07:00:10 +00:00
Sergey Vlasov
958215e9d6
Fix more qmk generate-api fallout from userspace support (#22619) 2023-12-06 17:59:42 +11:00
QMK Bot
5f63daf2b9 Merge remote-tracking branch 'origin/develop' into xap 2023-12-06 04:56:33 +00:00
QMK Bot
4e836dd6cf Merge remote-tracking branch 'origin/master' into develop 2023-12-06 04:56:04 +00:00
Ryan
f1043e3a92
Fix JSON keymap URLs generated by the API (#22618) 2023-12-06 15:55:35 +11:00
QMK Bot
cde94f827c Merge remote-tracking branch 'origin/develop' into xap 2023-12-05 13:33:16 +00:00
QMK Bot
ca2e424b75 Merge remote-tracking branch 'origin/master' into develop 2023-12-05 13:32:43 +00:00
Joel Challis
bba5c14933
Avoid exceptions when layouts contain OOB matrix values (#22609) 2023-12-05 13:32:07 +00:00
QMK Bot
5748866b1a Merge remote-tracking branch 'origin/develop' into xap 2023-12-02 23:59:20 +00:00
QMK Bot
ceb15bf5db Merge remote-tracking branch 'origin/master' into develop 2023-12-02 23:58:44 +00:00
Joel Challis
98f4e9b837
Fix qmk doctor not finding binaries on Windows (#22593) 2023-12-02 23:58:12 +00:00
QMK Bot
25fe07b94c Merge remote-tracking branch 'origin/develop' into xap 2023-12-02 22:47:39 +00:00
QMK Bot
c7a58bf280 Merge remote-tracking branch 'origin/master' into develop 2023-12-02 22:47:08 +00:00
Nick Brassel
01eed8d5d8
Dedup the list of tested userspace paths. (#22599) 2023-12-03 09:46:37 +11:00
QMK Bot
3b8612dc04 Merge remote-tracking branch 'origin/develop' into xap 2023-12-02 21:51:33 +00:00
QMK Bot
b45b3aaec7 Merge remote-tracking branch 'origin/master' into develop 2023-12-02 21:51:04 +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
QMK Bot
091310e75e Merge remote-tracking branch 'origin/master' into develop 2023-11-30 09:28:22 +00:00
Nick Brassel
024b4070c3
Fixup --no-temp for qmk mass-compile. (#22582) 2023-11-30 20:27:02 +11:00
QMK Bot
2bc8e2aa6f Merge remote-tracking branch 'origin/develop' into xap 2023-11-29 06:01:45 +00:00
Stefan Kerkmann
36ad597e15
lib: chibios-contrib: sync with chibios-21.11.x (#22560)
This contains commit from da78eb3759b8..9d7a7f904ed1:

    9d7a7f90 Merge pull request #382 from KarlK90/fix/rp2040-i2c-speeds
    70119934 Merge pull request #383 from
             KarlK90/fix/rp2040-usb-get-status-request
    1a1bbe6c rp2040: usb: fix usb_lld_get_status functions
    7d9212dd rp2040: i2c: fix speed calculation
    fb67e502 Merge pull request #377 from 1Conan/sn32_fix_registry
    e72939ef SN32: update registry
    5b4836ca Merge pull request #376 from dexter93/sn32_usb_v2
    5ded9de9 sn32: usb: do NOT clear interrupt status until handled
    Leftover Sonix reference code cleanup. Sometimes when there is
    traffic on more than 1 ep's packets would be dropped before they
    could be handled. Clearing the status flags after handling them
    takes care of it.
    e9a4a512 sn32: usb: only activate interrupts on lld start
    e4a35d1c sn32: fix host remote wakeup
2023-11-29 07:01:16 +01: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
zvecr
555b290f55 Revert lib/chibios-contrib 2023-11-01 02:33:09 +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