Commit Graph

674 Commits

Author SHA1 Message Date
QMK Bot
0bcd20162f Merge remote-tracking branch 'origin/develop' into xap 2023-01-02 22:01:10 +00:00
Joel Challis
3a5a4c708f
Report submodule status when not valid work-tree (#19474) 2023-01-03 09:00:29 +11:00
zvecr
35ff477d77 dedupe merge_ordered_dicts 2023-01-01 19:20:04 +00:00
QMK Bot
c316a5c7b6 Merge remote-tracking branch 'origin/develop' into xap 2023-01-01 19:17:15 +00:00
Joel Challis
24adecd922
Implement XAP style merge semantics for DD keycodes (#19397) 2023-01-01 19:16:38 +00:00
QMK Bot
c2ce5b878c Merge remote-tracking branch 'origin/develop' into xap 2023-01-01 04:52:06 +00:00
Joel Challis
e4cfbd2532
Allow CLI to flash .uf2 files (#19462) 2023-01-01 15:51:29 +11:00
QMK Bot
e0de07773d Merge remote-tracking branch 'origin/develop' into xap 2023-01-01 00:47:01 +00:00
QMK Bot
422fd8aed8 Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:44:40 +00:00
Joel Challis
b8e12eed80
WSL qmk flash firmware.bin workaround (#19434) 2023-01-01 11:44:33 +11:00
Joel Challis
61696fda83
CLI flashers should allow files outside qmk_firmware folder (#19454) 2023-01-01 11:43:30 +11:00
QMK Bot
e8a58535e3 Merge remote-tracking branch 'origin/develop' into xap 2022-12-23 18:19:35 +00:00
jack
003cee0098
Validate keyboard name before accepting further input (#19394) 2022-12-23 18:18:57 +00:00
QMK Bot
92668735cc Merge remote-tracking branch 'origin/develop' into xap 2022-12-23 11:13:20 +00:00
QMK Bot
8f506b5bc2 Merge remote-tracking branch 'origin/master' into develop 2022-12-23 11:12:33 +00:00
Joel Challis
ab1898e660
Minor alignment of rgb_breathe_table generator (#19403) 2022-12-23 11:11:56 +00:00
QMK Bot
1ca4aeaeb3 Merge remote-tracking branch 'origin/develop' into xap 2022-12-21 23:35:55 +00:00
Joel Challis
e5721bbd37
Remaining DD keymap_extras migration (#19110)
* Parse headers to data

* Regen headers from data
2022-12-21 23:35:23 +00:00
QMK Bot
ce56f20ee2 Merge remote-tracking branch 'origin/develop' into xap 2022-12-14 15:32:17 +00:00
Stefan Kerkmann
962e4c0e18
[Test] Reset timer for every unit test and provide timestamps for log messages (#17028) 2022-12-15 02:31:08 +11:00
Nick Brassel
ee93b00e6c
Merge remote-tracking branch 'upstream/develop' into xap 2022-12-10 13:29:35 +11:00
Joel Challis
9bc7e9afbd
Initial uk+us DD keymap_extras migration (#19031) 2022-12-09 00:54:52 +00:00
QMK Bot
6fdac4f80f Merge remote-tracking branch 'origin/develop' into xap 2022-12-08 16:32:10 +00:00
QMK Bot
5a2ed77a08 Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:31:37 +00:00
Joel Challis
6e6039995b
Add lint check for keyboard/keymap license header (#19215) 2022-12-09 03:31:02 +11:00
QMK Bot
d41b071b41 Merge remote-tracking branch 'origin/develop' into xap 2022-12-03 12:04:41 +00:00
Joel Challis
32dabd5320
Align new-keymap with new-keyboard (#19229) 2022-12-03 12:04:06 +00:00
QMK Bot
69af71779f Merge remote-tracking branch 'origin/develop' into xap 2022-12-03 00:43:25 +00:00
Joel Challis
82760bcea6
Apply suggested workaround for #18371 (#19226)
Fixes undefined
2022-12-03 11:42:54 +11:00
QMK Bot
352db98418 Merge remote-tracking branch 'origin/develop' into xap 2022-11-30 20:09:29 +00:00
Joel Challis
3e59bbd731
Automate "Data Driven" migrations (#17820) 2022-11-30 20:08:54 +00:00
QMK Bot
cda509bfbd Merge remote-tracking branch 'origin/develop' into xap 2022-11-30 06:40:49 +00:00
Joel Challis
5d516ac2e2
Ignore some layout macro names from lint (#19207) 2022-11-30 06:39:41 +00:00
QMK Bot
fc927a9dcd Merge remote-tracking branch 'origin/develop' into xap 2022-11-30 04:29:21 +00:00
Joel Challis
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
3ec8ba641b Merge remote-tracking branch 'origin/develop' into xap 2022-11-25 17:33:19 +00:00
QMK Bot
2582992381 Merge remote-tracking branch 'origin/master' into develop 2022-11-25 17:32:45 +00:00
Ryan
8f9b49dc5b
Fix build failures for bastardkb/tbk and jels/boaty (#19152) 2022-11-25 17:31:58 +00:00
QMK Bot
d7c6f31567 Merge remote-tracking branch 'origin/develop' into xap 2022-11-23 18:49:04 +00:00
Joel Challis
af6aa225eb
Additional DD backlight config (#19124)
* Additional dd backlight config

* Update docs
2022-11-23 18:48:22 +00:00
QMK Bot
7bc9ff8fe1 Merge remote-tracking branch 'origin/develop' into xap 2022-11-23 18:01:40 +00:00
Joel Challis
dfa53900dc
Publish constants metadata to API (#19143)
* Publish metadata

* Ensure content is sorted
2022-11-23 18:01:07 +00:00
zvecr
2ba7232131 Remove duplicate comment 2022-11-18 00:18:11 +00:00
QMK Bot
830d8a76da Merge remote-tracking branch 'origin/develop' into xap 2022-11-15 06:44:39 +00:00
Drashna Jaelre
1a3f2130d5
Revert "Add pointing device support to data driven config (#18215)" (#19063) 2022-11-15 17:44:09 +11:00
QMK Bot
ec7c36145b Merge remote-tracking branch 'origin/develop' into xap 2022-11-13 16:06:25 +00:00
Drashna Jaelre
d3073ef494
Add pointing device support to data driven config (#18215)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-11-14 03:05:46 +11:00
QMK Bot
4e86fc43ff Merge remote-tracking branch 'origin/develop' into xap 2022-11-09 15:51:31 +00:00
Joel Challis
dc9162438d
Reject json with duplicate keys? (#18108) 2022-11-09 15:50:43 +00:00
QMK Bot
b6506ccab9 Merge remote-tracking branch 'origin/develop' into xap 2022-11-09 14:04:20 +00:00