bab997c8c4
Merge remote-tracking branch 'origin/master' into develop
4 years ago
bdd0a6c097
[Keyboard] Addition of VIA keymap and a few fixes for naked60 ( #14225 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
4 years ago
4d4c61f2e8
Merge remote-tracking branch 'origin/master' into develop
4 years ago
f2c9e82e5b
cherry pick tidy up ( #14244 )
4 years ago
a163d34abc
Merge remote-tracking branch 'origin/master' into develop
4 years ago
1e7117317f
Documentation: Fix links in key overrides ( #14228 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
4 years ago
25a2502216
Merge remote-tracking branch 'origin/master' into develop
4 years ago
5ed8edae49
Update ws2812_spi.c ( #14237 )
4 years ago
15710db4ad
Move feature suspend logic out of platform specific code ( #14210 )
4 years ago
cf28feaf4d
Merge remote-tracking branch 'origin/master' into develop
4 years ago
2dc07391bd
[Keyboard] Add Iris Rev. 5 ( #13934 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
4 years ago
d770e273e1
Merge remote-tracking branch 'origin/master' into develop
4 years ago
27aebba1b1
[Keymap] Add new snailmap keymap to nullbitsco/nibble keyboard ( #14024 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
4 years ago
3f4d39ec84
Merge remote-tracking branch 'origin/master' into develop
4 years ago
c9283f4c1f
[Keyboard] Add OwLab Jelly Epoch ( #14190 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
4 years ago
b63114ea29
[Keyboard] add slamz keyboard ( #14188 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
4 years ago
3471b2ac89
Merge remote-tracking branch 'origin/master' into develop
4 years ago
9583f9f589
[Bug] Fix build error when enabling NO_HAPTIC_MOD ( #14178 )
...
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.
4 years ago
4853ca1437
Merge remote-tracking branch 'origin/master' into develop
4 years ago
949cfd4632
[Keyboard] add maker keyboards alexa ( #14165 )
4 years ago
9a888a5ec5
Merge remote-tracking branch 'origin/master' into develop
4 years ago
557fce7a8e
[Keymap] Add peott-fr keymap for Kbd6x ( #14164 )
4 years ago
5b4f63c45f
Merge remote-tracking branch 'origin/master' into develop
4 years ago
9d32cb68c3
[Keyboard] Changed ProductID on basketweav keyboards ( #14162 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Vince Vorholter <vince@28east.co.za>
4 years ago
596c4a1f87
Remove bin/qmk ( #14231 )
...
* Remove the bin/qmk script
* remove bin/qmk from workflows
4 years ago
b46064a891
Merge remote-tracking branch 'origin/master' into develop
4 years ago
baa423004a
ensure that the directory for sys.executable is in the user's path ( #14229 )
4 years ago
92e606b927
Merge remote-tracking branch 'origin/master' into develop
4 years ago
b705020daf
move everything from qmkfm/base_container to qmkfm/qmk_cli ( #14230 )
4 years ago
5fbfab1f3b
Merge remote-tracking branch 'origin/master' into develop
4 years ago
13a2da973f
Nyquist ( #14202 )
...
* adding my Nyquist keymap
* Updating Nyquist keymap with licensing.
* Cleaning-up and improving Nyquist keymap.
* Cleaning-up and improving Nyquist keymap.
4 years ago
532bff7b6c
Merge remote-tracking branch 'origin/master' into develop
4 years ago
a1866a962c
Update the nix-shell environment ( #13316 )
...
* 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 )
4 years ago
d227c8692a
Merge remote-tracking branch 'origin/master' into develop
4 years ago
ef7fdee6c8
[Keyboard] Add Viktus SP Mini ( #14069 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
4 years ago
55d6956553
Merge remote-tracking branch 'origin/master' into develop
4 years ago
f87cd8e8a0
[Keyboard] Corrected layout for np24 by YMDK ( #14096 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
4 years ago
8800adc533
Merge remote-tracking branch 'origin/master' into develop
4 years ago
94d7635a4a
[Keymap] My Prime E keymap ( #14117 )
4 years ago
7209d7cca9
Merge remote-tracking branch 'origin/master' into develop
4 years ago
5d5668c3f8
[Keyboard] Add kelownaRGB64 ( #14141 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
4 years ago
77a93fec79
Merge remote-tracking branch 'origin/master' into develop
4 years ago
9afc64cd61
[Keyboard] fix compile error `make helix/rev2/sc:all` ( #14214 )
4 years ago
c729df09ca
fix automatic directory for qmk lint ( #14215 )
4 years ago
566d598516
Add check for non-assignment code in rules.mk ( #12108 )
...
* Add check for non-assignment code in rules.mk
* fix lint check
* fix lint
* fixup to reflect the final state of #8422
* fix lint
4 years ago
f155865804
remove qmk console, which is now part of the global cli ( #14206 )
4 years ago
1ac3b3e9b6
Merge remote-tracking branch 'origin/master' into develop
4 years ago
dd8922d482
Fixup upstream paths for submodules. ( #14205 )
4 years ago
7b8cdfc19d
Merge remote-tracking branch 'origin/master' into develop
4 years ago
6caebb7b61
Bootmagic lite docs clarity. ( #14204 )
4 years ago
QMK Bot
Salicylic-acid3
Joel Challis
coliss86
JX
Drashna Jaelre
Danny
dogspace
kb-elmo
Rifaa Subekti
Purdea Andrei
Felix Jen
peott-fr
Vincent Vorholter
Zach White
Sergey Vlasov
J.Flanagan
Trent Hoh
Weirdo
Takeshi ISHII
Nick Brassel