summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-102-0/+55
|\
| * [KEYBOARD] keyboardio/atreus: VIA support (#16604)Hao Xiang Liew2022-03-092-0/+55
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1014-11/+612
|\|
| * [keyboard]Add v1 to jones keyboard (#14405)Takeshi Nishio2022-03-0914-11/+612
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-104-0/+483
|\|
| * Personalizacion del teclado de AdG (#15738)maherma-adg2022-03-094-0/+483
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Personalizacion del teclado de AdG Update layout description fix symbol layer * fix doc Colemak * explicitly define enabled animations * Change keymap folder name
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-102-6/+2
|\|
| * [Keyboard] Size reduction for kbdfans/kbd67/mkiirgb_iso (#16601)jack2022-03-092-6/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-094-0/+617
|\|
| * Add macOS-friendly keymap for GMMK Pro (ANSI) (#14333)Hansol Kim2022-03-094-0/+617
| | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-095-0/+343
|\|
| * Add Gergoplex keymap for tgrosinger (#15148)Tony Grosinger2022-03-095-0/+343
| | | | | | | | | | | | | | * Add Gergoplex keymap for tgrosinger * Add improved shortcuts for PopOS * Add license
* | Missed some erroneous prints. (#16597)Nick Brassel2022-03-102-10/+12
| |
* | Fixup builds. (#16596)Nick Brassel2022-03-093-8/+10
| |
* | Fix missing definition for non-encoder case. (#16593)Nick Brassel2022-03-091-8/+17
| |
* | Add support for encoder mapping. (#13286)Nick Brassel2022-03-0916-53/+279
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0919-304/+526
|\|
| * Various improvements for the AnnePro2 (#16579)jpe2302022-03-0919-304/+526
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-094-0/+444
|\|
| * [Keymap] Personal keymap for crkbd (#16546)jpe2302022-03-084-0/+444
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-092-12/+107
|\|
| * [Keymap] Added RGB_Matrix effect mode for naked48/j73gl (#16578)Salicylic-acid32022-03-082-12/+107
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-091-8/+8
|\|
| * Correct order of takashicompany/dogtag info.json (#16591)Joel Challis2022-03-091-8/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0910-106/+61
|\|
| * Fix yandrstudio/zhou65 (#16589)jack2022-03-0910-106/+61
| | | | | | | | | | * initial cleanup and hotfix for rgb.... * remove /f401
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0810-0/+212
|\|
| * Add Big Switch Seat (#16524)Danny2022-03-0810-0/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0812-80/+89
|\|
| * handwired/misterdeck refactor (#16572)Ryan2022-03-0812-80/+89
| | | | | | | | | | * handwired/misterdeck refactor * Forgot to remove this
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-087-0/+241
|\|
| * [Keyboard] Add Rama Works M4-A (#16570)Jason Barnachea2022-03-087-0/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-081-1/+35
|\|
| * `qmk info`: Nicer rendering of big-ass enter (#16541)Ryan2022-03-081-1/+35
| | | | | | | | | | * `qmk info`: Nicer rendering of big-ass enter * Formatting...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-083-0/+50
|\|
| * [keymap] Add via support for Iskar (#16575)drewpyun2022-03-083-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0814-0/+370
|\|
| * [Keyboard] Add Y&R Studio zhou65 keyboard (#14192)JX2022-03-0814-0/+370
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-089-0/+508
|\|
| * [Keyboard] Add Novus 60% keyboard (#16473)Callum Hart2022-03-089-0/+508
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Asymmetric encoders, encoder tests. (#16068)Nick Brassel2022-03-0827-138/+921
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-081-0/+1
|\|
| * [Keyboard] Fix late9/rev1 (#16576)jack2022-03-071-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-083-2/+2
|\|
| * Oddball: set default pointing device driver (#16574)Ryan2022-03-083-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0817-0/+935
|\|
| * [Keyboard] Add Iskar (#16562)drewpyun2022-03-078-0/+688
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add mini winni (#15341)Matthew Dias2022-03-079-0/+247
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0810-0/+300
|\|
| * [Keyboard] Add rb69 (#16526)Ryan Baker2022-03-0710-0/+300
| |