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
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
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
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
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
2e2dd3113b
Merge remote-tracking branch 'origin/master' into develop
2021-04-10 13:23:47 +00:00
03685309fd
Reverse K0E and K0G ( #12491 )
...
Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
2021-04-10 23:23:08 +10:00
11e5bb2d8a
Merge remote-tracking branch 'origin/master' into develop
2021-04-10 05:58:04 +00:00
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
29d537ce7b
Merge remote-tracking branch 'origin/master' into develop
2021-04-10 00:38:17 +00:00
3dbb7f261d
[Keymap] Remove LAYOUT_kc macros from edvorakjp keymaps ( #12217 )
2021-04-09 17:37:49 -07:00
688fb1999b
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 21:36:55 +00:00
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
bcfa3fb9f2
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 21:32:31 +00:00
7f9409bbb3
[Keyboard] Added senselessclay had60 ( #12093 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-09 14:31:57 -07:00
58afb87288
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 19:05:51 +00:00
633464acfa
Add VIA keymap for Kawii9 ( #12521 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-09 21:05:14 +02:00
0a453194e8
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 18:49:03 +00:00
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
d4b3d00d88
Merge remote-tracking branch 'origin/master' into develop
2021-04-08 16:48:07 +00:00
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
52e8875eba
Merge remote-tracking branch 'origin/master' into develop
2021-04-07 13:58:12 +00:00
d1270c9d55
Update info.json to correctly. ( #12507 )
2021-04-07 09:57:36 -04:00
69bc465ace
Merge remote-tracking branch 'origin/master' into develop
2021-04-07 10:04:21 +00:00
546dfce209
Add info.json for CK60i ( #12318 )
2021-04-07 20:03:45 +10:00
96acb499d2
Fix up builds that are now too big for `develop` branch. ( #12495 )
2021-04-06 16:39:31 +10:00
3ce8c9fc8f
Merge remote-tracking branch 'origin/master' into develop
2021-04-04 09:10:07 +00:00
e0614e4f52
Disarray ProductID change ( #12440 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com>
Co-authored-by: Zach White <skullydazed@gmail.com>
2021-04-04 11:09:43 +02:00
8428cedc83
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 19:43:05 +00:00
49dc332a04
[Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows ( #12259 )
...
* cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows
* Made the layout data easier to read.
* helix/rev2/keymaps/five_rows/keymap.c
* helix/rev3_5rows/keymaps/five_rows/keymap.c
* The following two were made the same.
* keymaps/five_rows/config.h
* keymaps/five_rows/oled_display.c
The binary of the compilation result has not changed.
* update keyboards/helix/rev2/keymaps/five_rows/rules.mk
KEYBOARD_LOCAL_FEATURES_MK was moved to the end.
* add '#define DISABLE_SYNC_TIMER' into helix/rev3_5rows/keymaps/five_rows/config.h
The sync timer features worsen the matrix scan rate of the Helix keyboard. I'm not sure if it makes sense to have sync timer features enabled on the Helix keyboard. So in my keymap I disable this.
2021-04-04 04:42:29 +09:00
e90ec6a474
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 13:51:51 +00:00
7d33d1bace
Added Epoch80 ( #12307 )
2021-04-03 15:51:21 +02:00
638cc50727
Merge remote-tracking branch 'upstream/master' into develop
2021-04-03 20:15:54 +11:00
4b9f5578a0
[CI] Format code according to conventions ( #12468 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-03 20:13:45 +11:00
QMK Bot
MechMerlin
Jan Christoph Ebersbach
Marius Kavoliunas
J.Flanagan
James Young
Leon Anavi
Ryan
Dave Vandyke
Kyle McCreery
jackytrabbit
Joseph Whom
Álvaro A. Volpato
Eithan Shavit
Ryo Maeda
littleferris
hadi
kiwikey
mechlovin
Adrian
Kosuke Adachi
Nick Brassel
SneakboxKB
Takeshi ISHII
kb-elmo
github-actions[bot]