summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-169-0/+376
|\
| * [Keyboard] Added Bolsa Supply Midway60 Keyboard (#12747)Felix Jen2021-05-159-0/+376
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1619-0/+1035
|\|
| * [Keyboard] Added Lucid KB Scarlet [Maker KB] (#12748)Felix Jen2021-05-159-0/+394
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Add Chevron (#12762)Ramon Imbao2021-05-1510-0/+641
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1617-0/+618
|\|
| * [Keyboard] Add Rosa (#12884)Brandon Lee2021-05-1517-0/+618
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1511-0/+345
|\|
| * [Keyboard] Add Potato65 Hotswap keyboard (#12874)Aeonstrife2021-05-1511-0/+345
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1510-0/+336
|\|
| * [Keyboard] Add Frusta Fundamental (#12583)William Lam2021-05-1510-0/+336
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-05-1517-297/+702
|\|
| * [Keyboard] Add Neopad macropad (#12614)rookiebwoy2021-05-1410-0/+387
| |
| * Fix Marauder and add readme (#12906)Ryan2021-05-147-297/+315
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1425-88/+1099
|\|
| * [Keyboard] Add Marauder (#12550)Cosmin2021-05-146-0/+297
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] split right shift iso layout for ok60 (#12890)Faehriss2021-05-141-0/+14
| |
| * TKC Portico: layout macro/Configurator touch-up (#12897)James Young2021-05-146-88/+97
| |
| * [Keyboard] Add UM-70 (#12556)duoshock2021-05-1412-0/+691
| | | | | | | | | | 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>
* | [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)Dave Vandyke2021-05-141-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-149-0/+371
|\|
| * [Keyboard] Added FJLabs Polaris (#12746)Felix Jen2021-05-139-0/+371
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1416-3/+613
|\|
| * [Keymap] csc027/keymap-updates (#12694)csc0272021-05-133-3/+38
| |
| * [Keyboard] Add Studio Kestra Cascade PCB (#12704)studiokestra2021-05-1313-0/+575
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-148-0/+4859
|\|
| * [Keyboard] Add Training Wheel 40 (#12542)KnoblesseOblige2021-05-138-0/+4859
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1411-0/+286
|\|
| * [Keyboard] Added smAllice (#12543)Brandon2021-05-1311-0/+286
| | | | | | Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-141-2/+2
|\|
| * [Keyboard] update dactyl manuform 4x5 thumb cluster wiring(#12545)Nathaniel2021-05-131-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-148-0/+301
|\|
| * [Keyboard] Add fluxlab zplit keyboard (#12396)cccywj2021-05-138-0/+301
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-141-5/+5
|\|
| * [Keyboard] Fix Alix40 layout (#12398)Ross Nelson2021-05-131-5/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-149-0/+246
|\|
| * [Keyboard] add feels/feels65 (#12426)Brandon Claveria2021-05-139-0/+246
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Swiftrax <swiftrax@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1416-14/+654
|\|
| * [Keyboard] Add Plaid-Pad Rev3 and oled keymap (#12464)Ben2021-05-1316-14/+654
| | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1413-0/+372
|\|
| * [Keyboard] Add pisces keyboard (#12287)knaruo2021-05-1313-0/+372
| | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-143-47/+26
|\|
| * [Keyboard][PloopyCo] Fix code for Mini and Nano Trackballs (#12889)Drashna Jaelre2021-05-133-47/+26
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1416-0/+1007
|\|
| * [Keyboard] 60% keyboard with ISSI3733RGB IC (#11559)wangyifu2021-05-139-0/+432
| | | | | | | | | | | | 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>
| * [Keyboard] added yampad configuration to keyboard subfolder (#10112)Daveyr2021-05-137-0/+575
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-133-0/+218
|\|
| * [Keymap] Own/dactyl (#12624)Christian Eiden2021-05-133-0/+218
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-1310-0/+472
|\|
| * Add Gvalchca SpaccBoard (#12876)Gvalch-ca2021-05-1310-0/+472
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 19:39:34 +0000