summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-071-0/+82
|\|
| * Add info.json for CK60i (#12318)Ryan2021-04-071-0/+82
| |
* | Fix up builds that are now too big for `develop` branch. (#12495)Nick Brassel2021-04-063-0/+6
| |
* | Add support for producing UF2-format binaries. (#12435)Nick Brassel2021-04-066-8/+373
| | | | | | | | | | * First stab at enabling builds of UF2-format binaries. * Add description on producing a UF2 file.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-041-1/+1
|\|
| * Disarray ProductID change (#12440)SneakboxKB2021-04-041-1/+1
| | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com> Co-authored-by: Zach White <skullydazed@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-036-339/+353
|\|
| * [Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows (#12259)Takeshi ISHII2021-04-046-339/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows * Made the layout data easier to read. * helix/rev2/keymaps/five_rows/keymap.c * helix/rev3_5rows/keymaps/five_rows/keymap.c * The following two were made the same. * keymaps/five_rows/config.h * keymaps/five_rows/oled_display.c The binary of the compilation result has not changed. * update keyboards/helix/rev2/keymaps/five_rows/rules.mk KEYBOARD_LOCAL_FEATURES_MK was moved to the end. * add '#define DISABLE_SYNC_TIMER' into helix/rev3_5rows/keymaps/five_rows/config.h The sync timer features worsen the matrix scan rate of the Helix keyboard. I'm not sure if it makes sense to have sync timer features enabled on the Helix keyboard. So in my keymap I disable this.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-30/+35
|\|
| * Add WSL specific logic for avrdude device detection (#12392)Joel Challis2021-04-031-30/+35
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-1/+0
|\|
| * Remove `wave` from requirements-dev.txt (#12387)Excitable Snowball2021-04-031-1/+0
| | | | | | | | | | | | | | | | | | This resolves to <https://pypi.org/project/Wave/>, but the places where the `wave` module is imported make it clear that the standard library module <https://docs.python.org/3/library/wave.html> was intended. Was originally added in #11820 and used in the following files: * `util/sample_parser.py` * `util/wavetable_parser.py`
* | Format code according to conventions (#12467)github-actions[bot]2021-04-031-11/+11
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0311-24/+676
|\|
| * fix line endingsZach White2021-04-033-56/+56
| |
| * [nix] Use niv and poetry2nix to more easily manage dependencies (#11181)Steve Purcell2021-04-036-24/+611
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [nix] Update nixpkgs to avoid issues with Big Sur The older nixpkgs snapshot did not contain nix changes to the compiler/linker hooks that are necessary for compatibility with MacOS Big Sur. The fix is simply to update to a newer snapshot. * [nix] Add a poetry manifest and use poetry to build the Python env * [nix] Use niv to manage upstream sources like nixpkgs * [nix] Update to newer nixpkgs snapshot * [nix] Bump python package versions
| * 3 new LED effect animations (#9827)TurtleHunter2021-04-035-0/+65
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0312-0/+1198
|\|
| * Added Epoch80 (#12307)kb-elmo2021-04-0312-0/+1198
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-04-032-77/+77
|\|
| * [CI] Format code according to conventions (#12468)github-actions[bot]2021-04-032-77/+77
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-24/+6
|\|
| * kingly_keys/ave: move RGBLight config to keyboard level (#12457)James Young2021-04-023-24/+6
| | | | | | QMK Configurator's API can't use the RGBLight configurator when it's defined at keymap level.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-3/+3
|\|
| * keymaps: fix kinesis default keymap progrm/reset keycode (#12429)Michael Stapelberg2021-04-023-3/+3
| | | | | | | | | | | | | | | | | | | | The right-most top-most key on the Kinesis Advantage keyboard is labeled “Progrm” and was meant to enter the Teensy bootloader as per the comment. However, the keycode was set to KC_1, which just produces a “1”. It should be RESET instead. This commit fixes KC_1 to RESET in all files where the fix is needed. The other files have already been fixed independently.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-1/+5
|\|
| * [Keymap] Fixing userspace `rverst` (#12422)Robert Verst2021-04-021-1/+5
| | | | | | Co-authored-by: Robert Verst <robert.verst@tobit.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-44/+15
|\|
| * [Keymap] Remove kc keymap from khord chocopad keymap (#12409)Dylan Khor2021-04-021-44/+15
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-2/+66
|\|
| * [Keyboard] Add GON NerD TKL VIA keymap (#12309)kaylanm2021-04-023-2/+66
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+336
|\|
| * [Keyboard] Add pkb65 keyboard (#12230)MCKeebs2021-04-029-0/+336
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-033-2/+50
|\|
| * [Keyboard] KBD67 Hotswap VIA Support (#12351)MechMerlin2021-04-023-2/+50
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+265
|\|
| * [Keyboard] Added wilba.tech WT70-JB (#12347)Wilba2021-04-029-0/+265
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+298
|\|
| * [Keyboard] Added RAMA WORKS KARA (#12346)Wilba2021-04-029-0/+298
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-2/+2
|\|
| * [Keyboard] Update sixkeyboard VID/PID (#12345)jrdsgl2021-04-021-2/+2
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-031-70/+57
|\|
| * [Keymap] remove kc layout from levinson jyh keymap (#12301)Jason Yamada-Hanff2021-04-021-70/+57
| | | | | | Co-authored-by: Jason Yamada-Hanff <jyamada-hanff@chromologic.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-032-0/+69
|\|
| * [Keyboard] Added VIA support to dmqdesign/spin (#12300)adamkraus62021-04-022-0/+69
| | | | | | Co-authored-by: Kraus, Adam <adam.kraus@mines.sdsmt.edu>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-0314-0/+437
|\|
| * [Keyboard] Add FoldKB (#12255)Danny2021-04-0214-0/+437
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Big quantum_keycodes cleanup (#12249)Ryan2021-04-021-466/+417
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-039-0/+343
|\|
| * [Keyboard] Add Lumberjack keyboard (#12124)Paul James2021-04-029-0/+343
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 18:44:13 +0000