31ee13a5d7
Merge remote-tracking branch 'origin/master' into develop
2022-02-21 01:19:42 +00:00
3bc8afbb81
Update fix for MW65_rgb and added personal keymap ( #15279 )
...
* Update fix for MW65 and added personal keymap
* Resolve fix
* Resolved fix, again
* Added missing GPLv2 license headers
* Resolved issue
2022-02-20 17:18:35 -08:00
f6d8dd972e
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 18:37:05 +00:00
d175ee1d9b
rart67m: move OLED and WPM code to default keymap ( #16403 )
...
* rart67m: move OLED and WPM code to default keymap
* Apply suggestions from code review
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2022-02-20 18:36:15 +00:00
4d3ce3cdf8
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 13:57:38 +00:00
60f22831cb
clueboard/card: disable Command to reduce size ( #16404 )
2022-02-20 13:57:03 +00:00
f787114fe9
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 08:21:51 +00:00
38e3be4c74
Add h08_ocelot and h65 PCBs ( #14054 )
...
* add h65 start
* add h65 base files
* add ocelot base files
* add via keymap
* Update keyboards/hineybush/h08_ocelot/config.h
* Update keyboards/hineybush/h65/config.h
* add base files for h65 hotswap
* changes made per PR
* finally made updates per PR
* update readmes
* Update keyboards/hineybush/h65_hotswap/config.h
* Update keyboards/hineybush/h65_hotswap/rules.mk
* Update keyboards/hineybush/h65_hotswap/rules.mk
* Update keyboards/hineybush/h65_hotswap/readme.md
* Update keyboards/hineybush/h65_hotswap/info.json
* Update keyboards/hineybush/h65/rules.mk
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/h65_hotswap.h
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65/rules.mk
* Update keyboards/hineybush/h65/readme.md
* Update keyboards/hineybush/h08_ocelot/h08_ocelot.h
* Update keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c
* Update keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c
* Update keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c
* Update keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c
* Update keyboards/hineybush/h08_ocelot/readme.md
* Update keyboards/hineybush/h08_ocelot/rules.mk
* Update keyboards/hineybush/h08_ocelot/rules.mk
* Update keyboards/hineybush/h65/h65.h
* Update keyboards/hineybush/h08_ocelot/info.json
* Update keyboards/hineybush/h65/info.json
* Update keyboards/hineybush/h65/keymaps/default/keymap.c
* Apply suggestions from code review
* update jsons for default qmk config layout
* Update keyboards/hineybush/h08_ocelot/rules.mk
* Update keyboards/hineybush/h65/h65.h
* Update keyboards/hineybush/h65/info.json
* Update keyboards/hineybush/h65/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
* Update keyboards/hineybush/h65_hotswap/rules.mk
* Update keyboards/hineybush/h65/config.h
2022-02-20 00:21:18 -08:00
1d9808606a
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 07:10:44 +00:00
60e28544b2
Bliss Hotdox keymaps ( #13160 )
...
* Bliss Hotdox keymaps
* Update keyboards/hotdox/keymaps/bliss/keymap.c
* Update keyboards/hotdox/keymaps/bliss/keymap.c
* Add GPL License to keymap.c file
Changes to be committed:
modified: keymap.c
* make changes requested by fauxpark
* Update keyboards/hotdox/keymaps/bliss/readme.md
* Update keyboards/hotdox/keymaps/bliss/keymap.c
* Update keyboards/hotdox/keymaps/bliss/readme.md
2022-02-19 23:10:15 -08:00
e2691c22c1
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 05:52:47 +00:00
73657a7d58
Add kikkou keyboard ( #15291 )
...
* Add kikkou keyboard
* Apply suggestions from code review
* Update keyboards/kikkou/rules.mk
* Apply suggestions from code review1
2022-02-19 21:52:11 -08:00
5b688a09ec
Merge remote-tracking branch 'upstream/master' into develop
2022-02-19 04:27:09 +11:00
4666d26008
Fix a couple of boards being wrongly identified as AVR ( #16377 )
2022-02-19 02:53:36 +11:00
2d12eacb4b
[Keyboard] Renamed Frooastboard to Frooastboard Nano ( #16373 )
2022-02-17 08:59:12 -08:00
da280739ef
Merge remote-tracking branch 'origin/master' into develop
2022-02-17 08:44:30 -08:00
548a463fe9
`mokey/xox70`: clean up layouts ( #16375 )
2022-02-17 08:43:03 -08:00
7e00fcd7bc
[Keyboard] Remove Helix/rev1 ( #16389 )
2022-02-17 08:18:16 -08:00
5ff823d35f
Bodge for helix build failures ( #16376 )
2022-02-16 17:46:48 +00:00
08ebf1523b
Merge remote-tracking branch 'origin/master' into develop
2022-02-15 17:48:14 +00:00
da68083fdf
Update USB VID and PID for Aya ( #16363 )
2022-02-15 18:47:35 +01:00
6a8df58887
Merge remote-tracking branch 'origin/master' into develop
2022-02-15 07:02:33 +00:00
92eb067a63
Add extra braces for trackball keymaps ( #16361 )
2022-02-15 18:01:54 +11:00
c9f192bae8
Merge remote-tracking branch 'origin/master' into develop
2022-02-15 01:16:27 +00:00
ac8bee7091
Fix multiple definition errors for trackball "boards" with no keys ( #16350 )
2022-02-15 01:15:53 +00:00
1980e48e0d
Merge remote-tracking branch 'origin/master' into develop
2022-02-14 06:25:23 +00:00
485cf920b4
Xenon: correct QMK Configurator key sequence ( #16332 )
2022-02-13 22:24:52 -08:00
61ed2e2b3c
Merge remote-tracking branch 'origin/master' into develop
2022-02-14 06:24:45 +00:00
6b01657a86
Mode M75S Layout Additions, Configurator Data and Code Touch-Up ( #16327 )
...
* m75s.h: correct matrix position identifier
`K5C` is actually on row 4, so it should be `K4C`.
* m75s.h: add matrix diagram
* add QMK Configurator data
* polish whitespace
- convert tabs to spaces
- update indent to four spaces
- remove trailing whitespace
* update readme
Didn't seem to be fully updated after being copied from the M65S codebase.
* add LAYOUT_ansi with keymap
ANSI layout with 2u Backspace.
* add LAYOUT_iso with keymap
ISO layout with 2u Backspace.
* add LAYOUT_ansi_tsangan with keymap
ANSI layout with 2u Backspace and 7u Spacebar.
* add LAYOUT_iso_tsangan with keymap
ISO layout with 2u Backspace and 7u Spacebar.
* add LAYOUT_ansi_split_bs with keymap
ANSI layout with Split Backspace.
* add LAYOUT_iso_split_bs with keymap
ISO layout with Split Backspace.
* add LAYOUT_ansi_tsangan_split_bs with keymap
ANSI layout with Split Backspace and 7u Spacebar.
* add LAYOUT_iso_tsangan_split_bs with keymap
ISO layout with Split Backspace and 7u Spacebar.
2022-02-13 22:24:11 -08:00
f77e569e9f
Merge remote-tracking branch 'origin/master' into develop
2022-02-14 02:02:16 +00:00
b6b7e12029
Digicarp65: fix layouts ( #16328 )
2022-02-14 13:01:39 +11:00
9f506e64ba
Merge remote-tracking branch 'origin/master' into develop
2022-02-12 07:01:58 +00:00
773205cd1f
[Keyboard] Convert Maxr1998/Phoebe to use info.json where possible ( #16309 )
2022-02-11 23:01:25 -08:00
aefe6ee9f5
Merge remote-tracking branch 'origin/master' into develop
2022-02-12 04:03:02 +00:00
19c57a2a6a
[Keyboard] Lulu keyboard by boardsource ( #15951 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-02-11 20:02:30 -08:00
17c0ca6fa4
[Keyboard] move g heavy industry boards into /gboards ( #16040 )
...
Co-authored-by: zvecr <git@zvecr.com>
2022-02-11 19:54:48 -08:00
52d6f07a82
Merge remote-tracking branch 'origin/master' into develop
2022-02-12 03:23:18 +00:00
40529e89de
[Keymap] Add uqs' keymaps for various boards and ploopy mouse ( #16265 )
2022-02-11 19:22:47 -08:00
0f926a8ae8
move montex to IDOBAO vendor folder ( #15668 )
...
* move montex to IDOBAO vendor folder
* move montex to montex/v1
2022-02-12 01:14:07 +00:00
c72120baab
move @satt99 's comet46 to satt/ ( #16059 )
2022-02-12 01:13:48 +00:00
50201af2b7
Merge remote-tracking branch 'origin/master' into develop
2022-02-12 01:11:25 +00:00
8b48bab54f
Add wren configurator data ( #16321 )
2022-02-12 01:10:48 +00:00
8957e928a2
move mechkeys keyboards into the mechkeys/ vendor folder ( #15760 )
...
* move mechkeys keyboards to mechkeys/
* fix compilation
* fix default folder
2022-02-11 22:41:10 +00:00
bd35fa7de1
move @takashiski 's keebs into /takashiski ( #16089 )
2022-02-11 21:51:20 +00:00
2d4a69cfc6
Merge remote-tracking branch 'origin/master' into develop
2022-02-11 12:38:20 +00:00
5f10387c41
handwired/promethium: fix missing include ( #16317 )
2022-02-11 12:37:36 +00:00
656c151e07
Merge remote-tracking branch 'origin/master' into develop
2022-02-11 03:38:26 +00:00
89fc2f166f
mechlovin/kay60: fix mismatched layout name ( #16314 )
2022-02-11 14:37:41 +11:00
8106697a42
Merge remote-tracking branch 'origin/master' into develop
2022-02-11 02:31:55 +00:00
2bc4a216df
maxr1998/pulse4k: Move Combo code to keymap level ( #16301 )
...
* maxr1998/pulse4k: Move Combo code to keymap level
* Reorder code
2022-02-11 02:31:19 +00:00
9e4942bec8
[Keyboard] move latincompass's boards to /latincompass ( #16039 )
2022-02-10 15:20:11 -08:00
27ec667430
move id80 and id75 to v1 to accommodate for id75 v2 and id80 v3 ( #15992 )
...
* move id80 to a v1 to acommondate for v2 and a future v3
* move id75 to v1
* fix manufacturer and product fields, enable backlight
* move user keymap
* Fix DEFAULT_FOLDER
* Update build command
Co-authored-by: zvecr <git@zvecr.com>
2022-02-10 21:46:03 +00:00
7c57c88c86
move ID87 to IDOBAO vendor folder ( #15667 )
...
* move ID87 to IDOBAO vendor folder
* move to v1 to acommondate for v2
2022-02-10 21:19:33 +00:00
8787978951
Merge remote-tracking branch 'origin/master' into develop
2022-02-10 21:03:01 +00:00
bc5d46aaad
Mode 75H Touch-UP ( #16310 )
...
* m75h.h: correct matrix position identifier
`K5C` is actually on row 4, so it should be `K4C`.
* m75h.h: add matrix diagram
* add QMK Configurator data
* polish whitespace
- convert tabs to spaces
- update indent to four spaces
- remove trailing whitespace
2022-02-10 21:02:23 +00:00
e04f6c5d38
Remove manual enable of LTO within user keymaps ( #15378 )
2022-02-10 09:52:39 -08:00
7a0fd646e3
Merge remote-tracking branch 'origin/master' into develop
2022-02-10 16:23:14 +00:00
195242dc37
keyten kt60-M: rename LAYOUT to LAYOUT_60_tsangan_hhkb ( #16307 )
...
* rename LAYOUT to LAYOUT_60_tsangan_hhkb
* info.json: correct maintainer value
Field is meant to reference the maintainer's GitHub username.
* rules.mk: enable Community Layout support
2022-02-10 16:22:42 +00:00
9f4fbd3aa7
Merge remote-tracking branch 'origin/master' into develop
2022-02-10 16:22:18 +00:00
d25bce24cd
Keyprez Unicorn: fix QMK Configurator key sequence ( #16305 )
...
* info.json: apply friendly formatting
* info.json: fix key sequence
2022-02-10 16:21:38 +00:00
54572c8daf
Merge remote-tracking branch 'origin/master' into develop
2022-02-10 16:20:03 +00:00
c9e19fe6fc
KeebsForAll Freebird Numpad Pro: fix Configurator key positioning ( #16303 )
...
* info.json: apply friendly formatting
* info.json: fix key positioning
Fixes the second row being rendered on top of the first row.
2022-02-10 16:19:27 +00:00
cbdb225a67
Merge remote-tracking branch 'origin/master' into develop
2022-02-10 16:18:23 +00:00
21522e0964
info.json: fix QMK Configurator rendering ( #16299 )
2022-02-10 16:17:47 +00:00
78c3149365
Merge remote-tracking branch 'origin/master' into develop
2022-02-10 16:17:45 +00:00
da4eda8930
info.json: fix key sequence ( #16297 )
2022-02-10 16:17:12 +00:00
473557ff7d
Merge remote-tracking branch 'origin/master' into develop
2022-02-10 05:24:53 +00:00
cb9142224b
Eye Oh Designs SPRH: fix Configurator data ( #16296 )
2022-02-09 21:24:10 -08:00
03b1de6925
Merge remote-tracking branch 'origin/master' into develop
2022-02-10 05:23:32 +00:00
c092d716c5
gl516/j73gl: fix Configurator key sequence ( #16298 )
2022-02-09 21:22:47 -08:00
12246733b7
Merge remote-tracking branch 'origin/master' into develop
2022-02-10 03:30:02 +00:00
66f61ae4cb
CMM.Studio Fuji65: correct layout data for real this time ( #16295 )
...
Because I apparently can't tell the difference between coordinates and dimensions.
2022-02-09 19:29:25 -08:00
61e8a0879e
Merge remote-tracking branch 'origin/master' into develop
2022-02-10 01:31:55 +00:00
5475553dd8
Demiurge: correct Configurator Layout data ( #16294 )
...
* info.json: apply friendly formatting
* info.json: correct layout data
2022-02-10 01:31:07 +00:00
968081958a
Merge remote-tracking branch 'origin/master' into develop
2022-02-10 01:15:04 +00:00
ae041078e8
CMM.Studio Fuji65: Configurator Data Patch ( #16293 )
...
* info.json: correct layout data
* info.json: correct maintainer field
2022-02-10 01:14:32 +00:00
6339b6dab7
Merge remote-tracking branch 'origin/master' into develop
2022-02-10 01:04:13 +00:00
9d74c95215
[Keymap] submitting ariccb planck keymap ( #16177 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-02-09 17:03:43 -08:00
250fd721ac
move four_banger to bpiphany ( #16082 )
2022-02-09 21:33:40 +00:00
8e34b64a99
move hid_liber to /bpiphany ( #16091 )
2022-02-09 21:29:59 +00:00
cd673cceba
move spaceholdings boards into /spaceholdings ( #16096 )
2022-02-09 21:19:28 +00:00
a9250ad8a1
move @7-rate 's keebs to /rate ( #16099 )
2022-02-09 21:14:33 +00:00
9aed06ba47
move @npspears 's boards into /checkerboards ( #16100 )
2022-02-09 21:08:20 +00:00
c2c2f30f9f
Remove parent-relative paths from keyboards. ( #16282 )
...
* Remove parent-relative paths from keyboards.
* Update keyboards/capsunlocked/cu75/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-02-10 07:02:53 +11:00
1f67de2001
Align existing pca9555 driver to better match mcp23018 API ( #16277 )
2022-02-09 19:55:39 +00:00
96afc7a03a
Merge remote-tracking branch 'origin/master' into develop
2022-02-09 19:48:31 +00:00
de4f2bf1ff
Further update to #13745 on Crkbd keymap ( #16284 )
...
* Further update to #13745
Hello,
This is further update to #13745 , somehow my commit did not get merged
https://github.com/qmk/qmk_firmware/pull/13745#discussion_r802603490
* Update config.h
2022-02-09 19:47:53 +00:00
d1e5221bf8
Fix idobao/id80/v3 compilation errors ( #16280 )
...
* fix
* another redefintion
2022-02-09 07:01:58 +00:00
3face6b704
Merge remote-tracking branch 'origin/master' into develop
2022-02-09 05:51:58 +00:00
c49438feec
[Keyboard] Digicarp65 ( #15926 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: swiftrax <swiftrax@github.com>
2022-02-08 21:51:51 -08:00
c212b65e48
New Keyboard: 1upkeyboards super16v2 ( #16198 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-02-08 21:51:20 -08:00
69b6e0796b
Merge remote-tracking branch 'origin/master' into develop
2022-02-09 05:50:15 +00:00
b114b27373
[Keyboard] Idobao ID80 V3 ( #15912 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-02-08 21:49:53 -08:00
a75fb03f39
[Keyboard] MelGeek Mach80 rev2 ( #15610 )
2022-02-08 21:49:40 -08:00
7650e68798
Merge remote-tracking branch 'origin/master' into develop
2022-02-09 05:42:39 +00:00
bf4ce41696
[Keyboard] refine LED Matrix LED positions on KBD67 Lite ( #15769 )
2022-02-08 21:42:01 -08:00
4b377a80fa
Merge remote-tracking branch 'origin/master' into develop
2022-02-09 05:24:00 +00:00
11e50f5ff1
[Keyboard] Add explicit RGB Matrix defines for Iris Rev. 6 ( #16275 )
2022-02-08 21:23:25 -08:00
70e9f70c93
Merge remote-tracking branch 'origin/master' into develop
2022-02-09 05:20:34 +00:00
71a48a0102
[Keyboard] Add Kapl ( #16255 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-02-08 21:19:54 -08:00
QMK Bot
HorrorTroll
Ryan
Josh Hinnebusch
Benjamin Chausse
Matthew Dias
Simon
Drashna Jael're
Takeshi ISHII
Joel Challis
Dan Nixon
James Young
Max Rumpf
cole smith
peepeetee
uqs
Aric Crosson Bouwers
Nick Brassel
Arda Kılıçdağı
jack
Brandon Claveria
MechMerlin
bomb
Vino Rodrigues
Danny
Alexander