gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-13 21:30:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,297 Commits 63 Branches 1,613 Tags 897 MiB
d8988ead43
Commit Graph

754 Commits

Author SHA1 Message Date
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
Ryan
d789b4b7d9
Improve LED config parsing error messages (#19007) 2022-11-09 14:02:44 +00:00
QMK Bot
6652faaf08 Merge remote-tracking branch 'origin/develop' into xap 2022-11-08 15:47:43 +00:00
Nick Brassel
9daf77b593
Add raw output option for QGF/QFF files. (#18998) 2022-11-08 15:47:07 +00:00
QMK Bot
8588fe79fe Merge remote-tracking branch 'origin/develop' into xap 2022-11-08 03:04:14 +00:00
Joel Challis
7666c966d5
Publish hjson files as json (#18996) 2022-11-08 03:03:02 +00:00
QMK Bot
b4a3a76042 Merge remote-tracking branch 'origin/develop' into xap 2022-11-08 01:05:41 +00:00
Ryan
479d8de622
Format DD mappings and schemas (#18924) 2022-11-08 01:05:08 +00:00
zvecr
0af00fb45c Stub some keycode rendering 2022-11-07 23:30:09 +00:00
Nick Brassel
d6841242e6
Merge remote-tracking branch 'upstream/develop' into xap 2022-11-06 08:34:19 +11:00
Nick Brassel
4d33f356a6
Macro keycode name refactoring (#18958) 2022-11-05 23:22:11 +11:00
Joel Challis
a69ab05dd6
Initial DD keycode migration (#18643) 
* Initial DD keycode migration

* Sort magic keycodes
 2022-11-05 10:30:09 +00:00
QMK Bot
9a6d54d673 Merge remote-tracking branch 'origin/develop' into xap 2022-10-21 01:21:32 +00:00
Joel Challis
345f19a5d7
Add converter support to keymap.json (#18776) 2022-10-20 18:21:17 -07:00
QMK Bot
5835eda1f0 Merge remote-tracking branch 'origin/develop' into xap 2022-10-20 13:36:23 +00:00
Joel Challis
0b41c13509
[CLI] Ensure consistent clean behaviour (#18781) 2022-10-20 14:35:27 +01:00
QMK Bot
c0ae9b316b Merge remote-tracking branch 'origin/develop' into xap 2022-10-19 16:43:58 +00:00
Joel Challis
aa8e0a3e7a
Build correctly when out of tree (#18775) 2022-10-19 17:43:25 +01:00
QMK Bot
86c6b0c333 Merge remote-tracking branch 'origin/develop' into xap 2022-10-19 10:30:15 +00:00
Joel Challis
fc0330a54a
Correctly build keymap.json containing additional config (#18766) 2022-10-19 11:29:44 +01:00
Nick Brassel
bc56585932
Actually take into account keyboard/keymap xap specs 2022-10-17 10:16:30 +11:00
zvecr
edc14b29be Dump lighting maps out of inline gen 2022-10-16 23:55:44 +01:00
zvecr
9fcab705a9 Align client/docs gen with recent changes 2022-10-16 20:24:37 +01:00
Nick Brassel
5083c618cf
qmk pytest 2022-10-16 13:25:48 +11:00
Nick Brassel
c2e95c8522
Squashed commit of the following: 
commit d614bc5f62f3c2efc5c5cc0f38168a67681e6fb5
Author: Nick Brassel <nick@tzarc.org>
Date:   Sun Oct 16 13:17:03 2022 +1100

    Remove old header generator.

commit 08337b814cfcef57a1f6b41acf06b806ad4bb116
Author: Nick Brassel <nick@tzarc.org>
Date:   Sat Oct 15 11:47:20 2022 +1100

    Restart jinja2 generation for firmware-side output.
 2022-10-16 13:19:15 +11:00
zvecr
384bb7ddc7 Correctly handle 'latest' 2022-10-13 02:21:15 +01:00
zvecr
d1e3036ce2 Generate python effect constants 2022-10-13 01:43:47 +01:00
QMK Bot
858808af9b Merge remote-tracking branch 'origin/develop' into xap 2022-10-12 21:42:02 +00:00
QMK Bot
e93dc66733 Merge remote-tracking branch 'origin/master' into develop 2022-10-12 21:41:29 +00:00
Joel Challis
4dec07741b
Remove unused LED_INDICATORS constant (#18686) 2022-10-12 22:40:53 +01:00
zvecr
dfc3ead42d Ignore xap_client lint issues 2022-10-12 19:41:50 +01:00
zvecr
9e1b8a710c Refactor XAP keycode logic 2022-10-12 19:41:50 +01:00
zvecr
77a86b018a Resolve ifdef todo 2022-10-02 00:53:05 +01:00
zvecr
309a08ff8f Poential fix for pre gcc 8.1 2022-10-02 00:23:31 +01:00
zvecr
179049dfc9 Fix some matrix effects 2022-09-30 00:16:11 +01:00
zvecr
019d3f4877 Finish stub for effect mapping 2022-09-29 23:44:19 +01:00
zvecr
f81328068e stash more lighting 2022-09-29 23:44:19 +01:00
zvecr
1dbb4c0f96 stash 2022-09-29 23:44:19 +01:00
zvecr
76a45a4e24 Stub out nested routes 2022-09-29 23:44:19 +01:00
QMK Bot
cd4315897e Merge remote-tracking branch 'origin/develop' into xap 2022-09-26 00:04:57 +00:00
Ryan
675d91b813
Generate DD RGBLight/LED/RGB Matrix animation defines (#18459) 2022-09-26 01:04:21 +01:00
QMK Bot
015a2613cc Merge remote-tracking branch 'origin/develop' into xap 2022-09-21 17:32:30 +00:00
Ryan
2f48d300f4
Normalise info_config.h define generation (#18439) 
* Normalise info_config.h define generation

* format

* Fix tests

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

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2022-09-21 18:31:57 +01:00
QMK Bot
5cd0dafc7f Merge remote-tracking branch 'origin/develop' into xap 2022-09-21 01:41:50 +00:00
Ryan
591701cdf9
Fix incorrect g_led_config generation (#18431) 2022-09-21 02:41:18 +01:00
QMK Bot
abe63ae50f Merge remote-tracking branch 'origin/develop' into xap 2022-09-19 00:36:31 +00:00
Joel Challis
20f142a772
Tidy up LAYOUT macro generation (#18262) 2022-09-19 01:35:46 +01:00
QMK Bot
0f234fc77e Merge remote-tracking branch 'origin/develop' into xap 2022-09-17 07:51:36 +00:00
Drashna Jaelre
fb29c0ae53
[Core] Add getreuer's Autocorrect feature to core (#15699) 
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
 2022-09-17 17:50:54 +10:00
QMK Bot
73c01a3c6d Merge remote-tracking branch 'origin/develop' into xap 2022-09-16 08:20:25 +00:00
QMK Bot
cf0494e458 Merge remote-tracking branch 'origin/master' into develop 2022-09-16 08:19:51 +00:00
Nick Brassel
cf88d95613
Add ability to remove temporary files during multibuild. (#18381) 2022-09-16 09:19:10 +01:00
QMK Bot
6a5bca1914 Merge remote-tracking branch 'origin/develop' into xap 2022-09-16 02:06:26 +00:00
Ryan
bc0756f294
Disconnect usb.device_ver (#18259) 2022-09-16 12:05:25 +10:00
QMK Bot
ffbc30e943 Merge remote-tracking branch 'origin/develop' into xap 2022-09-12 22:59:18 +00:00
Joshua Diamond
23e12497b2 Merge remote-tracking branch 'origin/master' into develop 2022-09-12 18:57:58 -04:00
Joel Challis
725df1278b
Fix '_RIGHT' matrix pins lint error (#18320) 2022-09-09 21:22:55 +01:00
QMK Bot
b1f814a2b9 Merge remote-tracking branch 'origin/develop' into xap 2022-08-31 14:17:56 +00:00
Ryan
bb6f028833
Move bootloader.mk to platforms (#18228) 2022-08-31 07:17:24 -07:00
QMK Bot
c87899aa27 Merge remote-tracking branch 'origin/develop' into xap 2022-08-31 05:21:13 +00:00
QMK Bot
ba7030d216 Merge remote-tracking branch 'origin/master' into develop 2022-08-31 05:20:33 +00:00
Ryan
6f804f76b4
qmk lint: fix TypeError (#18226) 2022-08-31 15:20:00 +10:00
QMK Bot
be815457b5 Merge remote-tracking branch 'origin/develop' into xap 2022-08-28 18:35:49 +00:00
Ryan
3adaf6a46a
Handle escaping of manufacturer/product strings (#18194) 2022-08-28 19:35:17 +01:00
QMK Bot
5f08fff016 Merge remote-tracking branch 'origin/develop' into xap 2022-08-28 17:00:20 +00:00
Ryan
d983251c10
Switch over MANUFACTURER and PRODUCT to string literals (#18183) 2022-08-28 09:59:40 -07:00
QMK Bot
0ffb4028a2 Merge remote-tracking branch 'origin/develop' into xap 2022-08-26 02:20:06 +00:00
Ryan
24720400a8
Update LUFA submodule (#18168) 2022-08-26 12:19:34 +10:00
QMK Bot
f438b95380 Merge remote-tracking branch 'origin/develop' into xap 2022-08-24 19:27:05 +00:00
QMK Bot
129c60946c Merge remote-tracking branch 'origin/master' into develop 2022-08-24 19:26:18 +00:00
Joel Challis
3d8c624698
Update invalid pip install flag (#18146) 2022-08-24 20:25:16 +01:00
QMK Bot
b5436f182a Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 14:59:50 +00:00
Sergey Vlasov
7ee55b1754
Fix PID value for the Keyboardio Atreus 2 bootloader (#18116) 
Copy the correct PID from `util/udev/50-qmk.rules`.
 2022-08-20 15:59:17 +01:00
QMK Bot
1a68d5dee7 Merge remote-tracking branch 'origin/develop' into xap 2022-08-20 05:40:23 +00:00
Erovia
5e2ffe7d8f
CLI: Teaching the CLI to flash binaries (#16584) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2022-08-20 15:39:19 +10:00
QMK Bot
d0a9ceb8b2 Merge remote-tracking branch 'origin/develop' into xap 2022-08-19 00:57:25 +00:00
Joel Challis
3c745caf61
Remove legacy bootmagic cli parsing (#18099) 2022-08-19 01:56:48 +01:00
QMK Bot
646099927d Merge remote-tracking branch 'origin/develop' into xap 2022-08-19 00:49:34 +00:00
Joel Challis
9550cc464c
Fix new-keyboard default for RP2040 bootloader (#18100) 2022-08-19 01:48:33 +01:00
QMK Bot
6f840cd8b7 Merge remote-tracking branch 'origin/develop' into xap 2022-08-13 13:40:07 +00:00
Joel Challis
fc7e9efd21
Improve importer workflow (#17707) 2022-08-13 14:39:56 +01:00
zvecr
b0756d18c7 Be more defensive in blob gen 2022-08-09 23:53:15 +01:00
zvecr
507d65eb1b Strip more from embedded info.json 2022-08-09 19:10:49 +01:00
Nick Brassel
8150d66c47 Merge remote-tracking branch 'upstream/develop' into xap 2022-08-06 23:29:03 +10:00
Nick Brassel
154d35ac14
Remove UNUSED_PINS (#17931) 2022-08-06 23:23:35 +10:00
QMK Bot
820371c31b Merge remote-tracking branch 'origin/master' into develop 2022-08-06 12:38:13 +00:00
Ryan
37345e2ace
Provide users with replacements for deprecated/invalid functionality where applicable (#17604) 2022-08-06 22:37:40 +10:00
Joel Challis
897403c4a7
Publish data as part of API generation (#17020) 2022-08-06 16:14:29 +10:00
zvecr
e1e3e6b599 strip out some additional info.json items 2022-08-02 03:48:06 +01:00
QMK Bot
720ba5296e Merge remote-tracking branch 'origin/develop' into xap 2022-07-27 09:30:24 +00:00
QMK Bot
00c1653a15 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 09:29:50 +00:00
Albert Y
3285659690
CLI compatibility for MacOS (#17811) 2022-07-27 10:29:10 +01:00
QMK Bot
545f7da5cd Merge remote-tracking branch 'origin/develop' into xap 2022-07-26 16:38:14 +00:00
QMK Bot
61da9286a1 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 16:38:06 +00:00
Nick Brassel
d1434b6d75
Make qmk doctor print out the last log entry for upstream/{master,develop}, including dates (#17713) 2022-07-26 17:37:28 +01:00
QMK Bot
c76869604a Merge remote-tracking branch 'origin/develop' into xap 2022-07-23 16:43:30 +00:00
QMK Bot
8254d73fd4 Merge remote-tracking branch 'origin/master' into develop 2022-07-23 16:42:55 +00:00
Niko Wenselowski
1f42a8ccdd
Fix test logic to check for both keymaps (#17761) 
Python will evaluate first the left and then the right side of the and operator.

The left side would previously return True based on the truthiness logic that treats any non-emptry string as true.

It would not check if the desired keymap exists.

If the left side is true it will evaluate the right side which will check for the existance of a specific keymap.

With this change the check for existance of two keymaps is implemented.
 2022-07-23 17:42:19 +01:00
zvecr
f4f2002ed8 Patch up version encoding 2022-07-19 02:14:53 +01:00
zvecr
819bf2eff8 Tidy up code/docstrings 2022-07-19 00:55:36 +01:00
zvecr
ca8af27673 Tidy up python client 2022-07-17 22:02:26 +01:00
zvecr
e4a41e8795 Stub out python client routes 2022-07-17 02:58:14 +01:00
zvecr
2a1bfafa1a Stub out python client gen 2022-07-17 01:54:11 +01:00
zvecr
70eae6b348 Move client to own folder 2022-07-17 01:54:11 +01:00
zvecr
28855f658a Hash dynamic keymap at runtime 2022-07-15 03:33:34 +01:00
zvecr
f4e5901726 Strip out 'permissions: ignore' 2022-07-13 23:50:01 +01:00
zvecr
98fd483611 XAP Client - Ensure route exists 2022-07-13 23:50:00 +01:00
QMK Bot
c88370f937 Merge remote-tracking branch 'origin/develop' into xap 2022-07-11 09:52:37 +00:00
Joel Challis
35d78aa8a4
More DD encoder fixes (#17615) 2022-07-11 10:51:39 +01:00
QMK Bot
83bcf0d940 Merge remote-tracking branch 'origin/develop' into xap 2022-07-09 12:34:12 +00:00
QMK Bot
39e1e27ea9 Merge remote-tracking branch 'origin/master' into develop 2022-07-09 12:33:33 +00:00
Nick Brassel
561c5e1d7a
Add line to multibuild output log showing the actual build target. (#17606) 2022-07-09 22:32:43 +10:00
zvecr
c155b16ec9 Minor tidy up of cli 2022-07-09 00:21:41 +01:00
QMK Bot
1cfa48ccfa Merge remote-tracking branch 'origin/develop' into xap 2022-07-08 21:51:02 +00:00
QMK Bot
30f2556ae9 Merge remote-tracking branch 'origin/master' into develop 2022-07-08 21:50:28 +00:00
Dasky
06310e81e9
Allow only col or row pins for *_right extraction. (#17590) 2022-07-08 22:49:55 +01:00
QMK Bot
56b1aad37b Merge remote-tracking branch 'origin/develop' into xap 2022-07-08 21:49:27 +00:00
Joel Challis
81d317aa87
Fix rgbkb/sol/rev2 build issues (#17601) 2022-07-08 22:48:48 +01:00
zvecr
f913f126b4 Add in some defaults to info.json payload 2022-07-07 16:48:18 +01:00
zvecr
ced7094ddd Add xap cli functions to test secure 2022-07-07 01:57:41 +01:00
zvecr
6ec0ff387b Update reserved tokens 2022-07-07 00:58:09 +01:00