summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-074-4/+4
|\|
| * name changeJane Bernhardt2021-01-074-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-064-2/+264
|\|
| * [Keymap] Xyverz's crkbd keymap (#11299)Xyverz2021-01-064-2/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial commit for my Corne keyboard layout. * Updates to Corne, etc. Finished working on primary layout for Corne keyboard. Cleaned up some comments for my 4x12 Ortho layout. * Changes for crkbd layout * Fixed the config.h to reflect using ee_hands * Added RGB configs to crkbd/corne layout Co-authored-by: Ian Sterling <503326@MC02YT9K9LVCF.tld>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-062-6/+6
|\|
| * [Keymap] Update NIBBLE ISO keymap (#11295)Jay Greco2021-01-062-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-067-0/+208
|\|
| * [Keyboard] add support for bigknob (#11291)Craig Gardner2021-01-067-0/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add support for bigknob Add support for bigknob macropad * corrected files * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * corrected tap dance * Update config.h * correct image link * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * added GPL headers * Update readme.md Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-069-0/+237
|\|
| * [Keyboard] add joypad keyboard (#11283)Brandon Claveria2021-01-069-0/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add joypad * add joypad keymaps * change pid * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/handwired/swiftrax/joypad/joypad.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/handwired/swiftrax/joypad/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/handwired/swiftrax/joypad/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Swiftrax <swiftrax@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-068-0/+347
|\|
| * [Keyboard] Add Louhi keyboard (#11244)Erkki Halinen2021-01-068-0/+347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Louhi QMK config * Modify info.json layout * change compile and flash examples * Tweak layout, change picture * Change pictures to Imgur hosted * Update keyboards/pohjolaworks/louhi/louhi.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/pohjolaworks/louhi/louhi.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/pohjolaworks/louhi/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/pohjolaworks/louhi/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/pohjolaworks/louhi/info.json Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/pohjolaworks/louhi/info.json Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/pohjolaworks/louhi/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/pohjolaworks/louhi/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/pohjolaworks/louhi/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pohjolaworks/louhi/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pohjolaworks/louhi/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erkki Halinen <erkki-eemeli.halinen@cgi.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-065-0/+290
|\|
| * [Keymap] Dbroqua alps64 poker (#11254)Damien2021-01-061-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Apple M5120] First iteration * Cleaned apple_m5120 files * Changes requested by PR * Update keyboards/apple_m5120/iso/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/apple_m5120/iso/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Added dbroqua keymap for ALPS64 * Removed other keyboard * Added volume keys * Added licence * Update keyboards/alps64/keymaps/dbroqua/keymap.c Co-authored-by: dbroqua <dbroqua@mousur.org> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] Added my lily58 keymap (#11258)Barabas2021-01-064-0/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added my keymap * Tidy up Add readme, run clang-format, remove some comments * Fixed some formatting issues * Update after reading PR checklist Add GPL header to keymap.c, remove backslash in LAYOUT macro * Use integer constants for switch labels * Remove unneeded code, remove F-keys from raise layer * Use program memory for some text on OLED * Fixed left over debug code * tidy up config.h and rules.mk Remove all unused defines from config.h, and remove options which are the same as the keyboard level make file. Enabled command to be able to toggle NKRO.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-067-0/+259
|\|
| * [Keyboard] Adding "Bigmac" 5x17 handwired by Taylore101 (#11204)Taylore1012021-01-067-0/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding bigmac handwired by taylore101 * Adding bigmac handwired by taylore101 * Updated Big Mac pin layout * Updated files from kbfirmware to newer qmk. Thanks drashna * Updated config file to have product and manufacturer info. Thanks again drashna * Update readme.md added missing picture of board layout * Update keyboards/handwired/bigmac/readme.md Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Taylor Graves <taylorgraves@BOS0005.local> Co-authored-by: Taylor Graves <taylorgraves@BOS0005.lan> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-066-0/+116
|\|
| * [Keymap] Add jian/keymaps/left_hand (#11196)KgOfHedgehogs2021-01-056-0/+116
| | | | | | | | | | | | | | | | | | | | | | * Add jian/keymaps/left_hand * Add jian/rev2/readme.md * Remove mod tap on mirrored layer * Add GPL2+ license header * Add gb version to readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0611-0/+327
|\|
| * [Keyboard] Add TMKL PCB (#11173)mechlovin2021-01-0511-0/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add * update * update indicator LED * Update keyboards/mechlovin/tmkl/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechlovin/tmkl/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: vuhopkep <boy9x0@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-061-0/+74
|\|
| * [Docs] Japanese translation of feature_rawhid.md (#10858)umi2021-01-061-0/+74
| | | | | | | | | | | | | | | | | | * add feature_rawhid.md translation * update files based on comments * update files based on comments * update files based on comments
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-063-103/+123
|\|
| * [Docs] Japanese translation of feature_led_indicators.md (#10960)umi2021-01-063-103/+123
| | | | | | | | | | | | | | * add feature_led_indicators.md translation * update related document * add link on _summary
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0612-0/+1693
|\|
| * [Keyboard] Sagittarius (#10896)Andrew Kannan2021-01-0512-0/+1693
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Sagittarius keyboard * Update Sagittarius keyboard * fix * remove info.json as it's very hard to make * Add license and address PR comments * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Add info json, update keymap * Fix info json * Update keymap * Update keyboards/cannonkeys/sagittarius/info.json Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0613-0/+1952
|\|
| * [Keyboard] Evolv75 (#10947)Álvaro A. Volpato2021-01-0513-0/+1952
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial support for Evolv75 * Fix encoder directional and layer support * Invert knob directions * Remove info.json and updated README * Update keyboards/evolv/evolv.c Update encoder_update call Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/evolv/config.h Remove description field from USB descriptors Co-authored-by: Drashna Jaelre <drashna@live.com> * Remove KC_NO define from default keymap * Update config.h New USB descriptor ID numbers * Update keyboards/evolv/rules.mk Remove words from bluetooth and audio enable comments Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/evolv/rules.mk Enable full bootmagic Co-authored-by: Ryan <fauxpark@gmail.com> * Add info.json for QMK Configurator * Edit copyright info, add VIA initial support * Fix KC_NO seven underscores issue in keymap definitions * Update info.json * Update info.json * ANSI and ISO layouts, info.json file with both * Reorganized layouts to match info.json order Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Fix compiling treadstone32/rev1 (#11447)Zach White2021-01-062-10/+9
| | | | | | | | | | * fix compiling treadstone32/rev1 * move most options back to top level rules.mk
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0510-0/+791
|\|
| * [Keyboard] add dz96 (#11252)kb-elmo2021-01-0510-0/+791
| | | | | | | | | | | | | | | | | | | | * add dz96 * Apply suggestions from code review * Update keyboards/dztech/dz96/keymaps/iso/keymap.c * add image to readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-051-1/+18
|\|
| * Add build debug option to tmk_core/rules.mk (#11324)Takeshi ISHII2021-01-061-1/+18
| | | | | | | | | | | | | | | | | | | | | | * Add DUMP_C_MACROS to tmk_core/rules.mk * update DUMP_C_MACROS * add VERBOSE_LD_CMD, VERBOSE_AS_CMD * add VERBOSE_C_CMD, VERBOSE_C_INCLUDE * update DUMP_C_MACROS, VERBOSE_C_INCLUDE, VERBOSE_C_CMD
* | Fix compiling squiggle/rev1Zach White2021-01-052-25/+24
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-051-1/+2
|\|
| * enable LTO to bring firmware size downZach White2021-01-051-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into developZach White2021-01-0530-135/+159
|\|
| * [Keyboard] Disable music mode on OctoPad to reduce sizeDrashna Jael're2021-01-051-3/+1
| |
| * [Keyboard] Fix compiler errors for Kingly Key boards (#11100)Drashna Jaelre2021-01-052-49/+45
| |
| * Migrate python tests away from onekey (#11367)Joel Challis2021-01-0527-82/+113
| | | | | | | | | | | | | | * Migrate python tests away from onekey * Add stub files to stop lint complaints * Make all the pytest keymaps compile
* | Set avr's bootloader_jump function to be weak (#11418)Dasky2021-01-041-1/+1
| | | | | | Co-authored-by: Dasky <dasky@nowhere>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-058-16/+19
|\|
| * Fix Tap-Hold Configs (#11127)Drashna Jaelre2021-01-048-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add proper prototypes for Tap-Hold Per Key functions * Fix handwired/tennie default keymap * Remove unneeded references * Fix tapping term per key check in space cadet * Pre-emptive fix for tap dance * Fix marksard/leftover30 * Replace hard coded tapping term with define
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-052-451/+289
|\|
| * Update MXSS custom rgblight and fix compilation errorfauxpark2021-01-042-451/+289
| |
* | Fix up build dependencies. (#11435)Nick Brassel2021-01-052-5/+15
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0410-0/+427
|\|
| * [Keyboard] Add handwired/evk (#11034)YangPiCui2021-01-0410-0/+427
| | | | | | | | | | | | | | | | | | | | | | |