summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-243-1/+2
|\|
| * Fix use of encoder map in mechwild/clunker (#18156)Joel Challis2022-08-243-1/+2
| |
* | Move keyboard USB IDs and strings to data driven: develop (#18152)Ryan2022-08-2417-70/+38
| | | | | | | | | | * Move keyboard USB IDs and strings to data driven: develop * Also do new onekeys
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-239-0/+378
|\|
| * [Keyboard] Add Plywrks Lune (#17057)Ramon Imbao2022-08-239-0/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Plywrks Lune * Add OLED functionality * Update keyboards/plywrks/lune/keymaps/default/keymap.c * Update keyboards/plywrks/lune/keymaps/via/keymap.c * Update keyboards/plywrks/lune/keymaps/via/keymap.c * Update keyboards/plywrks/lune/lune.c * Add the missing 2 layers in the keymap Also added a missing parenthesis in lune.c, and removed the oled_task_user in the default keymap. * Update keyboards/plywrks/lune/info.json * Update keyboards/plywrks/lune/info.json * Update keyboards/plywrks/lune/info.json * Update keyboards/plywrks/lune/config.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-237-0/+266
|\|
| * [Keyboard] Add Clunker (#18141)Kyle McCreery2022-08-237-0/+266
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-231-1/+1
|\|
| * Use correct board files for cantor (#18144)Joel Challis2022-08-231-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-234-5/+60
|\|
| * [Keyboard] Enable VIA - ALF X1.1 (#18140)Dave Rowe2022-08-224-5/+60
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-231-1/+10
|\|
| * [Keyboard] add rgb animation handwired/swiftrax/glacier (#18121)Brandon Claveria2022-08-221-1/+10
| | | | | | | | Co-authored-by: swiftrax <swiftrax@github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-221-10/+0
|\|
| * Remove USB IDs and strings from `fungo/rev1` (#18133)Ryan2022-08-221-10/+0
| |
* | RESET -> QK_BOOT user keymaps (#17940)Joel Challis2022-08-211407-1800/+1898
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2164-114/+152
|\|
| * Move keyboard USB IDs and strings to data driven, pass 3 (#18111)Ryan2022-08-2164-114/+152
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-211-0/+132
|\|
| * Add pcewing Speedo v3 keymap (#18118)Paul Ewing2022-08-211-0/+132
| | | | | | | | | | * Add pcewing Speedo v3 keymap * Add readme and code quality improvements
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-214-0/+81
|\|
| * [Keymap] Add new keymap to nasu (#18024)Mario Cadenas2022-08-214-0/+81
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-215-0/+130
|\|
| * [Keyboard] Add ai macropad (#17722)Louis Dalibard2022-08-205-0/+130
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Louis Dalibard <ontake@ontake.dev>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-203-0/+238
|\|
| * added keymap for kprepublic/jj40:brdlf (#17961)Abigail2022-08-203-0/+238
| | | | | | | | | | * added keymap for kprepublic/jj40:brdlf
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2012-0/+872
|\|
| * [Keyboard] Add yandrstudio/nz67v2 keyboard. (#17591)JX2022-08-2012-0/+872
| | | | | | * add yr nz67v2 by jiaxin96
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-201-29/+29
|\|
| * Format code according to conventions (#18119)QMK Bot2022-08-201-29/+29
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2011-0/+563
|\|
| * add fungo keyboard (#17513)bojiguard2022-08-2011-0/+563
| | | | | | by bojiguard
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2011-0/+331
|\|
| * Add Nascent keyboard support. (#17824)studiokestra2022-08-2011-0/+331
| | | | | | * Add nascent keyboard by studiokestra
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2029-0/+852
|\|
| * [Keyboard] Add Zed65 (#17917)mechlovin2022-08-2029-0/+852
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-08-20352-373/+373
|\|
| * RESET -> QK_BOOT keyboard readme (#18110)Joel Challis2022-08-20352-373/+373
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-202-0/+112
|\|
| * [Keymap] Add joe_scotto keymap for CRKBD (#18103)Joe Scotto2022-08-192-0/+112
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-201-0/+4
|\|
| * [Keyboard] Fix compilation issues for keycapsss kimiko (#18112)Drashna Jaelre2022-08-201-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-204-0/+84
|\|
| * [Keymap] Add Miryoku keymap for Hillside family (#18087)Davide Masserut2022-08-194-0/+84
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2019-0/+1164
|\|
| * [Keyboard] Add aliceh66 pianoforte (#18081)AliceH662022-08-1919-0/+1164
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2022-08-20550-1819/+1689
|\|
| * Move keyboard USB IDs and strings to data driven, pass 2: S-Y (#18093)Ryan2022-08-20119-386/+351
| |
| * Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090)Ryan2022-08-20146-452/+418
| |
| * Move keyboard USB IDs and strings to data driven, pass 2: P-R (#18091)Ryan2022-08-2098-375/+282
| |