varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity
17122 commits 2 branches 1545 tags 870 MiB
Commit graph

9334 commits

Author SHA1 Message Date
QMK Bot ae6a3ae20e Merge remote-tracking branch 'origin/master' into develop 2021-07-29 16:12:19 +00:00
Takeshi Nishio 441fd2ca5b
[Keyboard] Match Vendor ID to my other keyboard, "unison". (#13699) 
Co-authored-by: Takeshi Nishio <kkeennnn@gmail.com>
 2021-07-29 09:11:40 -07:00
QMK Bot 5bb736d1d6 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 16:04:06 +00:00
Uy Bui 6bdecb16c0
[Keyboard] we27 update info.json (#13678) 2021-07-29 09:03:21 -07:00
QMK Bot 935079f266 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:50:58 +00:00
bomb 768072e824
[Keyboard] Add Mojo68 for Melgeek (#13578) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:50:28 -07:00
QMK Bot 957bd4d1d1 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:50:24 +00:00
AquaCylinder ae268596ce
[Keyboard] Add Emi20 (#13603) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:49:51 -07:00
QMK Bot faf4f6d005 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:49:11 +00:00
DA ad6acb3a03
[Keyboard] add cherryb studio cb1800 keyboard (#13639) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:48:39 -07:00
QMK Bot 58baf5a3d8 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:48:22 +00:00
QMK Bot 04a0f0cb18 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:47:52 +00:00
X-Bows Tech 8fa674727d
[Keyboard] Add X-Bows Ranger Keyboard (#13660) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:47:51 -07:00
Jonavin 8d611f6873
[Keymap] Jonavin keymap Mercutio add win key lockout function (#13670) 
Co-authored-by: Jonavin <=>
 2021-07-29 08:47:14 -07:00
QMK Bot 1df2f23ab4 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:43:12 +00:00
N2-Sumikko dc2dfe2a6c
[Keyboard] Add halfcliff keyboard (#13515) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:42:28 -07:00
QMK Bot 5418777454 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:29:02 +00:00
ESCA47 3a48cd64cb
[Keyboard] Add GetawayVan (#13412) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:28:33 -07:00
QMK Bot ec8d08810f Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:23:56 +00:00
Jordan Blackbourn f3d7901950
[Keyboard] Added Orthocode keyboard (#13487) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:23:27 -07:00
QMK Bot 69661eb5ab Merge remote-tracking branch 'origin/master' into develop 2021-07-28 23:34:48 +00:00
James Young ccdb432f71
Allison Numpad: Configurator fix for LAYOUT_numpad_6x4 (#13759) 
* info.json: human-friendly formatting

- one key object per line; line breaks between physical rows
- four-space indent
- remove trailing whitespace

* info.json: correct key object order for LAYOUT_numpad_6x4
 2021-07-28 16:34:17 -07:00
QMK Bot 2f4361c88f Merge remote-tracking branch 'origin/master' into develop 2021-07-28 07:25:28 +00:00
Jonavin 9088df04c3
[Keyboard] fix short circuit in led_update_kb for quefrency rev3 (#13752) 
Co-authored-by: Jonavin <=>
 2021-07-28 00:24:51 -07:00
Joel Challis 7ac7ca96e9
Remove some legacy files (#13715) 2021-07-27 23:57:42 +01:00
Ryan 56443fe3cf
Fix typo in Dactyl Manuform (#13740) 2021-07-27 08:16:41 -07:00
Ryan 468f705455
Dactyl Manuform cleanup (#13686) 2021-07-27 22:00:38 +10:00
QMK Bot 998ac203e4 Merge remote-tracking branch 'origin/master' into develop 2021-07-27 02:44:18 +00:00
James Young a617c8b80a
[Keyboard] Ares refactor (#13730) 2021-07-26 19:43:48 -07:00
Albert Y be34fdea4b
[Keyboard] Add RGB matrix support for Kyria (#12789) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-07-26 19:42:34 -07:00
Drashna Jaelre 3affdcb45b
Reduce firmware size in prep for #12670 (#13724) 
* Reduce firmware size in pre for #12670

* Also disable pixel mode, just in case
 2021-07-27 12:41:28 +10:00
Albert Y e032fbe326
[Keyboard] Update kyria make path example (#13720) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-07-26 18:01:16 -07:00
Drashna Jaelre eb46c954dc
[Keymap] Drashna's Defaults cleanup (#13722) 2021-07-26 17:59:49 -07:00
Joel Challis 368efb5d2b
Remove legacy BACKLIGHT_CUSTOM_DRIVER option (#13731) 2021-07-27 10:17:58 +10:00
Nick Brassel 394272a266 Merge remote-tracking branch 'upstream/master' into develop 2021-07-27 10:11:52 +10:00
datafx b1c5a53a68
Add bootloader size (#13729) 
* Add bootloader size

Bootloader size needs to be 6144 to allow QMK to jump to the correct location with bootmagic

* Include dz60rgb v2.1

Add boot loader size to this pcb also
 2021-07-27 10:07:29 +10:00
James Young e6e4ec6267
40percentclub/nein: update info.json layout macro reference (#13726) 
- change LAYOUT to LAYOUT_ortho_3x3
 2021-07-26 21:02:44 +01:00
Xelus22 e0375c0b71
[Keyboard Update] Change to L422 (#13717) 
* change to L422

* Add bootloader

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

* add bootloader

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-26 16:05:13 +10:00
Cyril a73e0a7b13
Revert "Fixed the ortho60 and ortho48 matrix layout after testing (#12106)" (#13456) 
This reverts commit e25f05224f.
 2021-07-25 22:51:23 -07:00
Xelus22 b9902a3f59
[Keyboard] Valor Rev 2 (#13551) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-25 22:34:39 -07:00
bomb 2e5cecd704
[Keyboard] Change RGB light defaults for melgeek/mj6xy (#13657) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-25 21:22:13 -07:00
Drashna Jaelre 4bb595f94b
[Keyboard] Fix up SplitKB keyboards (#13511) 2021-07-25 18:18:39 -07:00
Drashna Jaelre d45da3f0fb
[Keyboard] Update ZSA Keyboard Readmes and keymaps (#13041) 
* [Keyboard] Update ZSA Keyboard Readmes and keymaps

* Apply suggestions from code review

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

* Remove custom rgb code for RGB_M_P

* Fix inevitable typo

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

* Update keyboards/planck/ez/readme.md

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-25 18:18:22 -07:00
Drashna Jaelre a030950fd6
[Keyboard] Fix compile size for the Vitamins Included via keymap (#13696) 2021-07-25 14:19:38 +10:00
Dasky a938c54512
dirty fix (#13695) 2021-07-25 12:33:30 +10:00
Nick Brassel 4ec8764c70 Merge remote-tracking branch 'upstream/master' into develop 2021-07-25 12:17:15 +10:00
Drashna Jaelre b69e7431aa
[Keyboard] Fix keymaps for clueboard 66_hotswap (#13694) 
* [Keyboard] Fix default keymap for clueboard proto

* Fix keymaps, because they're not actually revision compatible

* Add copyright headers
 2021-07-25 12:07:46 +10:00
Drashna Jaelre fdf3ce3cd1
[Keyboard] Fix compile size for the Lets Split Sockets via keymap (#13691) 2021-07-25 11:05:48 +10:00
Drashna Jaelre 210da7b233
[Keyboard] Fix Compile size on ungodly Launch Pad (#13692) 2021-07-25 11:05:19 +10:00
Ryan 8cc568bc29
Fix & clean up tronguylabs/m122_3270 (#13684) 2021-07-25 11:02:36 +10:00
Drashna Jaelre 95730d4f96
[Keyboard] Fix compile size for the Merge UM70 via keymap (#13690) 2021-07-25 11:01:13 +10:00
Drashna Jaelre 0b95ac2e4b
Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines (#13689) 2021-07-24 20:17:04 +01:00
Dasky ab42945c9a
[Keyboard] Fix Q1 change dip switch to bool (#13687) 2021-07-24 10:45:34 -07:00
QMK Bot 93fc2cbc8a Merge remote-tracking branch 'origin/master' into develop 2021-07-24 16:37:57 +00:00
lokher 145d89ab91
[Keyboard] Add Keychron Q1 (#13397) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-07-24 09:37:24 -07:00
QMK Bot e681c4368b Merge remote-tracking branch 'origin/master' into develop 2021-07-24 15:40:38 +00:00
James Won 44a0aa924c
[Keymap] add kinesis/keymaps/jwon (#13618) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-24 08:40:05 -07:00
QMK Bot 7aa1938fa4 Merge remote-tracking branch 'origin/master' into develop 2021-07-24 15:39:35 +00:00
Xelus22 1b002b7dcc
[Keyboard] Dharma (#13663) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-24 08:39:26 -07:00
Shane Celis d4bc77ac94
feature: Add swap hands support for sofle keyboard. (#13654) 2021-07-24 08:39:04 -07:00
Joel Challis e562238309
Fix up xd002 rgb keymaps (#13685) 2021-07-24 15:50:32 +01:00
Drashna Jaelre 7907a72584
[Keyboard] Reduce compile size for dz60rgb v2.1 (#13680) 2021-07-24 19:36:41 +10:00
Drashna Jaelre a2d0efe5ad
[Keyboard] Fix type on pandora via keymap (#13681) 2021-07-24 18:06:56 +10:00
Drashna Jaelre b8a1e14f53
Remove deprecated callbacks for encoders and dip switches (#13404) 2021-07-24 00:37:19 -07:00
Drashna Jaelre 73d4d7dc2b
[Keyboard] Quick hack to fix Astro65 board (#13665) 
* [Keyboard] Quick hack to fix Astro65 board

* Use proper pins
 2021-07-23 23:38:54 -07:00
QMK Bot b7fe93c4b8 Merge remote-tracking branch 'origin/master' into develop 2021-07-24 03:45:59 +00:00
Rafael Yumagulov e08203f16a
[Keyboard] Added Compound keyboard support (#12942) 
* [Keyboard] Added Compound keyboard support

* Small fixes for Compound keyboard

* Fixed readme and header file for Compound keyboard

* Update keyboards/compound/rules.mk

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

* Changed info.json and readme.md for Compound Keyboard

info.json - removed key_count
readme.md - changed PCB picture url to low-resolution

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-23 20:45:24 -07:00
Drashna Jaelre 83a0d85f2b
[Keyboard] Fix split matrix for sekigon grs 70ec (#13672) 2021-07-23 18:06:06 -07:00
Drashna Jaelre e35672169e
[Keyboard] Fix matrix delay on Drop boards (#13671) 2021-07-23 23:36:39 +01:00
Drashna Jaelre 8f1ebdb718
[Keyboard] Disable console by default on all Keebio boards (#13649) 2021-07-23 14:57:24 -07:00
Drashna Jaelre 164a74a078
[Keyboard] Enable LTO by default on BastardKB Scylla (#13664) 2021-07-23 11:28:41 -07:00
Takeshi ISHII 5b904a92c4
[Keyboard] Fix symmetric70_proto build break on develop branch (#13667) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-07-23 09:05:06 -07:00
Nick Brassel 6747890562
[Keyboard] Remove broken, unmaintained converter/ibm_5291 (#13658) 2021-07-23 08:17:15 -07:00
QMK Bot 8ea31698c9 Merge remote-tracking branch 'origin/master' into develop 2021-07-23 15:11:42 +00:00
Matthew Dias 4a47ee937d
[Keyboard] Add model-v keyboard (#13643) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-23 08:10:01 -07:00
Zach White fa32c66e9d
[Keyboard] Fix dc01/left so that it doesn't throw a warning (#13653) 2021-07-23 08:06:12 -07:00
QMK Bot 4ff4c05719 Merge remote-tracking branch 'origin/master' into develop 2021-07-23 04:45:49 +00:00
Matthew Dias cda1792ece
[Keyboard] Add Txuu keyboard (#13650) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-22 21:45:35 -07:00
Jay Greco a08c7087be
[Keymap] Reduce NIBBLE oled_bongocat keymap size so it compiles (#13638) 2021-07-22 21:45:17 -07:00
Drashna Jaelre 816accda3d
Fix errors with matrix_output_unselect_delay function calls (#13645) 2021-07-22 21:42:59 -07:00
QMK Bot 750f40566a Merge remote-tracking branch 'origin/master' into develop 2021-07-23 04:24:47 +00:00
Domantas dfd795e48e
Add backslash in lily58 domnantas keymap (#12713) 2021-07-23 14:24:16 +10:00
Drashna Jaelre 21e0a9780d
[Keyboard] Fix matrix issues with Promethium (#13648) 2021-07-22 21:02:50 -07:00
Drashna Jaelre bf57c552c9
[Keyboard] Fix Matrix Row number for ggkeyboards/genisis (#13647) 2021-07-22 21:02:16 -07:00
Drashna Jaelre 7f8bc83b30
[Keyboard] Fix default keymap for 0xCB 1337 keyboard (#13646) 2021-07-22 20:59:55 -07:00
Zach White 677222301e
[Keyboard] Remove the vision_division keyboard (#13571) 2021-07-22 19:19:47 -07:00
QMK Bot 94065ca64a Merge remote-tracking branch 'origin/master' into develop 2021-07-23 01:51:40 +00:00
kb-elmo 4a8f540949
[Keyboard] Added another layer for VIA on the AEK II (#13100) 2021-07-22 18:51:29 -07:00
kb-elmo 270bf7a87a
[Keyboard] Added Stratos keyboard (#13139) 2021-07-22 18:51:12 -07:00
QMK Bot e1eb307d74 Merge remote-tracking branch 'origin/master' into develop 2021-07-23 01:48:06 +00:00
KnoblesseOblige 79c8f035cc
[Keyboard] Added Crin keyboard (#13630) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-22 18:47:32 -07:00
QMK Bot 490fa5a9e3 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 22:01:53 +00:00
Joel Challis 5d7f2823c9
Implement GPIO abstraction for atsam (#13567) 
* Implement GPIO abstraction for atsam

* Convert Drop boards to normal matrix config

* Work round pin conflicts and matrix delay
 2021-07-22 23:01:19 +01:00
QMK Bot 34a9acd090 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 16:39:42 +00:00
Dasky f33532764f
[Keyboard][Bug] Add timer_avr to includes for broken builds (#13641) 2021-07-22 09:39:27 -07:00
Tran Kim Tung 95a7c22824
[Keyboard] adds new revision: dztech/dz60rgb/v2_1 (#13636) 2021-07-22 09:39:08 -07:00
QMK Bot 3316ac3f42 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 16:36:05 +00:00
Md. Mashur Shalehin Sakib 58abdfc834
[Keyboard] Fixing info.json for h0oni/hotduck (#13640) 2021-07-22 09:35:28 -07:00
QMK Bot 62099dc120 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 08:11:39 +00:00
Trent Hoh 78a3f43c08
[Keyboard] Ymd40v2new layouts and fixed per-switch backlight (#13622) 2021-07-22 01:11:11 -07:00
Xelus22 6e9f667672
[Bug] Develop - DC01 left (#13597) 2021-07-22 01:06:03 -07:00
QMK Bot 78fb223da7 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 07:53:44 +00:00
Drashna Jaelre 8158473464
[Keyboard] Fix clawsome/hatchback and reviung5 compile issues (#13607) 2021-07-22 00:53:18 -07:00
QMK Bot 44ea6d0442 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 07:18:21 +00:00
drhigsby 336c8d3efe
[Keyboard] add ogurec (#13242) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-22 00:17:47 -07:00
Donald Kjer 13a514923a
[Keyboard] Add Durgod Taurus K310 keyboard (#12314) 
Co-authored-by: Tyler Tidman <tyler.tidman@draak.ca>
Co-authored-by: Simon Arlott <sa.me.uk>
 2021-07-22 00:09:00 -07:00
QMK Bot 931bf52b74 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:58:28 +00:00
farfalleflickan a400681ccf
[Keyboard] Updated keyboard & keymaps (#12667) 
Co-authored-by: pastapojken <6597735+pastapojken@users.noreply.github.com>
 2021-07-21 23:57:35 -07:00
QMK Bot b5a1db9c05 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:48:20 +00:00
joedinkle e9c3f71e74
[Keyboard] add SPRH keyboard (#12999) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-07-21 23:47:48 -07:00
QMK Bot 85128302c8 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:40:51 +00:00
Sắn 92cca84651
[Keyboard] Add keypad Satxri6key (#13423) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-21 23:40:24 -07:00
QMK Bot a2d94371c6 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:40:15 +00:00
jmaynard 8e905a7a5c
[Keyboard] Initial Tron Guy Labs keyboard implementation. (#13438) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
 2021-07-21 23:39:45 -07:00
QMK Bot 0753cbc77f Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:31:35 +00:00
Brandon Lewis 8c17a822a8
[Keyboard] Add Ristretto Keyboard (#13479) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Brandon Lewis <blewis308@users.noreply.github.com>
 2021-07-21 23:31:03 -07:00
QMK Bot 5c42446508 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:22:35 +00:00
Kyle McCreery 5766b9bfb7
[Keyboard] New Keyboard - OBE (#13545) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-07-21 23:22:00 -07:00
QMK Bot 203c4fdf58 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 05:57:21 +00:00
Adam Abrams fbe782534a
[Keyboard] Add personal planck keymap (#13635) 2021-07-21 22:56:46 -07:00
QMK Bot 71560853ce Merge remote-tracking branch 'origin/master' into develop 2021-07-22 05:46:45 +00:00
Manassarn "Noom" Manoonchai 665af4fa8d
[Keymap] narze/xd004 (#13634) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-21 22:46:15 -07:00
QMK Bot b28c5e6acb Merge remote-tracking branch 'origin/master' into develop 2021-07-22 05:40:08 +00:00
Md. Mashur Shalehin Sakib 5b8d2b5cde
[Keyboard] Add h0oni hotduck keyboard (#13609) 2021-07-21 22:39:36 -07:00
QMK Bot 874a3df950 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 18:30:35 +00:00
Ryan b564ba13ee
Fix API generation failure caused by GRS-70EC (#13631) 2021-07-21 19:30:29 +01:00
Ryan c79bc7c909
Fix MATRIX_COLS for peranekofactory/tone (#13632) 2021-07-21 19:28:58 +01:00
QMK Bot 201b4dc7ab Merge remote-tracking branch 'origin/master' into develop 2021-07-21 18:26:05 +00:00
Ryan 78265ea742
Fix MATRIX_COLS for aeboards/constellation/rev2 (#13633) 2021-07-21 19:26:00 +01:00
Alabahuy 2b260bd846
fixed number layer on keymap (#13627) 2021-07-21 19:25:21 +01:00
QMK Bot d2cdb0b1d3 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 17:14:33 +00:00
gkeyboard ca1aa56c7f
[Keyboard] Fix iso layout compile error (#13628) 
Fix iso layout compile erreo on qmk web.
 2021-07-21 10:14:04 -07:00
QMK Bot df37ce4ea2 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 15:36:02 +00:00
Xelus22 afc629210c
[Bug] VIA compile fixes (#13626) 2021-07-21 08:35:10 -07:00
QMK Bot 531886b984 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 05:28:30 +00:00
Alabahuy ec1a6f6b8b
[Keyboard] add rartland with via support (#13585) 
* add rartland and via support

* moved encoder adn oled to c file

* update c file
 2021-07-20 22:28:05 -07:00
QMK Bot 793fabc449 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 05:05:45 +00:00
Andrew Kannan ddc2766537
Fix vicious40 rules (#13623) 2021-07-21 15:05:10 +10:00
QMK Bot 598fa867d1 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 20:10:21 +00:00
AlisGraveNil c98e25887c
[Keyboard] GameBuddy v1.M (#12637) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-20 13:10:15 -07:00
Weirdo dbca44ae8d
[Keyboard] Add Tiger910 (#12605) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-20 13:09:53 -07:00
QMK Bot 200f1e8e6a Merge remote-tracking branch 'origin/master' into develop 2021-07-20 20:08:44 +00:00
Conor Burns 81cac8eec6
[Keyboard] 0xcb 1337 - Added keymap "conor" and fixed some minor stuff (#12744) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-07-20 13:07:53 -07:00
QMK Bot c4db9f7fb2 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:48:49 +00:00
kb-elmo c1ba35363d
[Keyboard] Added Kineticlabs Emu (#12968) 2021-07-20 10:48:17 -07:00
QMK Bot 32a44b6a2c Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:47:04 +00:00
Paul Ewers 3591312fa3
[Keymap] Updates to personal Drop ALT keymap (#13058) 2021-07-20 10:46:52 -07:00
StefanGrindelwald 42ac7c0541
[Keyboard] Add Momoka ergo (#13127) 
Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-20 10:46:29 -07:00
QMK Bot 362bbe53c7 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:44:20 +00:00
gkeyboard 8c526703f8
[Keyboard] Update lm60n.h (#13249) 2021-07-20 10:43:44 -07:00