924b9fcf05
Merge remote-tracking branch 'origin/master' into develop
2021-04-18 22:23:25 +00:00
a3d717cb83
Keymap: Orthocarpus keymap for idobo ( #12462 )
...
* Keymap: Orthocarpus keymap for idobo
* Update keyboards/idobo/keymaps/gkbd_75/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Giorgi Chavchanidze <giorgi@vivaldi.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-04-18 18:22:56 -04:00
884f8658ef
Merge remote-tracking branch 'origin/master' into develop
2021-04-18 22:14:59 +00:00
fd65451679
keyboardio/atreus: Add ardumont keymap ( #12479 )
2021-04-18 18:14:23 -04:00
99ce84827a
Merge remote-tracking branch 'origin/master' into develop
2021-04-18 15:52:15 +00:00
d0973e1cfb
Add ferris 0.2 ( #12133 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-18 17:51:45 +02:00
7f809c013a
Merge remote-tracking branch 'origin/master' into develop
2021-04-17 15:47:13 +00:00
c32264d9b7
mcrown crkbd new keymap ( #12092 )
...
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-17 17:46:46 +02:00
40365f8297
Merge remote-tracking branch 'origin/master' into develop
2021-04-16 14:26:52 +00:00
09a392433a
Ergodone via support ( #11618 )
...
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-16 16:26:19 +02:00
1ac030b119
Merge remote-tracking branch 'origin/master' into develop
2021-04-16 14:24:18 +00:00
3975c712f0
Bug in beautifier script, compound modifiers not correctly parsed ( #12595 )
2021-04-16 16:23:30 +02:00
e2289ffac0
Add missing RGB_MODE_TWINKLE / RGB_M_TW keycodes ( #11935 )
...
* Add missing RGB_MODE_TWINKLE / RGB_M_TW keycodes
* Better comment
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-15 19:32:17 -04:00
1629c9b71a
Merge remote-tracking branch 'origin/master' into develop
2021-04-15 17:20:12 +00:00
a8c013a145
Fix audio on WT60-XT ( #12526 )
2021-04-15 13:19:41 -04:00
42a57b37fb
Merge remote-tracking branch 'origin/master' into develop
2021-04-15 17:05:00 +00:00
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
be1b5c5a54
Merge remote-tracking branch 'origin/master' into develop
2021-04-15 17:01:54 +00:00
39d31d3ee4
update readme ( #12322 )
2021-04-15 13:01:25 -04:00
53eb35b6cf
LED Matrix: Task system ( #12580 )
2021-04-15 12:08:52 +10:00
2c0aa27e6c
Merge remote-tracking branch 'origin/master' into develop
2021-04-15 02:00:59 +00:00
588bcdc8ca
Add support for tab completion ( #12411 )
...
* Add support for tab completion
* make flake8 happy
* Add documentation
2021-04-14 19:00:22 -07:00
19b143688f
Merge remote-tracking branch 'origin/master' into develop
2021-04-14 21:51:45 +00:00
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
3c08d27abb
Merge remote-tracking branch 'origin/master' into develop
2021-04-14 20:39:01 +00:00
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
98dd9b6614
Merge remote-tracking branch 'origin/master' into develop
2021-04-14 03:09:16 +00:00
9dea6f7720
[Keyboard] Add Caffeinated Studios Serpent65 ( #12578 )
2021-04-13 20:08:42 -07:00
4ed273699a
Merge remote-tracking branch 'origin/master' into develop
2021-04-14 01:32:38 +00:00
b64dabdffd
Correct layout macro name in Cannonkeys Ortho75 info.json ( #12581 )
2021-04-13 18:31:51 -07:00
333cd4ec9b
[CI] Format code according to conventions ( #12570 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-13 19:58:34 +10:00
30f38c4952
Merge remote-tracking branch 'origin/master' into develop
2021-04-13 09:52:45 +00:00
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
a28fbcda23
Terrazzo: Fix wrong LED Matrix function names ( #12561 )
2021-04-13 19:51:31 +10:00
ce99f98bb5
LED Matrix: suspend code ( #12509 )
2021-04-13 19:51:03 +10:00
15f7cc3bde
[Keymap] Add kzar keymap for Kinesis Advantage ( #12444 )
2021-04-13 11:39:39 +02:00
a8d64c8b89
Change `BOOTMAGIC_ENABLE=yes` to use Bootmagic Lite ( #12172 )
2021-04-12 21:18:52 +02:00
f5aaecfdfc
Merge remote-tracking branch 'origin/master' into develop
2021-04-12 18:41:12 +00:00
1a7a821582
Merc updates ( #12289 )
2021-04-12 20:40:38 +02:00
ebdf750cdd
Merge remote-tracking branch 'origin/master' into develop
2021-04-12 17:56:32 +00:00
50e0f5dc80
Update layout option for lazydesigners/THE40 ( #12312 )
2021-04-12 19:55:57 +02:00
79bdfc1110
Merge remote-tracking branch 'origin/master' into develop
2021-04-11 10:51:12 +00:00
0f516d9026
A few small typo fixes in docs ( #12524 )
2021-04-11 12:50:45 +02:00
90875997ac
Merge remote-tracking branch 'origin/master' into develop
2021-04-11 10:49:39 +00:00
b23eeb6a14
Documentation update ( #12484 )
...
Update documentation to reflect what the actual target flags are
Co-authored-by: swampmonster <>
2021-04-11 12:49:12 +02:00
f02af23973
Merge remote-tracking branch 'origin/master' into develop
2021-04-11 10:47:14 +00:00
1298eab6ab
Update readme.md ( #12502 )
...
Noticed a letter missing in "compiling".
2021-04-11 12:46:43 +02:00
c9d7a4af45
Merge remote-tracking branch 'origin/master' into develop
2021-04-11 10:45:56 +00:00
98939868fa
Update github instruction link in newbs_getting_started.md ( #12510 )
...
Clarify that the link to the github/forking instructions is a link to how to fork this project. Previous wording implied that the link was to a how-to-use github in general page.
2021-04-11 12:45:30 +02:00
34323ecd8b
Merge remote-tracking branch 'origin/master' into develop
2021-04-10 16:34:58 +00:00
QMK Bot
Giorgi Chavchanidze
Antoine R. Dumont
Pierre Chevalier
MarioCorona
Harshit Goel
sendmmsg
Joshua Diamond
Wilba
Jay Greco
MechMerlin
Ryan
Zach White
Jan Christoph Ebersbach
Marius Kavoliunas
J.Flanagan
James Young
github-actions[bot]
Leon Anavi
Dave Vandyke
Kyle McCreery
jackytrabbit
Arthur Tabatchnic
swampmonster
Joseph Whom
Hawley Waldman