summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1214-0/+591
|\|
| * [Keyboard] Add KBIC65 keyboard (#15151)Karl B2022-01-1214-0/+591
| | | | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Karl Berggren <berggren.karl+git@gmail.com> Co-authored-by: spacefrogfeds <73514335+spacefrogfeds@users.noreply.github.com> Co-authored-by: Karl Berggren <karber@raysearchlabs.com>
* | move id67 (#15662)peepeetee2022-01-1220-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-124-0/+254
|\|
| * [Keymap] Planck Keymap: Inkwell (#14311)Kevin Hartley2022-01-124-0/+254
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-129-0/+290
|\|
| * [Keyboard] add AddOn macropad (#15841)Rifaa Subekti2022-01-129-0/+290
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | move @kakunpc 's keebs into kakunpc/ (#15814)peepeetee2022-01-12132-19/+19
| | | | | | Co-authored-by: kakunpc <15257475+kakunpc@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1218-0/+806
|\|
| * [Keyboard] Add Simpler60 support (#15499)EqualzC32022-01-1218-0/+806
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1212-0/+353
|\|
| * [Keyboard] Add Signature65 (#15698)onefiftynine2022-01-1212-0/+353
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-129-0/+437
|\|
| * [Keyboard] Add OwLab Spring (#15614)owlab-git2022-01-129-0/+437
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1210-17/+271
|\|
| * [Keyboard] Add Hex4B rev.2 PCB (#15811)mechlovin2022-01-1210-17/+271
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1215-61/+83
|\|
| * NoPunIn10Did Kastenwagen touch-up (#15836)James Young2022-01-1215-61/+83
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1113-178/+515
|\|
| * keyhive sofle rgb: fix configuration. (#15339)Will Winder2022-01-1113-178/+515
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * keyhive sofle rgb: fix configuration. * Add Colemak-DH and cycle layer keycode. * Fix indentation. * Add PLACEHOLDER for better readability. * Fix breaking changes. * Just one colemak. * PR Cleanup * Use NO_PIN definition instead of C7 * Define animations individually * Remove via json file and update documentation * Reduce LED brightness, one of the animations caused a crash * More PR feedback. * Better credit. * Disable NKRO. * Cleanup RGB configuration. * animations defined in keymap. * Update keyboards/sofle/keyhive/readme.md * PR Feedback. * Update phrasing from template. * Disable RGBLIGHT_ENABLE in keymap for better compatibility with default keymap. * Set a default animation. * Use default in keyboard readme. * Update keyboards/sofle/keyhive/info.json * Move via specific layout into via keymap.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-117-0/+265
|\|
| * [Keyboard] Carpolly (#15778)PollyV12022-01-117-0/+265
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1119-0/+1142
|\|
| * [Keyboard] handwire: 3dfoxc (#15739)dlgoodr2022-01-1111-0/+800
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] AMJ84 (#15742)peepeetee2022-01-118-0/+342
| |
* | [Keyboard] move @obosob 's boards into obosob/ (#15799)peepeetee2022-01-1119-3/+3
| |
* | [Keyboard] move @nacly 's boards to nacly/ (#15801)peepeetee2022-01-1117-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1117-94/+84
|\|
| * Correct matrix effect name (#15816)Albert Y2022-01-1114-14/+14
| |
| * [Keyboard] Add RGB matrix to CK60 (#15817)kb-elmo2022-01-113-80/+70
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-115-20/+185
|\|
| * [Keymap] Jonavin keymap kastenwagen48 (#15825)jonavin2022-01-114-0/+163
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Jonavin <=>
| * [Keyboard] Use correct callback in macro1 implementation (#15819)Fredrik Larsen2022-01-111-20/+22
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-111-9/+65
|\|
| * [Keyboard] Fix KBD67 mark 2 v4 (#15835)Drashna Jaelre2022-01-111-9/+65
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1112-0/+540
|\|
| * [Keyboard] Add Alicia Cook keyboard (#11722)Ibnu Daru Aji2022-01-1012-0/+540
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: robby-hartana <robby@alumagubi.com>
* | Fix CI. (#15828)Nick Brassel2022-01-1143-15/+15
| | | | | | * Fix CI.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1131-0/+1701
|\|
| * [m65] add via, new mcu gd32f303, stm32f401 weact support for encoder and led ↵Alin Marin Elena2022-01-1031-0/+1701
| | | | | | | | | | strip (#14381) Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-117-7/+199
|\|
| * [Keyboard] add kbd67mkiirgb v4 support (#15024)moyi46812022-01-107-7/+199
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-112-0/+157
|\|
| * [keymap] Add massdrop/ctrl R167 keymap (#15585)Winston Durand2022-01-102-0/+157
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1114-0/+716
|\|
| * [Keyboard] M60 simple 5x12 in lego keyboard (#15534)Alin Marin Elena2022-01-1014-0/+716
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * add m60 lego case, with stm32f401 * Update keyboards/mlego/m60/m60.h * Update keyboards/mlego/m60/keymaps/default/keymap.c * Update keyboards/mlego/m60/m60.h * Update keyboards/mlego/m60/keymaps/via/keymap.c * address the moving of enum in keymaps
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1133-0/+1430
|\|
| * [Keyboard] New kbd Navpad 1.0 (#15507)MakotoKurauchi2022-01-1033-0/+1430
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-1114-0/+1856
|\|
| * [Keyboard] Add system76/launch_1 keyboard (#15395)jecassis2022-01-1014-0/+1856
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |