summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mnk50: Configurator Fix and Layout Macro Additions (#14257)James Young2021-09-012-1/+200
| | | Co-authored-by: Ryan <fauxpark@gmail.com>
* [Keymap] cwebster2 Keymap and userspace updates (#14258)Casey Webster2021-08-315-41/+51
|
* Move GMMK Pro layouts to the correct subdir (#14241)Andre Brait2021-09-0117-1/+1
| | | Also fix a compilation issue in the mike1808 keymap
* [Keyboard] Disable console on Iris Rev5 (#14249)Drashna Jaelre2021-08-311-1/+1
|
* emi20: remove dead space from Configurator layout (#14254)James Young2021-08-311-20/+24
|
* [Keyboard] Add FJLabs KF87 PCB (#14179)Felix Jen2021-08-319-0/+419
| | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keymap] reflects current rick's keymap (#14169)Ibnu Daru Aji2021-08-3110-265/+231
|
* [Keyboard] Addition of VIA keymap and a few fixes for naked60 (#14225)Salicylic-acid32021-08-3011-29/+170
| | | Co-authored-by: Joel Challis <git@zvecr.com>
* cherry pick tidy up (#14244)Joel Challis2021-08-314-39/+6
|
* Documentation: Fix links in key overrides (#14228)coliss862021-08-311-1/+1
| | | Co-authored-by: Joel Challis <git@zvecr.com>
* Update ws2812_spi.c (#14237)JX2021-08-301-10/+10
|
* [Keyboard] Add Iris Rev. 5 (#13934)Danny2021-08-305-5/+170
| | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* [Keymap] Add new snailmap keymap to nullbitsco/nibble keyboard (#14024)dogspace2021-08-303-0/+583
| | | Co-authored-by: Ryan <fauxpark@gmail.com>
* [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>
* [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.
* [Keyboard] add maker keyboards alexa (#14165)Felix Jen2021-08-309-0/+375
|
* [Keymap] Add peott-fr keymap for Kbd6x (#14164)peott-fr2021-08-301-0/+23
|
* [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>
* ensure that the directory for sys.executable is in the user's path (#14229)Zach White2021-08-291-1/+7
|
* move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230)Zach White2021-08-2913-17/+16
|
* 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.
* 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 )
* [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>
* [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>
* [Keymap] My Prime E keymap (#14117)peott-fr2021-08-291-0/+97
|
* [Keyboard] Add kelownaRGB64 (#14141)Weirdo2021-08-299-0/+302
| | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* [Keyboard] fix compile error `make helix/rev2/sc:all` (#14214)Takeshi ISHII2021-08-291-8/+19
|
* Fixup upstream paths for submodules. (#14205)Nick Brassel2021-08-291-1/+10
|
* Bootmagic lite docs clarity. (#14204)Nick Brassel2021-08-291-1/+1
|
* 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
| |\ | |/ |/|
* | [keyboard] Add 0x3E (#14088)Charles2021-08-269-0/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-251-1/+1
| |\ | |/ |/|
* | [converter/a1200] Changing layout macro reference info.json (#14143)8bits4ever2021-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-254-0/+317
| |\ | |/ |/|
* | [Keymap] mechmaster48 keymap for OLKB Preonic rev3 (#14137)MechMaster482021-08-254-0/+317
| |
| * Move nix folder alongside vagrant (#14132)Joel Challis2021-08-255-2/+2
| |
| * Revert 14083 && 14144 (#14150)Joel Challis2021-08-258-118/+104
| | | | | | | | | | | | | | | | | | * Revert "Short term bodge for firmware size bloat (#14144)" This reverts commit a8d65473461c337fb1e168d907bfb8c3ac8fdbd0. * Revert "Tidy up quantum.c now some of tmk_core has been merged (#14083)" This reverts commit c4dbf4bf0118dd785802861beb247433b5b7411d.
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-241-9/+9
| |\ | |/ |/|