4e2ab3a177
Remove wave from requirements-dev.txt ( #12387 )
...
This resolves to <https://pypi.org/project/Wave/ >, but the places where
the `wave` module is imported make it clear that the standard library
module <https://docs.python.org/3/library/wave.html > was intended.
Was originally added in #11820 and used in the following files:
* `util/sample_parser.py`
* `util/wavetable_parser.py`
2021-04-03 09:15:39 -07:00
733c861052
Format code according to conventions ( #12467 )
...
Co-authored-by: QMK Bot <hello@qmk.fm >
2021-04-03 08:35:26 -07:00
dd7f18f65f
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 15:29:28 +00:00
41f649c9a9
fix line endings
2021-04-03 08:27:46 -07:00
d91938c19d
[nix] Use niv and poetry2nix to more easily manage dependencies ( #11181 )
...
* [nix] Update nixpkgs to avoid issues with Big Sur
The older nixpkgs snapshot did not contain nix changes to the
compiler/linker hooks that are necessary for compatibility with MacOS
Big Sur. The fix is simply to update to a newer snapshot.
* [nix] Add a poetry manifest and use poetry to build the Python env
* [nix] Use niv to manage upstream sources like nixpkgs
* [nix] Update to newer nixpkgs snapshot
* [nix] Bump python package versions
2021-04-03 08:05:46 -07:00
a3cd1290be
3 new LED effect animations ( #9827 )
...
Co-authored-by: Joel Challis <git@zvecr.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
Co-authored-by: Erovia <Erovia@users.noreply.github.com >
2021-04-03 16:41:54 +02:00
e90ec6a474
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 13:51:51 +00:00
7d33d1bace
Added Epoch80 ( #12307 )
2021-04-03 15:51:21 +02:00
638cc50727
Merge remote-tracking branch 'upstream/master' into develop
2021-04-03 20:15:54 +11:00
4b9f5578a0
[CI] Format code according to conventions ( #12468 )
...
Co-authored-by: QMK Bot <hello@qmk.fm >
2021-04-03 20:13:45 +11:00
1444ebb7f1
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 06:20:42 +00:00
59c8672f5c
kingly_keys/ave: move RGBLight config to keyboard level ( #12457 )
...
QMK Configurator's API can't use the RGBLight configurator when it's defined at keymap level.
2021-04-02 23:20:11 -07:00
028a0dcd3d
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 05:12:49 +00:00
a7920acff5
keymaps: fix kinesis default keymap progrm/reset keycode ( #12429 )
...
The right-most top-most key on the Kinesis Advantage keyboard is labeled
“Progrm” and was meant to enter the Teensy bootloader as per the comment.
However, the keycode was set to KC_1, which just produces a “1”.
It should be RESET instead.
This commit fixes KC_1 to RESET in all files where the fix is needed.
The other files have already been fixed independently.
2021-04-02 22:12:24 -07:00
655927ab15
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 05:06:28 +00:00
79a87a9c2b
[Keymap] Fixing userspace rverst ( #12422 )
...
Co-authored-by: Robert Verst <robert.verst@tobit.com >
2021-04-02 22:06:02 -07:00
051e23c782
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 04:45:06 +00:00
8d3581a49f
[Keymap] Remove kc keymap from khord chocopad keymap ( #12409 )
...
Co-authored-by: Ryan <fauxpark@gmail.com >
2021-04-02 21:44:37 -07:00
887d0fca0e
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 04:21:01 +00:00
cd96377312
[Keyboard] Add GON NerD TKL VIA keymap ( #12309 )
...
Co-authored-by: Ryan <fauxpark@gmail.com >
2021-04-02 21:20:34 -07:00
358b040157
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 04:18:44 +00:00
8b98e67643
[Keyboard] Add pkb65 keyboard ( #12230 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
2021-04-02 21:18:15 -07:00
184c553cab
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 03:59:15 +00:00
6876263961
[Keyboard] KBD67 Hotswap VIA Support ( #12351 )
...
Co-authored-by: Ryan <fauxpark@gmail.com >
2021-04-02 20:58:42 -07:00
fc8495a744
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 03:57:51 +00:00
4caeb64888
[Keyboard] Added wilba.tech WT70-JB ( #12347 )
...
Co-authored-by: Ryan <fauxpark@gmail.com >
2021-04-02 20:57:18 -07:00
428e9e7886
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 03:48:53 +00:00
70540a1f74
[Keyboard] Added RAMA WORKS KARA ( #12346 )
...
Co-authored-by: Ryan <fauxpark@gmail.com >
2021-04-02 20:48:26 -07:00
d475f04c78
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 03:44:40 +00:00
f0dc206784
[Keyboard] Update sixkeyboard VID/PID ( #12345 )
...
Co-authored-by: Ryan <fauxpark@gmail.com >
2021-04-02 20:44:06 -07:00
39e1b5b962
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 02:04:56 +00:00
caca8949de
[Keymap] remove kc layout from levinson jyh keymap ( #12301 )
...
Co-authored-by: Jason Yamada-Hanff <jyamada-hanff@chromologic.com >
2021-04-02 19:04:28 -07:00
c375ae3ec7
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 02:03:00 +00:00
0232941b1d
[Keyboard] Added VIA support to dmqdesign/spin ( #12300 )
...
Co-authored-by: Kraus, Adam <adam.kraus@mines.sdsmt.edu >
2021-04-02 19:02:26 -07:00
f561b857f2
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 00:52:10 +00:00
63445be4e5
[Keyboard] Add FoldKB ( #12255 )
...
Co-authored-by: Ryan <fauxpark@gmail.com >
2021-04-02 17:51:39 -07:00
8880e89bcd
Big quantum_keycodes cleanup ( #12249 )
2021-04-02 17:45:56 -07:00
4c981953ac
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 00:26:01 +00:00
619885b484
[Keyboard] Add Lumberjack keyboard ( #12124 )
2021-04-02 17:25:23 -07:00
41723340de
Merge remote-tracking branch 'origin/master' into develop
2021-04-02 21:45:17 +00:00
6592f83589
[Keymap] for Ibm m122 ( #11704 )
...
Co-authored-by: Ryan <fauxpark@gmail.com >
2021-04-02 14:44:46 -07:00
56560a859b
Merge remote-tracking branch 'origin/master' into develop
2021-04-02 21:26:07 +00:00
43d74d7fa5
[Keyboard] Add CherryB Studio Keyboards ( #11475 )
...
Co-authored-by: Joel Challis <git@zvecr.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
2021-04-02 14:25:44 -07:00
65fab0ef5b
Merge remote-tracking branch 'origin/master' into develop
2021-04-02 21:24:42 +00:00
cd981ec56a
qmk doctor: Fix WSL /mnt check (#12466 )
2021-04-02 22:24:09 +01:00
6e531d0ccc
Merge remote-tracking branch 'origin/master' into develop
2021-04-02 10:45:01 +00:00
12f308748f
qmk doctor: Display macOS and Windows versions, and add WSL warning for /mnt ( #12441 )
2021-04-02 21:44:27 +11:00
c1ea97e15d
Merge remote-tracking branch 'origin/master' into develop
2021-04-01 01:59:03 +00:00
ac0ba832c7
change BM68 RGB USB Device descriptor device name ( #12418 )
...
* change styling USB Device descriptor device name to reflect stylistic choices of the developer
2021-03-31 18:58:23 -07:00
da51302345
Merge remote-tracking branch 'origin/master' into develop
2021-03-31 13:09:34 +00:00
