summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-11Merge remote-tracking branch 'upstream/master' into developJames Young
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
2021-08-11[Keyboard] Add Rune Vaengr Keyboard (#13945)Vicktor Hutama
* 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>
2021-08-11[Keyboard] Improvements to m122_3270 (#13947)jmaynard
Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
2021-08-11Poker87C and Poker87D Refactor (#13961)James Young
2021-08-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-11Update USB Device strings for VIA identification (#13962)James Young
2021-08-11[Userspace] Add custom tap dancing function (#13963)Kyle Xiao
2021-08-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-10[Keyboard] Added split plus layout to Cospad (#13938)Fernando Rodrigues
2021-08-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-10[Keyboard] Gorthage Truck - Rotary Encoder Switch Position (#13942)jpuerto96
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-11Hp69 - Update led logic (#13940)Ananya Kirti
Co-authored-by: zvecr <git@zvecr.com>
2021-08-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-11Fix shell port bug in computation of QMK_FIRMWARE_DIR (#13950)Eric S. Raymond
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.
2021-08-11Handwired/Stream_Cheap/2x4: Add via support (#13297)Luigi311
* 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>
2021-08-11add support for m65 and simple 5x13 ortholinear (#12315)Alin Marin Elena
* 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>
2021-08-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-10Improve the qmk lint readme check (#13941)Zach White
* improve lint readme check * improve if
2021-08-10Architecture documentation for Configurator and API (#13935)Zach White
* 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>
2021-08-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-10Update feature_wpm.md (#13936)Stefan Subich
Fix example markdown code formatting
2021-08-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-10Add padding to LUFA-MS .BIN files (#13922)Ryan
2021-08-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-09[Keyboard] Added pistachio_pro (#13466)rate
* Added pistachio_pro * Apply suggestions from code review * Apply suggestions from code review
2021-08-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-09adding my keymap "vayashiko" (#13049)Ryuki
* adding my keymap * changed some bugs * removed include keymap.h
2021-08-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-09Ristretto - Update bootloader (#13933)Brandon Lewis
* 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
2021-08-09Fix compliation for ferris 0.2 bling (#13937)Dasky
* Fix include
2021-08-09Merge remote-tracking branch 'upstream/master' into developJames Young
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
2021-08-09Remove backwards compatibility of debounce names (#13877)Joel Challis
* Remove backwards compatibility of debounce names * Update docs * Update keyboards/keymaps
2021-08-09Remove ONEHAND_ENABLE (#13920)Joel Challis
2021-08-09Limit RGB max brightness on KPrepublic BM-series keyboards (#13132)Daniil Yastremskiy
2021-08-09Fixup rgb matrix config for KBD67 mkII boards (#13931)Drashna Jaelre
2021-08-09Support all the 0.2 Ferris variants (#12653)Pierre Chevalier
* 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
2021-08-09[User] changes to nstickney's keymaps (#11456)Stick
0) Built a Bastyl, gave away the ErgoDoxEZ 1) UNICODEMAP 2) Iris left is now Elite-C 3) New QMK flashing instructions
2021-08-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-09[Keymap] new keymap for nui_mini (#13924)Edvard Sire
2021-08-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-09Make default keymap for GMMK Pro reflect stock (#13850)Andre Brait
2021-08-09[Keymap] Add kbd67 mkiirgb keymap (#13884)Pascal Pfeil
Co-authored-by: Spaceman <rionlion100@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-09[Keyboard] Add TouhouPad (#13915)Michele Ferri
* Touhoupad rev 2 * cleanup for PR * fixes after review
2021-08-09Merge remote-tracking branch 'origin/master' into developZach White
Conflicts: keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
2021-08-09Fix generate api (#13930)Zach White
* Add missing returncode to exit() * fix the aozora/hotswap vendor id
2021-08-09make json imports more robust (#13928)Zach White
2021-08-09[Keymap] rootiest for planck/rev6/ (#13294)Chris
* squashed commits to master * Fix in case of missing user_song_list Substitutes missing songs with safe versions Also updated and added detail to keymap readme * Adjust Readme to match qmk contrib conventions * Update keyboards/planck/keymaps/rootiest/config.h * Update keyboards/planck/keymaps/rootiest/keymap.c * Update keyboards/planck/keymaps/rootiest/keymap.c * Update keyboards/planck/keymaps/rootiest/keymap.c * Update keyboards/planck/keymaps/rootiest/keymap.c * Fixed license header to GPLv2+ * Fix Volume key delay Use a static number instead of removed MEDIA_KEY_DELAY * Use TAP_CODE_DELAY * added license to config.h * Clean up formatting - Fixed markdown in readme - Removed extra commented line from config.h * Update keyboards/planck/keymaps/rootiest/config.h
2021-08-08[Keyboard] Undead 60M (#13735)jfescobar18
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 06:35:03 +0000