Commit graph

8604 commits

Author SHA1 Message Date
QMK Bot 99ce84827a Merge remote-tracking branch 'origin/master' into develop 2021-04-18 15:52:15 +00:00
Pierre Chevalier d0973e1cfb
Add ferris 0.2 (#12133)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-18 17:51:45 +02:00
QMK Bot 7f809c013a Merge remote-tracking branch 'origin/master' into develop 2021-04-17 15:47:13 +00:00
MarioCorona c32264d9b7
mcrown crkbd new keymap (#12092)
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-17 17:46:46 +02:00
QMK Bot 40365f8297 Merge remote-tracking branch 'origin/master' into develop 2021-04-16 14:26:52 +00:00
Harshit Goel 09a392433a
Ergodone via support (#11618)
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-16 16:26:19 +02:00
QMK Bot 1ac030b119 Merge remote-tracking branch 'origin/master' into develop 2021-04-16 14:24:18 +00:00
sendmmsg 3975c712f0
Bug in beautifier script, compound modifiers not correctly parsed (#12595) 2021-04-16 16:23:30 +02:00
QMK Bot 1629c9b71a Merge remote-tracking branch 'origin/master' into develop 2021-04-15 17:20:12 +00:00
Wilba a8c013a145
Fix audio on WT60-XT (#12526) 2021-04-15 13:19:41 -04:00
QMK Bot 42a57b37fb Merge remote-tracking branch 'origin/master' into develop 2021-04-15 17:05:00 +00:00
Jay Greco a69616c45c
Optimize NIBBLE oled_bongocat keymap to reduce flash usage (#12330)
* Optimize with squeez-o frame compression

Adds VIA support!

* Clean up for PR

+ Add copyright header
- Remove debug print statements
2021-04-15 13:04:26 -04:00
QMK Bot be1b5c5a54 Merge remote-tracking branch 'origin/master' into develop 2021-04-15 17:01:54 +00:00
MechMerlin 39d31d3ee4
update readme (#12322) 2021-04-15 13:01:25 -04:00
QMK Bot 19b143688f Merge remote-tracking branch 'origin/master' into develop 2021-04-14 21:51:45 +00:00
Jan Christoph Ebersbach b33e6793de
Dactyl manuform 5x6 2 5 keymap (#11353)
* feat(keymap): add DactylManuform w/ 2 extra keys and 5 thumb keys

* fix(keymap): add missing readme

* chore: add gpl2 license header

* chore: add gpl2 license header

* docs[dactyl_manuform_5x6_2_5]: reformat readme

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-14 17:51:08 -04:00
QMK Bot 3c08d27abb Merge remote-tracking branch 'origin/master' into develop 2021-04-14 20:39:01 +00:00
Marius Kavoliunas bcceb701cd
[Keyboard] CyberGear Macro25 (#12518)
* add cybergear macro25 keyboard

* add readme and fix file namings

* rename readme.md

* separate default and via keymaps

* add info.json

* unify info.json and key coordinates

* remove via json

* add missing via layers

* Update keyboards/cybergear/macro25/keymaps/via/rules.mk

* Update keyboards/cybergear/macro25/macro25.c

* Update keyboards/cybergear/macro25/macro25.h

* Update keyboards/cybergear/macro25/readme.md

* Update keyboards/cybergear/macro25/readme.md

* Update keyboards/cybergear/macro25/readme.md

* Update keyboards/cybergear/macro25/readme.md

* remove unnecessary config.h parameters

* Update keyboards/cybergear/macro25/config.h

* remove MATRIX_ROWS and COLS from config.h

* Apply suggestions from code review

set to LAYOUT_ortho_2x5 and fix grammar
2021-04-14 13:38:27 -07:00
QMK Bot 98dd9b6614 Merge remote-tracking branch 'origin/master' into develop 2021-04-14 03:09:16 +00:00
J.Flanagan 9dea6f7720
[Keyboard] Add Caffeinated Studios Serpent65 (#12578) 2021-04-13 20:08:42 -07:00
QMK Bot 4ed273699a Merge remote-tracking branch 'origin/master' into develop 2021-04-14 01:32:38 +00:00
James Young b64dabdffd
Correct layout macro name in Cannonkeys Ortho75 info.json (#12581) 2021-04-13 18:31:51 -07:00
QMK Bot 30f38c4952 Merge remote-tracking branch 'origin/master' into develop 2021-04-13 09:52:45 +00:00
Leon Anavi a2ac6f50aa
[Keymap] ANAVI Macro Pad 2 add Google Meet keymap (#12449)
This keymap for ANAVI Macro Pad 2 contains a couple of shortcuts
for Google Meet:

- left key: turn on/off the microphone (mute button)
- right key: turn on/off the camera

Signed-off-by: Leon Anavi <leon@anavi.org>
2021-04-13 11:52:13 +02:00
Ryan a28fbcda23
Terrazzo: Fix wrong LED Matrix function names (#12561) 2021-04-13 19:51:31 +10:00
Dave Vandyke 15f7cc3bde
[Keymap] Add kzar keymap for Kinesis Advantage (#12444) 2021-04-13 11:39:39 +02:00
James Young a8d64c8b89
Change BOOTMAGIC_ENABLE=yes to use Bootmagic Lite (#12172) 2021-04-12 21:18:52 +02:00
QMK Bot f5aaecfdfc Merge remote-tracking branch 'origin/master' into develop 2021-04-12 18:41:12 +00:00
Kyle McCreery 1a7a821582
Merc updates (#12289) 2021-04-12 20:40:38 +02:00
QMK Bot ebdf750cdd Merge remote-tracking branch 'origin/master' into develop 2021-04-12 17:56:32 +00:00
jackytrabbit 50e0f5dc80
Update layout option for lazydesigners/THE40 (#12312) 2021-04-12 19:55:57 +02:00
QMK Bot f02af23973 Merge remote-tracking branch 'origin/master' into develop 2021-04-11 10:47:14 +00:00
Joseph Whom 1298eab6ab
Update readme.md (#12502)
Noticed a letter missing in "compiling".
2021-04-11 12:46:43 +02:00
QMK Bot 2e2dd3113b Merge remote-tracking branch 'origin/master' into develop 2021-04-10 13:23:47 +00:00
Álvaro A. Volpato 03685309fd
Reverse K0E and K0G (#12491)
Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
2021-04-10 23:23:08 +10:00
QMK Bot 11e5bb2d8a Merge remote-tracking branch 'origin/master' into develop 2021-04-10 05:58:04 +00:00
Eithan Shavit e09ca63317
[Keyboard] Add afternoonlabs/oceanbreeze (#12299)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Eithan Shavit <eithan@fb.com>
2021-04-09 22:57:30 -07:00
QMK Bot 29d537ce7b Merge remote-tracking branch 'origin/master' into develop 2021-04-10 00:38:17 +00:00
Ryo Maeda 3dbb7f261d
[Keymap] Remove LAYOUT_kc macros from edvorakjp keymaps (#12217) 2021-04-09 17:37:49 -07:00
QMK Bot 688fb1999b Merge remote-tracking branch 'origin/master' into develop 2021-04-09 21:36:55 +00:00
littleferris 93e8a401df
[Keyboard] ergosaurus - add VIA support, enabled RGB (#12126)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-04-09 14:36:18 -07:00
QMK Bot bcfa3fb9f2 Merge remote-tracking branch 'origin/master' into develop 2021-04-09 21:32:31 +00:00
hadi 7f9409bbb3
[Keyboard] Added senselessclay had60 (#12093)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-09 14:31:57 -07:00
QMK Bot 58afb87288 Merge remote-tracking branch 'origin/master' into develop 2021-04-09 19:05:51 +00:00
kiwikey 633464acfa Add VIA keymap for Kawii9 (#12521)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-09 21:05:14 +02:00
QMK Bot 0a453194e8 Merge remote-tracking branch 'origin/master' into develop 2021-04-09 18:49:03 +00:00
mechlovin f744e22b49
Add TH1800 PCB, Hex6C PCB, Rogue87 PCB, Rouge87 PCB, Infinity87 series (#11977)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: vuhopkep <boy9x0@gmail.com>
2021-04-09 20:48:30 +02:00
QMK Bot d4b3d00d88 Merge remote-tracking branch 'origin/master' into develop 2021-04-08 16:48:07 +00:00
Adrian 75f83210f4
Add new handwired keyboard (Ergocheap) (#11857)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-08 18:47:24 +02:00
QMK Bot 52e8875eba Merge remote-tracking branch 'origin/master' into develop 2021-04-07 13:58:12 +00:00