QMK Bot
ca11abc201
Merge remote-tracking branch 'origin/master' into develop
2021-04-19 04:02:42 +00:00
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
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 and GitHub
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
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 and GitHub
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 and GitHub
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
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 and GitHub
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
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
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
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
a28fbcda23
Terrazzo: Fix wrong LED Matrix function names ( #12561 )
2021-04-13 19:51:31 +10:00
Dave Vandyke and GitHub
15f7cc3bde
[Keymap] Add kzar keymap for Kinesis Advantage ( #12444 )
2021-04-13 11:39:39 +02:00
James Young and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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
QMK Bot