Commit Graph

17066 Commits

Author SHA1 Message Date
b5a1db9c05 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:48:20 +00:00
e9c3f71e74 [Keyboard] add SPRH keyboard (#12999)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-21 23:47:48 -07:00
fb9a254a43 Retain brightness with lighting layers (#13025)
Add guard `RGBLIGHT_LAYERS_RETAIN_VAL` to retain the currently used val
when applying lighting layers.
2021-07-21 23:46:12 -07:00
85128302c8 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:40:51 +00:00
92cca84651 [Keyboard] Add keypad Satxri6key (#13423)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-21 23:40:24 -07:00
a2d94371c6 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:40:15 +00:00
8e905a7a5c [Keyboard] Initial Tron Guy Labs keyboard implementation. (#13438)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
2021-07-21 23:39:45 -07:00
0753cbc77f Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:31:35 +00:00
8c17a822a8 [Keyboard] Add Ristretto Keyboard (#13479)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Brandon Lewis <blewis308@users.noreply.github.com>
2021-07-21 23:31:03 -07:00
5c42446508 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:22:35 +00:00
5766b9bfb7 [Keyboard] New Keyboard - OBE (#13545)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-21 23:22:00 -07:00
203c4fdf58 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 05:57:21 +00:00
fbe782534a [Keyboard] Add personal planck keymap (#13635) 2021-07-21 22:56:46 -07:00
71560853ce Merge remote-tracking branch 'origin/master' into develop 2021-07-22 05:46:45 +00:00
665af4fa8d [Keymap] narze/xd004 (#13634)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-21 22:46:15 -07:00
b28c5e6acb Merge remote-tracking branch 'origin/master' into develop 2021-07-22 05:40:08 +00:00
5b8d2b5cde [Keyboard] Add h0oni hotduck keyboard (#13609) 2021-07-21 22:39:36 -07:00
874a3df950 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 18:30:35 +00:00
b564ba13ee Fix API generation failure caused by GRS-70EC (#13631) 2021-07-21 19:30:29 +01:00
c79bc7c909 Fix MATRIX_COLS for peranekofactory/tone (#13632) 2021-07-21 19:28:58 +01:00
201b4dc7ab Merge remote-tracking branch 'origin/master' into develop 2021-07-21 18:26:05 +00:00
78265ea742 Fix MATRIX_COLS for aeboards/constellation/rev2 (#13633) 2021-07-21 19:26:00 +01:00
2b260bd846 fixed number layer on keymap (#13627) 2021-07-21 19:25:21 +01:00
d2cdb0b1d3 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 17:14:33 +00:00
ca1aa56c7f [Keyboard] Fix iso layout compile error (#13628)
Fix iso layout compile erreo on qmk web.
2021-07-21 10:14:04 -07:00
df37ce4ea2 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 15:36:02 +00:00
afc629210c [Bug] VIA compile fixes (#13626) 2021-07-21 08:35:10 -07:00
531886b984 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 05:28:30 +00:00
ec1a6f6b8b [Keyboard] add rartland with via support (#13585)
* add rartland and via support

* moved encoder adn oled to c file

* update c file
2021-07-20 22:28:05 -07:00
793fabc449 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 05:05:45 +00:00
ddc2766537 Fix vicious40 rules (#13623) 2021-07-21 15:05:10 +10:00
598fa867d1 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 20:10:21 +00:00
c98e25887c [Keyboard] GameBuddy v1.M (#12637)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 13:10:15 -07:00
dbca44ae8d [Keyboard] Add Tiger910 (#12605)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 13:09:53 -07:00
200f1e8e6a Merge remote-tracking branch 'origin/master' into develop 2021-07-20 20:08:44 +00:00
81cac8eec6 [Keyboard] 0xcb 1337 - Added keymap "conor" and fixed some minor stuff (#12744)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-20 13:07:53 -07:00
4ab8734d6e Move all our CLI file formatters to the format dir (#13296)
* move all our file formatters to the format dir

* Apply suggestions from code review

Co-authored-by: Erovia <Erovia@users.noreply.github.com>

Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-07-20 11:52:14 -07:00
c4db9f7fb2 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:48:49 +00:00
c1ba35363d [Keyboard] Added Kineticlabs Emu (#12968) 2021-07-20 10:48:17 -07:00
32a44b6a2c Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:47:04 +00:00
3591312fa3 [Keymap] Updates to personal Drop ALT keymap (#13058) 2021-07-20 10:46:52 -07:00
42ac7c0541 [Keyboard] Add Momoka ergo (#13127)
Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 10:46:29 -07:00
362bbe53c7 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:44:20 +00:00
8c526703f8 [Keyboard] Update lm60n.h (#13249) 2021-07-20 10:43:44 -07:00
11334ef6af Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:25:14 +00:00
c6698cfce3 [Keyboard] Add keyboard GRS-70EC (#11296) 2021-07-20 10:24:22 -07:00
14a839e39c Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:12:47 +00:00
8f6867ce95 [Docs] Added note about no split support (#12512)
Currently, this feature isn't supported on splits, spent about an hour troubleshooting my board and firmware before asking, and turns out it's not in place. Note added to save others from this in the future.
2021-07-20 10:11:49 -07:00
638fda5946 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 16:59:21 +00:00
16e52980c4 [Keyboard] Hard Light - Add keyboard, basic keymap (#12654)
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 09:58:39 -07:00