QMK Bot
fb80505733
Merge remote-tracking branch 'origin/master' into develop
2021-08-17 16:07:05 +00:00
yulei
e264550345
[Keyboard] add n6 keyboard ( #13768 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-17 09:06:26 -07:00
QMK Bot
fd37a111bd
Merge remote-tracking branch 'origin/master' into develop
2021-08-16 20:51:03 +00:00
James Young
bb10445bfa
ryanbaekr rb86: rename LAYOUT_numpad_6x17 to LAYOUT ( #14011 )
...
This keyboard isn't a numpad.
2021-08-16 13:50:30 -07:00
QMK Bot
4542f5b920
Merge remote-tracking branch 'origin/master' into develop
2021-08-16 06:44:50 +00:00
James Young
5033bd372e
Fix line endings in keyboards/absinthe/keymaps/via/rules.mk ( #14028 )
2021-08-15 23:44:03 -07:00
QMK Bot
cd535b3737
Merge remote-tracking branch 'origin/master' into develop
2021-08-14 15:08:27 +00:00
Ramon Imbao
e9324e3811
[Keyboard] Add TKL-FF PCB ( #14003 )
2021-08-14 08:07:55 -07:00
QMK Bot
7180529ca7
Merge remote-tracking branch 'origin/master' into develop
2021-08-14 14:59:20 +00:00
Rifaa Subekti
e31e293ead
[Keyboard] add Stealth macropad ( #13986 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-14 07:58:44 -07:00
QMK Bot
9a43952dcf
Merge remote-tracking branch 'origin/master' into develop
2021-08-14 08:48:55 +00:00
James Young
b52fa0bc4d
Noxary 378 Layout Macro rework ( #13998 )
...
* physically arrange layout macro
* add info.json
2021-08-14 01:48:25 -07:00
QMK Bot
b1432e8350
Merge remote-tracking branch 'origin/master' into develop
2021-08-14 06:36:00 +00:00
yulei
ba540d6f7d
add falcon keyboard ( #13674 )
...
* added falcon keyboard
* Update keyboards/matrix/falcon/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/matrix/falcon/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Apply suggestions from code review
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Apply suggestions from code review
Co-authored-by: Ryan <fauxpark@gmail.com>
* added description for the bootloader
* Apply suggestions from code review
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-14 16:35:32 +10:00
QMK Bot
29f071be67
Merge remote-tracking branch 'origin/master' into develop
2021-08-14 04:55:04 +00:00
Ramon Imbao
08db06fe1b
[Keyboard] Add Irene Keyboard ( #13991 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-13 21:54:38 -07:00
Drashna Jaelre
062a6cb381
Fix Line endings in Absinthe VIA keymap ( #13997 )
2021-08-14 13:57:41 +10:00
QMK Bot
857bf81064
Merge remote-tracking branch 'origin/master' into develop
2021-08-14 00:01:38 +00:00
James Young
b3b5d8e778
Crin Refactor ( #13982 )
...
* rename LAYOUT_default to LAYOUT_all
* apply human-friendly formatting to info.json
* correct keyboard dimensions
* correct data for LAYOUT_tsangan
* add labels to LAYOUT_ansi data
* add labels to LAYOUT_all data
* add labels to LAYOUT_iso data
* crin.h: update grid alignment of matrix identifiers
* crin.h: add matrix diagram
* physically position matrix identifiers for LAYOUT_all
- move k2d to top row (right half of split Backspace)
- move k41 to fourth row (right half of split Left Shift [KC_NUBS])
* physically position matrix identifiers for LAYOUT_iso
- move k1d to top row ([KC_NUHS])
- add k41 to fourth row ([KC_NUBS], previously missing)
* refactor keymaps
- grid-align keycodes
- use four-space indent
* correct data for LAYOUT_iso
- move Enter key to home row
* rename LAYOUT_tsangan to LAYOUT_ansi_tsangan
* add LAYOUT_iso_tsangan
* update readme.md
- add `make` command for building
- add "Flashing example..."
- touch-up bootloader jump instructions (previous Markdown didn't render ideally on GitHub)
* extend keymap functionality
- add Grave Accent, Function keys, Print Screen, Scroll Lock and Pause keycodes to keymaps
- add RESET keycode (Fn+R)
- use KC_RGHT for Right arrow
* touch-up bootloader instructions on readme
- note that Bootmagic Lite jump erases persistent settings
- note that Fn+R is RESET keycode by default
2021-08-13 17:01:05 -07:00
Drashna Jael're
703d4201e1
Merge remote-tracking branch 'origin/master' into develop
2021-08-13 14:15:58 -07:00
alittlepeace
696a5a630d
[Keyboard] Adding VIA to Absinthe ( #13031 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-13 12:35:56 -07:00
eniigmakeyboards
44a6b662b2
[Keyboard] Add eniigmakeyboards/ek60 ( #13140 )
...
* add eniigmakeyboards/ek60
* Update keyboards/eniigmakeyboards/ek60/rules.mk
Updated layouts
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keymap.c
Added GPL2+ header
* Update keymap.c
Added GPL2+
* Update rules.mk
Added ISO layout here
* Update readme.md
Added instructions for resetting bootloader
* Update keyboards/eniigmakeyboards/ek60/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: adamws <adamws@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 12:34:27 -07:00
NightlyBoards
49a329f37c
[Keyboard] Add n9 macropad ( #13168 )
2021-08-13 12:32:33 -07:00
DonutCables
1292868c14
[Keyboard] Updates to ScrabblePad ( #13177 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 12:30:38 -07:00
QMK Bot
0e2967440d
Merge remote-tracking branch 'origin/master' into develop
2021-08-13 19:27:20 +00:00
npspears
f1d559af6c
[Keyboard] add support for alternate ortho UD40 PCB ( #13491 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 12:26:49 -07:00
QMK Bot
ebb10133b1
Merge remote-tracking branch 'origin/master' into develop
2021-08-13 18:48:39 +00:00
Weirdo
da3178d2cf
[Keybord] Add LS_60 keyboard ( #13851 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 11:47:57 -07:00
QMK Bot
0b45aeb012
Merge remote-tracking branch 'origin/master' into develop
2021-08-13 18:21:40 +00:00
Simon
f395bea177
[Keyboard] Added Frooastboard ( #13970 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-13 11:21:32 -07:00
Vincent Vorholter
1aceccd1b9
[Keyboard] Add Basketweave VIA keymap ( #13972 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Vince Vorholter <vince@28east.co.za>
2021-08-13 11:21:09 -07:00
QMK Bot
2126656e6c
Merge remote-tracking branch 'origin/master' into develop
2021-08-13 18:18:30 +00:00
Alabahuy
914649818d
[Keyboard] add rart75m with via support ( #13975 )
2021-08-13 11:18:02 -07:00
QMK Bot
7aeb6114cf
Merge remote-tracking branch 'origin/master' into develop
2021-08-12 18:04:20 +00:00
Drashna Jaelre
137a8e5a13
[Keyboard] Fix keymaps for Ocean Gin v2 ( #13976 )
2021-08-13 04:03:50 +10:00
Drashna Jael're
bc6937aa71
Merge remote-tracking branch 'origin/master' into develop
2021-08-12 09:18:18 -07:00
Luis Godinez
1b7e707de5
[Keyboard] Add Launch Pad keymaps ( #12490 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-12 08:51:56 -07:00
David Hoelscher
6f183e734f
[Keyboard] Update to customMK Genesis ( #12511 )
...
Co-authored-by: Ray <ray@custommk.com>
2021-08-12 08:51:34 -07:00
Paul James
fd48971b15
[Keyboard] Add Tripel keyboard ( #12635 )
2021-08-12 08:49:51 -07:00
QMK Bot
eaefd14fc8
Merge remote-tracking branch 'origin/master' into develop
2021-08-12 14:43:35 +00:00
sato-takashi
96cc3fd5ac
[Keyboard] Add EndZone34 ( #13847 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-12 07:43:01 -07:00
QMK Bot
6012fca6e0
Merge remote-tracking branch 'origin/master' into develop
2021-08-12 13:59:41 +00:00
arnstadm
0ed42fbbc4
[Keyboard] Add Edda Keyboard ( #13953 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-12 06:59:07 -07:00
Andre Brait
c7545f4bd6
[Keymap] Add andrebrait layout for GMMK Pro ( #13932 )
2021-08-12 06:55:19 -07:00
QMK Bot
91755e1359
Merge remote-tracking branch 'origin/master' into develop
2021-08-12 02:45:25 +00:00
Rifaa Subekti
fcb6af1da3
[Keyboard] add Gin V2 keyboard ( #13943 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-11 19:44:59 -07:00
QMK Bot
ad8dd51af5
Merge remote-tracking branch 'origin/master' into develop
2021-08-12 02:44:46 +00:00
Rifaa Subekti
50be164858
[Keyboard] add Wang V2 keyboard ( #13948 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-11 19:44:15 -07:00
James Young
342a08c355
Merge remote-tracking branch 'upstream/master' into develop
...
Fixes merge conflicts in:
- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
- Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
- Conflict from PR 13947
2021-08-11 09:48:25 -07:00
Vicktor Hutama
1dc2b0cafa
[Keyboard] Add Rune Vaengr Keyboard ( #13945 )
...
* initial commit
* fixed layout
* enabled NKRO
* removed qmkbest
* changed the pins and bootloader to the mcu version
* updated readme
* Apply suggestions from code review
thank you @drashna
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-11 00:24:34 -07:00