summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-3029-2/+1133
|\
| * [Keyboard] Add OwLab Jelly Epoch (#14190)kb-elmo2021-08-3020-2/+907
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] add slamz keyboard (#14188)Rifaa Subekti2021-08-309-0/+226
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-301-0/+1
|\|
| * [Bug] Fix build error when enabling NO_HAPTIC_MOD (#14178)Purdea Andrei2021-08-301-0/+1
| | | | | | | | | | 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-309-0/+375
|\|
| * [Keyboard] add maker keyboards alexa (#14165)Felix Jen2021-08-309-0/+375
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-301-0/+23
|\|
| * [Keymap] Add peott-fr keymap for Kbd6x (#14164)peott-fr2021-08-301-0/+23
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-302-1/+14
|\|
| * [Keyboard] Changed ProductID on basketweav keyboards (#14162)Vincent Vorholter2021-08-302-1/+14
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Vince Vorholter <vince@28east.co.za>
* | Remove bin/qmk (#14231)Zach White2021-08-2914-114/+11
| | | | | | | | | | * Remove the bin/qmk script * remove bin/qmk from workflows
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-1/+7
|\|
| * ensure that the directory for sys.executable is in the user's path (#14229)Zach White2021-08-291-1/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-2913-17/+16
|\|
| * move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230)Zach White2021-08-2913-17/+16
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-21/+21
|\|
| * Nyquist (#14202)peott-fr2021-08-291-21/+21
| | | | | | | | | | | | | | | | | | * adding my Nyquist keymap * Updating Nyquist keymap with licensing. * Cleaning-up and improving Nyquist keymap. * Cleaning-up and improving Nyquist keymap.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-293-74/+86
|\|
| * Update the nix-shell environment (#13316)Sergey Vlasov2021-08-293-74/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 )
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-299-0/+581
|\|
| * [Keyboard] Add Viktus SP Mini (#14069)J.Flanagan2021-08-299-0/+581
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-296-11/+126
|\|
| * [Keyboard] Corrected layout for np24 by YMDK (#14096)Trent Hoh2021-08-296-11/+126
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-0/+97
|\|
| * [Keymap] My Prime E keymap (#14117)peott-fr2021-08-291-0/+97
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-299-0/+302
|\|
| * [Keyboard] Add kelownaRGB64 (#14141)Weirdo2021-08-299-0/+302
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-8/+19
|\|
| * [Keyboard] fix compile error `make helix/rev2/sc:all` (#14214)Takeshi ISHII2021-08-291-8/+19
| |
* | fix automatic directory for qmk lint (#14215)Zach White2021-08-281-5/+5
| |
* | Add check for non-assignment code in rules.mk (#12108)Zach White2021-08-291-41/+98
| | | | | | | | | | | | | | | | | | | | | | * Add check for non-assignment code in rules.mk * fix lint check * fix lint * fixup to reflect the final state of #8422 * fix lint
* | remove qmk console, which is now part of the global cli (#14206)Zach White2021-08-293-352/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-1/+10
|\|
| * Fixup upstream paths for submodules. (#14205)Nick Brassel2021-08-291-1/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-281-1/+1
|\|
| * Bootmagic lite docs clarity. (#14204)Nick Brassel2021-08-291-1/+1
| |
* | add 'include keyboard_features.mk' into build_keyboard.mk (#8422)Takeshi ISHII2021-08-292-0/+47
|/ | | | | | | | | | | * 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`
* Breaking changes develop merge to master, 2021Q3 edition. (#14196)Nick Brassel2021-08-295477-60000/+76245
|\
| * 2021Q3 pre-merge `develop` changelog, keyboard aliases (#14198)Nick Brassel2021-08-295-6/+683
| | | | | | | | | | | | | | | | | | | | | | | | | | * Initial changelog. * Data driven. * Submodule update. * Updated breaking changes docs. * Aliases. * Aliases.
| * [Docs] Add examples to RGB Matrix Indicators docs (#12797)Drashna Jaelre2021-08-271-0/+39
| |
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-269-0/+237
| |\ | |/ |/|
* | Add support for lazydesigners/cassette8 (#14145)jackytrabbit2021-08-269-0/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-2613-0/+418
| |\ | |/ |/|
* | New Keyboard - V4n4g0rth0n (#14152)jpuerto962021-08-2613-0/+418
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Update readme files (#14172)Joel Challis2021-08-2625-79/+74
| |
| * Move to correct location (#14171)Joel Challis2021-08-262-0/+0
| |
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-261-1/+1
| |\ | |/ |/|
* | Skeletn87 - Fix RGB pin (#14170)kb-elmo2021-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add Skeletn87 * update skeletn87 files * update skeletn87 soldered * update readme image * update readme (again) * fix skeletn87 indicator LEDs * fix led pin for production PCB
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-259-0/+442
| |\ | |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 08:49:49 +0000