9115ddfedb
Merge remote-tracking branch 'origin/develop' into xap
2023-01-07 17:06:28 +00:00
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
c929942bff
Merge remote-tracking branch 'origin/develop' into xap
2023-01-06 04:17:27 +00:00
5c730d971e
Migrate submodule dirty check to CLI ( #19488 )
2023-01-06 04:16:52 +00:00
5ca4855afe
Merge remote-tracking branch 'origin/develop' into xap
2023-01-05 23:42:05 +00:00
b2384f1809
Merge remote-tracking branch 'origin/master' into develop
2023-01-05 23:41:28 +00:00
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
566376be27
Merge remote-tracking branch 'origin/develop' into xap
2023-01-04 04:18:45 +00:00
115c241f21
Merge remote-tracking branch 'origin/master' into develop
2023-01-04 04:17:58 +00:00
691668340c
Add qmk mass-compile, which intends to supercede qmk multibuild whilst providing support for filtering as per data-driven definitions. ( #18971 )
2023-01-04 04:10:18 +00:00
0a4264fea4
Merge remote-tracking branch 'origin/develop' into xap
2023-01-03 03:16:15 +00:00
c345278101
Replace list_keyboards.sh with CLI calls ( #19485 )
2023-01-03 14:15:29 +11:00
ebb8bf20c4
Merge remote-tracking branch 'origin/develop' into xap
2023-01-02 22:12:33 +00:00
b297531dbf
Migrate 'make git-submodule' to CLI command ( #19479 )
2023-01-03 09:11:57 +11:00
0bcd20162f
Merge remote-tracking branch 'origin/develop' into xap
2023-01-02 22:01:10 +00:00
3a5a4c708f
Report submodule status when not valid work-tree ( #19474 )
2023-01-03 09:00:29 +11:00
35ff477d77
dedupe merge_ordered_dicts
2023-01-01 19:20:04 +00:00
c316a5c7b6
Merge remote-tracking branch 'origin/develop' into xap
2023-01-01 19:17:15 +00:00
24adecd922
Implement XAP style merge semantics for DD keycodes ( #19397 )
2023-01-01 19:16:38 +00:00
c2ce5b878c
Merge remote-tracking branch 'origin/develop' into xap
2023-01-01 04:52:06 +00:00
e4cfbd2532
Allow CLI to flash .uf2 files ( #19462 )
2023-01-01 15:51:29 +11:00
e0de07773d
Merge remote-tracking branch 'origin/develop' into xap
2023-01-01 00:47:01 +00:00
422fd8aed8
Merge remote-tracking branch 'origin/master' into develop
2023-01-01 00:44:40 +00:00
b8e12eed80
WSL qmk flash firmware.bin workaround ( #19434 )
2023-01-01 11:44:33 +11:00
61696fda83
CLI flashers should allow files outside qmk_firmware folder ( #19454 )
2023-01-01 11:43:30 +11:00
e8a58535e3
Merge remote-tracking branch 'origin/develop' into xap
2022-12-23 18:19:35 +00:00
003cee0098
Validate keyboard name before accepting further input ( #19394 )
2022-12-23 18:18:57 +00:00
92668735cc
Merge remote-tracking branch 'origin/develop' into xap
2022-12-23 11:13:20 +00:00
8f506b5bc2
Merge remote-tracking branch 'origin/master' into develop
2022-12-23 11:12:33 +00:00
ab1898e660
Minor alignment of rgb_breathe_table generator ( #19403 )
2022-12-23 11:11:56 +00:00
1ca4aeaeb3
Merge remote-tracking branch 'origin/develop' into xap
2022-12-21 23:35:55 +00:00
e5721bbd37
Remaining DD keymap_extras migration ( #19110 )
...
* Parse headers to data
* Regen headers from data
2022-12-21 23:35:23 +00:00
ce56f20ee2
Merge remote-tracking branch 'origin/develop' into xap
2022-12-14 15:32:17 +00:00
962e4c0e18
[Test] Reset timer for every unit test and provide timestamps for log messages ( #17028 )
2022-12-15 02:31:08 +11:00
ee93b00e6c
Merge remote-tracking branch 'upstream/develop' into xap
2022-12-10 13:29:35 +11:00
9bc7e9afbd
Initial uk+us DD keymap_extras migration ( #19031 )
2022-12-09 00:54:52 +00:00
6fdac4f80f
Merge remote-tracking branch 'origin/develop' into xap
2022-12-08 16:32:10 +00:00
5a2ed77a08
Merge remote-tracking branch 'origin/master' into develop
2022-12-08 16:31:37 +00:00
6e6039995b
Add lint check for keyboard/keymap license header ( #19215 )
2022-12-09 03:31:02 +11:00
d41b071b41
Merge remote-tracking branch 'origin/develop' into xap
2022-12-03 12:04:41 +00:00
32dabd5320
Align new-keymap with new-keyboard ( #19229 )
2022-12-03 12:04:06 +00:00
69af71779f
Merge remote-tracking branch 'origin/develop' into xap
2022-12-03 00:43:25 +00:00
82760bcea6
Apply suggested workaround for #18371 ( #19226 )
...
Fixes undefined
2022-12-03 11:42:54 +11:00
0431558da0
Mock up audio routes to match via
2022-12-02 22:48:00 +00:00
352db98418
Merge remote-tracking branch 'origin/develop' into xap
2022-11-30 20:09:29 +00:00
3e59bbd731
Automate "Data Driven" migrations ( #17820 )
2022-11-30 20:08:54 +00:00
cda509bfbd
Merge remote-tracking branch 'origin/develop' into xap
2022-11-30 06:40:49 +00:00
5d516ac2e2
Ignore some layout macro names from lint ( #19207 )
2022-11-30 06:39:41 +00:00
fc927a9dcd
Merge remote-tracking branch 'origin/develop' into xap
2022-11-30 04:29:21 +00:00
17fec52b0f
Extend layout lint checks ( #19200 )
...
* Extend layout lint checks
* Apply suggestions from code review
Co-authored-by: Ryan <fauxpark@gmail.com >
* Fix function comment
Co-authored-by: Ryan <fauxpark@gmail.com >
2022-11-30 04:27:48 +00:00
QMK Bot
Joel Challis
Sergey Vlasov
Nick Brassel
jack
Stefan Kerkmann