Commit Graph

836 Commits

Author SHA1 Message Date
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
Joel Challis 79b0f9168e Custom keycodes in JSON (#19925) 2023-03-27 20:01:07 +01:00
QMK Bot 919aebd4b6 Merge remote-tracking branch 'origin/develop' into xap 2023-03-27 18:16:08 +00:00
Joel Challis e35bb8ebfa Add force support to 'qmk git-submodule' (#19705) 2023-03-27 19:15:25 +01:00
zvecr e953b72835 Fix lint errors 2023-03-26 03:15:58 +01:00
QMK Bot c74439d49a Merge remote-tracking branch 'origin/develop' into xap 2023-03-24 02:48:06 +00:00
QMK Bot 2ae5a4a535 Merge remote-tracking branch 'origin/master' into develop 2023-03-24 02:47:22 +00:00
Ryan d6ce42ae5b Check for multiple matrix positions assigned to same key (#20039) 2023-03-24 13:46:42 +11:00
QMK Bot 19e0225d2b Merge remote-tracking branch 'origin/develop' into xap 2023-03-23 11:20:26 +00:00
Joel Challis fa4dfb542f Strip API specific output from qmk info (#20234) 2023-03-23 11:19:30 +00:00
zvecr 42895141de Decouple lighting_map from XAP 2023-03-23 00:48:52 +00:00
zvecr 7edc0bcd43 Tidy up bool implementation 2023-03-22 21:21:02 +00:00
zvecr 64c5531be6 Refactor inline_generator to template 2023-03-22 21:21:02 +00:00
QMK Bot 89e5152b5c Merge remote-tracking branch 'origin/develop' into xap 2023-03-21 08:25:58 +00:00