summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-08-12128-1925/+5388
|\
| * Update config.h for kbdfans/kbd67/mkiirgb/v3 (#13978)Vino Rodrigues2021-08-121-1/+1
| | | | | | QMK Configurator does not compile - needs a value on RGB_DISABLE_WHEN_USB_SUSPENDED
| * [Keymap] add kuatsure planck keymap (#10625)Jarrett Drouillard2021-08-127-13/+371
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add Launch Pad keymaps (#12490)Luis Godinez2021-08-129-246/+923
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Update to customMK Genesis (#12511)David Hoelscher2021-08-1229-85/+764
| | | | | | Co-authored-by: Ray <ray@custommk.com>
| * [Keyboard] Add Spacey keyboard firmware (#12599)Vanilla2021-08-128-0/+357
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: tfjones24 <tannerfj24@gmail.com>
| * [Keyboard] Add Tripel keyboard (#12635)Paul James2021-08-1215-0/+429
| |
| * [Keyboard] Keyprez rhino (#13035)Christian Sandven2021-08-1212-0/+811
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Fix incorrect RGBLED_NUM value for kbd67 (#13166)Miles Flavel2021-08-120-0/+0
| |
| * [Keyboard] Add Skeletyl keyboard (#13495)Quentin2021-08-127-0/+320
| | | | | | | | | | Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] JJerrell - Add Userspace and ZSA Keyboard Keymaps (#13548)Jacob Jerrell2021-08-1240-1575/+1399
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-129-0/+589
|\|
| * [Keyboard] Add EndZone34 (#13847)sato-takashi2021-08-129-0/+589
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-121-15/+41
|\|
| * Cospad Configurator touch-up (#13971)James Young2021-08-121-15/+41
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-129-0/+438
|\|
| * [Keyboard] Add Edda Keyboard (#13953)arnstadm2021-08-129-0/+438
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keymap] Add andrebrait layout for GMMK Pro (#13932)Andre Brait2021-08-128-3/+342
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-123-0/+325
|\|
| * [Keymap] Add lily58 datadavd layout (#13560)David Dansby2021-08-113-0/+325
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-129-0/+241
|\|
| * [Keyboard] add Gin V2 keyboard (#13943)Rifaa Subekti2021-08-119-0/+241
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-129-0/+247
|\|
| * [Keyboard] add Wang V2 keyboard (#13948)Rifaa Subekti2021-08-119-0/+247
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-08-1131-146/+961
|\| | | | | | | | | | | | | | | | | Fixes merge conflicts in: - keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk - Conflicts from PR 13961 - keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c - Conflict from PR 13947
| * [Keyboard] Add Rune Vaengr Keyboard (#13945)Vicktor Hutama2021-08-1110-0/+449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial commit * fixed layout * enabled NKRO * removed qmkbest * changed the pins and bootloader to the mcu version * updated readme * Apply suggestions from code review thank you @drashna Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Improvements to m122_3270 (#13947)jmaynard2021-08-116-14/+141
| | | | | | Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
| * Poker87C and Poker87D Refactor (#13961)James Young2021-08-1112-120/+360
| |
| * Update USB Device strings for VIA identification (#13962)James Young2021-08-113-7/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-118-0/+414
|\|
| * [Userspace] Add custom tap dancing function (#13963)Kyle Xiao2021-08-118-0/+414
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-111-0/+31
|\|
| * [Keyboard] Added split plus layout to Cospad (#13938)Fernando Rodrigues2021-08-101-0/+31
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-115-19/+16
|\|
| * [Keyboard] Gorthage Truck - Rotary Encoder Switch Position (#13942)jpuerto962021-08-105-19/+16
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-111-1/+1
|\|
| * Hp69 - Update led logic (#13940)Ananya Kirti2021-08-111-1/+1
| | | | | | Co-authored-by: zvecr <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-101-1/+1
|\|
| * Fix shell port bug in computation of QMK_FIRMWARE_DIR (#13950)Eric S. Raymond2021-08-111-1/+1
| | | | | | | | | | Previous code would fail if cd echoes the tathet directory to stdout, which is pretty common. Redirecting its output to /dev/null solves the problem.
* | Handwired/Stream_Cheap/2x4: Add via support (#13297)Luigi3112021-08-116-3/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Handwired/Stream_Cheap/2x4: Add via support Signed-off-by: Luigi311 <luigi311.lg@gmail.com> * Handwired/Stream_Cheap: Update readme for via Signed-off-by: Luigi311 <luigi311.lg@gmail.com> * Handwired/Stream_Cheap/2x4: Add 2x4 to via json Signed-off-by: Luigi311 <luigi311.lg@gmail.com> * Handwired/Stream_Cheap/2x4: Add GPL2+ License to keymap Signed-off-by: Luigi311 <luigi311.lg@gmail.com>
* | add support for m65 and simple 5x13 ortholinear (#12315)Alin Marin Elena2021-08-1119-0/+741
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add support for m65 and simple 5x13 ortholinear * Update keyboards/m65/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Update keyboards/m65/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Update keyboards/m65/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Update keyboards/m65/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Update keyboards/m65/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Update keyboards/m65/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * updates as per @sigprof review plus reformat * pins all now are defined at microcontroller level * profuct id defined at microcontroller level * put leds on when _ADJ is on * add danish keymap * make default uk centric iso as per readme * default is now iso generic, uk is its own business * add license * update imgur links to reflect the layout * leds for _ADJ layer now do not prevent the other layers leds to get on * Update keyboards/m65/keymaps/uk/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/m65/keymaps/dk/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/m65/keymaps/uk/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/m65/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * add support for gd32f303cct6 by we act in rev2 * Revert "add support for gd32f303cct6 by we act in rev2" This reverts commit 4ad3834925508b79f2ff9fd5526dfc39f07fa3bc. * Update keyboards/m65/rev1/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/m65/keymaps/dk/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/m65/keymaps/uk/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/m65/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * remove empty hal * add capslock * Update keyboards/m65/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/m65/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Alin M Elena <alin-marin.elena@stfc.ac.uk> Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-105-4/+71
|\|
| * Improve the qmk lint readme check (#13941)Zach White2021-08-101-4/+5
| | | | | | | | | | * improve lint readme check * improve if
| * Architecture documentation for Configurator and API (#13935)Zach White2021-08-104-0/+66
| | | | | | | | | | | | | | | | | | * Architecture documentation for the configurator and api * Apply suggestions from code review Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-101-0/+2
|\|
| * Update feature_wpm.md (#13936)Stefan Subich2021-08-101-0/+2
| | | | | | Fix example markdown code formatting
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-101-0/+5
|\|
| * Add padding to LUFA-MS .BIN files (#13922)Ryan2021-08-101-0/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1017-0/+1370
|\|
| * [Keyboard] Added pistachio_pro (#13466)rate2021-08-0917-0/+1370
| | | | | | | | | | | | | | | | * Added pistachio_pro * Apply suggestions from code review * Apply suggestions from code review