summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-091-2/+8
|\
| * [Keyboard] Valor FRL TKL update - EEPROM change (#11163)Xelus222020-12-091-2/+8
| | | | | | | | | | | | | | * valor fix * change eeprom * fix up eeprom
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-094-4/+4
|\|
| * Fixup config template to match <> instead of "" for includes. (#11166)Nick Brassel2020-12-094-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-092-33/+50
|\|
| * Fix titan60 and h660 error_log complaints (#11124)Ryan2020-12-092-33/+50
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2020-12-0989-47/+4479
|\|
| * [Keymap] Fix rules.mk for nullbits nibble oled keymap (#11142)Jay Greco2020-12-081-1/+1
| |
| * [Keyboard] Geekboards Macropad V2 keyboard (#11045)Sergey Omelchenko2020-12-0815-0/+1810
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial commit of Geekboards Macropad V2 keyboard * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * Apply suggestions from code review: delete unnecessary files * Fixed typos * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Change RGB_MATRIX config syntax following recent core changes * Apply suggestions from drashna code review * Remove unnecessary file (it is now defined in the core) * Remove unnecessary code, due to PR 11084 approve Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Fixed taleguers75 info.json (#11121)Borja López Jiménez2020-12-081-10/+10
| |
| * Add missing hardware availability for Plank EZ (#11069)Charles A Moonen2020-12-081-1/+1
| | | | | | Add missing information needed to mirror the supported hardware in the previous line
| * [Keyboard] Big Dill Extended by MechWild (#11047)Kyle McCreery2020-12-0825-0/+774
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] New Keyboard - BDE Added the Big Dill Extended by MechWild * Corrected pinout for righty config Corrected the copied line from the lefty config that had not been updated prior to this commit. * Corrected the files that had been overwritten with old versions during testing. * Update keyboards/mechwild/bde/lefty/config.h * Made changes based on suggestions. Added GPL and split preference config.h lines into keymap level. * Apply suggestions from code review Readme cleanup * Update keyboards/mechwild/bde/lefty/keymaps/fancy/config.h * Update keyboards/mechwild/bde/lefty/keymaps/via/config.h * Apply suggestions from code review Corrects a stray style line in one of the readme files as well as correcting the name of the keymap layout from the inaccurate 3x14 name to just "layout"
| * add via layout for aek2 usb pcb (#11125)kb-elmo2020-12-083-0/+40
| |
| * [Keyboard] Add nt980 (#11092)Evy Dekkers2020-12-079-0/+739
| | | | | | | | | | * Add nt980 * update LED configuration
| * [Keyboard] New keyboard SLZ40 (#11088)sithlord1212020-12-078-0/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New SLZ40 keyboard new keyboard added * Update readme.md * Update info.json * Delete slz40_default.hex * Update keyboards/slz40/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/slz40/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update readme.md * Update readme.md Co-authored-by: Joel Challis <git@zvecr.com>
| * [Keyboard] Add Bastyl keyboard (#11085)Quentin2020-12-077-0/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add bastyl * no need to copy the folder anymore * clean up according to PR rules * remove via, fix disposition * add reset button on right half * Update readme.md * Update keyboards/hidtech/bastyl/bastyl.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hidtech/bastyl/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hidtech/bastyl/config.h Co-authored-by: Joel Challis <git@zvecr.com> * move json, remove via files * Update keyboards/hidtech/bastyl/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hidtech/bastyl/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hidtech/bastyl/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hidtech/bastyl/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * add GPL to c and h files * Update keyboards/hidtech/bastyl/info.json Change order to match layout macro Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hidtech/bastyl/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * serial define can be ommited, is used by default Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Add customMK Genesis Macro Pad (#11080)David Hoelscher2020-12-0713-0/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | * Adding customMK Genesis keyboard and keymap files * Updated readme.md fixed a typo * Fixed code for QMK PR * Updated syntax in config.h and changed dfu to flash in readme Co-authored-by: Ray <ray@custommk.com>
| * [Keymap] sneakbox keymap and userspace code (redo) (#10977)stanrc852020-12-074-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add support for LAYOUT_alice to sneakbox pcb * define variables for sneakbox led pins * set rules for sneakbox pcb * add rotary encoder to userspace * fix rotary function * add custom layer indicators for sneakbox * Revert "Add support for LAYOUT_alice to sneakbox pcb" This reverts commit 5ed94d8d897de6ef4f7a349368a6342cef5eff06. * add license header * Use KEYBOARD_sneakbox_aliceclone * cleaned up indicator code
| * Fix lineending in mt84 files (#11150)Erovia2020-12-072-35/+35
| |
* | ChibiOS conf migration: dekunukem/duckypad (#11123)Nick Brassel2020-12-083-1366/+83
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-079-0/+451
|\|
| * add mt84 keyboard (#10857)maikong2020-12-079-0/+451
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-0716-0/+591
|\|
| * Eek! keyboard firmware merge into QMK (#11020)James Smith2020-12-0716-0/+591
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-073-0/+58
|\|
| * Add VIA support for E88 (#11065)monjebf2020-12-073-0/+58
| | | | | | | | | | | | * Add VIA support for E88 * Update keyboards/e88/keymaps/via/keymap.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-064-0/+243
|\|
| * [Keymap] Adding encg keymap for 2% Milk keyboard (#11041)encg2020-12-064-0/+243
| | | | | | | | | | | | | | * adding my keymap * Updating coding convention and style for new keymap PR * Added GPL license header and to-do list to readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-061-0/+1
|\|
| * Use patch bump for auto tagging workflow (#11137)Joel Challis2020-12-061-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-066-86/+126
|\|
| * handwired/videowriter: oleg keymap update, via keymap (#10984)Dmitry Nosachev2020-12-066-86/+126
| | | | | | | | | | | | | | | | | | | | | | * oleg keymap update, via keymap * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * via keymap use default bootloader Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-0610-0/+1661
|\|
| * [Keyboard] Add Lasgweloth (#10944)Álvaro A. Volpato2020-12-0610-0/+1661
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial Lasgweloth PCB support * Fix column attribution * Fix Col1 pin assignment * New xoxotus layout and revised README * Removed KC_NO definition * Update keyboards/acheron/lasgweloth/config.h Remove USB DESCRIPTION filed from config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/acheron/lasgweloth/rules.mk Remove unnecessary comment lines on rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update readme.md Update readme.md Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-069-0/+358
|\|
| * [Keyboard] Added a dactyl promicro rah (#10889)Ralph Azucena2020-12-069-0/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added a dactyl promicro with a slightly different 6x6 layout * updated keyboard layout * Removed description as per code review * refactored as per code review * removed redundant config.h file * removed and updated a couple of lines in rules.mk * replaced symlink with copy of file * removed lines in readme * Update readme.md Co-authored-by: ralphie02 <ralph.azucena@carbon60.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-068-0/+314
|\|
| * [Keyboard] Latin47ble bluetooth keyboard (#11023)haierwangwei20052020-12-068-0/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create rules.mk * Create glcdfonr.c * Create keymap.c * Create keymap.c * Create rules.mk * Add files via upload * Update readme.md * Update readme.md * Update readme.md * Update config.h * Update 10bleoledhub.h * Update 10bleoledhub.c * Update info.json * Update keymap.c * Update keymap.c * Rename glcdfonr.c to glcdfont.c * Update config.h * Update config.h * Update config.h * Update rules.mk * Update 10bleoledhub.c * Update 10bleoledhub.h * Update info.json * Update config.h * Update rules.mk * Update keymap.c * Update keymap.c * Update glcdfont.c * Update keyboards/10bleoledhub/rules.mk * Update keyboards/10bleoledhub/keymaps/via/keymap.c * Update keyboards/10bleoledhub/keymaps/default/keymap.c * Update keyboards/10bleoledhub/config.h * Update keyboards/10bleoledhub/config.h * Update keyboards/10bleoledhub/10bleoledhub.h * Create readme.md * Create rules.mk * Create latin47ble.h * Create latin47ble.c * Create info.json * Create config.h * Create keymap.c * Create rules.mk * Create keymap.c * Update keymap.c * Update keyboards/latin47ble/keymaps/default/keymap.c * Update keymap.c * Update keyboards/latin47ble/keymaps/via/keymap.c * Update keyboards/latin47ble/rules.mk * Update keyboards/latin47ble/rules.mk * Update keyboards/latin47ble/rules.mk * Update latin47ble.h * Update latin47ble.c * Update latin47ble.h * Update latin47ble.c * Update keymap.c * Update keymap.c * Update config.h * Update keyboards/latin47ble/config.h * Update keyboards/latin47ble/config.h * Update keyboards/latin47ble/config.h * Update keyboards/latin47ble/config.h * Update keyboards/latin47ble/keymaps/via/keymap.c * Update keyboards/latin47ble/rules.mk * Delete info.json * Update readme.md * Update keymap.c * Update keymap.c * Update keyboards/latin47ble/config.h * Update keyboards/latin47ble/config.h * Update keyboards/latin47ble/keymaps/default/keymap.c * Update keyboards/latin47ble/latin47ble.c * Update keyboards/latin47ble/latin47ble.h * Update keyboards/latin47ble/keymaps/via/keymap.c * Update keymap.c * Update keymap.c * Update latin47ble.h * Update keymap.c * Update keymap.c * Update keymap.c * Update keymap.c * Update keyboards/latin47ble/keymaps/default/keymap.c * Update keyboards/latin47ble/keymaps/default/keymap.c * Update keyboards/latin47ble/latin47ble.h * Update keyboards/latin47ble/keymaps/default/keymap.c * Update keyboards/latin47ble/keymaps/via/keymap.c * Update keyboards/latin47ble/rules.mk
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-062-22/+32
|\|
| * CI: Add workflow for tagging essential modified files (#7384)Joel Challis2020-12-062-22/+32
| | | | | | | | | | | | | | | | | | * Add workflow for tagging essential modified files * Update inline with recent actions * align rules to labeler * Update .github/workflows/auto_tag.yaml
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-061-13/+21
|\|
| * Revert back to the old matrix (Take the blue pill) (#10568)MechMerlin2020-12-061-13/+21
| | | | | | | | | | * revert back to the old matrix. * apparently I can't count, J is the 19th not the 20th column
* | Merge remote-tracking branch 'origin/master' into developQMK Bo