1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

11817 commits

Author SHA1 Message Date
QMK Bot 5eb3fc255b Merge remote-tracking branch 'origin/master' into develop 2022-03-13 23:55:18 +00:00
Ryan c0f4179117
Move keyboard USB IDs and strings to data driven: 0-9 (#16481) 2022-03-13 23:54:49 +00:00
QMK Bot 338cf71ee9 Merge remote-tracking branch 'origin/master' into develop 2022-03-13 23:46:46 +00:00
Ryan df3770551a
USB-USB converter cleanup (#16618) 2022-03-13 23:46:13 +00:00
QMK Bot 3f83a21383 Merge remote-tracking branch 'origin/master' into develop 2022-03-13 21:50:20 +00:00
Spencer Peterson 8fe3864fe7
[Keyboard] Add "Uno" rev2 (#14071)
* [Keyboard] Add "Uno" rev2

Adds support for the second revision of Uno, courtesy of @Snipeye.

* Update keyboards/uno/rev2/rules.mk

* Update keyboards/uno/rev1/rules.mk

* Update keyboards/uno/uno.h

* Update keyboards/uno/rev2/rules.mk

* Update keyboards/uno/rev1/rules.mk

* Update keyboards/uno/keymaps/demo/keymap.c

* Update keyboards/uno/keymaps/demo/keymap.c

* Update keyboards/uno/keymaps/demo/keymap.c

* Update keyboards/uno/rev2/rules.mk

* Update keyboards/uno/rev1/rules.mk

* Align rules.mk comments

* Update keyboards/uno/info.json

* Update keyboards/uno/rev1/config.h

* Update keyboards/uno/rev2/config.h

* Update keyboards/uno/rev2/config.h

* Update keyboards/uno/rev2/config.h

* Update keyboards/uno/rev1/config.h
2022-03-13 14:49:47 -07:00
QMK Bot 2df28c1850 Merge remote-tracking branch 'origin/master' into develop 2022-03-13 17:31:22 +00:00
jels 109c60feeb
[Keyboard] Add support for Jels60 (#16605)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-03-13 10:30:55 -07:00
QMK Bot e226a70adc Merge remote-tracking branch 'origin/master' into develop 2022-03-13 13:57:24 +00:00
Takeshi ISHII b906af0073
helix:edvorakjp keymap change to use split_common (#16532) 2022-03-13 13:56:56 +00:00
QMK Bot 16fab460fd Merge remote-tracking branch 'origin/master' into develop 2022-03-13 10:10:03 +00:00
jpe230 1f63dbfb8e
[Keymap] Update personal crkbd keymap (#16624) 2022-03-13 03:09:36 -07:00
QMK Bot 8ff2497384 Merge remote-tracking branch 'origin/master' into develop 2022-03-13 10:09:12 +00:00
jack 08794fef4e
[Keyboard] add missing endif in glitch keyboard (#16629) 2022-03-13 03:08:33 -07:00
QMK Bot 55b53006a5 Merge remote-tracking branch 'origin/master' into develop 2022-03-13 07:37:55 +00:00
Matthew Dias dccb5711c7
[Keyboard] Add damapad (#16443)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-12 23:37:22 -08:00
QMK Bot ebe87aa67e Merge remote-tracking branch 'origin/master' into develop 2022-03-13 07:36:50 +00:00
Matthew Dias 20424fd37f
[Keyboard] Add Glitch (#16444)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-12 23:36:12 -08:00
QMK Bot 0015ebad47 Merge remote-tracking branch 'origin/master' into develop 2022-03-11 13:26:21 +00:00
James Young 3f79708095
Acheron Elongate Delta: add info.json (#16615) 2022-03-11 13:26:15 +00:00
James Young 74b24e410b
DZ64RGB: add info.json (#16616) 2022-03-11 13:25:31 +00:00
QMK Bot e3404d21fe Merge remote-tracking branch 'origin/master' into develop 2022-03-11 05:03:12 +00:00
mechlovin 003231aaf2
[Keyboard] Add Mechlovin Infinity87.5 PCB (#15163)
* add infinity87.5

* Update readme.md

* Update keyboards/mechlovin/infinity875/config.h

* Update keyboards/mechlovin/infinity875/info.json

* Update keyboards/mechlovin/infinity875/rules.mk

* Update keyboards/mechlovin/infinity875/rules.mk

* Update keyboards/mechlovin/infinity875/config.h

* Enable RGB matrix effect

* update keymap default

* undef RGB matrix effect

* Update keyboards/mechlovin/infinity875/rules.mk

* Update keyboards/mechlovin/infinity875/rules.mk

* Update keyboards/mechlovin/infinity875/rules.mk

* Update keyboards/mechlovin/infinity875/readme.md

* Update keyboards/mechlovin/infinity875/infinity875.h

* Update keyboards/mechlovin/infinity875/infinity875.h

* Update keyboards/mechlovin/infinity875/info.json

* Update keyboards/mechlovin/infinity875/infinity875.h

* Update keyboards/mechlovin/infinity875/infinity875.h

* Update keyboards/mechlovin/infinity875/info.json

* Update keyboards/mechlovin/infinity875/info.json

* Update keyboards/mechlovin/infinity875/info.json
2022-03-10 21:02:40 -08:00
QMK Bot e9458fd694 Merge remote-tracking branch 'origin/master' into develop 2022-03-10 23:28:26 +00:00
Rocco Meli ee71362f99
Personal user space and CRKBD R2G keymap (#15888)
* r2g folder groundwork

* Default mb keymap featuring mb logos

* Migrate Oled to keyboard folder

* Move rules configs to support config better

* update readmes

* Liscnece update

* Update config and fix issues caused by redef errs

* funciton name adjusts, define specific rgb modes

* move default oled font to postconfig

* update oled in line with develop merge

* fix return value

* Add some default rgb matrix defines

* del ugfx

* remove #include <stdio.h>

* create personal keymap for r2g

* reduce firmware size

* change keymap to follow physical layout

* remove RGBlight config lines to make both sides work (@Dasky on MechboardsUK Discord)

* strip down configuration, similar to crkbd/r2g:mb_via

* remove wrong oled code overwriting the r2g one

* broken code with RGB matrix (briks right side)

* remove high max brightness limit

* caps lock tap dance and RGB indicator for active caps lock

* fix caps lock led on right side

* add test macro

* remove latex macro which is too slow

* move caps lock tap dance to RALT and add space cadet shift

* switch CTL with ALT in first layer

* add tap dance for ESC/DEL

* space cadet tap dance with caps lock; shift works by needs a short pause

* add space cadet tap dance with caps lock on the right; shift works by needs a short pause and does not hold

* make more keys transparent

* enable auto shift and use logo on both oleds

* add user oled logo, slows down linking considerably

* oled name

* add arrow keys in usual configuration and add linear configuration to symbol layer

* add unicoede support

* add accents

* update to latest version

* add colemak dh layer

* report auto shift timeout

* define layer name shorcuts correctly

* disable VIA to enable more layers

* enable NKRO

* move some rules and unicode to user space

* move oled and tap dances to user space

* move tap dances fully out of keymap

* expand unicode map

* fix unicode code

* revert changes to r2g, make it equal to merged code

* revert changes to r2g, make it equal to merged code

* clang-format userspace

* clang-format config file

* Update keyboards/crkbd/keymaps/rmeli/keymap.c

* replace define with enum

* add licenses
2022-03-10 15:27:37 -08:00
QMK Bot 27cde5f4c2 Merge remote-tracking branch 'origin/master' into develop 2022-03-10 20:42:00 +00:00
Christian Hofstede b33fdc299c
add chofstede keymap for gmmk/pro/iso (#16045)
Add new keymap for GMMK with some additional mappings and led indicator for caps lock

* add chofstede keymap

* fix formatting

* fix formatting

* add readme

* Update keyboards/gmmk/pro/iso/keymaps/chofstede/keymap.c
2022-03-10 12:41:30 -08:00
QMK Bot 83f757f8f0 Merge remote-tracking branch 'origin/master' into develop 2022-03-10 20:22:41 +00:00
Liashenko Volodymyr fc7a41fdce
[Keyboard] lily58/glow_enc (#16101)
Add rgb-light and encoder for lily58 mod

* add support for lily58 encoders (one per size) and rgb-light.

The pcb and details here https://github.com/orvisevans/Lily58-Glow-Enc

* add support for lily58 encoders (one per size) and rgb-light.

The pcb and details here https://github.com/orvisevans/Lily58-Glow-Enc

* Update keyboards/lily58/glowEnc/config.h

* add GPL License to growEnc.h

* rename folder according to requirement to lower case
2022-03-10 12:21:55 -08:00
QMK Bot ee6a0e8744 Merge remote-tracking branch 'origin/master' into develop 2022-03-10 20:08:54 +00:00
Era James 98da119293
era1112 keymap for preonic (#16064)
Added the keymap I have been using as a daily driver for the last month.

* good firmware 26 jan, best clicky mode stability so far

* modified to reflect master branch coding style

* further modified to reflect master branch coding style

* improving clicky stability, tuned down clicky delay duration

* changed name of keymap folder to use lowercase letters
2022-03-10 12:07:37 -08:00
QMK Bot 35fa0f23a5 Merge remote-tracking branch 'origin/master' into develop 2022-03-10 19:10:42 +00:00
kopibeng 61a8a60dfb
[Keyboard] Add MNK65 (#16400)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2022-03-10 11:10:34 -08:00
makenova 265b96a12c
[Keyboard] Add omega4 (#16464) 2022-03-10 11:10:05 -08:00
QMK Bot cf44bde909 Merge remote-tracking branch 'origin/master' into develop 2022-03-10 12:18:47 +00:00
Ryan bd70f5261c
Remove matrix_key_count() (#16603)
* Remove `matrix_key_count()`

* Remove `matrix_bitpop()`
2022-03-10 12:18:07 +00:00
QMK Bot cb65c7755e Merge remote-tracking branch 'origin/master' into develop 2022-03-10 07:36:31 +00:00
Hao Xiang Liew dc8db6551d
[KEYBOARD] keyboardio/atreus: VIA support (#16604) 2022-03-09 23:35:54 -08:00
QMK Bot a8b01dc5de Merge remote-tracking branch 'origin/master' into develop 2022-03-10 04:15:19 +00:00
Takeshi Nishio 9d0153dc70
[keyboard]Add v1 to jones keyboard (#14405)
* Change for latest information.

* Update from v03_1 to v1.

* Add v1 files.

* Remove finished todo comment.

* Fix COLUMN number, from "a" to "9".

* Formatting

* Update keyboards/jones/v1/rules.mk

* Add license header.

https://github.com/qmk/qmk_firmware/pull/14405#discussion_r710752035

* Implement better way to handle keycode for encoder.

Use "action_exec" instead of "tap_code16"
https://github.com/qmk/qmk_firmware/pull/14405#discussion_r710752924

* Move External EEPROM config  to keyboard level

* Move the lest of DYNAMIC_KEYMAP config  to keyboard level

https://github.com/qmk/qmk_firmware/pull/14405#discussion_r711668094

* Move the rest of DYNAMIC_KEYMAP config  to keyboard level

https://github.com/qmk/qmk_firmware/pull/14405#discussion_r711668094

* Update keyboards/jones/v1/rules.mk

* Update keyboards/jones/v1/rules.mk

* Update keyboards/jones/v1/rules.mk
2022-03-09 20:14:53 -08:00
QMK Bot 876c5201b9 Merge remote-tracking branch 'origin/master' into develop 2022-03-10 03:57:12 +00:00
maherma-adg 8bcb77cb9a
Personalizacion del teclado de AdG (#15738)
* Personalizacion del teclado de AdG

Update layout description

fix symbol layer

* fix doc Colemak

* explicitly define enabled animations

* Change keymap folder name
2022-03-09 19:56:42 -08:00
QMK Bot 62696e82cd Merge remote-tracking branch 'origin/master' into develop 2022-03-10 03:47:09 +00:00
jack 708b3f9192
[Keyboard] Size reduction for kbdfans/kbd67/mkiirgb_iso (#16601) 2022-03-09 19:46:30 -08:00
QMK Bot 0f22bccb3f Merge remote-tracking branch 'origin/master' into develop 2022-03-09 22:05:21 +00:00
Hansol Kim caeb213400
Add macOS-friendly keymap for GMMK Pro (ANSI) (#14333)
* Add macOS keymap for GMMK Pro (ANSI)

* Change macOS keymap directory name to lowercase

* Add toggleable layer with alternative keymap for function row

* Update readme
2022-03-09 14:04:41 -08:00
QMK Bot 6f1793d486 Merge remote-tracking branch 'origin/master' into develop 2022-03-09 21:48:28 +00:00
Tony Grosinger db16271a72
Add Gergoplex keymap for tgrosinger (#15148)
* Add Gergoplex keymap for tgrosinger

* Add improved shortcuts for PopOS

* Add license
2022-03-09 13:47:57 -08:00
Nick Brassel 77180a6649
Fixup builds. (#16596) 2022-03-09 17:09:38 +00:00
Nick Brassel 8d5eacb7dd
Add support for encoder mapping. (#13286) 2022-03-09 19:29:00 +11:00
QMK Bot 7121a228eb Merge remote-tracking branch 'origin/master' into develop 2022-03-09 05:49:59 +00:00
jpe230 dc67fd9b87
Various improvements for the AnnePro2 (#16579) 2022-03-09 16:49:29 +11:00
QMK Bot 4d5e532068 Merge remote-tracking branch 'origin/master' into develop 2022-03-09 01:36:07 +00:00
jpe230 6ab5a7d048
[Keymap] Personal keymap for crkbd (#16546) 2022-03-08 17:35:33 -08:00
QMK Bot eedbb9ae64 Merge remote-tracking branch 'origin/master' into develop 2022-03-09 01:35:15 +00:00
Salicylic-acid3 c5c5d37e08
[Keymap] Added RGB_Matrix effect mode for naked48/j73gl (#16578) 2022-03-08 17:34:37 -08:00
QMK Bot c5b11978c7 Merge remote-tracking branch 'origin/master' into develop 2022-03-09 01:25:30 +00:00
Joel Challis ed169a6b30
Correct order of takashicompany/dogtag info.json (#16591) 2022-03-09 01:24:59 +00:00
QMK Bot c349e85956 Merge remote-tracking branch 'origin/master' into develop 2022-03-09 00:38:10 +00:00
jack 5244b13173
Fix yandrstudio/zhou65 (#16589)
* initial cleanup and hotfix for rgb....

* remove /f401
2022-03-09 00:37:40 +00:00
QMK Bot 41225620c2 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 22:08:38 +00:00
Danny 022e1fdac8
Add Big Switch Seat (#16524)
* Add Big Switch Seat

* Update keyboards/keebio/bigswitchseat/rules.mk

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

* Update keyboards/keebio/bigswitchseat/rules.mk

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-08 22:08:02 +00:00
QMK Bot 7f8f66512c Merge remote-tracking branch 'origin/master' into develop 2022-03-08 22:07:48 +00:00
Ryan 3347b63d83
handwired/misterdeck refactor (#16572)
* handwired/misterdeck refactor

* Forgot to remove this
2022-03-08 22:07:02 +00:00
QMK Bot d4bf9b1cc1 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 21:24:38 +00:00
Jason Barnachea d38696a493
[Keyboard] Add Rama Works M4-A (#16570)
* Initial commit

Add Rama Works M4-A keyboard.

* Update default keymap.c

* Update keyboards/machine_industries/m4_a/config.h

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-08 21:24:06 +00:00
QMK Bot fba3820405 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 18:57:21 +00:00
drewpyun 65eb0f939f
[keymap] Add via support for Iskar (#16575)
* iskar initial commit

* testing

* added info.json to iskar

* Updated read.me

* updated info.json removed unnessary keymap folders, fixed rules.mk, added second layer to default layout, added vendor/product id, tested and compiled

* Update readme.md

* Update readme.md

* updated info.json, formatted files according to PR checklist

* Update keyboards/drewkeys/iskar/rules.mk

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

* Update keyboards/drewkeys/iskar/readme.md

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

* added keymaps onto iskar.h that was referenced in info.json

* changed filename to lowercase to match guidelines

* initial commit of VIA files

* edited via keymap

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-08 18:56:48 +00:00
QMK Bot 0d428b9b39 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 17:03:41 +00:00
JX 40d6766576
[Keyboard] Add Y&R Studio zhou65 keyboard (#14192)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-08 09:03:05 -08:00
QMK Bot 68a62b99a2 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 16:48:29 +00:00
Callum Hart d92994be71
[Keyboard] Add Novus 60% keyboard (#16473)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-08 08:47:57 -08:00
Nick Brassel 2f6751e48a
Asymmetric encoders, encoder tests. (#16068) 2022-03-08 16:58:05 +11:00
QMK Bot 2218690d0b Merge remote-tracking branch 'origin/master' into develop 2022-03-08 05:50:04 +00:00
jack fe8b7619d3
[Keyboard] Fix late9/rev1 (#16576) 2022-03-07 21:48:56 -08:00
QMK Bot 212e820ff1 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 05:31:24 +00:00
Ryan 89a515913f
Oddball: set default pointing device driver (#16574) 2022-03-08 16:30:37 +11:00
QMK Bot 18bfbc93ab Merge remote-tracking branch 'origin/master' into develop 2022-03-08 04:24:07 +00:00
drewpyun 403536986d
[Keyboard] Add Iskar (#16562)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-07 20:23:53 -08:00
Matthew Dias 4d2ae22690
[Keyboard] Add mini winni (#15341)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-07 20:23:06 -08:00
QMK Bot e0fbb07129 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 04:20:15 +00:00
Ryan Baker 996880a1da
[Keyboard] Add rb69 (#16526) 2022-03-07 20:19:45 -08:00
QMK Bot 1d5b462da2 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 04:19:07 +00:00
yiancar 4493f31f80
Add HS version of Nebula65b due to different number of per-key-RGB (#16514)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: yiancar <yiancar@gmail.com>
2022-03-07 20:18:41 -08:00
QMK Bot b5996bf793 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 04:10:36 +00:00
Albert Y 8f70adc0b6
[Keyboard] Update encoder code for macro3 (#16005) 2022-03-07 20:09:54 -08:00
QMK Bot b6000e0fe5 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 04:00:30 +00:00
rookiebwoy 87c2f97def
[Keyboard] Add LATE-9 keyboard (#13966) 2022-03-07 19:59:50 -08:00
QMK Bot 0cf1186f8d Merge remote-tracking branch 'origin/master' into develop 2022-03-08 03:46:20 +00:00
peepeetee eb35f58a6e
[Keyboard] Idobao ID87 v2 (#15875)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-03-07 19:45:54 -08:00
Sergey Vlasov 249bc3a5c5
[Keyboard] Add Winry315 keyboard (#15894) 2022-03-07 19:45:30 -08:00
QMK Bot b069002e61 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 03:41:21 +00:00
Beanaccle 86966fce69
[Keyboard] Add KB58 (#15896)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-03-07 19:40:46 -08:00
QMK Bot 280bea87a6 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 03:40:42 +00:00
TerryMathews ec3df85f08
[Keyboard] TKC Portico68 v2 (#15916)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-07 19:39:33 -08:00
QMK Bot 9237326664 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 03:02:26 +00:00
Uthol b2fdb072e5
[Keyboard] Uthol (#16393)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-07 19:01:47 -08:00
QMK Bot 2d985687a9 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 03:01:10 +00:00
Matthew Dias 869ede8e4a
[Keyboard] Add parallel 65 (#16445)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-03-07 19:00:35 -08:00
QMK Bot 26372c81ad Merge remote-tracking branch 'origin/master' into develop 2022-03-08 02:47:28 +00:00