| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-01 | 5 | -41/+51 |
| |\ | |||||
| | * | [Keymap] cwebster2 Keymap and userspace updates (#14258) | Casey Webster | 2021-08-31 | 5 | -41/+51 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-31 | 17 | -1/+1 |
| |\| | |||||
| | * | Move GMMK Pro layouts to the correct subdir (#14241) | Andre Brait | 2021-09-01 | 17 | -1/+1 |
| | | | | | | | Also fix a compilation issue in the mike1808 keymap | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-31 | 1 | -1/+1 |
| |\| | |||||
| | * | [Keyboard] Disable console on Iris Rev5 (#14249) | Drashna Jaelre | 2021-08-31 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-31 | 1 | -20/+24 |
| |\| | |||||
| | * | emi20: remove dead space from Configurator layout (#14254) | James Young | 2021-08-31 | 1 | -20/+24 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-31 | 9 | -0/+419 |
| |\| | |||||
| | * | [Keyboard] Add FJLabs KF87 PCB (#14179) | Felix Jen | 2021-08-31 | 9 | -0/+419 |
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-31 | 10 | -265/+231 |
| |\| | |||||
| | * | [Keymap] reflects current rick's keymap (#14169) | Ibnu Daru Aji | 2021-08-31 | 10 | -265/+231 |
| | | | |||||
| * | | handwired/symmetric70_proto use post_rules.mk (#14235) | Takeshi ISHII | 2021-08-31 | 5 | -12/+2 |
| | | | |||||
| * | | [Keyboard] Helix use `post_rules.mk` (#14216) | Takeshi ISHII | 2021-08-31 | 14 | -49/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Helix/pico use post_rules.mk insted of local_features.mk Tested with the following procedure. ``` git checkout 77a93fec79 (qmk/develop) make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 git checkout helix_use_post_rules.mk make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 ``` * Helix/rev2 use post_rules.mk Tested with the following procedure. ``` git checkout 77a93fec79 (qmk/develop) make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 make helix/rev2:all:check-md5 make helix/rev2/sc:all:check-md5 git checkout helix_use_post_rules.mk make clean make helix/pico:all:check-md5 make helix/pico/sc:all:check-md5 make helix/rev2:all:check-md5 make helix/rev2/sc:all:check-md5 ``` | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-31 | 11 | -29/+170 |
| |\| | |||||
| | * | [Keyboard] Addition of VIA keymap and a few fixes for naked60 (#14225) | Salicylic-acid3 | 2021-08-30 | 11 | -29/+170 |
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 4 | -39/+6 |
| |\| | |||||
| | * | cherry pick tidy up (#14244) | Joel Challis | 2021-08-31 | 4 | -39/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 1 | -1/+1 |
| |\| | |||||
| | * | Documentation: Fix links in key overrides (#14228) | coliss86 | 2021-08-31 | 1 | -1/+1 |
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 1 | -10/+10 |
| |\| | |||||
| | * | Update ws2812_spi.c (#14237) | JX | 2021-08-30 | 1 | -10/+10 |
| | | | |||||
| * | | Move feature suspend logic out of platform specific code (#14210) | Drashna Jaelre | 2021-08-30 | 4 | -179/+102 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 5 | -5/+170 |
| |\| | |||||
| | * | [Keyboard] Add Iris Rev. 5 (#13934) | Danny | 2021-08-30 | 5 | -5/+170 |
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 3 | -0/+583 |
| |\| | |||||
| | * | [Keymap] Add new snailmap keymap to nullbitsco/nibble keyboard (#14024) | dogspace | 2021-08-30 | 3 | -0/+583 |
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 29 | -2/+1133 |
| |\| | |||||
| | * | [Keyboard] Add OwLab Jelly Epoch (#14190) | kb-elmo | 2021-08-30 | 20 | -2/+907 |
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| | * | [Keyboard] add slamz keyboard (#14188) | Rifaa Subekti | 2021-08-30 | 9 | -0/+226 |
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 1 | -0/+1 |
| |\| | |||||
| | * | [Bug] Fix build error when enabling NO_HAPTIC_MOD (#14178) | Purdea Andrei | 2021-08-30 | 1 | -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. | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 9 | -0/+375 |
| |\| | |||||
| | * | [Keyboard] add maker keyboards alexa (#14165) | Felix Jen | 2021-08-30 | 9 | -0/+375 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 1 | -0/+23 |
| |\| | |||||
| | * | [Keymap] Add peott-fr keymap for Kbd6x (#14164) | peott-fr | 2021-08-30 | 1 | -0/+23 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-30 | 2 | -1/+14 |
| |\| | |||||
| | * | [Keyboard] Changed ProductID on basketweav keyboards (#14162) | Vincent Vorholter | 2021-08-30 | 2 | -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> | ||||
| * | | Remove bin/qmk (#14231) | Zach White | 2021-08-29 | 14 | -114/+11 |
| | | | | | | | | | | | * Remove the bin/qmk script * remove bin/qmk from workflows | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 1 | -1/+7 |
| |\| | |||||
| | * | ensure that the directory for sys.executable is in the user's path (#14229) | Zach White | 2021-08-29 | 1 | -1/+7 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 13 | -17/+16 |
| |\| | |||||
| | * | move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230) | Zach White | 2021-08-29 | 13 | -17/+16 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 1 | -21/+21 |
| |\| | |||||
| | * | Nyquist (#14202) | peott-fr | 2021-08-29 | 1 | -21/+21 |
| | | | | | | | | | | | | | | | | | | | * adding my Nyquist keymap * Updating Nyquist keymap with licensing. * Cleaning-up and improving Nyquist keymap. * Cleaning-up and improving Nyquist keymap. | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 3 | -74/+86 |
| |\| | |||||
| | * | Update the nix-shell environment (#13316) | Sergey Vlasov | 2021-08-29 | 3 | -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 ) | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 9 | -0/+581 |
| |\| | |||||
| | * | [Keyboard] Add Viktus SP Mini (#14069) | J.Flanagan | 2021-08-29 | 9 | -0/+581 |
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-08-29 | 6 | -11/+126 |
| |\| | |||||
 |
index : qmk_firmware | |
| [no description] |
| summaryrefslogtreecommitdiffstats |