Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-10 | 13 | -4/+374 |
|\ | |||||
| * | [Keyboard] Add afternoonlabs/oceanbreeze (#12299) | Eithan Shavit | 2021-04-09 | 13 | -4/+374 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Eithan Shavit <eithan@fb.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-10 | 20 | -627/+525 |
|\| | |||||
| * | [Keymap] Remove LAYOUT_kc macros from edvorakjp keymaps (#12217) | Ryo Maeda | 2021-04-09 | 20 | -627/+525 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-09 | 3 | -15/+69 |
|\| | |||||
| * | [Keyboard] ergosaurus - add VIA support, enabled RGB (#12126) | littleferris | 2021-04-09 | 3 | -15/+69 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-09 | 11 | -0/+454 |
|\| | |||||
| * | [Keyboard] Added senselessclay had60 (#12093) | hadi | 2021-04-09 | 11 | -0/+454 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-09 | 3 | -1/+42 |
|\| | |||||
| * | Add VIA keymap for Kawii9 (#12521) | kiwikey | 2021-04-09 | 3 | -1/+42 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-09 | 67 | -80/+2526 |
|\| | |||||
| * | Add TH1800 PCB, Hex6C PCB, Rogue87 PCB, Rouge87 PCB, Infinity87 series (#11977) | mechlovin | 2021-04-09 | 67 | -80/+2526 |
| | | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: vuhopkep <boy9x0@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-09 | 1 | -1/+1 |
|\| | |||||
| * | Fix Breaking Change date (#12272) | peepeetee | 2021-04-09 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-08 | 12 | -0/+402 |
|\| | |||||
| * | Add new handwired keyboard (Ergocheap) (#11857) | Adrian | 2021-04-08 | 12 | -0/+402 |
| | | | | | | | | 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-04-08 | 1 | -2/+2 |
|\| | |||||
| * | `qmk chibios-confmigrate`: Make `-i` and `-r` required (#12515) | Ryan | 2021-04-08 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-07 | 1 | -9/+58 |
|\| | |||||
| * | Update info.json to correctly. (#12507) | Kosuke Adachi | 2021-04-07 | 1 | -9/+58 |
| | | |||||
* | | LED Matrix: Implement CIE1931 curve (#12417) | Ryan | 2021-04-07 | 3 | -27/+57 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-07 | 1 | -0/+82 |
|\| | |||||
| * | Add info.json for CK60i (#12318) | Ryan | 2021-04-07 | 1 | -0/+82 |
| | | |||||
* | | Fix up builds that are now too big for `develop` branch. (#12495) | Nick Brassel | 2021-04-06 | 3 | -0/+6 |
| | | |||||
* | | Add support for producing UF2-format binaries. (#12435) | Nick Brassel | 2021-04-06 | 6 | -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 develop | QMK Bot | 2021-04-04 | 1 | -1/+1 |
|\| | |||||
| * | Disarray ProductID change (#12440) | SneakboxKB | 2021-04-04 | 1 | -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 develop | QMK Bot | 2021-04-03 | 6 | -339/+353 |
|\| | |||||
| * | [Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows (#12259) | Takeshi ISHII | 2021-04-04 | 6 | -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 develop | QMK Bot | 2021-04-03 | 1 | -30/+35 |
|\| | |||||
| * | Add WSL specific logic for avrdude device detection (#12392) | Joel Challis | 2021-04-03 | 1 | -30/+35 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 1 | -1/+0 |
|\| | |||||
| * | Remove `wave` from requirements-dev.txt (#12387) | Excitable Snowball | 2021-04-03 | 1 | -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-03 | 1 | -11/+11 |
| | | | | | | Co-authored-by: QMK Bot <hello@qmk.fm> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 11 | -24/+676 |
|\| | |||||
| * | fix line endings | Zach White | 2021-04-03 | 3 | -56/+56 |
| | | |||||
| * | [nix] Use niv and poetry2nix to more easily manage dependencies (#11181) | Steve Purcell | 2021-04-03 | 6 | -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) | TurtleHunter | 2021-04-03 | 5 | -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 develop | QMK Bot | 2021-04-03 | 12 | -0/+1198 |
|\| | |||||
| * | Added Epoch80 (#12307) | kb-elmo | 2021-04-03 | 12 | -0/+1198 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into develop | fauxpark | 2021-04-03 | 2 | -77/+77 |
|\| | |||||
| * | [CI] Format code according to conventions (#12468) | github-actions[bot] | 2021-04-03 | 2 | -77/+77 |
| | | | | | | Co-authored-by: QMK Bot <hello@qmk.fm> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 3 | -24/+6 |
|\| | |||||
| * | kingly_keys/ave: move RGBLight config to keyboard level (#12457) | James Young | 2021-04-02 | 3 | -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 develop | QMK Bot | 2021-04-03 | 3 | -3/+3 |
|\| | |||||
| * | keymaps: fix kinesis default keymap progrm/reset keycode (#12429) | Michael Stapelberg | 2021-04-02 | 3 | -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 develop | QMK Bot | 2021-04-03 | 1 | -1/+5 |
|\| | |||||
| * | [Keymap] Fixing userspace `rverst` (#12422) | Robert Verst | 2021-04-02 | 1 | -1/+5 |
| | | | | | | Co-authored-by: Robert Verst <robert.verst@tobit.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-03 | 1 | -44/+15 |
|\| | |||||
| * | [Keymap] Remove kc keymap from khord chocopad keymap (#12409) | Dylan Khor | 2021-04-02 | 1 | -44/+15 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> |