mirrors/keychron_qmk_firmware
mirrors/keychron_qmk_firmware
0
0
Fork 0
mirror of https://github.com/Keychron/qmk_firmware.git synced 2024-11-23 00:47:02 +06:00
Code Issues Packages Projects Releases Wiki Activity
16,046 Commits 8 Branches 1,419 Tags 332 MiB
95d2f7c3c5
Commit Graph

8929 Commits

Author SHA1 Message Date
QMK Bot
86ab4fcb71 Merge remote-tracking branch 'origin/master' into develop 2021-04-27 06:45:17 +00:00
James Young
f9fb52951d
Update noroadsleft userspace and keymaps (2021-04-26) (#12711) 
* Update noroadsleft userspace and keymaps (2021-04-26)

- add Discipline keymap
- move Emulated Non-US Backslash, Numeric Keypad and F13-F24 code fully to userspace
- re-add some custom keycode handling I accidentally deleted
- update VRSN keycode
- update KC60 and userspace readmes

* remove Git readme from kc60 keymap

* update kc60:noroadsleft readme

Concatenates this readme into one file, and updates the image links.
 2021-04-26 23:44:45 -07:00
QMK Bot
171f3e840b Merge remote-tracking branch 'origin/master' into develop 2021-04-26 17:24:58 +00:00
Xelus22
8f660ca1e6
[Keyboard] fix planck light via endpoints (#12701) 2021-04-26 10:24:19 -07:00
JTM
54c1548247
Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: JuanTapMan <68515848+JuanTapMan@users.noreply.github.com>
 2021-04-26 10:38:13 +02:00
QMK Bot
5168af9a9b Merge remote-tracking branch 'origin/master' into develop 2021-04-26 02:52:29 +00:00
Xelus22
2f47bafd6a
fix configs (#12631) 2021-04-26 12:52:00 +10:00
QMK Bot
5b1c3e360a Merge remote-tracking branch 'origin/master' into develop 2021-04-25 08:57:56 +00:00
Xelus22
611cd80861
[Keyboard] Ninjin (#12496) 
* ninjin init

* put in gpl thing

* underglow

* update to latest chibios

* fix gpl headers

* remove other files

* fix header

* Update keyboards/xelus/ninjin/readme.md

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update keyboards/xelus/ninjin/mcuconf.h

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update keyboards/xelus/ninjin/halconf.h

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-04-25 18:57:22 +10:00
QMK Bot
23e70fa857 Merge remote-tracking branch 'origin/master' into develop 2021-04-25 04:03:14 +00:00
peepeetee
89bd04b9eb
peepeetee's *very janky* hub16 keymap (#12506) 
* peepeetee's bodged hub16 keymap

* add layer 3 lighting

* actually adds layer 3 lighting

* fixes layer 0; behavior is that layor 0 is unaltered from base pattern, while other states have distinct solid colors
 2021-04-25 14:02:42 +10:00
Nick Brassel
891d18d356
Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600) 
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.

* Update flashing.md

* Update chconf.h

* Update config.h

* Update halconf.h

* Update mcuconf.h
 2021-04-25 13:40:56 +10:00
QMK Bot
19b3aa3a12 Merge remote-tracking branch 'origin/master' into develop 2021-04-25 01:48:16 +00:00
Albert Y
c7ca67a036
Add RGB matrix suspend wake function for Planck/rev6 (#12290) 
* Add RGB matrix suspend wake function for Planck/rev6

* Update suggested definition to allow user override.

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: filterpaper <filterpaper@localhost>
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-04-25 11:47:43 +10:00
QMK Bot
f12aea5dfb Merge remote-tracking branch 'origin/master' into develop 2021-04-25 01:14:55 +00:00
Leon Anavi
0c50a9eae9
[Keymap] Add Git keymap for ANAVI Macro Pad 8 (#12436) 
Git keymap for ANAVI Macro Pad 8 with the following shortcuts.
On the first row from left to right:

- git status
- git log
- git pull
- git push

On the second row from left to right:

- git diff
- git add
- git commit
- FN key to switch to the 2nd layout and control lights

Reduce the number of supported RGB animations and effects in
config.h to shrink the firmware size and fit it on the device.

Signed-off-by: Leon Anavi <leon@anavi.org>
 2021-04-25 11:14:28 +10:00
QMK Bot
7845cf1fac Merge remote-tracking branch 'origin/master' into develop 2021-04-25 01:05:05 +00:00
gkeyboard
35944df7b0
Add lm60n keyboard (#12408) 
Add lm60n keyboard
 2021-04-25 11:04:38 +10:00
QMK Bot
33a5468a60 Merge remote-tracking branch 'origin/master' into develop 2021-04-25 01:02:27 +00:00
Matthew Dias
2a45d99059
Add m3n3van rev2 (#12405) 
* Add m3n3van rev2

* Add via support
 2021-04-25 11:02:00 +10:00
QMK Bot
34b63cecb1 Merge remote-tracking branch 'origin/master' into develop 2021-04-25 01:01:19 +00:00
Christian Fehmer
06f8cb1b8a
Add VIA support for Filco Majestouch 2 /w The Tiger Lily (#12401) 2021-04-25 11:00:56 +10:00
QMK Bot
7748a093cb Merge remote-tracking branch 'origin/master' into develop 2021-04-25 01:00:39 +00:00
Pavlos Vinieratos
b2b075c123
not accessible and not needed anyway for a test keymap (#12366) 2021-04-25 11:00:12 +10:00
QMK Bot
8f5cc8d762 Merge remote-tracking branch 'origin/master' into develop 2021-04-22 21:16:12 +00:00
SonOfAres
54dc6b7bf2
adding keyboard (#12414) 
* adding keyboard

* Update keyboards/iriskeyboards/readme.md - picture size

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

* Delete iriskeyboards.json, it belongs in VIA repo

* Update info.json

* Update readme.md

* Update keyboards/iriskeyboards/keymaps/default/keymap.c

Removing unnecessary layers

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-22 17:15:28 -04:00
QMK Bot
6be87836dc Merge remote-tracking branch 'origin/master' into develop 2021-04-22 17:14:44 +00:00
George Wietor
ffa1507c2c
VIA support for Planck Rev6 (#9144) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: George Wietor <george@LIGHT-GRAY.local>
Co-authored-by: Jack Humbert <jack.humb@gmail.com>
 2021-04-22 10:13:44 -07:00
QMK Bot
417803d7ae Merge remote-tracking branch 'origin/master' into develop 2021-04-22 14:58:49 +00:00
rainkeebs
4f2afaa6fb
Delilah keyboard added (#12638) 
* Delilah keyboard added

* Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>

* removed unnecessary lines as per review

* removed unnecessary lines as per review

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-04-22 10:58:09 -04:00
QMK Bot
5d458c6c8a Merge remote-tracking branch 'origin/master' into develop 2021-04-21 23:51:07 +00:00
MechMaster48
0b6d8150e4
Personal keymap for dztech DZ60RGB plus README.md (#12485) 
* Personal keymap and README to go along with it.

* Noticed typo in README and removed name from comment in keymap

* Added GPL copyright notice
 2021-04-21 19:50:26 -04:00
QMK Bot
fbc5a6c24b Merge remote-tracking branch 'origin/master' into develop 2021-04-20 19:02:29 +00:00
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
QMK Bot
e90ec6a474 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 13:51:51 +00:00
kb-elmo
7d33d1bace
Added Epoch80 (#12307) 2021-04-03 15:51:21 +02:00
fauxpark
638cc50727 Merge remote-tracking branch 'upstream/master' into develop 2021-04-03 20:15:54 +11:00
github-actions[bot]
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
1444ebb7f1 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 06:20:42 +00:00
James Young
59c8672f5c
kingly_keys/ave: move RGBLight config to keyboard level (#12457) 
QMK Configurator's API can't use the RGBLight configurator when it's defined at keymap level.
 2021-04-02 23:20:11 -07:00
QMK Bot
028a0dcd3d Merge remote-tracking branch 'origin/master' into develop 2021-04-03 05:12:49 +00:00
Michael Stapelberg
a7920acff5
keymaps: fix kinesis default keymap progrm/reset keycode (#12429) 
The right-most top-most key on the Kinesis Advantage keyboard is labeled
“Progrm” and was meant to enter the Teensy bootloader as per the comment.

However, the keycode was set to KC_1, which just produces a “1”.
It should be RESET instead.

This commit fixes KC_1 to RESET in all files where the fix is needed.
The other files have already been fixed independently.
 2021-04-02 22:12:24 -07:00
QMK Bot
051e23c782 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 04:45:06 +00:00
Dylan Khor
8d3581a49f
[Keymap] Remove kc keymap from khord chocopad keymap (#12409) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 21:44:37 -07:00
QMK Bot
887d0fca0e Merge remote-tracking branch 'origin/master' into develop 2021-04-03 04:21:01 +00:00
kaylanm
cd96377312
[Keyboard] Add GON NerD TKL VIA keymap (#12309) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 21:20:34 -07:00
QMK Bot
358b040157 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 04:18:44 +00:00
MCKeebs
8b98e67643
[Keyboard] Add pkb65 keyboard (#12230) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 21:18:15 -07:00
QMK Bot
184c553cab Merge remote-tracking branch 'origin/master' into develop 2021-04-03 03:59:15 +00:00
MechMerlin
6876263961
[Keyboard] KBD67 Hotswap VIA Support (#12351) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 20:58:42 -07:00
QMK Bot
fc8495a744 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 03:57:51 +00:00
Wilba
4caeb64888
[Keyboard] Added wilba.tech WT70-JB (#12347) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 20:57:18 -07:00
QMK Bot
428e9e7886 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 03:48:53 +00:00
Wilba
70540a1f74
[Keyboard] Added RAMA WORKS KARA (#12346) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 20:48:26 -07:00
QMK Bot
d475f04c78 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 03:44:40 +00:00
jrdsgl
f0dc206784
[Keyboard] Update sixkeyboard VID/PID (#12345) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 20:44:06 -07:00
QMK Bot
39e1b5b962 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 02:04:56 +00:00
Jason Yamada-Hanff
caca8949de
[Keymap] remove kc layout from levinson jyh keymap (#12301) 
Co-authored-by: Jason Yamada-Hanff <jyamada-hanff@chromologic.com>
 2021-04-02 19:04:28 -07:00
QMK Bot
c375ae3ec7 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 02:03:00 +00:00
adamkraus6
0232941b1d
[Keyboard] Added VIA support to dmqdesign/spin (#12300) 
Co-authored-by: Kraus, Adam <adam.kraus@mines.sdsmt.edu>
 2021-04-02 19:02:26 -07:00
QMK Bot
f561b857f2 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 00:52:10 +00:00
Danny
63445be4e5
[Keyboard] Add FoldKB (#12255) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 17:51:39 -07:00
QMK Bot
4c981953ac Merge remote-tracking branch 'origin/master' into develop 2021-04-03 00:26:01 +00:00
Paul James
619885b484
[Keyboard] Add Lumberjack keyboard (#12124) 2021-04-02 17:25:23 -07:00
QMK Bot
41723340de Merge remote-tracking branch 'origin/master' into develop 2021-04-02 21:45:17 +00:00
dsanchezseco
6592f83589
[Keymap] for Ibm m122 (#11704) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 14:44:46 -07:00
QMK Bot
56560a859b Merge remote-tracking branch 'origin/master' into develop 2021-04-02 21:26:07 +00:00
Duong Anh
43d74d7fa5
[Keyboard] Add CherryB Studio Keyboards (#11475) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2021-04-02 14:25:44 -07:00
QMK Bot
c1ea97e15d Merge remote-tracking branch 'origin/master' into develop 2021-04-01 01:59:03 +00:00
peepeetee
ac0ba832c7
change BM68 RGB USB Device descriptor device name (#12418) 
* change styling USB Device descriptor device name to reflect stylistic choices of the developer
 2021-03-31 18:58:23 -07:00
QMK Bot
da51302345 Merge remote-tracking branch 'origin/master' into develop 2021-03-31 13:09:34 +00:00
Nick Brassel
c5ddada32e
Remove leftover old implementations of the lily58 split code. (#12442) 2021-04-01 00:09:01 +11:00
Michael Stapelberg
9d3b11d485
add kinesis/kint36 (#10171) 
This moves the config_common.h into the files that include ../config.h,
so that the kint36/config.h does not include it (which would cause
compilation errors).
 2021-03-31 10:41:41 +11:00
QMK Bot
c738d60cef Merge remote-tracking branch 'origin/master' into develop 2021-03-29 03:46:52 +00:00
kb-elmo
ae59a51193
Added the 64_ansi (GK64) layout to DZ60 (#12378) 
* add gk64 layout

* Apply suggestions from code review
 2021-03-28 20:46:17 -07:00
QMK Bot
ea472b46c9 Merge remote-tracking branch 'origin/master' into develop 2021-03-27 08:04:42 +00:00
James Young
a866fbf381
handwired/rs60: use LAYOUT_ortho_5x12 directly (#12397) 
This commit renames the macro LAYOUT to LAYOUT_ortho_5x12, and removes the alias.
 2021-03-27 19:03:42 +11:00
QMK Bot
76f8e84edd Merge remote-tracking branch 'origin/master' into develop 2021-03-26 17:58:46 +00:00
joedinkle
8af7200085
Pull Request for babyV keyboard (#12112) 
* Add files via upload

* Add files via upload

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update Readme.md

* Update Readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Create CaseFiles

* Delete CaseFiles

* Create Readme.md

* Add files via upload

* Add files via upload

* Add files via upload

* Create Readme.md

* Create Readme.md

* Create Readme.md

* Delete S50-Top.dxf

* Delete S50-Top.svg

* Add files via upload

* Update Readme.md

* Update Readme.md

* Update Readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Updating encoder code.

* Update encoder code.

* Case files and encoder update.

* Update encoder code.

* Updates to encoder code.

* Syntax fixes.

* Create readme.md

* Add files via upload

* Create readme.md

* Add files via upload

* Removed case files from s50 branch

* Format changes.

* Add case files to Master branch

* Syntax fixes

* Recommended code changes for pull request into QMK.

* Recommended change for pull request.

* Delete config.h

* Delete config.h

* Delete config.h

* Delete config.h

* Delete config.h

* Delete config.h

* Add config.h and rules.mk files to the joedinkle layout for autoshift.

* Delete S50-Top-New.dxf

* Delete S50-Top-New.svg

* New case files

Revision to S50 top file.

* Added 3D printed case STL and DXF files.

* Create readme.md

* Update readme.md

* Added babyV firmware

* Update readme.md

* QMK PR preperations.

* Delete config.h

* Delete keymap.c

* Delete readme.md

* Delete rules.mk

* Delete config.h

* Delete keymap.c

* Delete readme.md

* Changes for QMK formatting.

* Removed excess files

Removed case files and schematics from the joedinkle branch. The joedinkle branch is primarily for QMK PRs. These files will remain in the master branch of this fork.

* Add SPRH keyboard

* Formatting and cleanup.

* Edits to default Layout

* Readme Update

* Formatting changes.

* Deleted obsolete code.

* Formatting changes and file removal for QMK PR

* Deleted S50

S50 is a completed keyboard and is located in the Master Branch. S50 removed from the in progress branch.

* Delete Read Me

* Replaced S50 files accidentally deleted in merge.

* Added split layout for SPRH

* Added Files for Blvd PCB

* Add PCB files for Blvd

* Added compressed kicad projects

* Removed obsolete PCB files

* Added PCB files

* Added personal babyV keymap.

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* babyV-added info.json and updated default keymap

* Added case files for babyV

* Update readme.md

* Update readme.md

* Update readme.md

* Updated default keymap.

* Cleaned up keymap folder.

* Added info.json for babyV

* babyV updates

* PR preps

* PR preps

* Update .gitignore

* Delete Backlight.png

* Delete MCU.png

* Delete Matrix.png

* Delete readme.md

* Rename Readme.md to readme.md

* Requested PR changes.

* Update rules.mk

* Update rules.mk

* readme and rules.mk updates

* Update keyboards/eyeohdesigns/babyv/readme.md

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

* Update keyboards/eyeohdesigns/babyv/readme.md

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

* Update keyboards/eyeohdesigns/babyv/readme.md

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

* Update keyboards/eyeohdesigns/babyv/rules.mk

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

* Update keyboards/eyeohdesigns/readme.md

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

* Update keyboards/eyeohdesigns/readme.md

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

* Update readme.md

* Update keyboards/eyeohdesigns/babyv/readme.md

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-26 13:58:13 -04:00
QMK Bot
3d957a33fa Merge remote-tracking branch 'origin/master' into develop 2021-03-26 12:37:54 +00:00
Anthon van der Neut
f028dbf179
Minor typo in comments Colemak DM-MK -> DH-MK (#10721) 2021-03-26 23:37:17 +11:00
QMK Bot
56dee4acc6 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:40:23 +00:00
Sendy Aditya Suryana
34205f5bb5
Add new Keyboard: SENDYYeah Bevi (#12011) 
* Add bevi Keyboard

* Update readme

* Change image embed

* Update instructions to compile

* beVi initial

* Enable NKRO

* Update README

* Revert Lily58 rules.mk

* Revert h87a info.json

* Add URL and maintainer in info.json

* Update year

* Add layer 1

* Tidying up

* Fix keymap

* Add one line at end of file

* Replicate default keymap to via

* Update keyboards/sendyyeah/bevi/bevi.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Remove comment on layout macro definition

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Sendy Aditya Suryana <sendy.suryana@go-jek.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-03-25 23:39:35 +11:00
QMK Bot
d0d77e8c60 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:39:14 +00:00
Liyang HU
3143846ba4
keyboards/xd60/readme.md: link to schematic on EasyEDA (#12018) 2021-03-25 23:38:54 +11:00
Takeshi Nishio
9f1608a6a2
Add unison v04 keyboard (#11982) 
* Update: JonesのMIDIキーマップをベースに初期作成。AudioとMIDIの同時使用はファームウェアサイズ的に厳しい。

* Update: Unison用のIDへ変更

* Update: Audioはデフォとせず、OLEDをデフォとした。

* Update: v03基板から実際に動くものとなったため、v01からv03に変更。基本的な設定を完了。

* Update: 基本的なキーマップを作成

* Update: キーマップ、ロータリーエンコーダの感度を調整。

* TEST: BOOTMAGIC = lite　でどうなるのかテスト

* Update: Jones ---> Unison

* TEST: BOOTMAGIC = lite で、TABキーでBootloaerに入る設定

* Update: インデント

* Update: QMKの一般的な表記に合わせ、 k(col)(row) から k(row)(col) へ変更。

* Update: 自前のカスタムマトリクスを使用せず、COL2ROW方式で総当たりマトリクスを動作させるテストを開始。

特に問題なく動作している。

* TEST: BOOTMAGICテスト用コード追加

* Update: 主に中央部分のキーマップ変更

* TEST: COL2ROWで、COLのピンの順番を変えてキーを読むテスト

* Update: QMKの仕様上、MacではKC_PSCRがFキーとして判定されるため、スクリーンショット用マクロを用意した。

* TEST: COL2ROWで、ROWとCOLのピン定義をずらした状態で、BOOTMAGIC = lite の（0,0)キーに引っかからない。

* Update: ロータリーエンコーダにマウスホイールを割り当て

* Update: 自明のコメントを削除

* Update: NKRO指定時は、NKRO動作を強制。

* Update: MIDIなしのとき、AUDIOのフル機能がファームウェアサイズ内に収まることをチェック。

* Update: Bootmagicテスト完了のため、無効化。

* TEST: LED動作チェック。

* Update: キーマップを、LOWER, RAISEを中心に大幅変更。

数字を左手レイヤーキーではなく、右手レイヤーキーにしたことで、CMD+Qによる誤爆アプリ終了を避ける狙いもある。

* Update: 未使用のNumレイヤとTapDanceを削除。

* Update: MIDI関連の設定を多数追加。

* New: Add Sequencer keymap

* enumの開始を明記

* TAP_DANCEを無効化

* シーケンサーで、トラック単位の有効・無効の切り替えを追加。※動作せず

* デバッグ用設定をテスト

* Change custom keycode name for classification.

* Add LED update on sequencer step.

* change LED adjusting value.

* TEST: SQ_T related things.

* DEBUG

* Increase track 6 ---> 8. Add track indicator.

* Add sequencer step viewer.

* Move Bootmagic lite position to keyboard's config.

* Revert matrix as phisically connected.

* Change default RGB lighting animation.

* Remove MIDI options from keyboard's config.

* change version

* Remove unused.

* Delete unused. Round-Robin matrix woks with COL2ROW.

* Delete unused. Round-Robin matrix woks with COL2ROW.

* Formatting.

* Formatting.

* Remove unused.

* No enum.

* LED setting for Sequencer layer.

* Add TODO flag

* Remove unused.

* change LCTL

* Update Rotary Encoder setting.

* revert to default

* Add TODO flag.

* Update to latest information.

* Update to latest information.

* Add v04

* Move keymaps directory to just under keyboard directory.

* Add music layout.

* Update to Unison layout.

* Add default keymap.

* Update readme description.

* Commenting.

* Exclude non-PR files.

* Change keymap name more general.

* Remove unused

* Commenting.

* Remove unused.

* Commenting.

* Change Macro name for consistency.

* Add tempo definition.

* Change transparent to noop for better musical play.

* Add Rotary Encoder push functions for Sequencer.

* FIX printscreen to work _WIN layer.

* Fix style name.

* Change keymap style from PC to Music.

* Adjust LED number and index to v04 PCB.

* Commenting.

* Add #ifdef block to LED config related.

* Change Sequencer display function from Rotary Encoder right-3 to right-4.

* Change default animations.

* Set LED effect range. Add LED reset on layer change.

* Remove unused.

* Commenting.

* Commenting.

* Use function to change Sequencer track indicator.

* Use function to change Sequencer track indicator.

* Remove unused

* Add PC-style keymap.

* Adjust keymap.

* Add micro volume control for Mac.

* Adjust keymap.

* Adjust cursor block.

* Adjust grave and tild in layer.

* Change magic-key position to Left-Bottom where both Music-style and Terminal-style have a key.

* Change LED settings for front-side 9 LEDs.

* Change keymap name.

* Update supported functions.

* Adjust indicator dimmer.

* Remove unused.

* Add underglow support.

* Add rotary encoder keymap at Adjust layer for test hardware function.

* Disable rotary encoders.

* Change description.

* Add support for underglow.

Disable knight animation to prevent unnatural feeling when underglow not installed.

* Commenting.

* Formatting.

* Turn on default layer indicator.

* remove duplication

* Change VID for via.

* Initial commit for VIA.

* Add layout option.

* restore AUDIO enabled.

* Removed a JSON file for VIA app, not for QMK.

* Remove non-related files for PR.

* Add keymap for music layout.

* Add photo links.

* Commenting.

* Apply PR checklist.

* Change unused function to "no".

* Add keymap image and change keymap as image shows.

* Change bootloader entering key to widely known "Left-Top".

* Turn off ENCODER by default.

* Add VIA keymap.

* Change VID unique.

https://github.com/qmk/qmk_firmware/pull/11982#discussion_r582276979

* Add config option to prepare future release, #11820.

https://github.com/qmk/qmk_firmware/pull/11820

* Remove old defines for Audio.

Co-authored-by: Takeshi Nishio <kkeennnn@gmail.com>
 2021-03-25 23:38:31 +11:00
QMK Bot
2df1b124a7 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:11:36 +00:00
ploopyco
666623d39a
ADNS-5050 / Ploopy Nano / Ploopy Mini Trackballs (#11994) 
* added adns5050 sensor code, as well as implementations for the Ploopy Mini and the Ploopy Nano

* fixed spurious scrolling issue

* recommended fixes for pr linting and cleanup
 2021-03-25 23:10:55 +11:00
QMK Bot
f2729e8974 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:08:38 +00:00
Albert Y
0eabb01e27
Minor improvements to BM68RGB (#12156) 
* Minor improvements to BM68RGB

* Add grave esc and LTO support

* Move comments to end of line

* Document the use of qmk script for compiling and flashing

* Revert arrow key flags back to mod

* Update keyboards/bm68rgb/bm68rgb.c

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

* Update keyboards/bm68rgb/bm68rgb.c

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

* Remove grave escape

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

* Update tab spacing

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

* Reverted make default

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

* Reverted make flash

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

Co-authored-by: filterpaper <filterpaper@localhost>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-25 23:08:04 +11:00
QMK Bot
aa85b5ee1e Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:05:42 +00:00
Naoto Takai
a5ecd4eb87
Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same (#12203) 
* Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same

* Use NO_PIN instead of duplicate pin
 2021-03-25 23:05:05 +11:00
QMK Bot
fd24546787 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:04:35 +00:00
Sendy Aditya Suryana
f3f444c1df
Add Nix Studio OXALYS80 Keyboard (#12118) 
* Initial commit of OXALYS80 firmware

* Remove comments

* Add new return in info.json

* Fix pin output init for scroll lock indicator

* Update keyboards/nix_studio/oxalys80/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nix_studio/oxalys80/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nix_studio/oxalys80/oxalys80.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nix_studio/oxalys80/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nix_studio/oxalys80/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nix_studio/oxalys80/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nix_studio/oxalys80/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Delete keymaps config.h

* Update keyboards/nix_studio/oxalys80/config.h

Co-authored-by: Sendy Aditya Suryana <sendy.suryana@go-jek.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-03-25 23:04:02 +11:00
QMK Bot
9294c5aa0a Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:03:24 +00:00
Takeshi ISHII
81c51ec51c
[Keymap] Update keyboards/helix/pico/keymaps/mtei/keymap.c (#12188) 
* update keyboards/helix/pico/keymaps/mtei/keymap.c

Stopped using the LAYOUT_kc macro. (this is response to #12160)

There is no change in the generated binary.

* small update pico/keymaps/mtei/keymap.c
 2021-03-25 23:02:54 +11:00
QMK Bot
712c9fc848 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:02:24 +00:00
Leon Anavi
b5a12fa6d3
[Keymap] ANAVI Macro Pad 2 add git keymap (#12212) 
This keymap for ANAVI Macro Pad 2 contains popular git commands
typed out and executed with a single key:

- left key: git commit -s
- right key: git push

Signed-off-by: Leon Anavi <leon@anavi.org>
 2021-03-25 23:01:45 +11:00
QMK Bot
96a6214316 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:01:35 +00:00
Albert Y
29c82cfb33
Add RGB Matrix suspend wake functions to BM40 (#12246) 
* Add suspend wake functions for RGB Matrix

* Add suspension RGB functions to Planck/rev6 and Preonic/rev3

* Add suspend wake to Mark 65

* Revert changes to planck and preonic

* Remove changes to The Mark65

Co-authored-by: filterpaper <filterpaper@localhost>
 2021-03-25 23:01:03 +11:00
QMK Bot
d2b405066d Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:55:36 +00:00