masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,851 Commits 2 Branches 0 Tags 274 MiB
Commit Graph

17851 Commits

Author SHA1 Message Date
Rifaa Subekti b63114ea29
[Keyboard] add slamz keyboard (#14188) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-30 11:28:54 -07: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
Felix Jen 949cfd4632
[Keyboard] add maker keyboards alexa (#14165) 2021-08-30 11:05:13 -07:00
peott-fr 557fce7a8e
[Keymap] Add peott-fr keymap for Kbd6x (#14164) 2021-08-30 11:04:42 -07: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 baa423004a
ensure that the directory for sys.executable is in the user's path (#14229) 2021-08-29 16:46:36 -07:00
Zach White b705020daf
move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230) 2021-08-29 16:41:56 -07: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
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
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
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
peott-fr 94d7635a4a
[Keymap] My Prime E keymap (#14117) 2021-08-29 04:08:23 -07: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
Takeshi ISHII 9afc64cd61
[Keyboard] fix compile error `make helix/rev2/sc:all` (#14214) 2021-08-29 15:06:00 +09:00
Nick Brassel dd8922d482
Fixup upstream paths for submodules. (#14205) 2021-08-29 10:51:53 +10:00
Nick Brassel 6caebb7b61
Bootmagic lite docs clarity. (#14204) 2021-08-29 09:47:48 +10:00
Nick Brassel f061ca4974 Breaking changes develop merge to master, 2021Q3 edition. (#14196) 2021-08-29 08:20:25 +10:00
Nick Brassel 4bad375d7c
2021Q3 pre-merge `develop` changelog, keyboard aliases (#14198) 
* Initial changelog.

* Data driven.

* Submodule update.

* Updated breaking changes docs.

* Aliases.

* Aliases.
 2021-08-29 08:18:18 +10:00
Drashna Jaelre 29ec2d8f42
[Docs] Add examples to RGB Matrix Indicators docs (#12797) 2021-08-27 06:41:33 +10:00
QMK Bot 7e1634e2a6 Merge remote-tracking branch 'origin/master' into develop 2021-08-26 17:50:09 +00:00
jackytrabbit ff65185dec
Add support for lazydesigners/cassette8 (#14145) 
* 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-26 18:49:36 +01:00
QMK Bot a13b0d8a6c Merge remote-tracking branch 'origin/master' into develop 2021-08-26 17:47:28 +00:00
jpuerto96 3fce5e6912
New Keyboard - V4n4g0rth0n (#14152) 
* 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-26 18:45:48 +01:00
Joel Challis 87cdb1cf9a
Update readme files (#14172) 2021-08-26 16:53:24 +01:00
Joel Challis 48d0ad28e7
Move to correct location (#14171) 2021-08-26 14:14:48 +01:00
QMK Bot 6d646880a4 Merge remote-tracking branch 'origin/master' into develop 2021-08-26 11:38:28 +00:00
kb-elmo edf35615cf
Skeletn87 - Fix RGB pin (#14170) 
* 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-26 12:37:55 +01:00
QMK Bot 2bc978437e Merge remote-tracking branch 'origin/master' into develop 2021-08-25 23:56:39 +00:00
Charles ee3a1133f1
[keyboard] Add 0x3E (#14088) 
* Add 0x3E - default config

* Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Apply suggestions from code review 2

Firmware size optimization

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Rename files as per project guidelines + remove empty

* Update link in readme.md

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-26 00:56:09 +01:00
QMK Bot 0c97bc5179 Merge remote-tracking branch 'origin/master' into develop 2021-08-25 23:40:04 +00:00
8bits4ever 4c5334cb9e
[converter/a1200] Changing layout macro reference info.json (#14143) 
* Rename keyboards/converter/a1200/config.h to keyboards/converter/a1200/teensy2pp/config.h

* Rename keyboards/converter/a1200/rules.mk to keyboards/converter/a1200/teensy2pp/rules.mk

* Create dummy

* Add files via upload

* Delete dummy

* Update readme.md

* Update info.json
 2021-08-26 00:39:34 +01:00
QMK Bot 329c130202 Merge remote-tracking branch 'origin/master' into develop 2021-08-25 19:04:06 +00:00
MechMaster48 89f2b9486f
[Keymap] mechmaster48 keymap for OLKB Preonic rev3 (#14137) 2021-08-25 12:03:27 -07:00
Joel Challis 527b1e52aa
Move nix folder alongside vagrant (#14132) 2021-08-25 15:27:48 +01:00
Joel Challis a84de5e22b
Revert 14083 && 14144 (#14150) 
* Revert "Short term bodge for firmware size bloat (#14144)"

This reverts commit a8d6547346.

* Revert "Tidy up quantum.c now some of tmk_core has been merged (#14083)"

This reverts commit c4dbf4bf01.
 2021-08-25 01:16:59 +01:00
QMK Bot 3855713ca0 Merge remote-tracking branch 'origin/master' into develop 2021-08-24 22:10:04 +00:00
Albert Y bb1b822247
[Keyboard] Update Technik ortholinear RGB matrix points (#14124) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-08-24 15:09:26 -07:00
Joel Challis 622c3cac3a
Fix merge artifacts (#14146) 2021-08-24 17:18:25 +01:00
Joel Challis 2cade3a483
Align some quantum sub-directories (#14134) 
* Misc folder tidy

* Review comments

* Remove redundant entry
 2021-08-24 17:07:11 +01:00
QMK Bot 2827a3cf75 Merge remote-tracking branch 'origin/master' into develop 2021-08-24 15:44:36 +00:00
Yoichiro Tanaka b4867e1600
[Keyboard] Add yoichiro/lunakey_macro (#13849) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-24 08:44:00 -07:00
Joel Challis a8d6547346
Short term bodge for firmware size bloat (#14144) 2021-08-24 16:09:23 +01:00
Drashna Jael're e3b68ddfe8
Merge remote-tracking branch 'origin/master' into develop 2021-08-24 07:32:31 -07:00
Takeshi ISHII c9c60d227e
add wait_cpuclock() macro for AVR and CPU_CLOCK macro (#12755) 2021-08-24 14:34:24 +01:00
Joel Challis c4dbf4bf01
Tidy up quantum.c now some of tmk_core has been merged (#14083) 2021-08-24 14:28:37 +01:00
GG 097e85e930
[Keyboard] Add serneity65 (#13889) 2021-08-24 02:50:56 -07:00
Xelus22 c4a2dc9a2d
fix (#14142) 2021-08-24 19:39:24 +10:00
Christian Sandven 3ef978cb13
[Keyboard] Fix keyprez qmk configurator (#14119) 2021-08-24 01:54:17 -07:00
kb-elmo a4aa6ccf7b
[Keyboard] Add QEZ keyboard (#14131) 2021-08-24 01:49:50 -07:00
Albert Y b8c74d6b5d
[Keyboard] Update Technik staggered RGB matrix points (#14125) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-08-24 01:49:13 -07:00