summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-3110-265/+231
|\
| * [Keymap] reflects current rick's keymap (#14169)Ibnu Daru Aji2021-08-3110-265/+231
| |
* | handwired/symmetric70_proto use post_rules.mk (#14235)Takeshi ISHII2021-08-315-12/+2
| |
* | [Keyboard] Helix use `post_rules.mk` (#14216)Takeshi ISHII2021-08-3114-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 developQMK Bot2021-08-3111-29/+170
|\|
| * [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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-304-39/+6
|\|
| * cherry pick tidy up (#14244)Joel Challis2021-08-314-39/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-301-1/+1
|\|
| * Documentation: Fix links in key overrides (#14228)coliss862021-08-311-1/+1
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-301-10/+10
|\|
| * Update ws2812_spi.c (#14237)JX2021-08-301-10/+10
| |
* | Move feature suspend logic out of platform specific code (#14210)Drashna Jaelre2021-08-304-179/+102
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-305-5/+170
|\|
| * [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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-303-0/+583
|\|
| * [Keymap] Add new snailmap keymap to nullbitsco/nibble keyboard (#14024)dogspace2021-08-303-0/+583
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-3029-2/+1133
|\|
| * [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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-301-0/+1
|\|
| * [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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-309-0/+375
|\|
| * [Keyboard] add maker keyboards alexa (#14165)Felix Jen2021-08-309-0/+375
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-301-0/+23
|\|
| * [Keymap] Add peott-fr keymap for Kbd6x (#14164)peott-fr2021-08-301-0/+23
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-302-1/+14
|\|
| * [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>
* | Remove bin/qmk (#14231)Zach White2021-08-2914-114/+11
| | | | | | | | | | * Remove the bin/qmk script * remove bin/qmk from workflows
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-1/+7
|\|
| * ensure that the directory for sys.executable is in the user's path (#14229)Zach White2021-08-291-1/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-2913-17/+16
|\|
| * move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230)Zach White2021-08-2913-17/+16
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-21/+21
|\|
| * 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-293-74/+86
|\|
| * 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 )
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-299-0/+581
|\|
| * [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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-296-11/+126
|\|
| * [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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-0/+97
|\|
| * [Keymap] My Prime E keymap (#14117)peott-fr2021-08-291-0/+97
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-299-0/+302
|\|
| * [Keyboard] Add kelownaRGB64 (#14141)Weirdo2021-08-299-0/+302
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-291-8/+19
|\|
| * [Keyboard] fix compile error `make helix/rev2/sc:all` (#14214)Takeshi ISHII2021-08-291-8/+19
| |
* | fix automatic directory for qmk lint (#14215)Zach White2021-08-281-5/+5
| |
* | Add check for non-assignment code in rules.mk (#12108)Zach White2021-08-291-41/+98
| | | | | | | | | | | | | | | | | | | | | | * Add check for non-assignment code in rules.mk * fix lint check * fix lint * fixup to reflect the final state of #8422 * fix lint
* | remove qmk console, which is now part of the global cli (#14206)Zach White2021-08-293-352/+0
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 08:30:28 +0000