summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-138-21/+631
|\
| * Quarkeys Z60 Layout Addtions (#19568)James Young2023-01-128-21/+631
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * quarkeys/z60/hotswap: rename LAYOUT to LAYOUT_60_ansi_tsangan_split_rshift * quarkeys/z60/solder: add matrix diagram * quarkeys/z60/solder: rename LAYOUT to LAYOUT_all * quarkeys/z60/solder: add LAYOUT_60_ansi * quarkeys/z60/solder: add LAYOUT_60_ansi_split_bs_rshift * quarkeys/z60/solder: add LAYOUT_60_iso * quarkeys/z60/solder: add LAYOUT_60_iso_split_bs_rshift * quarkeys/z60/solder: add LAYOUT_60_ansi_tsangan * quarkeys/z60/solder: add LAYOUT_60_tsangan_hhkb * quarkeys/z60/solder: add LAYOUT_60_iso_tsangan * quarkeys/z60/solder: enable Community Layout support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-131-2/+2
|\|
| * Rectified ins/del layout macro ordering of Keychron Q1 ANSI (#19560)Jonathan Moallem2023-01-131-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-124-4/+4
|\|
| * weact docs patch re "security vulnerability" (#19572)Tom Barnes2023-01-124-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-124-0/+504
|\|
| * [Keymap] Add brauner preonic layout (#19444)Christian Brauner2023-01-124-0/+504
| |
* | [Keymap] Add The Uni Utility Belt Keymap (#19411)Peter Park2023-01-122-0/+55
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Peter Park <peter@Peters-MacBook-Air.local>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-126-0/+260
|\|
| * [Keyboard] Add Plywrks Ji-Eun (#18276)Ramon Imbao2023-01-116-0/+260
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-112-16/+16
|\|
| * Keychron V3: correct layout data (#19567)James Young2023-01-112-16/+16
| | | | | | | | | | * keychron/v3/ansi_encoder: correct layout data * keychron/v3/iso_encoder: correct layout data
* | Tidy up use of CTPC (#19570)Joel Challis2023-01-116-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2023-01-1113-250/+442
|\|
| * Keychron V1: correct layout data for ANSI versions (#19558)James Young2023-01-112-134/+134
| | | | | | | | | | * keychron/v1/ansi: correct layout data * keychron/v1/ansi_encoder: correct layout data
| * [Keyboard] Work Louder updates for via v3 (#19555)Drashna Jaelre2023-01-1011-116/+308
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-108-26/+34
|\|
| * Keychron S1 ANSI Layout Touch-Up (#19556)James Young2023-01-108-26/+34
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-106-0/+528
|\|
| * [Keymap] Kbdfans Tiger 80 keymap & Planck keymap (#19428)squarecut2023-01-106-0/+528
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Abhishek Malavalli <abhishek.malavalli@fphcare.co.nz>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-106-159/+112
|\|
| * [Keymap] Updated Freoduo keymap (#19351)Filip Paryż2023-01-096-159/+112
| |
* | Migrate `LAYOUTS` to data driven (#19541)Ryan2023-01-101153-1139/+559
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Migrate `LAYOUTS` to data driven, 0-9 * Migrate `LAYOUTS` to data driven, A * Migrate `LAYOUTS` to data driven, B * Migrate `LAYOUTS` to data driven, C * Migrate `LAYOUTS` to data driven, D * Migrate `LAYOUTS` to data driven, E * Migrate `LAYOUTS` to data driven, F * Migrate `LAYOUTS` to data driven, G * Migrate `LAYOUTS` to data driven, H * Migrate `LAYOUTS` to data driven, handwired * Migrate `LAYOUTS` to data driven, I * Migrate `LAYOUTS` to data driven, J * Migrate `LAYOUTS` to data driven, K * Migrate `LAYOUTS` to data driven, L * Migrate `LAYOUTS` to data driven, M * Migrate `LAYOUTS` to data driven, N * Migrate `LAYOUTS` to data driven, O * Migrate `LAYOUTS` to data driven, P * Migrate `LAYOUTS` to data driven, Q * Migrate `LAYOUTS` to data driven, R * Migrate `LAYOUTS` to data driven, S * Migrate `LAYOUTS` to data driven, T * Migrate `LAYOUTS` to data driven, U * Migrate `LAYOUTS` to data driven, V * Migrate `LAYOUTS` to data driven, W * Migrate `LAYOUTS` to data driven, X * Migrate `LAYOUTS` to data driven, Y * Migrate `LAYOUTS` to data driven, Z
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-109-0/+646
|\|
| * [Keyboard] add YMDK40 AIR40 (#19276)Dennis Kruyt2023-01-099-0/+646
| | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-095-1/+19
|\|
| * [keyboard] Enable community layout support (#19499)Manna Harbour2023-01-095-1/+19
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-091-1/+1
|\|
| * [Keychron Q5] Build failures: recursive function call. (#19553)Nick Brassel2023-01-101-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-085-1/+212
|\|
| * Add some missing layout data (#19539)Joel Challis2023-01-085-1/+212
| |
* | Ignore defaults.hjson values if already set (#19511)Joel Challis2023-01-072-4/+2
| | | | | | | | | | * Ignore defaults.hjson values if already set * Add warning when nothing is merged
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-072-1/+3
|\|
| * Fix `handwired/onekey/kb2040` WS2812 pin (#19517)Joel Challis2023-01-072-1/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-046-0/+138
|\|
| * Add SapuSeven MacroPad12 (#19466)SapuSeven2023-01-046-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add SapuSeven MacroPad12 * Update image url Co-authored-by: Drashna Jaelre <drashna@live.com> * Remove unnecessary layers Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-044-12/+14
|\|
| * feat(kprepublic/bm60hsrgb_poker): update carlosala keymap (#19426)Carlo2023-01-043-11/+14
| |
| * [Keyboard] Stop LED1 from flashing on layer change (#19427)Paul James2023-01-041-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-021-1/+1
|\|
| * Fix github URL for the atreyu maintainer. (#19476)Jesus Climent2023-01-031-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-025-57/+25
|\|
| * adpenrose/akemipad fixes (#19477)Joel Challis2023-01-035-57/+25
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-011-0/+1
|\|
| * [Keyboard] Add community layout support to Piantor (#19455)Byron Clark2023-01-011-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-01-016-78/+69
|\|
| * Keyboard/fix work louder micro (#18968)Drashna Jaelre2023-01-016-78/+69
| |
* | Partially revert #18940 for Ploopy Thumb Trackball (#18943)Drashna Jaelre2023-01-012-0/+37
| |
* | [Bug] Prevent dynamic keymaps from processing layers that don't exist (#19225)Drashna Jaelre2023-01-019-69/+16
| |