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

8796 commits

Author SHA1 Message Date
Joshua Coffey 054adbaf1e
Update for the dodger keymap for the Planck (#12456) 2021-04-20 21:01:54 +02:00
QMK Bot f7f8f97e6a Merge remote-tracking branch 'origin/master' into develop 2021-04-20 17:50:40 +00:00
Brandon Claveria 2bccb7132d
[Keyboard] Siris (#12415) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Swiftrax <swiftrax@gmail.com>
 2021-04-20 10:50:06 -07:00
QMK Bot 2927af43e1 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 17:48:10 +00:00
mechlovin 0d5458a7ad
[Keyboard] add adelais rev4 (#12443) 2021-04-20 10:47:58 -07:00
Felix Jen cce9ddff80
[Keyboard] Added BKS65 Solder PCB (#12451) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-20 10:47:31 -07:00
QMK Bot 7795e167ab Merge remote-tracking branch 'origin/master' into develop 2021-04-20 17:46:58 +00:00
Christiano Haesbaert d330203486
[Keyboard] Add amigopunk, a handwired 75% ALPS (#12489) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-20 10:46:19 -07:00
QMK Bot b68ed9ebea Merge remote-tracking branch 'origin/master' into develop 2021-04-20 17:25:10 +00:00
kb-elmo 45a557641d
[Keyboard] Matrix 1.2og AVR PCB - VIA support (#12534) 2021-04-20 10:24:36 -07:00
QMK Bot ed59337239 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 17:23:34 +00:00
QMK Bot 120b15458c Merge remote-tracking branch 'origin/master' into develop 2021-04-20 17:23:01 +00:00
Mikkel Jeppesen 271c7d4923
[Keyboard] Added support for the older no_led revision (#12563) 2021-04-20 10:23:00 -07:00
duoshock 54bad99e0e
[Keyboard] Update ISO Macro vendor ID to meet VIA requirement (#12564) 
Co-authored-by: online <33636898+online@users.noreply.github.com>
 2021-04-20 10:22:29 -07:00
QMK Bot 19887f2d35 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 17:22:13 +00:00
kb-elmo 9a3ba6874c
[Keyboard] fix bella debounce (#12568) 2021-04-20 10:21:59 -07:00
yynmt 5f670fbdc4
[Keyboard] Add Acperience12 macropad (#12573) 
Co-authored-by: yynmt <yynmt@yynmt.com>
 2021-04-20 10:21:39 -07:00
QMK Bot a9e6dc3629 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 17:18:12 +00:00
Dimitris Papavasiliou bd07120d33
[Keyboard] Fix and improve SPI transport in the Lagrange (#12606) 
Co-authored-by: Dimitris Papavasiliou <dpapavas@gmail.com>
 2021-04-20 10:17:39 -07:00
Michael Stapelberg c922fc2cf3
[Keyboard] kint2pp: reduce input latency by ≈10ms (#12625) 2021-04-20 10:08:29 -07:00
Michael Stapelberg 3d32cbb0dc
[Keyboard] kint36: switch to sym_eager_pk debouncing (#12626) 2021-04-20 10:08:01 -07:00
QMK Bot 8da2c48650 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 16:59:38 +00:00
AlisGraveNil 4ff16fe73e
[Keyboard] doodle macropad - 03/14 (#12243) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-04-20 09:59:05 -07:00
QMK Bot 5aa3fd5ac7 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 16:57:07 +00:00
mechlovin 21c147c11b
[Keyboard] Refactor IF87_rev1 (#12574) 2021-04-20 09:56:32 -07:00
QMK Bot 6620b6c515 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 16:32:55 +00:00
tszaboo 752f5d6eb6
[Keyboard] Fixing files for Orto4exent (#12607) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-20 09:32:20 -07:00
QMK Bot e31f210b59 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 16:24:28 +00:00
obosob b6c353db0c
[Keyboard] Set OLED_DISPLAY_128X64 for Arch-36 (#12609) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-20 09:23:48 -07:00
QMK Bot 39e80a3f5c Merge remote-tracking branch 'origin/master' into develop 2021-04-20 16:15:59 +00:00
GLozares 666944df2e
[Keyboard] Add millipad keypad and default keymap (#12522) 2021-04-20 09:15:21 -07:00
QMK Bot bc66d71dae Merge remote-tracking branch 'origin/master' into develop 2021-04-20 16:12:25 +00:00
Xelus22 3d37afd495
[Keyboard] Pachi Mini 32u4 (#12533) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-20 09:11:48 -07:00
QMK Bot 427bff8504 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 15:18:18 +00:00
Joel Challis f778ede8bd
Initial firmware for Forever65 (#12572) 2021-04-20 16:17:47 +01:00
QMK Bot b1f48da5ee Merge remote-tracking branch 'origin/master' into develop 2021-04-20 04:13:18 +00:00
yiancar 8405d28670
[Keyboard] Carbo65 (#12406) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-19 21:12:48 -07:00
QMK Bot 49efd6abb0 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 02:40:47 +00:00
Jos Boersema f93ad79f41
[Keymap] Minifan minor issues (#12592) 2021-04-19 19:40:18 -07:00
QMK Bot 663664e48f Merge remote-tracking branch 'origin/master' into develop 2021-04-19 18:04:50 +00:00
kiwikey dffa089173
[Keyboard] Add Wanderland - An Alice-layout keyboard (#12516) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-19 11:04:03 -07:00
QMK Bot c3d1456615 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 16:40:51 +00:00
Jaehee 3990c0f43d
[Keyboard] Add jkdlab/binary_monkey (#12374) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-19 09:39:54 -07:00
QMK Bot d562b4fdc5 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 10:15:56 +00:00
peepeetee 20f35afd53
Fix bm68rgb led map (#12503) 2021-04-19 20:15:23 +10:00
QMK Bot 46318f36ac Merge remote-tracking branch 'origin/master' into develop 2021-04-19 09:23:28 +00:00
AaronVerDow 00eea387fc
[Keymap] Iracing replay keymap (#12461) 
Co-authored-by: Aaron VerDow <aaron@verdow.com>
 2021-04-19 02:23:20 -07:00
QMK Bot 97e7defaae Merge remote-tracking branch 'origin/master' into develop 2021-04-19 09:22:54 +00:00
jack 81be065fa5
[Keyboard] VIA Support for LCK75 (#12402) 2021-04-19 02:22:18 -07:00
QMK Bot 56fff80e71 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 09:21:56 +00:00
Wilba 53a35c0d0c
[Keyboard] Update RAMA WORKS M50-A (#12459) 2021-04-19 02:21:27 -07:00
QMK Bot 34df6743f6 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 08:21:39 +00:00
Benedict Tan 5581ea8809
[Keyboard] Update dz60rgb default keymap (#12488) 
The keymap for this PCB as of April 5, 2020 has a 4rth, largely superfluous layer, creating a total of 5 layers.

When ported to VIA, this results in a layer that users can access but cannot edit. I propose removing this layer completely along with it's access from the default.
 2021-04-19 01:20:51 -07:00
QMK Bot 0235fc7ab2 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 06:43:21 +00:00
Michael Stapelberg 17c880b076
[Keymap] add kinesis/keymaps/stapelberg (#12430) 2021-04-18 23:42:40 -07:00
QMK Bot f65a5d2fb5 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 06:18:08 +00:00
Alexander Kagno ef6802ca60
New keyboard keymap, small keymap updates to mm2 keymap (#12310) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Alex <alex@turncommerce.com>
 2021-04-18 23:17:34 -07:00
QMK Bot 6e5fd1a210 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 06:13:00 +00:00
Wilba c7adb7a352
[Keyboard] Add wilba.tech WT60-G2 (#12395) 2021-04-18 23:12:48 -07:00
QMK Bot a66947b7d6 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 06:12:34 +00:00
Wilba 10dfc8d92f
[Keyboard] Add wilba.tech WT65-FX (#12394) 2021-04-18 23:12:26 -07:00
Wilba c7214e1d13
[Keyboard] Add wilba.tech WT65-F (#12393) 2021-04-18 23:12:05 -07:00
QMK Bot 86ece8e98e Merge remote-tracking branch 'origin/master' into develop 2021-04-19 06:04:50 +00:00
Eric Wood 94d9d2bb31
[Keyboard] Add handwired/frankie_macropad (#12349) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-18 23:04:16 -07:00
QMK Bot 5632c5db31 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 06:00:42 +00:00
Conor Burns 0b560673ce
[Keyboard] Updates for 0xCB 1337 (#12336) 2021-04-18 23:00:05 -07:00
QMK Bot ca9da27e16 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 05:44:51 +00:00
Ben Fiedler 2b7078cd21
[Keymap] add my quefrency layout (#12104) 2021-04-18 22:44:23 -07:00
QMK Bot 54521bd04b Merge remote-tracking branch 'origin/master' into develop 2021-04-19 05:31:08 +00:00
Angel Rojas 99c46e4b73
[Keyboard] Add G1_65 keyboard (#12140) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-04-18 22:30:36 -07:00
QMK Bot 2e7fd319a1 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 05:25:03 +00:00
maz0r 1e19227b31
[Keyboard] Capsunlocked CU80 Squish and Refactor (#12193) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
 2021-04-18 22:24:30 -07:00
QMK Bot 21997e8894 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 05:05:55 +00:00
LIParadise 9b8c5c1860
[Keyboard] Helen80 matrix fixes (#11969) 
Co-authored-by: LIParadise <a58524andy>
 2021-04-18 22:05:21 -07:00
QMK Bot ea29874099 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 04:54:01 +00:00
Sanctified-git 0afbf8cc3c
[Keyboard] Add Dystopia keyboard (#11997) 
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: Sanctified <Sanctified@users.noreply.github.com>
 2021-04-18 21:53:33 -07:00
QMK Bot ca11abc201 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 04:02:42 +00:00
MelGeek 2aab8a114e
[Keyboard] Update MJ61 architecture to support multi version (#11787) 
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-04-18 21:02:13 -07:00
QMK Bot 8ecdc66700 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 03:54:31 +00:00
RinoSolutions 6b2a3a67a6
[Keyboard] Adding of Monarch keyboard (#11769) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ramon Imbao <ramonimbao@gmail.com>
 2021-04-18 20:54:07 -07:00
QMK Bot 9484c46555 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 03:45:01 +00:00
Ian McLinden cfefecd951
[Keyboard] Added Koolertron AMAG23 (#11725) 2021-04-18 20:44:32 -07:00
QMK Bot c2d7ebc3df Merge remote-tracking branch 'origin/master' into develop 2021-04-19 03:37:16 +00:00
Oliver Gaskell 05357d7937
[Keyboard] Add Tau4 keyboard (#11361) 
with default and i2cscanner keymaps

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2021-04-18 20:36:40 -07:00
QMK Bot 7728b0f966 Merge remote-tracking branch 'origin/master' into develop 2021-04-19 03:08:31 +00:00
Nick Brassel a0089aa345
Fixup Satisfaction75 bootprocess. (#12621) 
- Use normal ChibiOS I2C driver.
- Move drawing code to housekeeping -- previously it was during matrix
  scan, which gets executed during bootmagic checks. However, bootmagic
  is invoked before QWIIC subsystem is enabled, which means I2C isn't
  configured yet. All I2C calls to the OLED fail with timeouts while
  bootmagic is being checked. Housekeeping ensures this is executed once
  the system has initialised and settled.
- QWIIC OLED driver: properly clear out OLED buffer when clearing screen.
 2021-04-19 13:08:01 +10:00
QMK Bot 0a9e18fae1 Merge remote-tracking branch 'origin/master' into develop 2021-04-18 22:40:16 +00:00
Richard Dawe eb7e668eb9
Add RGB controls to picture; label Layer 3 correctly (#12337) 2021-04-18 18:39:15 -04:00
QMK Bot 924b9fcf05 Merge remote-tracking branch 'origin/master' into develop 2021-04-18 22:23:25 +00:00
Giorgi Chavchanidze 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
QMK Bot 884f8658ef Merge remote-tracking branch 'origin/master' into develop 2021-04-18 22:14:59 +00:00
Antoine R. Dumont fd65451679
keyboardio/atreus: Add ardumont keymap (#12479) 2021-04-18 18:14:23 -04:00
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
Kosuke Adachi d1270c9d55
Update info.json to correctly. (#12507) 2021-04-07 09:57:36 -04:00
QMK Bot 69bc465ace Merge remote-tracking branch 'origin/master' into develop 2021-04-07 10:04:21 +00:00
Ryan 546dfce209
Add info.json for CK60i (#12318) 2021-04-07 20:03:45 +10:00
Nick Brassel 96acb499d2
Fix up builds that are now too big for develop branch. (#12495) 2021-04-06 16:39:31 +10:00
QMK Bot 3ce8c9fc8f Merge remote-tracking branch 'origin/master' into develop 2021-04-04 09:10:07 +00:00
SneakboxKB 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
QMK Bot 8428cedc83 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 19:43:05 +00:00
Takeshi ISHII 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