summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1213-0/+422
|\
| * [Keyboard] Add Bloop65 (#13388)Kwabena Aduse-Poku2021-07-1213-0/+422
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-119-10/+225
|\|
| * [Keyboard] Update lazydesigners/the60/rev2/rev2.h (#13505)jackytrabbit2021-07-111-10/+10
| | | | | | Update lazydesigners/the60/rev2/rev2.h
| * [Keyboard] CapsUnlocked CU7 (#13429)Rys Sommefeldt2021-07-118-0/+215
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-111-0/+1
|\|
| * [Keymap] Fix Corne Via Layout properly (#13518)Drashna Jaelre2021-07-111-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1113-292/+297
|\|
| * [Keyboard] Wuque Studio Ikki68 Aurora codebase touch-up (#13510)James Young2021-07-1113-292/+297
| |
* | first pass: matrix consistency improvements (#13471)Zach White2021-07-1122-28/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-111-0/+3
|\|
| * Fixed the Helix keymap 'fraanrosi' compile issues (#13514)Takeshi ISHII2021-07-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to `helix/rev2/keymaps/fraanrosi/readme.md`, this keymap should be compiled with the following command: ``` make helix/rev2/under:fraanrosi ``` Therefore, when compiling all helix keymaps with the following command, an error occurs when compiling `fraanrosi`. ``` make helix:all ``` Therefore, add `LED_UNDERGLOW_ENABLE = yes` to `keymaps/fraanrosi/rules.mk` to suppress the error.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-113-182/+233
|\|
| * [Keymap] plattfot - Keymap updates for Kyria (#13449)Fredrik Salomonsson2021-07-103-182/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Major change in the keymap to work with EurKey. Which relaxes some constraints it had before when it had to take in consideration two layouts. With this the parenthesis can be moved to a better location instead of being in the top right corner. This also allows esc, del and rctrl to be moved to the base layer. Only downside is that ctrl+lalt needed to be removed and instead AltGr takes it's place. Add rctrl on right thumb cluster to compensate for this which need some reorganization on the thumb cluster. - Split the symbol and function keys layer into two layers, one for each hand. Make it easier to press symbols and function keys. - Add some symbols specific for the EurKey layout. - Change from running C-<tab> S-C-<tab> to page up/down for the right rotary. As holding ctrl and using page up/down works the same in firefox. Which allows the rotary to be useful for other things. - Move scroll lock and insert to right rotary. - Introducing close tap (CLO_TAP), which is a combination of the double tap feature and my macros. E.g. pressing CLO_TAP and ( will generate ()←. Which removes the need of the macros and makes it more useful than DBL_TAP as it now saves me some keypresses. CLO_TAP exist on both the left and right hand layers to make it easy to use. - Use text for the secondary oled, firmware is too big after rebasing on upstream master. - Update image in the readme to reflect my new layout.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1129-0/+1292
|\|
| * [Keyboard] add new firewave ikki68_aurora (#13364)GG2021-07-1029-0/+1292
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-102-0/+0
|\|
| * Clawsome Hatchback & SUV: fix improperly named keymap directories (#13508)James Young2021-07-102-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-101-18/+11
|\|
| * Fix VIA compilation issues for RGB Matrix (#13503)Drashna Jaelre2021-07-101-18/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-093-54/+98
|\|
| * Mechmini V1 Refactor (#13498)James Young2021-07-093-54/+98
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-081-2/+2
|\|
| * nknl7en: correct key object order (#13482)James Young2021-07-081-2/+2
| |
* | Use the new ST7565 driver on Ergodox Infinity (#13165)Joakim Tufvegren2021-07-075-12/+107
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-074-6/+113
|\|
| * Xelus Ninjin: rename LAYOUT_all to LAYOUT_tkl_ansi_tsangan; add info.json ↵James Young2021-07-074-6/+113
| | | | | | | | (#13477)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-074-85/+245
|\|
| * Kopibeng XT65: Layout Macro Refactor (#13476)James Young2021-07-074-85/+245
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0718-0/+732
|\|
| * [Keyboard] Add poker87c and poker87d (#12810)mfkiiyd2021-07-0618-0/+732
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Water <mfkiiyd@163.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-079-0/+562
|\|
| * [Keyboard] Add new Elise, 65% Keyboard ANSI / ISO (#12782)Blake2021-07-069-0/+562
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0715-0/+785
|\|
| * [Keyboard] Add bm65iso (#13400)Simon2021-07-0615-0/+785
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0612-0/+404
|\|
| * [Keyboard] Add keyboard reviung5 (#13375)gtips2021-07-0612-0/+404
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0612-0/+575
|\|
| * [Keyboard] Add kabedon98e (#13314)KDon2021-07-0612-0/+575
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-065-37/+72
|\|
| * [Keyboard] Set reasonable defaults for Corne keyboard (#13440)Drashna Jaelre2021-07-065-37/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Set reasonable defaults for Corne keyboard * Add note about bootmagic * Make bootmagic config super weak * cleanup * Apply suggestions from code review * Update keyboards/crkbd/readme.md
* | Migrate SHIFT_ESC and RGB `fn_actions` to Grave Escape and RGB keycodes (#13360)Ryan2021-07-0620-1114/+22
| |
* | `keymap_extras`: Remove deprecated defines (#12949)Ryan2021-07-0685-359/+343
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-051-1/+2
|\|
| * [Keyboard] fix encoder_update_user for nullbitsco/nibble (#13451)David Luo2021-07-051-1/+2
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-07-0510-512/+354
|\|
| * Traveller cleanup (#13441)Ryan2021-07-058-485/+341
| | | | | | | | | | | | | | | | | | * Traveller cleanup * Update keyboards/handwired/traveller/info.json Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
| * LatinPadBLE: correct info.json data (#13452)James Young2021-07-052-27/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * correct info.json data Removes an extra key object, and corrects the layout macro reference. * refactor rules.mk file - remove invalid `LAYOUTS` rule - edits the rules.mk file to more closely resemble the file from QMK's AVR template. * additional rules.mk cleanup per fauxpark Apply suggestions from code review
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-052-121/+122
|\|
| * Jabberwocky: adjust key positioning in Configurator (#13447)James Young2021-07-052-121/+122
| | | | | | | | | | | | | | | | | | | | | | * adjust key positioning in Configurator Some of the keys were visually overlapping when rendered. Adjusted the key positioning to remove the overlaps. * update readme.md - fix a broken URL - rewrite the Bootloader access instructions - remove trailing whitespace