QMK Bot
bab997c8c4
Merge remote-tracking branch 'origin/master' into develop
2021-08-31 05:19:55 +00:00
Salicylic-acid3
bdd0a6c097
[Keyboard] Addition of VIA keymap and a few fixes for naked60 ( #14225 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2021-08-30 22:19:21 -07:00
QMK Bot
4d4c61f2e8
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 23:26:17 +00:00
Joel Challis
f2c9e82e5b
cherry pick tidy up ( #14244 )
2021-08-31 00:25:41 +01:00
QMK Bot
a163d34abc
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 23:13:53 +00:00
coliss86
1e7117317f
Documentation: Fix links in key overrides ( #14228 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2021-08-31 09:13:19 +10:00
QMK Bot
25a2502216
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 19:34:52 +00:00
JX
5ed8edae49
Update ws2812_spi.c ( #14237 )
2021-08-30 20:34:19 +01:00
Drashna Jaelre
15710db4ad
Move feature suspend logic out of platform specific code ( #14210 )
2021-08-30 20:21:03 +01:00
QMK Bot
cf28feaf4d
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:50:23 +00:00
Danny
2dc07391bd
[Keyboard] Add Iris Rev. 5 ( #13934 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30 11:49:46 -07:00
QMK Bot
d770e273e1
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:42:37 +00:00
dogspace
27aebba1b1
[Keymap] Add new snailmap keymap to nullbitsco/nibble keyboard ( #14024 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30 11:42:04 -07:00
QMK Bot
3f4d39ec84
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:29:26 +00:00
kb-elmo
c9283f4c1f
[Keyboard] Add OwLab Jelly Epoch ( #14190 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30 11:29:15 -07:00
Rifaa Subekti
b63114ea29
[Keyboard] add slamz keyboard ( #14188 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30 11:28:54 -07:00
QMK Bot
3471b2ac89
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:23:31 +00:00
Purdea Andrei
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.
2021-08-30 11:22:53 -07:00
QMK Bot
4853ca1437
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:05:43 +00:00
Felix Jen
949cfd4632
[Keyboard] add maker keyboards alexa ( #14165 )
2021-08-30 11:05:13 -07:00
QMK Bot
9a888a5ec5
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:05:13 +00:00
peott-fr
557fce7a8e
[Keymap] Add peott-fr keymap for Kbd6x ( #14164 )
2021-08-30 11:04:42 -07:00
QMK Bot
5b4f63c45f
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:04:21 +00:00
Vincent Vorholter
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>
2021-08-30 11:03:53 -07:00
Zach White
596c4a1f87
Remove bin/qmk ( #14231 )
...
* Remove the bin/qmk script
* remove bin/qmk from workflows
2021-08-29 16:50:22 -07:00
QMK Bot
b46064a891
Merge remote-tracking branch 'origin/master' into develop
2021-08-29 23:47:04 +00:00
Zach White
baa423004a
ensure that the directory for sys.executable is in the user's path ( #14229 )
2021-08-29 16:46:36 -07:00
QMK Bot
92e606b927
Merge remote-tracking branch 'origin/master' into develop
2021-08-29 23:42:27 +00:00
Zach White
b705020daf
move everything from qmkfm/base_container to qmkfm/qmk_cli ( #14230 )
2021-08-29 16:41:56 -07:00
QMK Bot
5fbfab1f3b
Merge remote-tracking branch 'origin/master' into develop
2021-08-29 21:53:15 +00:00
peott-fr
13a2da973f
Nyquist ( #14202 )
...
* adding my Nyquist keymap
* Updating Nyquist keymap with licensing.
* Cleaning-up and improving Nyquist keymap.
* Cleaning-up and improving Nyquist keymap.
2021-08-29 22:52:49 +01:00
QMK Bot
532bff7b6c
Merge remote-tracking branch 'origin/master' into develop
2021-08-29 21:25:08 +00:00
Sergey Vlasov
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 )
2021-08-29 22:24:43 +01:00
QMK Bot
d227c8692a
Merge remote-tracking branch 'origin/master' into develop
2021-08-29 19:19:29 +00:00
J.Flanagan
ef7fdee6c8
[Keyboard] Add Viktus SP Mini ( #14069 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-29 12:18:56 -07:00
QMK Bot
55d6956553
Merge remote-tracking branch 'origin/master' into develop
2021-08-29 11:10:11 +00:00
Trent Hoh
f87cd8e8a0
[Keyboard] Corrected layout for np24 by YMDK ( #14096 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-29 04:09:43 -07:00
QMK Bot
8800adc533
Merge remote-tracking branch 'origin/master' into develop
2021-08-29 11:08:51 +00:00
peott-fr
94d7635a4a
[Keymap] My Prime E keymap ( #14117 )
2021-08-29 04:08:23 -07:00
QMK Bot
7209d7cca9
Merge remote-tracking branch 'origin/master' into develop
2021-08-29 11:08:23 +00:00
Weirdo
5d5668c3f8
[Keyboard] Add kelownaRGB64 ( #14141 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-29 04:07:54 -07:00
QMK Bot
77a93fec79
Merge remote-tracking branch 'origin/master' into develop
2021-08-29 06:06:26 +00:00
Takeshi ISHII
9afc64cd61
[Keyboard] fix compile error make helix/rev2/sc:all
( #14214 )
2021-08-29 15:06:00 +09:00
Zach White
c729df09ca
fix automatic directory for qmk lint ( #14215 )
2021-08-28 23:02:31 -07:00
Zach White
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
2021-08-29 12:37:55 +10:00
Zach White
f155865804
remove qmk console, which is now part of the global cli ( #14206 )
2021-08-29 11:27:57 +10:00
QMK Bot
1ac3b3e9b6
Merge remote-tracking branch 'origin/master' into develop
2021-08-29 00:52:22 +00:00
Nick Brassel
dd8922d482
Fixup upstream paths for submodules. ( #14205 )
2021-08-29 10:51:53 +10:00
QMK Bot
7b8cdfc19d
Merge remote-tracking branch 'origin/master' into develop
2021-08-28 23:48:16 +00:00
Nick Brassel
6caebb7b61
Bootmagic lite docs clarity. ( #14204 )
2021-08-29 09:47:48 +10:00