summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-111-949/+168
|\
| * [Keyboard] whale/sk/v3: Configurator fix (#11490)James Young2021-01-111-949/+168
| | | | | | | | | | | | | | | | | | | | | | * whale/sk/v3: info.json debug linting * LAYOUT_all key sequence fix * remove `key_count` key * LAYOUT_right_half_only dead-space removal Removes the dead space from the QMK Configurator rendering.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-114-29/+50
|\|
| * Lighting Layers should be disabled when suspended (#11442)Joshua Diamond2021-01-114-29/+50
| | | | | | | | | | * Lighting Layers should be disabled when suspended * bugfixes
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1112-0/+1668
|\|
| * [Keyboard] Add Borsdorf keyboard (#11474)Callum Hart2021-01-1112-0/+1668
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Borsdorf * Delete config.h * Add basic VIA keymap * Update default keymap * Default now uses layout_all * Default now has layer with reset key * Fix missing comma in borsdorf keymap * Update rules.mk to be less specific * Update chibiOS files * Update keymaps to swap GUI and Alt keys * Delete unnecessary readme * Update VIA keymap to match default * Remove boilerplate from readme * Udate Copyright message * Remove unused key from LAYOUT_rshift * Update borsdorf.c Remove unnecessary boiler plate Co-authored-by: Joel Challis <git@zvecr.com> * Add copyright message to VIA keymap Co-authored-by: Joel Challis <git@zvecr.com> * Fix missing directory in readme Co-authored-by: Joel Challis <git@zvecr.com> * Fix incorrect rules.mk * Update BOOTMAGIC_ENABLE to the preferred lite Co-authored-by: Joel Challis <git@zvecr.com> * Remove redundant description from config Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/cutie_club/borsdorf/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cutie_club/borsdorf/keymaps/via/keymap.c 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-1114-0/+1200
|\|
| * [Keyboard] Add Kimiko keyboard (#11458)Ben2021-01-1014-0/+1200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add keycapsss/kimiko split keyboard * add kimiko rgb matrix keymap (only master working) * move rgb_matrix_driver definiton to rev1 folder * add comments to rgb matrix code * add power draw limitation for ios * add SPLIT_TRANSPORT_MIRROR to kimiko * Add oled code and font for kimiko * Edit default keymap and add copyright entries * Improve typo style * Add info.json for Kimiko * Add readme * Remove split matrix code * Add image and more feature informations * Fix indention * Add make command example * Update keyboards/keycapsss/kimiko/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/keycapsss/kimiko/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/keycapsss/kimiko/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/keycapsss/kimiko/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/keycapsss/kimiko/readme.md Co-authored-by: Joel Challis <git@zvecr.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-1111-0/+1696
|\|
| * [Keyboard] CK60i support (#11432)Álvaro A. Volpato2021-01-1011-0/+1696
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial CK60i support * Update README, add HAL_PWM and remove AUDIO and BLUETOOTH from rules.mk * VIA support * Fix VIA_ENABLE to 'yes' * Remove CONSOLE_ENABLE from rules.mk * attribute weak for encoder callback * Remove KC_NO definition from default keymap Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-113-0/+133
|\|
| * [Keymap] own Redox keymap (#11394)Christian Eiden2021-01-103-0/+133
| | | | | | Signed-off-by: Christian Eiden <christian@eiden.ch>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-114-0/+74
|\|
| * [Keymap] Georgian linear keymap for idobo (#11386)Giorgi Chavchanidze2021-01-104-0/+74
| | | | | | | | | | | | | | * Georgian linear layout for idobo keyboard * fixup! Keymap formatting Co-authored-by: Giorgi Chavchanidze <giorgi@vivaldi.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-117-134/+658
|\|
| * [Keymap] revamped rjhilgefort planck keymap (#11385)Rob Hilgefort2021-01-103-134/+267
| |
| * [Keymap] rjhilgefort's Corne KBD (#11381)Rob Hilgefort2021-01-104-0/+391
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial crkbd rjhilgefort keymap * finished v1 of rjhilgefort's crkbd keymap * Update keyboards/crkbd/keymaps/rjhilgefort/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/crkbd/keymaps/rjhilgefort/readme.md * Update keyboards/crkbd/keymaps/rjhilgefort/readme.md * Update keyboards/crkbd/keymaps/rjhilgefort/readme.md Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-111-0/+2
|\|
| * [Docs] Update feature_rgblight.md (#11363)Nick Blyumberg2021-01-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | * Update feature_rgblight.md The note is meant to let people know that this is specific to RGB Backlight and does not work with RGB Matrix based implementations. * Update docs/feature_rgblight.md Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Refine twinkle to be smoother (use breathing curve) (#11350)Joshua Diamond2021-01-103-35/+50
| | | | | | | | | | | | | | | | | | * Refine twinkle to be smoother (use breathing curve) * tune more for firmware size * fix bug when v=255 ~ drashna approved ~
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-113-13/+13
|\|
| * [Keymap] stanrc85 Keymap/userspace updates (#11349)stanrc852021-01-103-13/+13
| | | | | | | | | | * keymap updates * adding fanfare back
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-118-0/+287
|\|
| * [Keyboard] Add Karina keyboard (#11347)misonoworks2021-01-108-0/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add karina keymap * Update info.json * Add files via upload * Update readme.md * Update info.json * Update info.json * Update keyboards/misonoworks/karina/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/misonoworks/karina/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/misonoworks/karina/config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: autumnisacutie <63772942+autumnisacutie@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <