summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-243-2/+3
|\
| * Fix use of encoder map in mechlovin/foundation (#18157)Joel Challis2022-08-243-2/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-241-1/+1
|\|
| * Update invalid pip install flag (#18146)Joel Challis2022-08-241-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-243-1/+2
|\|
| * Fix use of encoder map in mechwild/clunker (#18156)Joel Challis2022-08-243-1/+2
| |
* | Move keyboard USB IDs and strings to data driven: develop (#18152)Ryan2022-08-2417-70/+38
| | | | | | | | | | * Move keyboard USB IDs and strings to data driven: develop * Also do new onekeys
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-239-0/+378
|\|
| * [Keyboard] Add Plywrks Lune (#17057)Ramon Imbao2022-08-239-0/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Plywrks Lune * Add OLED functionality * Update keyboards/plywrks/lune/keymaps/default/keymap.c * Update keyboards/plywrks/lune/keymaps/via/keymap.c * Update keyboards/plywrks/lune/keymaps/via/keymap.c * Update keyboards/plywrks/lune/lune.c * Add the missing 2 layers in the keymap Also added a missing parenthesis in lune.c, and removed the oled_task_user in the default keymap. * Update keyboards/plywrks/lune/info.json * Update keyboards/plywrks/lune/info.json * Update keyboards/plywrks/lune/info.json * Update keyboards/plywrks/lune/config.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-237-0/+266
|\|
| * [Keyboard] Add Clunker (#18141)Kyle McCreery2022-08-237-0/+266
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-231-1/+1
|\|
| * Use correct board files for cantor (#18144)Joel Challis2022-08-231-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-234-5/+60
|\|
| * [Keyboard] Enable VIA - ALF X1.1 (#18140)Dave Rowe2022-08-224-5/+60
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-231-1/+10
|\|
| * [Keyboard] add rgb animation handwired/swiftrax/glacier (#18121)Brandon Claveria2022-08-221-1/+10
| | | | | | | | Co-authored-by: swiftrax <swiftrax@github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Nix shell updates for `develop` (#18131)Sergey Vlasov2022-08-234-185/+460
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shell.nix: Update `tomlkit` to 0.11.4 using a Nixpkgs overlay The used Nixpkgs snapshot contains `tomlkit` version 0.7.0, which is affected by https://www.github.com/sdispater/tomlkit/issues/148; that bug is triggered by `pyproject.toml` from `jsonschema` >= 4.11.0, preventing the build of that module. Just adding `tomlkit = "*"` to the `[tool.poetry.dev-dependencies]` section of `nix/pyproject.toml` does not fix the `jsonschema` build, because `makeRemoveSpecialDependenciesHook` inside `poetry2nix` is not affected by `nix/pyproject.toml`. Add a Nixpkgs overlay which updates the `tomlkit` Python module globally, so that `poetry2nix` would also use the updated version internally. * shell.nix: Bump `poetry2nix` to the most recent version The new `poetry2nix` version includes overrides which are required for recent versions of some Python packages (in particular, `jsonschema` and `dotty-dict`). * shell.nix: Bump QMK CLI to 1.1.1; update other Python deps Update `pyproject.toml` to match `requirements*.txt`: - add `pyserial = "*"` - replace `qmk-dotty-dict = "*"` with `dotty-dict = "*"` (#18117, also required for compatibility with `qmk` 1.1.1, where this replacement had already been performed) Add build dependencies of various Python modules to `pyproject.toml`: - `hatchling`, `hatch-vcs`, `hatch-fancy-pypi-readme` (required by `jsonschema` >= 4.11.0) - `pytest` (a newer version is required to solve the dependency conflict with the `hatchling` module due to the upper bound on `pluggy`) - `flit-core` (a more recent version is required to build `tomli`) - `poetry-core` (required for `dotty-dict` >= 1.3.1, and the version from Nixpkgs does not build on Darwin due to NixOS/nix#4758) Update `poetry.lock` to use the most recent versions of Python modules. The complete list of Python module updates as listed in `poetry.lock` (note that other modules might be present in the Python environment, e.g., if they come from Nixpkgs): - `atomicwrites`: none -> 1.4.1 (but this module is not actually used, because the corresponding dependency of `pytest` is win32-only) - `attrs`: 21.4.0 -> 22.1.0 - `colorama`: 0.4.4 -> 0.4.5 - `coverage`: 6.4 -> none - `dotty-dict`: none -> 1.3.1 (used instead of `qmk-dotty-dict`) - `editables`: none -> 0.3 - `flake8`: 4.0.1 -> 5.0.4 - `flake8-polyfill`: 1.0.2 -> none - `flit-core`: none -> 3.7.1 - `hatch-fancy-pypi-readme`: none -> 22.3.0 - `hatch-vcs`: none -> 0.2.0 - `hatchling`: none -> 1.8.0 - `hjson`: 3.0.2 -> 3.1.0 - `importlib-resources`: 5.7.1 -> 5.9.0 - `iniconfig`: none -> 1.1.1 - `jsonschema`: 4.5.1 -> 4.14.0 - `mccabe`: 0.6.1 -> 0.7.0 - `nose2`: 0.11.0 -> 0.12.0 - `packaging`: none -> 21.3 - `pathspec`: none -> 0.9.0 - `pep8-naming`: 0.12.1 -> 0.13.2 - `pillow`: 9.1.1 -> 9.2.0 - `pkgutil-resolve-name`: none -> 1.3.10 - `pluggy`: none -> 1.0.0 - `poetry-core`: none -> 1.0.8 - `py`: none -> 1.11.0 - `pycodestyle`: 2.8.0 -> 2.9.1 - `pyflakes`: 2.4.0 -> 2.5.0 - `pygments`: 2.12.0 -> 2.13.0 - `pyparsing`: none -> 3.0.9 - `pyserial`: none -> 3.5 - `pytest`: none -> 7.1.2 - `qmk`: 1.1.0 -> 1.1.1 - `qmk-dotty-dict`: 1.3.0.post1 -> none (replaced by `dotty-dict`) - `setuptools-scm`: none -> 7.0.5 - `tomli`: none -> 2.0.1 - `typing-extensions`: none -> 4.3.0 - `zipp`: 3.8.0 -> 3.8.1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-221-3/+5
|\|
| * Update Tap Dance Example 4 (#18138)Jesse2022-08-231-3/+5
| | | | | | break statements are missing from the switch for both registering and unregistering key codes. Neither have a default: case either. The code as exists in the repository right now does not compile. It does with this changes.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-221-10/+0
|\|
| * Remove USB IDs and strings from `fungo/rev1` (#18133)Ryan2022-08-221-10/+0
| |
* | RESET -> QK_BOOT user keymaps (#17940)Joel Challis2022-08-211495-1908/+2006
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2164-114/+152
|\|
| * Move keyboard USB IDs and strings to data driven, pass 3 (#18111)Ryan2022-08-2164-114/+152
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-215-0/+454
|\|
| * Add pcewing Speedo v3 keymap (#18118)Paul Ewing2022-08-215-0/+454
| | | | | | | | | | * Add pcewing Speedo v3 keymap * Add readme and code quality improvements
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-214-0/+81
|\|
| * [Keymap] Add new keymap to nasu (#18024)Mario Cadenas2022-08-214-0/+81
| |
* | Align CLI requirements (#18117)Joel Challis2022-08-211-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-215-0/+130
|\|
| * [Keyboard] Add ai macropad (#17722)Louis Dalibard2022-08-205-0/+130
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Louis Dalibard <ontake@ontake.dev>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-203-0/+238
|\|
| * added keymap for kprepublic/jj40:brdlf (#17961)Abigail2022-08-203-0/+238
| | | | | | | | | | * added keymap for kprepublic/jj40:brdlf
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2012-0/+872
|\|
| * [Keyboard] Add yandrstudio/nz67v2 keyboard. (#17591)JX2022-08-2012-0/+872
| | | | | | * add yr nz67v2 by jiaxin96
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-201-29/+29
|\|
| * Format code according to conventions (#18119)QMK Bot2022-08-201-29/+29
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2011-0/+563
|\|
| * add fungo keyboard (#17513)bojiguard2022-08-2011-0/+563
| | | | | | by bojiguard
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2011-0/+331
|\|
| * Add Nascent keyboard support. (#17824)studiokestra2022-08-2011-0/+331
| | | | | | * Add nascent keyboard by studiokestra
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-2029-0/+852
|\|
| * [Keyboard] Add Zed65 (#17917)mechlovin2022-08-2029-0/+852
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-08-20353-374/+374
|\|
| * RESET -> QK_BOOT keyboard readme (#18110)Joel Challis2022-08-20353-374/+374
| |
* | Fix PID value for the Keyboardio Atreus 2 bootloader (#18116)Sergey Vlasov2022-08-201-1/+1
| | | | | | Copy the correct PID from `util/udev/50-qmk.rules`.
* | CLI: Teaching the CLI to flash binaries (#16584)Erovia2022-08-208-93/+363
| | | | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-08-202-0/+112
|\|
| * [Keymap] Add joe_scotto keymap for CRKBD (#18103)Joe Scotto2022-08-192-0/+112
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 06:33:19 +0000