summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add ability to enter bootloader mode from `QK_MAKE` (#17745)jack2022-07-233-14/+17
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-231-5/+10
|\
| * Fix test logic to check for both keymaps (#17761)Niko Wenselowski2022-07-231-5/+10
| | | | | | | | | | | | | | | | | | | | | | Python will evaluate first the left and then the right side of the and operator. The left side would previously return True based on the truthiness logic that treats any non-emptry string as true. It would not check if the desired keymap exists. If the left side is true it will evaluate the right side which will check for the existance of a specific keymap. With this change the check for existance of two keymaps is implemented.
* | (develop) Update bootmagic for Adafruit Macropad (#17755)jpe2302022-07-222-4/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-224-0/+346
|\|
| * Added autoclicker, better mouse, Vim like editing layer and more. (#15702)Yuannan2022-07-224-0/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added autoclicker, better mouse, vim like FN layer and more. * Updated docs to comply with guidelines * Fixed Imgur links * increased step sizes * updated readme to reflect step size * Added second delay array for autoclicker to compensate for RGB animation CPU loads * better RGB effects and updated docs * better README.md formatting * added DEBONCE libinput workaround for Linux * fixed formatting * fixed typos and clarified * fixed layer picture order * Update keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/dztech/dz65rgb/keymaps/yuannan/README.md Co-authored-by: Drashna Jaelre <drashna@live.com> * Updated Docs and rules * Updated with the new deferred exec API to ensure more consistant CPS * renamed README.md to be lower case to comply with fauxpark's request * Remapped alt to be left instead of right for compatibility reasons * Update keyboards/dztech/dz65rgb/keymaps/yuannan/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-223-4/+5
|\|
| * [Kay60] Change LED pin state and correct keycode. (#17746)mechlovin2022-07-223-4/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-221-0/+4
|\|
| * Fix compilation error in Ploopy Nano maddie keymap (#17733)Aidan Gauland2022-07-221-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-2213-0/+540
|\|
| * [Keyboard] Add Krush65 Hotswap (#16692)Sắn2022-07-2113-0/+540
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Krush65 Hotswap * Led fix * small fix * a * B * move ec action to VIA keymaps * Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md * Update keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk * Update readme.md * Update readme.md * Update readme.md * Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md * Update keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk * Update keyboards/sawnsprojects/krush/krush65/hotswap/info.json * Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md * Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md * Update keyboards/sawnsprojects/krush/krush65/hotswap/info.json * Update keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-211-0/+3
|\|
| * Add reviewer/labels to dependabot PRs (#17743)Joel Challis2022-07-211-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-211-1/+1
|\|
| * Bump JamesIves/github-pages-deploy-action from 4.3.4 to 4.4.0 (#17742)dependabot[bot]2022-07-211-1/+1
| |
* | Move Pointing Device Initialization (#17740)Drashna Jaelre2022-07-211-3/+4
| | | | | | | | | | Move Pointing Device Initialization to after Split Post Initialization If both pointing device and split is enabled, the pointing device init needs to be called after the split post init, otherwise the connection (serial/etc) isn't initialized yet, and any commands that need to send data over (such as calling the set cpi command) never get sent over.
* | Adafruit Macropad: Add VIA keymap, fix default km (#17735)jpe2302022-07-214-1/+142
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-211-12/+8
|\|
| * Jonavin mercutio - reduce mem footprint (#17498)jonavin2022-07-211-12/+8
| | | | | | | | | | | | | | * Reduce mem footprint - remove sprintf * remove stdio reference and use get_u8_str Co-authored-by: Jonavin <=>
* | Add Blok 2040 conversion (#17603)Albert Y2022-07-215-3/+57
| |
* | VIA Encoder Map Support (#17734)Wilba2022-07-212-1/+15
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-202-2/+2
|\|
| * [Keyboardo] Update PID for mechlovin zed60 (#17728)mechlovin2022-07-202-2/+2
| |
* | fix syntax error (#17732)mknj2022-07-201-1/+1
| |
* | Use Pro Micro pinout for SDA/SCL (#17595)Albert Y2022-07-201-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-205-66/+473
|\|
| * Add miniZone Keymap (#17552)takashicompany2022-07-205-66/+473
| |
* | docs: fix default value of USB_SUSPEND_WAKEUP_DELAY (#17501)Ben Fiedler2022-07-202-3/+5
| | | | | | Documents the change made in #12081
* | Move Pointing Device code to a subdirectory (#17684)Drashna Jaelre2022-07-206-4/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-209-0/+358
|\|
| * Added Windz Sinanju to QMK (#17566)Felix Jen2022-07-209-0/+358
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-203-0/+275
|\|
| * [Keymap] Michal Keymap for Sofle rev1 (#17610)Michal2022-07-193-0/+275
| |
* | Add support for PAW3204 Optical Sensor (#17669)Drashna Jaelre2022-07-196-1/+282
| | | | | | | | Co-authored-by: gompa <gompa@h-bomb.nl> Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-195-35/+40
|\|
| * Add rgb underglow support and change vendor_id (#17719)Duccio2022-07-205-35/+40
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-198-0/+597
|\|
| * [Keyboard] Waterfowl keyboard support (#16760)JW25862022-07-198-0/+597
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added waterfowl files * Completing PR Checklist * Added encoders to info.json * Added license to default keymap * Update keyboards/waterfowl/keymaps/cyanduck/keymap.c * Update keyboards/waterfowl/keymaps/default/keymap.c * Update keyboards/waterfowl/waterfowl.c * Update keyboards/waterfowl/keymaps/default/keymap.c * Update keyboards/waterfowl/waterfowl.c * Update keyboards/waterfowl/waterfowl.c * Update keyboards/waterfowl/keymaps/cyanduck/keymap.c * Update keyboards/waterfowl/rules.mk * Update readme.md * Update keyboards/waterfowl/waterfowl.c * Update keyboards/waterfowl/info.json * Update keyboards/waterfowl/info.json
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-193-50/+93
|\|
| * Add keymap for Radialex (#17662)takashicompany2022-07-193-50/+93
| | | | | | | | | | * fix keymap * fix keymaps
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-1911-0/+1205
|\|
| * [Keyboard] customMK EVO70 (#14907)David Hoelscher2022-07-1911-0/+1205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added files for EVO70 * updated info.json and readme * ran qmk lint and fixed typo in info.json * removed defines from config.h in favor of info.json * removed an unnecssary include * removed unnecessary code * updated rules.mk to remove mention of Bluetooth * corrected edit to rules.mk * added code for OLED menu display * removed extraneous comments and spaces * added bongo cat animation * Update keyboards/custommk/evo70/rules.mk * Update keyboards/custommk/evo70/config.h * Modified Bongocat graphics to match original proportions * updated info.json device version * updated OLED splash screen display timing * improved bongo cat tap detection and added backlight breathing to OLED menu * various improvements to OLED, saving settings, and VIA keymap fix * removed extraneous define * custom encoder assignment retained upon powerup, backlight sleep upon suspend * corrected bongo cat tap detection * Changed splash screen and bongo cat encoder rotation to use the custom assignments * removed _default from LAYOUT naming and changed keyboard image to be hosted from imgur * Force smaller version of image to be used in readme
* | Fix AVR compilation of FNV by using standard integer typenames. (#17716)Nick Brassel2022-07-191-4/+5
| |
* | [Keyboard] boardsource/microdox data driven (#17675)jack2022-07-1819-339/+238
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-196-42/+36
|\|
| * Update noroadsleft userspace and keymaps (2022-07-18) (#17714)James Young2022-07-186-42/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | * kbdfans/kbd75/rev1:noroadsleft - remove LAYOUT_75_ansi_wkl definition * coseyfannitutti/discipline:noroadsleft - change KC_GESC to KC_ESC * update Quantum keycode instances in noroadsleft keymaps - `RESET` -> `QK_BOOT` - `EEP_RST` -> `EE_CLR` - `DEBUG` -> `DB_TOGG` * create and add G_PWD macro
* | Remove full bootmagic config (#17702)Joel Challis2022-07-1910-38/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-181-1/+1
|\|
| * Remove Nixpkgs-provided `poetry` from the environment (#17673)Sergey Vlasov2022-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `poetry` package from the used Nixpkgs snapshot triggers the regex compatibility issue in Nix >= 2.10.0 binaries for `x86_64-darwin`: https://www.github.com/NixOS/nix/issues/4758 Remove the `poetry` package from the Nix shell environment for now (it is not really required to compile QMK, only to develop the Nix shell environment itself). In addition, all `poetry` version earlier than 1.1.14 became effectively non-functional after a breaking change of the PyPI JSON API: https://www.github.com/python-poetry/poetry/pull/5973 Updating the `poetry` package is not trivial (just adding it it to `pyproject.toml` does not work due to dependency version conflicts with other modules), therefore removing it seems to be the easiest solution to restore compatibility with new Nix versions while not creating any major inconvenience for QMK users.