summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ | |/ |/|
* | [Keyboard] Update Technik ortholinear RGB matrix points (#14124)Albert Y2021-08-241-9/+9
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
| * Fix merge artifacts (#14146)Joel Challis2021-08-245-0/+0
| |
| * Align some quantum sub-directories (#14134)Joel Challis2021-08-2417-13/+6
| | | | | | | | | | | | | | * Misc folder tidy * Review comments * Remove redundant entry
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-2411-0/+426
| |\ | |/ |/|
* | [Keyboard] Add yoichiro/lunakey_macro (#13849)Yoichiro Tanaka2021-08-2411-0/+426
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Short term bodge for firmware size bloat (#14144)Joel Challis2021-08-243-4/+21
| |
| * Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-08-2454-288/+2135
| |\ | |/ |/|
* | [Keyboard] Add serneity65 (#13889)GG2021-08-2419-0/+945
| |
* | [Keyboard] Fix keyprez qmk configurator (#14119)Christian Sandven2021-08-242-81/+89
| |
* | [Keyboard] Add QEZ keyboard (#14131)kb-elmo2021-08-249-0/+374
| |
* | [Keyboard] Update Technik staggered RGB matrix points (#14125)Albert Y2021-08-241-9/+9
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | [Keyboard] Update info.json for ocean/gin_v2 (#14121)Rifaa Subekti2021-08-241-6/+68
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Fix default keymap for quark squared keyboard (#14139)Drashna Jaelre2021-08-241-1/+1
| |
* | Remove more unused files (#14135)Joel Challis2021-08-242-24/+0
| |
* | [Keyboard] Add new keyboard version: keychron/q1/rev_0102 (#14029)lalalademaxiya12021-08-2320-171/+653
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add keyboard Q1 * Update keyboards/keychron/q1/readme.md * Update keyboards/keychron/q1/rev_0100/rules.mk * Update keyboards/keychron/q1/readme.md * Change layer switch function to "default_layout_set" * Update keyboards/keychron/q1/rev_0100/info.json * Update keyboards/keychron/q1/q1.c * Mask out the DIP switch to fix sleeping issue when switch is ON * Added and changed readme.md Added keyboards\q1\rev_0100\readme.md Changed keyboards\q1\readme.md since different MCU may used in other version. * update * update keymap name * update keymap for keychron/q1/rev_0102 * Update info.json
| * add wait_cpuclock() macro for AVR and CPU_CLOCK macro (#12755)Takeshi ISHII2021-08-242-5/+8
| |
| * Tidy up quantum.c now some of tmk_core has been merged (#14083)Joel Challis2021-08-246-101/+98
| |
| * fix (#14142)Xelus222021-08-241-1/+1
| |
| * [Keymap] Fixed GMMK Pro -> stickandgum keymap readme.md (#14123)stickandgum2021-08-242-11/+10
| | | | | | Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
| * [Keymap] Drashna keymap fixups (#14140)Drashna Jaelre2021-08-247-27/+21
| |
| * [Core] Refactor OLED to allow easy addition of other types (#13454)Xelus222021-08-24500-1387/+1579
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add docs * core changes * update keyboards to new OLED * updated users to new OLED * update layouts to new OLED * fixup docs * drashna's suggestion * fix up docs * new keyboards with oled * core split changes * remaining keyboard files * Fix The Helix keyboards oled options * reflect develop Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
| * Fix Mouse Shared EP functionality (#14136)Drashna Jaelre2021-08-242-3/+4
| | | | | | Specifically, if you enable the shared endpoint for mouse reports (or keyboard, which force enables it for mouse), and you don't have mousekeys enabled, it does not properly enable shared mouse EP for pointing device (which uses mouse reports). This cause it to error out in compiling. This fixes up some of the logic to ensure that all use cases are supported, and consolidates some of the code.