summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-103-0/+255
|\|
| * adding my keymap "vayashiko" (#13049)Ryuki2021-08-093-0/+255
| | | | | | | | | | | | | | * adding my keymap * changed some bugs * removed include keymap.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-091-1/+1
|\|
| * Ristretto - Update bootloader (#13933)Brandon Lewis2021-08-091-1/+1
| | | | | | | | | | * updated bootloader for 32u4 mcu Should be atmel-dfu instead of caterina as the mcu is integrated instead of on a pro-micro/elite-c
* | Fix compliation for ferris 0.2 bling (#13937)Dasky2021-08-091-1/+1
| | | | | | * Fix include
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-08-0939-384/+815
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes merge conflicts in: - keyboards/bm40hsrgb/config.h - Conflict from PR 13132: - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch - updated file with changes from master branch - keyboards/keebio/iris/keymaps/nstickney/keymap.c - Conflict from PR 11456: - layer_state_set_user() updated in develop branch, removed in master branch - updated file with changes from master branch
| * Limit RGB max brightness on KPrepublic BM-series keyboards (#13132)Daniil Yastremskiy2021-08-096-10/+29
| |
| * Support all the 0.2 Ferris variants (#12653)Pierre Chevalier2021-08-0921-11/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Support all the 0.2 Ferris variants For the Compact, the High and the Mini, create a new directory so each keyboard may have the correct USB descriptor and a readme with more specific information about it. For the Bling, also add support for the underglow functionality. Change the "MANUFACTURER" string to "Cuddly Keyboards Ltd.", the name of the company I incorporated to sell keyboards, and change the default descriptor from "Ferris the keeb" to "Ferris 0.2" which is more descriptive. I didn't update the 0.1 variants as I don't intend to sell these kits with "Cuddly Keyboards". The firmware is mostly there to support existing users. Update the "hardware availability" to point to my new website: cuddlykeyboards.com. * Add RGB mode toggle to my keymap and to the default keymap * Improve wording in the readme
| * [User] changes to nstickney's keymaps (#11456)Stick2021-08-0912-362/+477
| | | | | | | | | | | | 0) Built a Bastyl, gave away the ErgoDoxEZ 1) UNICODEMAP 2) Iris left is now Elite-C 3) New QMK flashing instructions
* | Remove backwards compatibility of debounce names (#13877)Joel Challis2021-08-0911-56/+10
| | | | | | | | | | | | | | * Remove backwards compatibility of debounce names * Update docs * Update keyboards/keymaps
* | Remove ONEHAND_ENABLE (#13920)Joel Challis2021-08-095-7/+3
| |
* | Fixup rgb matrix config for KBD67 mkII boards (#13931)Drashna Jaelre2021-08-094-340/+198
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-092-0/+199
|\|
| * [Keymap] new keymap for nui_mini (#13924)Edvard Sire2021-08-092-0/+199
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-093-0/+87
|\|
| * [Keymap] Add kbd67 mkiirgb keymap (#13884)Pascal Pfeil2021-08-093-0/+87
| | | | | | | | Co-authored-by: Spaceman <rionlion100@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Make default keymap for GMMK Pro reflect stock (#13850)Andre Brait2021-08-095-24/+51
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-098-0/+170
|\|
| * [Keyboard] Add TouhouPad (#13915)Michele Ferri2021-08-098-0/+170
| | | | | | | | | | | | | | * Touhoupad rev 2 * cleanup for PR * fixes after review
* | Merge remote-tracking branch 'origin/master' into developZach White2021-08-0935-18/+3370
|\| | | | | | | | | Conflicts: keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 04:07:51 +0000