summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-114-64/+79
|\
| * [Keymap] Danielo515/redox_w (#11340)Daniel Rodríguez Rivero2021-01-104-64/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * chore: pulled the latest from master Bring my redox layout from my latest redox branch Bring my latest user stuff from my redox branch * Update users/danielo515/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * chore: some more layouts * feat: add gaming layer (has a bug) * chore: more gaming layout * chore: deactivate gaming layer when switching * chore: simplify gaming toggle * Update .vscode/settings.json Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-117-0/+350
|\|
| * [Keyboard] Add the 'THE40' (#11317)jackytrabbit2021-01-107-0/+350
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add support for keyboard 'THE40' Add support for keyboard 'THE40' * Update keyboards/lazydesigners/the40/the40.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lazydesigners/the40/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update the40.h Add layout option. * Update info.json Add layout option. * Update keymap.c Change for layout option. * Update keyboards/lazydesigners/the40/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lazydesigners/the40/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lazydesigners/the40/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lazydesigners/the40/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-114-0/+386
|\|
| * [Keymap] Adding my Planck Keymap (#11315)Eshan2021-01-104-0/+386
| | | | | | | | | | | | | | | | | | | | | | * Adding keymap files * Added compatible license header to config file * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1114-0/+504
|\|
| * [Keyboard] Add isometria 75 keyboard (#11210)Moritz2021-01-1014-0/+504
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added isometria_75 * added missing license header * added reset explanation * Update keyboards/ebastler/isometria_75/rev1/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/ebastler/isometria_75/rev1/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/ebastler/isometria_75/rev1/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/ebastler/isometria_75/rev1/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/ebastler/isometria_75/rev1/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * renamed uppercase readme * Update keyboards/ebastler/isometria_75/rev1/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ebastler/isometria_75/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ebastler/isometria_75/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ebastler/isometria_75/rev1/rev1.c Co-authored-by: Ryan <fauxpark@gmail.com> * changed configs to only necessary lines Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1119-10/+276
|\|
| * [Keyboard] Add support for idobao id80 iso layout (#11246)Carsten Rose2021-01-1019-10/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add support for idobao id80 iso layout * This change is required as there is a logic bug on the board that C7 (capslock) is inverted thus lowercase is with light on. Mind the ! in the write to the pin. * Apply suggestions from code review All fine for me, thanks for the additional information! Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * move device information to separate config.h for id80 iso and ansi * commit via keymap similar to default. There is a problem with mapping compiling vor via, resulting in KC_ENT residing on KC_PGDN. Switching off via support in rules.mk makes the keyboard behave fine * change KC_BSLS to KC_NUHS as this is an iso board Co-authored-by: Carsten <modebm@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-113-1/+67
|\|
| * [Keyboard] wheatfield/split75 with ISO layout (#11271)johannesk2021-01-103-1/+67
| | | | | | | | | | | | | | | | | | The pcb used for wheatfield/split75 supports ANSI and ISO layout. This commit adds the ISO variant. With suggestions from code review: Co-authored-by: Drashna Jael're <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1125-0/+2298
|\|
| * [Keyboard] Add the [n]40-o (#11286)NightlyBoards2021-01-1013-0/+617
| | | | | | | | | | | | | | | | | | | | | | | | | | * Create Alter folder * Revert "Create Alter folder" This reverts commit 361103b821dbb22957b66cdedb0d11f996def71c. * Added the n40_o folder * Edited info.json, n40_o.h and rules.mk * Edited readme as per comment
| * [Keyboard] Add Onyx keyboard to QMK (#11292)Andrew Kannan2021-01-1012-0/+1681
| | | | | | | | | | | | | | | | | | | | | | * Add Onyx keyboard to QMK * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1124-41/+1119
|\|
| * [Keyboard] Add Herringbone Pro, re-organize herringbone folder (#11115)Ramon Imbao2021-01-1024-41/+1119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Herringbone Pro, reorganize herringbone folder * Finish encoder functionality * Change image in readme * Fix info.json * Flip encoder direction * Update keyboards/ramonimbao/herringbone/pro/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ramonimbao/herringbone/pro/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ramonimbao/herringbone/pro/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ramonimbao/herringbone/pro/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Add OLED support, split space, default folder * Fix LAYOUT_all in info.json * Remove WPM feature * Add readme to top level herringbone folder * Re-add WPM because now the OLED won't turn back on lol * Add missing timer_read32 * Add OLED wakeup on knob use * Update keyboards/ramonimbao/herringbone/v1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ramonimbao/herringbone/v1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ramonimbao/herringbone/pro/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ramonimbao/herringbone/pro/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Add small QoL improvments for tapping * Update keyboards/ramonimbao/herringbone/readme.md Co-authored-by: Erovia <Erovia@users.noreply.github.com> * Add bootloader instructions and improve LAYOUT_all a bit * Update keyboards/ramonimbao/herringbone/pro/pro.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/ramonimbao/herringbone/pro/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/ramonimbao/herringbone/pro/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/ramonimbao/herringbone/pro/keymaps/iso/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/ramonimbao/herringbone/v1/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-112-0/+74
|\|
| * [Keymap] Quefrency layout for rogthefrog (#11140)Roger2021-01-102-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * noop; indent and comment cleanup * config for rogthefrog layout * removed encoder function as there is no encoder on this pcb * removed unnecessary declaration * replaced individual constants with an enum for extensibility * removed unused enum * Added GPL license language * added copyright for my changes, per GPL * noop; removed unneeded line continuations; fixed indentation
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-111-1/+1
|\|
| * Fix documentation of `lsusb` behaviour (#10903)L. K. Post2021-01-101-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1111-0/+1660
|\|
| * Alpine65 (#11223)Álvaro A. Volpato2021-01-1111-0/+1660
| | | | | | | | | | | | | | * Initial ALPINE65 support * Fix RGB LED number Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
* | [Keyboard] Added rev2 & move rev1+rev2 to parent folder (#10973)Aplyard2021-01-1012-7/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rev2 and move parent folder Moved aplx6 to parent folder, renamed it to rev1 and added rev2 * Update keyboards/aplx/aplx6/rev1/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/aplx/aplx6/rev2/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/aplx/aplx6/rev2/rev2.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/aplx/aplx6/rev2/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * license * Update keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/aplx/aplx6/rev2/rules.mk Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/aplx/aplx6/rev2/rules.mk Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/aplx/aplx6/rev2/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * layer definition * parent folder rename after suggestion * build instructions * update Hardware Availability links Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Document how to add data driven configurations (#11502)Zach White2021-01-102-0/+60
| | | | | | | | | | | | | | | | | | | | | | * describe how data driven configuration works * Apply suggestions from code review Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1133-678/+4430
|\|
| * [Keyboard] Oddball keyboard and optical sensor update (#10450)Alexander Tulloh2021-01-1033-678/+4430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add oddballl v2 - add CPI options - add scroll support - add click-and-drag support - PMW3360 implementation - ADNS9800 improvements * Set default make directory * Update readme with PMW config * Change bootloader * Update unused pins on v2 * Remove diode switch * Move bootloader selection to keyboard version level * Change default keyboard folder to v1 * Move sensor selection to keymap * Remove PK debounce * Change to only send mouse report on change * Change CPI function cpi type * Remove EEPROM state check * Update CPI to only change on key down * Fix incorrect F8 in keymap * Add v2.1 with more convenient controller pinout * Add keyboard readmes * Update keyboards/oddball/pmw/pmw3360_srom_0x04.h Remove direct AVR reference Co-authored-by: Ryan <fauxpark@gmail.com> * Remove direct AVR reference Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Alexander Tulloh <alex@riberry.io> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1132-0/+3714
|\|
| * [Keyboard] Add BIOI Keyboards (#9602)scottywei2021-01-1032-0/+3714
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add BIOI Keyboards Add keyboards from BIOI, including dual-mode G60, Morgan65, and S65 * Update keyboards/bioi/g60/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/bioi/g60/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/bioi/g60/g60.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/bioi/g60/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Rename rule.mk to rules.mk * Rename rule.mk to rules.mk * Rename rule.mk to rules.mk * Update readme.md * Apply suggestions from code review Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update ble.h * Update config.h Change VenderID to 8101 * Update config.h * Update config.h * Update ble.c * Update ble.h * Add license headers * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Add license header in keymap files * Fix year in license header * Update keyboards/bioi/s65/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-101-0/+8
|\|
| * freoduo: define RGBLight config at keyboard level (#11491)James Young2021-01-101-0/+8
| | | | | | Configurator compiles fail without the number of LEDs defined here. Included the rest to match the default keymap's settings.
* | ChibiOS conf migrations... take 6 (#11504)Nick Brassel2021-01-106-2756/+128
| | | | | | | | | | | |