Commit Graph

17061 Commits

Author SHA1 Message Date
QMK Bot
6fdf4baecd Merge remote-tracking branch 'origin/master' into develop 2023-06-14 16:27:44 +00:00
Danny
f5ee7b7ed8
Add Sinc Rev. 4 (#21130)
* Fork Rev. 3 to 4

* Update RGB LED positions

* Adjust RGB positions

* Enable more RGB modes

* Update copyrights

* Add license headers to keymaps

* Use same type of license header

Co-authored-by: Joel Challis <git@zvecr.com>

* Fix I2C pins

---------

Co-authored-by: Joel Challis <git@zvecr.com>
2023-06-14 12:26:46 -04:00
QMK Bot
6c7d518820 Merge remote-tracking branch 'origin/develop' into xap 2023-06-14 14:32:35 +00:00
James Young
7bafae64f9
FJLabs Swordfish Layout Macro Refactor (#21234)
* physically arrange layout macro

Arranges the layout macro to QMK standards (left to right, row by row).

This change breaks compatibility with out-of-tree keymaps, because the
order in which the keycode arguments must be passed is changed.

* rename `LAYOUT_alice_all` to `LAYOUT_split_bs`

* add `LAYOUT_2u_bs` macro
2023-06-14 07:31:51 -07:00
QMK Bot
b6ba275609 Merge remote-tracking branch 'origin/develop' into xap 2023-06-14 12:02:21 +00:00
Ryan
9551a0a38a
Move RGBLIGHT_LED_MAP to data driven (#21095) 2023-06-14 22:01:13 +10:00
QMK Bot
860438d65b Merge remote-tracking branch 'origin/develop' into xap 2023-06-14 06:28:26 +00:00
QMK Bot
6c4286152f Merge remote-tracking branch 'origin/master' into develop 2023-06-14 06:27:47 +00:00
jonylee@hfd
4055f2a937
[Keyboard]add 5108 Keyboard. (#21184)
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-14 00:27:08 -06:00
QMK Bot
a9a89dd810 Merge remote-tracking branch 'origin/develop' into xap 2023-06-13 15:19:21 +00:00
QMK Bot
5fd55908c6 Merge remote-tracking branch 'origin/master' into develop 2023-06-13 15:18:40 +00:00
rhmokey
55987542e1
[Keyboard] Add mokey12x2 (#20702)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-06-13 09:17:55 -06:00
QMK Bot
17289ba1b8 Merge remote-tracking branch 'origin/develop' into xap 2023-06-13 15:10:03 +00:00
QMK Bot
aefdb39393 Merge remote-tracking branch 'origin/master' into develop 2023-06-13 15:09:23 +00:00
Alabahuy
1194a6f0dd
[Keyboard] jaykeeb skyline (#21219) 2023-06-13 09:08:37 -06:00
QMK Bot
59493a01b9 Merge remote-tracking branch 'origin/develop' into xap 2023-06-13 15:06:49 +00:00
QMK Bot
d9bea011fa Merge remote-tracking branch 'origin/master' into develop 2023-06-13 15:05:55 +00:00
Alberto Pavano
e8b7244bb5
[Keyboard] rainkeebs trailmix (#20189)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-13 09:05:03 -06:00
QMK Bot
5474d12ad8 Merge remote-tracking branch 'origin/develop' into xap 2023-06-13 06:34:26 +00:00
QMK Bot
fd2a516f03 Merge remote-tracking branch 'origin/master' into develop 2023-06-13 06:33:41 +00:00
David Hoelscher
dabbc93df4
[Keyboard] Add ErgoStrafer keyboard (#21195) 2023-06-12 23:32:54 -07:00
QMK Bot
95e3f854ed Merge remote-tracking branch 'origin/develop' into xap 2023-06-13 06:20:16 +00:00
Duncan Sutherland
f4529eb42b
[Keymap] Fix scheikled keymap for dactyl_manuform/4x6 (#21206) 2023-06-13 00:19:38 -06:00
QMK Bot
b11f447c6c Merge remote-tracking branch 'origin/develop' into xap 2023-06-13 06:18:34 +00:00
QMK Bot
af58f26028 Merge remote-tracking branch 'origin/master' into develop 2023-06-13 06:17:56 +00:00
Joe Scotto
ca6921b1ba
[Keyboard] Add ScottoNum macropad (#21208) 2023-06-13 00:17:18 -06:00
QMK Bot
bf8868c15a Merge remote-tracking branch 'origin/develop' into xap 2023-06-12 19:09:42 +00:00
QMK Bot
94aaf38177 Merge remote-tracking branch 'origin/master' into develop 2023-06-12 19:08:59 +00:00
Joe Scotto
2d838d8ba9
[Keyboard] Add ScottoFrog macropad (#21209) 2023-06-12 13:08:13 -06:00
QMK Bot
7687207454 Merge remote-tracking branch 'origin/develop' into xap 2023-06-12 01:13:34 +00:00
QMK Bot
84c7aaae91 Merge remote-tracking branch 'origin/master' into develop 2023-06-12 01:12:57 +00:00
Alabahuy
53f20b197b
[Keyboard] Add orba keyboard (#21132) 2023-06-11 18:12:19 -07:00
QMK Bot
584dc1a856 Merge remote-tracking branch 'origin/develop' into xap 2023-06-11 08:03:04 +00:00
QMK Bot
f830b53a7a Merge remote-tracking branch 'origin/master' into develop 2023-06-11 07:56:32 +00:00
Joe Scotto
fdb2851187
[Keyboard] Add ScottoSplit Keyboard (#20945)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-06-11 01:56:20 -06:00
QMK Bot
332a8ad1a2 Merge remote-tracking branch 'origin/develop' into xap 2023-06-11 07:56:01 +00:00
flashquark
40c3b71569
[Keyboard] Add Flashquark Horizon Z (#21055)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-11 01:55:06 -06:00
QMK Bot
1fcb9a0228 Merge remote-tracking branch 'origin/master' into develop 2023-06-11 07:53:05 +00:00
Joe Scotto
33c93d3a96
[Keyboard] Add Scotto34 (PCB Edition) (#21085)
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
2023-06-11 01:52:43 -06:00
QMK Bot
acdc9ea74f Merge remote-tracking branch 'origin/develop' into xap 2023-06-11 07:52:32 +00:00
Joe Scotto
1914fbd951
[Keyboard] Add Scotto9 handwired macropad (#21105)
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-06-11 01:52:24 -06:00
QMK Bot
beaf6505ed Merge remote-tracking branch 'origin/master' into develop 2023-06-11 07:51:56 +00:00
FanXingStudio
bfdfeb6f3f
[Keyboard] Add kibou/winter (#21161) 2023-06-11 01:51:17 -06:00
QMK Bot
ab469db17a Merge remote-tracking branch 'origin/develop' into xap 2023-06-11 07:49:34 +00:00
Duncan Sutherland
cf6c92426d
[Keyboard] correct and modernise dactyl_manuform/6x7 variant (#21176) 2023-06-11 01:48:56 -06:00
QMK Bot
0c527df562 Merge remote-tracking branch 'origin/develop' into xap 2023-06-11 06:28:36 +00:00
QMK Bot
55f226159b Merge remote-tracking branch 'origin/master' into develop 2023-06-11 06:27:53 +00:00
blindassassin111
8cd9f07c30
[Keyboard] Adding OSAv2 Topre PCB (#21080) 2023-06-10 23:27:13 -07:00
QMK Bot
f4e4d197d7 Merge remote-tracking branch 'origin/develop' into xap 2023-06-10 23:34:54 +00:00
QMK Bot
c4b116875f Merge remote-tracking branch 'origin/master' into develop 2023-06-10 23:34:17 +00:00
James Young
dd8b4dce55
Atreyu: correct layout data (#21197) 2023-06-10 16:33:33 -07:00
QMK Bot
e5ac5405f6 Merge remote-tracking branch 'origin/develop' into xap 2023-06-10 20:36:38 +00:00
QMK Bot
38edc481d1 Merge remote-tracking branch 'origin/master' into develop 2023-06-10 20:35:55 +00:00
Allen Choi
57b23b8d96
[Keymap] thunderbird2086 layer status with RGB lighting/matrix (#21063) 2023-06-10 14:35:15 -06:00
QMK Bot
595f08f8b6 Merge remote-tracking branch 'origin/develop' into xap 2023-06-10 15:03:04 +00:00
QMK Bot
ea70b361ce Merge remote-tracking branch 'origin/master' into develop 2023-06-10 15:02:22 +00:00
Florent Linguenheld
eee9a53a80
Up keymap (#20769)
flinguenheld keymap aurora sweep
2023-06-10 16:01:44 +01:00
QMK Bot
fbfc0c3e24 Merge remote-tracking branch 'origin/develop' into xap 2023-06-10 14:59:50 +00:00
QMK Bot
0d574cd82e Merge remote-tracking branch 'origin/master' into develop 2023-06-10 14:59:13 +00:00
Cipulot
08289fc53a
EC Alveus (#20840)
Cipulot's EC Alveus PR
2023-06-10 15:58:36 +01:00
QMK Bot
cac721630e Merge remote-tracking branch 'origin/develop' into xap 2023-06-10 02:18:15 +00:00
QMK Bot
a9a68ff4f1 Merge remote-tracking branch 'origin/master' into develop 2023-06-10 02:17:31 +00:00
Jared
e01e3fc866
Typo Correction in planck/rev7 readme.md (#21194)
Corrected typo explaining encoder requirements.
2023-06-09 22:16:46 -04:00
QMK Bot
9e0d701a4c Merge remote-tracking branch 'origin/develop' into xap 2023-06-09 23:50:15 +00:00
QMK Bot
b9d78e4828 Merge remote-tracking branch 'origin/master' into develop 2023-06-09 23:49:38 +00:00
Joe Scotto
a875f7f038
[Keyboard] Add ScottoGame Keyboard (#20940) 2023-06-09 17:48:55 -06:00
QMK Bot
ee85b4b588 Merge remote-tracking branch 'origin/develop' into xap 2023-06-09 18:35:44 +00:00
QMK Bot
c8e47bea98 Merge remote-tracking branch 'origin/master' into develop 2023-06-09 18:35:05 +00:00
Ryan
e3b80b4151
Remove some keymap-level info.jsons (#21191) 2023-06-09 19:34:24 +01:00
QMK Bot
161ccb9d57 Merge remote-tracking branch 'origin/develop' into xap 2023-06-09 01:47:29 +00:00
QMK Bot
4c60ebdbe0 Merge remote-tracking branch 'origin/master' into develop 2023-06-09 01:46:47 +00:00
Jack Humbert
232281946d
Adds Planck Rev 7 & Updates rev6_drop to Matrix Lite Implementation (#21175)
* adds planck/rev7

* Remove config.h include

Co-authored-by: Drashna Jaelre <drashna@live.com>

* convert planck matrices to lite implementation

---------

Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-06-08 21:46:09 -04:00
QMK Bot
83a6ca4b96 Merge remote-tracking branch 'origin/develop' into xap 2023-06-08 01:48:24 +00:00
QMK Bot
9a6056d09c Merge remote-tracking branch 'origin/master' into develop 2023-06-08 01:47:47 +00:00
NortonTech
d042b92e7a
Add NortonTech handwired keypad (NortonTechPad) (#21148) 2023-06-08 02:47:06 +01:00
QMK Bot
0bed04a123 Merge remote-tracking branch 'origin/develop' into xap 2023-06-08 01:04:42 +00:00
QMK Bot
cc64247ebf Merge remote-tracking branch 'origin/master' into develop 2023-06-08 01:03:58 +00:00
biuboom-jun
f136171753
add kibou/wendy (#21150) 2023-06-08 02:03:17 +01:00
QMK Bot
4bb9b38912 Merge remote-tracking branch 'origin/develop' into xap 2023-06-07 23:59:27 +00:00
QMK Bot
a059d121fa Merge remote-tracking branch 'origin/master' into develop 2023-06-07 23:57:41 +00:00
QMK Bot
f7d54a127f Merge remote-tracking branch 'origin/develop' into xap 2023-06-07 23:57:35 +00:00
James Young
dffbe1e655
monoflex60: fix LAYOUT_60_iso_tsangan implementation (#21158) 2023-06-08 00:57:05 +01:00
QMK Bot
3fa92a4e7e Merge remote-tracking branch 'origin/master' into develop 2023-06-07 23:56:53 +00:00
James Young
57c5f3e674
poker87d: correct layout data (#21159) 2023-06-08 00:55:49 +01:00
QMK Bot
217708f7f5 Merge remote-tracking branch 'origin/develop' into xap 2023-06-06 21:55:48 +00:00
QMK Bot
a02230f6fc Merge remote-tracking branch 'origin/master' into develop 2023-06-06 21:55:10 +00:00
James Young
bb57aa28e5
peej/tripel: correct layout data (#21145)
Corrects the layout data for all three versions of the Peej Tripel.
2023-06-06 22:54:31 +01:00
QMK Bot
1772060e2e Merge remote-tracking branch 'origin/develop' into xap 2023-06-06 21:47:37 +00:00
QMK Bot
ff1d7d287c Merge remote-tracking branch 'origin/master' into develop 2023-06-06 21:46:52 +00:00
James Young
45d060805e
xelus/rs108: correct layout data (#21146) 2023-06-06 22:46:15 +01:00
QMK Bot
9f78e36c9b Merge remote-tracking branch 'origin/develop' into xap 2023-06-06 07:05:19 +00:00
QMK Bot
64eb9852d2 Merge remote-tracking branch 'origin/master' into develop 2023-06-06 07:04:38 +00:00
Travis Mick
dd9712c40e
[Keyboard] Add egg58 (#21021) 2023-06-06 00:03:57 -07:00
QMK Bot
d821f1ef28 Merge remote-tracking branch 'origin/develop' into xap 2023-06-06 05:47:37 +00:00
QMK Bot
6c9c9489d2 Merge remote-tracking branch 'origin/master' into develop 2023-06-06 05:46:59 +00:00
Joe Scotto
97014f0722
[Keyboard] Add Scotto36 handwired keyboard (#21104)
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
2023-06-05 23:46:21 -06:00
QMK Bot
8d26b77944 Merge remote-tracking branch 'origin/develop' into xap 2023-06-06 05:44:00 +00:00
QMK Bot
f61abde116 Merge remote-tracking branch 'origin/master' into develop 2023-06-06 05:43:14 +00:00
Joe Scotto
eaef139fc3
[Keyboard] Add Scotto40 handwired keyboard (#21103) 2023-06-05 23:42:27 -06:00
QMK Bot
3d2343c1d8 Merge remote-tracking branch 'origin/develop' into xap 2023-06-06 05:35:41 +00:00