summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-15[Keyboard] Added Lucid KB Scarlet [Maker KB] (#12748)Felix Jen
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-05-15[Keyboard] Add Chevron (#12762)Ramon Imbao
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-15[Keyboard] Add Rosa (#12884)Brandon Lee
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-15[Keyboard] Add Potato65 Hotswap keyboard (#12874)Aeonstrife
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-05-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-15[Keyboard] Add Frusta Fundamental (#12583)William Lam
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-15Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-05-14[Keyboard] Add Neopad macropad (#12614)rookiebwoy
2021-05-14Fix Marauder and add readme (#12906)Ryan
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-14[Keyboard] Add Marauder (#12550)Cosmin
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-05-14[Keyboard] split right shift iso layout for ok60 (#12890)Faehriss
2021-05-14TKC Portico: layout macro/Configurator touch-up (#12897)James Young
2021-05-14[Keyboard] Add UM-70 (#12556)duoshock
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: online <33636898+online@users.noreply.github.com>
2021-05-14[Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)Dave Vandyke
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keyboard] Added FJLabs Polaris (#12746)Felix Jen
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keymap] csc027/keymap-updates (#12694)csc027
2021-05-13[Keyboard] Add Studio Kestra Cascade PCB (#12704)studiokestra
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keyboard] Add Training Wheel 40 (#12542)KnoblesseOblige
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keyboard] Added smAllice (#12543)Brandon
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keyboard] update dactyl manuform 4x5 thumb cluster wiring(#12545)Nathaniel
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keyboard] Add fluxlab zplit keyboard (#12396)cccywj
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keyboard] Fix Alix40 layout (#12398)Ross Nelson
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keyboard] add feels/feels65 (#12426)Brandon Claveria
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Swiftrax <swiftrax@gmail.com>
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keyboard] Add Plaid-Pad Rev3 and oled keymap (#12464)Ben
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keyboard] Add pisces keyboard (#12287)knaruo
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keyboard][PloopyCo] Fix code for Mini and Nano Trackballs (#12889)Drashna Jaelre
2021-05-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keyboard] 60% keyboard with ISSI3733RGB IC (#11559)wangyifu
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-05-13[Keyboard] added yampad configuration to keyboard subfolder (#10112)Daveyr
* added yampad configuration to keyboard subfolder * Update keyboards/yampad/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * added debouncing algorithm, delay and a traditional layout * added link to readme * some missed conflicts resolved in readme and rule * Update readme.md * Update keyboards/yampad/keymaps/traditional/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/keymaps/traditional/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/keymaps/traditional/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/keymaps/traditional/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/keymaps/traditional/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/keymaps/traditional/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/keymaps/traditional/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/keymaps/traditional/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yampad/keymaps/traditional/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/yampad.c As suggested Co-authored-by: Drashna Jaelre <drashna@live.com> * Update readme.md Updated per suggestion * Update keymap.c Add MIT licence * Update keymap.c Added MIT licence to the traditional layout. * Update keyboards/yampad/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yampad/yampad.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/yampad/yampad.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * make cases numerical in .c file * corrected the bootloader in rules.mk * Update keyboards/yampad/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Richard <davey.richard@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-05-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keymap] Own/dactyl (#12624)Christian Eiden
2021-05-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13Add Gvalchca SpaccBoard (#12876)Gvalch-ca
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-05-13[Keymap] Add iris keymap 'boo' (#12749)Boo