summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Keyboard] Add OwLab Jelly Epoch (#14190)kb-elmo
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30[Keyboard] add slamz keyboard (#14188)Rifaa Subekti
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Bug] Fix build error when enabling NO_HAPTIC_MOD (#14178)Purdea Andrei
Without this build would fail, if a keyboard had haptic feedback enabled, TAPPING_TOGGLE was not overridden in a config.h, and if NO_HAPTIC_MOD was defined in config.h.
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Keyboard] add maker keyboards alexa (#14165)Felix Jen
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Keymap] Add peott-fr keymap for Kbd6x (#14164)peott-fr
2021-08-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-30[Keyboard] Changed ProductID on basketweav keyboards (#14162)Vincent Vorholter
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Vince Vorholter <vince@28east.co.za>
2021-08-29Remove bin/qmk (#14231)Zach White
* Remove the bin/qmk script * remove bin/qmk from workflows
2021-08-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-29ensure that the directory for sys.executable is in the user's path (#14229)Zach White
2021-08-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-29move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230)Zach White
2021-08-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-29Nyquist (#14202)peott-fr
* adding my Nyquist keymap * Updating Nyquist keymap with licensing. * Cleaning-up and improving Nyquist keymap. * Cleaning-up and improving Nyquist keymap.
2021-08-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-29Update the nix-shell environment (#13316)Sergey Vlasov
* Nix: Allow calls to `bin/qmk` even when the build was started by `qmk` The `$PATH` modifications performed by the Nix wrapper for the `qmk` executable prevent `bin/qmk` from working properly (the changed `$PATH` contains a wrong `python3` executable which does not have the needed Python modules in its module path). As a workaround, disable the generation of that wrapper for the `qmk` Python package (there is yet another wrapper generated while building the Python environment, which would still set the Python module path properly when running `qmk`). Although `bin/qmk` is officially deprecated, QMK CLI still invokes it in some cases (at least `qmk doctor` and `qmk pytest`), therefore keeping these invocations working is useful. * Nix: Update `util/nix/pyproject.toml` to match `requirements*.txt` Update the Python dependency information used by Poetry to match the current state of the qmk_firmware code. * Nix: Bump QMK CLI dependency to 1.0.0; bump other Python deps Update Python dependencies for nix-shell to the most recent releases: - dotty-dict: 1.3.0 -> no longer used - milc: 1.4.2 -> 1.6.2 - pep8-naming: 0.11.1 -> 0.12.1 - pygments: 2.9.0 -> 2.10.0 - pyrsistent: 0.17.3 -> 0.18.0 - pyusb: 1.1.1 -> 1.2.1 - setuptools-scm: 6.0.1 -> no longer used - qmk: 0.1.0 -> 1.0.0 - qmk-dotty-dict: not used -> 1.3.0.post1 - yapf: 0.30.0 -> 0.31.0 Note to self: The command to update Python dependencies changed to: ( cd util/nix && nix run 'nixpkgs#poetry' -- update --lock )
2021-08-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-29[Keyboard] Add Viktus SP Mini (#14069)J.Flanagan
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-29[Keyboard] Corrected layout for np24 by YMDK (#14096)Trent Hoh
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-29[Keymap] My Prime E keymap (#14117)peott-fr
2021-08-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-29[Keyboard] Add kelownaRGB64 (#14141)Weirdo
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-29[Keyboard] fix compile error `make helix/rev2/sc:all` (#14214)Takeshi ISHII
2021-08-28fix automatic directory for qmk lint (#14215)Zach White
2021-08-29Add check for non-assignment code in rules.mk (#12108)Zach White
* Add check for non-assignment code in rules.mk * fix lint check * fix lint * fixup to reflect the final state of #8422 * fix lint
2021-08-29remove qmk console, which is now part of the global cli (#14206)Zach White
2021-08-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-29Fixup upstream paths for submodules. (#14205)Nick Brassel
2021-08-28Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-29Bootmagic lite docs clarity. (#14204)Nick Brassel
2021-08-29add 'include keyboard_features.mk' into build_keyboard.mk (#8422)Takeshi ISHII
* add 'include keyboard_features.mk' into build_keyboard.mk keyboard_features.mk is a keyboard-local version of the functions performed by common_features.mk. * add comment into build_keyboard.mk * added description of keyboard_features.mk in hardware_keyboard_guidelines.md. * rename `keyboard_features.mk` to `post_rules.mk`
2021-08-29Breaking changes develop merge to master, 2021Q3 edition. (#14196)Nick Brassel
2021-08-292021Q3 pre-merge `develop` changelog, keyboard aliases (#14198)Nick Brassel
* Initial changelog. * Data driven. * Submodule update. * Updated breaking changes docs. * Aliases. * Aliases.
2021-08-27[Docs] Add examples to RGB Matrix Indicators docs (#12797)Drashna Jaelre
2021-08-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-26Add support for lazydesigners/cassette8 (#14145)jackytrabbit
* Add support for lazydesigners/cassette8 Add support for lazydesigners/cassette8 * Update keyboards/lazydesigners/cassette8/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lazydesigners/cassette8/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lazydesigners/cassette8/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lazydesigners/cassette8/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lazydesigners/cassette8/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lazydesigners/cassette8/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lazydesigners/cassette8/info.json Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
2021-08-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-26New Keyboard - V4n4g0rth0n (#14152)jpuerto96
* General: Initial commit for v4n4g0rth0n * Remove unecessary things| * General: Fix info.json * Finalize changes * Update keyboards/v4n4g0rth0n/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/v4n4g0rth0n/v1/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/v4n4g0rth0n/v4n4g0rth0n.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/v4n4g0rth0n/v4n4g0rth0n.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/v4n4g0rth0n/v2/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/v4n4g0rth0n/v1/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-26Update readme files (#14172)Joel Challis
2021-08-26Move to correct location (#14171)Joel Challis
2021-08-26Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-26Skeletn87 - Fix RGB pin (#14170)kb-elmo
* add Skeletn87 * update skeletn87 files * update skeletn87 soldered * update readme image * update readme (again) * fix skeletn87 indicator LEDs * fix led pin for production PCB
2021-08-25Merge remote-tracking branch 'origin/master' into developQMK Bot
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-19 15:04:45 +0000