summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-053-12/+255
|\
| * Mechlovin Infinity88 Layout Extension (#15058)James Young2021-11-053-12/+255
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-0516-0/+908
|\|
| * Add a new keyboard "Unicorne" (#12993)Yang Hu2021-11-0516-0/+908
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add keyboards/yanghu/unicorne initial files. * add default keymap to yanghu/unicorne * use slow i2c and enable internal pullup resistor * add oled to default keymaps * fix unicorne default keymap * fix encoder pad direction * fix marauder * add led matrix configs. * add encoder code to default keymap. * fix encoder direction * add readme, info.json and update copyright for c files. * fix build error by clean up include in unicorne.c * fix images in readme files * Fix various issues in PR #12993 feedback. * Added copyright in glcdfont, fix include in that file. * Removed `_kc` layout and renamed layout with generic style. * Moved capslock oled update to oled.c inside `oled_task_user()`. * Update keyboards/yanghu/unicorne/keymaps/default/rules.mk Always include oled.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/keymaps/default/oled.c Wrap `oled.c` with ifdef. Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/keymaps/default/oled.c Co-authored-by: Drashna Jaelre <drashna@live.com> * move oled code to unicorne.c, and set weakly. * Update keyboards/yanghu/unicorne/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/unicorne.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/yanghu/unicorne/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yanghu/unicorne/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yanghu/unicorne/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yanghu/unicorne/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yanghu/unicorne/keymaps/default/oled.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yanghu/unicorne/f411/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/yanghu/unicorne/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * remove oled.h * remove include of oled.h after the file is deleted. * Apply suggestions from code review: remove redundant macros and reformat. Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> * Apply suggestions from code review: change OLED driver macro. Use `OLED_ENABLE` instead of `OLED_DRIVER_ENABLE`. Co-authored-by: Jonathan Rascher <jon@bcat.name> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jonathan Rascher <jon@bcat.name>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-058-0/+572
|\|
| * My Personal Keymaps for the Planck and melody96 (#12672)devilzmods2021-11-058-0/+572
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * my planck keymap * my planck keymap * minor changes * Added personalized, VIA compatible keymap to the Melody96 * lighting layers added and keymap tweaked * added basic descriptions * added basic descriptions * added basic descriptions * added basic descriptions * hopefully removed personal change to .gitignore * restored .gitignore from my master * restored .gitignore from my master * requested changes and minor functionality tweaks * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-051-0/+10
|\|
| * Add example for turning off RGB colors and retaining indicator function (#14997)Albert Y2021-11-051-0/+10
| | | | | | | | | | | | | | * Add init function for solid effect with colors off * Restructure sentence Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-051-181/+160
|\|
| * Rework ISP flashing guide (#14938)Ryan2021-11-051-181/+160
| | | | | | | | Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-0521-0/+4020
|\|
| * add matrix abelx keyboard (#10968)yulei2021-11-0521-0/+4020
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add matrix abelx keyboard * Update keyboards/matrix/abelx/abelx.c Co-authored-by: Drashna Jaelre <drashna@live.com> * fixed rgb led pin issue * Apply suggestions from code review Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/matrix/abelx/aw9523b.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/matrix/abelx/aw9523b.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/matrix/abelx/abelx.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/matrix/abelx/abelx.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * fixed board name * Apply suggestions from code review Co-authored-by: Nick Brassel <nick@tzarc.org> * move led update from scan_kb to hoursekeeping_kb * move led update from scan_kb to housekeeping_kb Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-057-0/+541
|\|
| * [Keymap] foxx1337 for Massdrop CTRL with raw HID (#8692)foxx13372021-11-057-0/+541
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keymap] foxx1337's personal keymap * Add keymap based on ctrl default * Add 5 minute rgb matrix timeout * Add foxx1337 layout defaults * Add raw HID communication protocol * Add rgbmatrix to the raw HID protocol * Add readme * Modernize ctrl, shift, alt mods detection * Add GPL like copyright headers
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-046-255/+192
|\|
| * [Keyboard] Update Infinity87 rev. 2 (#14820)mechlovin2021-11-046-255/+192
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-11-054-4/+117
|\|
| * Fixup actions. (#15057)Nick Brassel2021-11-041-4/+8
| |
| * CLI: Add 'cd' subcommand (#12584)Erovia2021-11-053-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * CLI: Add 'cd' subcommand Go to your qmk_firmware dir with ease. * Fix for Windows and do not run if already under QMK Home * Make flake8 happy * Fix prompt for Windows * Make flake8 happy once again * I'll get it right eventually * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Add subcommand to __init__.py and fixup after rebase * Update Windows code to use milc's run * Unify the subshell starting with os.execl * Exit with error msg when output is redirected to non-TTY. * Revert Windows-specific code Co-authored-by: Ryan <fauxpark@gmail.com>
* | Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young2021-11-051286-1308/+1284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove BOOTMAGIC_ENABLE=lite setting * change keyboard BOOTMAGIC_ENABLE rules Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. * change keyboard BOOTMAGIC_ENABLE inline comments Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite". * change keymap BOOTMAGIC_ENABLE rules Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. * change keymap BOOTMAGIC_ENABLE inline comments Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite". * change layout/user BOOTMAGIC_ENABLE rules/comments Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite". * update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/ * remove docs references to Full Bootmagic * convert data-driven Bootmagic Lite instances * remove Bootmagic Lite bodge from data-driven generation * Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a * update docs/ja/config_options.md per mtei * update docs/faq_misc.md per mtei Remove remaining Full Bootmagic reference.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-0413-187/+90
|\|
| * Refactor new-keyboard to be python3.7 compatible (#14707)Mikkel Jeppesen2021-11-0513-187/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use copy_tree from distutils for python 3.7 support * Bump python version in docs * Changed new-keyboard to use printf-style format strings * Use username for manunfacturer / maintainer * Update lib/python/qmk/cli/new/keyboard.py Co-authored-by: Zach White <skullydazed@drpepper.org> Co-authored-by: Zach White <skullydazed@drpepper.org>
* | Map `PRODUCT` define to `keyboard_name` (#14372)Ryan2021-11-057-22/+24
| | | | | | | | | | | | | | * Map `PRODUCT` define to `keyboard_name` * Fix tests * Fix last test
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-042-9/+25
|\|
| * `qmk docs`: Run `docsify serve` if available (#15056)Ryan2021-11-052-9/+25
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-042-1/+2
|\|
| * [Keyboard] Reduce compile size for takashicompany compacx (#15054)Drashna Jaelre2021-11-042-1/+2
| |
* | [Keyboard] Fix keycode collision in craftwalk keymap (#15055)Drashna Jaelre2021-11-041-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-045-11/+245
|\|
| * Xelus Dawn60 Layout Macro Additions (#15049)James Young2021-11-045-11/+245
| | | | | | | | | | | | | | | | | | * add matrix diagrams to keyboard header files * rename LAYOUT_60_all to LAYOUT_all * add LAYOUT_60_ansi_arrow * add LAYOUT_60_tsangan_hhkb
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-0410-0/+739
|\|
| * [Keyboard] Add new keyboard "Compacx" (#14903)takashicompany2021-11-0310-0/+739
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Basic keycode overhaul (#14726)Ryan2021-11-0352-1081/+1135
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-0414-0/+800
|\|
| * [Keymap] added caps lock indicator for Keychron Q1 rev_0100 (#14653)Mike Killewald2021-11-0314-0/+800
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-049-0/+589
|\|
| * [Keyboard] Add the Kuku65 (#14910)Wolf Van Herreweghe2021-11-039-0/+589
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-041-6/+6
|\|
| * [Keyboard] Layout update to split89.h (#14930)jurassic732021-11-031-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-034-49/+70
|\|
| * Sets3n kk980 Layout Macro Refactor (#15039)James Young2021-11-034-49/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | * physically arrange layout macro Arranges the layout macro to resemble the keyboard layout, and updates the keymaps to match. * use 3-character notation for position identifiers in kk980.h * add matrix diagram to kk980.h * fix syntax error in info.json Apparently the API doesn't care about this error... but QMK Configurator does if you use the local import mode (Ctrl+Shift+I).
* | Remove deprecated KEYMAP alias (#15037)Joel Challis2021-11-0315-29/+16
| | | | | | | | | | | | | | * Remove deprecated KEYMAP alias * Remove some KEYMAP references * Remove some KEYMAP references
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-031-1/+1
|\|
| * steal_this_keyboard fix info.json macro reference (#15032)James Young2021-11-031-1/+1
| | | | | | - change LAYOUT to LAYOUT_split_3x5_2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-034-25/+28
|\|
| * Fix Rocketboard-16 QMK Configurator Implementation (#15028)James Young2021-11-034-25/+28
| | | | | | | | | | | | | | | | | | * rename LAYOUT_default to LAYOUT Only one layout is supported. * refactor keymaps - use short-form keycodes
* | [Keyboard] Reduce compile size for melgeek mach80 (#15034)Drashna Jaelre2021-11-032-1/+2
| |
* | Update to ChibiOS 20.3.4, support builds against trunk (#14208)Nick Brassel2021-11-0317-303/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add support for building against ChibiOS svn/trunk. * Swap to 21.6.x * Update to latest branch revision as released version is broken. * Updated configs. * Conf updates. * Updated ChibiOS * Convert STM32L422 to actual L422 ChibiOS platform. * Downgrade to 20.3.4 as ChibiOS 21.6.x is being aborted. * Rollback L422-based boards.
* | Fixup #15029 (#15031)Nick Brassel2021-11-021-2/+2