Commit Graph

749 Commits

Author SHA1 Message Date
QMK Bot fc9021240c Merge remote-tracking branch 'origin/develop' into xap 2023-02-02 18:24:11 +00:00
Pablo Martínez d55b07696b Add commit info to version.h (#19542)
* Initial commit

* Fix import order

* Fix deleted code instead of debug print line

* Format

* Update lib/python/qmk/cli/generate/version_h.py

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

* Renaming

* Update lib/python/qmk/cli/generate/version_h.py

Co-authored-by: Joel Challis <git@zvecr.com>

* Update lib/python/qmk/git.py

Co-authored-by: Joel Challis <git@zvecr.com>

---------

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-02 18:23:27 +00:00
QMK Bot 5c9b49c9ff Merge remote-tracking branch 'origin/develop' into xap 2023-01-30 07:56:55 +00:00
fauxpark ef6505ad75 Merge remote-tracking branch 'upstream/master' into develop 2023-01-30 18:55:36 +11:00
Ryan 2c878b1b16 Clean up qmk generate-autocorrect-data (#19710) 2023-01-30 03:37:02 +00:00
Nick Brassel 33e8e63e74 Merge remote-tracking branch 'upstream/develop' into xap 2023-01-25 11:24:52 +11:00
QMK Bot d14863c00b Merge remote-tracking branch 'origin/master' into develop 2023-01-24 14:20:10 +00:00
Natan-P b24fa2f9db escaped stray backslash in bux.py (#19667) 2023-01-24 14:19:34 +00:00
QMK Bot 0970845492 Merge remote-tracking branch 'origin/develop' into xap 2023-01-20 03:39:02 +00:00
Joel Challis fe6502f12e Publish keymap.json to API (#19167) 2023-01-20 03:38:19 +00:00
QMK Bot 9996e65ab4 Merge remote-tracking branch 'origin/develop' into xap 2023-01-19 10:26:27 +00:00
Joel Challis 4973950ddc Print distro in doctor output (#19633) 2023-01-19 10:25:47 +00:00
QMK Bot d5d168c081 Merge remote-tracking branch 'origin/develop' into xap 2023-01-19 01:06:47 +00:00
QMK Bot 3723c0e3d5 Merge remote-tracking branch 'origin/master' into develop 2023-01-19 01:06:08 +00:00
Nick Brassel 327f7ee9a7 Fixup ChibiOS header inclusion search ordering. (#19623)
* Add STM32F446-Nucleo onekey. 

* Fixup onekey build for F446, all keymaps.

* Fixup board inclusion search ordering.
2023-01-19 01:05:29 +00:00
QMK Bot be9c13dcf9 Merge remote-tracking branch 'origin/develop' into xap 2023-01-19 00:27:37 +00:00
Joel Challis 0b25528b6b Fix 'No LAYOUTs defined' check (#19537) 2023-01-19 00:27:11 +00:00
Joel Challis 0ce3f6bcfe De-duplicate platform detection (#19603) 2023-01-19 00:27:00 +00:00
QMK Bot 355ad8f80a Merge remote-tracking branch 'origin/develop' into xap 2023-01-19 00:24:47 +00:00
Joel Challis a1f253cbef qmk compile/qmk flash - Validate keymap argument (#19530) 2023-01-19 00:24:13 +00:00
QMK Bot a54f64cd16 Merge remote-tracking branch 'origin/develop' into xap 2023-01-18 23:56:51 +00:00
Nick Brassel 4723f308ad Remove CLI commands: multibuild, cformat, fileformat, pyformat. (#19629) 2023-01-19 10:56:15 +11:00
QMK Bot 214ae5df35 Merge remote-tracking branch 'origin/develop' into xap 2023-01-18 23:45:24 +00:00
Joel Challis 88ec588ae7 Remove make all-<platform> build targets (#19496) 2023-01-19 10:44:41 +11:00
QMK Bot 9992b05947 Merge remote-tracking branch 'origin/develop' into xap 2023-01-18 22:37:33 +00:00
QMK Bot 364a910b92 Merge remote-tracking branch 'origin/master' into develop 2023-01-18 22:37:06 +00:00
Nick Brassel 17c9388af5 Allow for wildcard filtering in qmk mass-compile (#19625) 2023-01-18 22:36:32 +00:00
QMK Bot 5594a5153b Merge remote-tracking branch 'origin/develop' into xap 2023-01-14 10:25:25 +00:00
David Hoelscher 45851a10f6 Add RGB565 and RGB888 color support to Quantum Painter (#19382) 2023-01-14 21:24:54 +11:00
Nick Brassel 03c47d295e Jinja2 cleanup. 2023-01-14 15:37:07 +11:00
QMK Bot 8de3e044b6 Merge remote-tracking branch 'origin/develop' into xap 2023-01-11 19:59:08 +00:00
Joel Challis 46c85c93f0 Revert "De-duplicate platform detection (#19545)" (#19564)
This reverts commit e11235ee14.
2023-01-11 19:58:27 +00:00
QMK Bot 6347b11704 Merge remote-tracking branch 'origin/develop' into xap 2023-01-11 02:14:11 +00:00
Joel Challis e11235ee14 De-duplicate platform detection (#19545) 2023-01-11 02:13:32 +00:00
QMK Bot 621e6205e8 Merge remote-tracking branch 'origin/develop' into xap 2023-01-11 01:39:10 +00:00
Joel Challis 20474ae232 Fix CLI community detection (#19562) 2023-01-11 12:38:35 +11:00
zvecr 0137c4a310 Handle userspace xap.hjson spec files - remove prints.... 2023-01-09 19:39:58 +00:00
zvecr 8e9e6c3ea7 Handle userspace xap.hjson spec files 2023-01-09 19:35:47 +00:00
QMK Bot f66dc2bafe Merge remote-tracking branch 'origin/develop' into xap 2023-01-09 09:28:31 +00:00
Joel Challis b57714f793 qmk doctor - Handle timeouts while checking binaries (#19549) 2023-01-09 09:27:41 +00:00
QMK Bot 7d48f6d4aa Merge remote-tracking branch 'origin/develop' into xap 2023-01-09 08:21:58 +00:00
Joel Challis 1b045b1e60 Handle doctor permission issues while checking udev (#19548) 2023-01-09 08:21:21 +00:00
QMK Bot 9115ddfedb Merge remote-tracking branch 'origin/develop' into xap 2023-01-07 17:06:28 +00:00
Joel Challis 974a1eaf2a Ignore defaults.hjson values if already set (#19511)
* Ignore defaults.hjson values if already set

* Add warning when nothing is merged
2023-01-07 17:05:53 +00:00
QMK Bot c929942bff Merge remote-tracking branch 'origin/develop' into xap 2023-01-06 04:17:27 +00:00
Joel Challis 5c730d971e Migrate submodule dirty check to CLI (#19488) 2023-01-06 04:16:52 +00:00
QMK Bot 5ca4855afe Merge remote-tracking branch 'origin/develop' into xap 2023-01-05 23:42:05 +00:00
QMK Bot b2384f1809 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 23:41:28 +00:00
Sergey Vlasov 4a7d65b9d7 Fix MATRIX_COLS and MATRIX_ROWS generation for custom matrix (#19508)
The code which generated the MATRIX_COLS and MATRIX_ROWS defines from
the JSON information was checking the presence of the `matrix_pins` key,
which may not exist if a custom matrix is used.  Check the presence of
`matrix_size` instead.
2023-01-05 23:40:53 +00:00
QMK Bot 566376be27 Merge remote-tracking branch 'origin/develop' into xap 2023-01-04 04:18:45 +00:00