~ruther/qmk_firmware

7b776346 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
221d8fd8 — LongerHV 4 years ago
[CLI] Add stdin support for json2c command (#11289)

* Implement stdin for json2c command

* Refactor

* Handle json decode error

* Add stdin support for c2json cli command

* Refactor to prevent code duplication

* Change exit(1) to return False in c2json command

* Remove unused import
9748b6b8 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
Typo fix: Useful function -> Useful Functions (#11342)

Thanks!
d1b9a7e1 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
55843480 — Zach White 4 years ago
Fix compile issues from the error page (#11314)

* fix abacus so it works with configurator

* create the keymap path if it doesn't exist

* bpiphany/unloved_bastard: remove the nested macros, move default keymap to json

* readd the unloved_bastard default keymap

* fix clueboard/card

* fixup handwired/2x5keypad

* fixup hub16

* matrix/noah: remove the broken matrix print code to fix compilation

* reinstate matrix_print with the right include

* Revert "create the keymap path if it doesn't exist"

This reverts commit af732776a539e8c6e2edf2e54f4d7f5ffa65b3a2.
8ea2650a — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
5fde2d73 — David Doan 4 years ago
1x4p1 (#11186)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
99d63499 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
Ensure single newline at EOF for core files (#11310)

0c5be869 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
bbf0f652 — Joel Challis 4 years ago
Simplify the visual flow of the getting started page (#11316)

* Add tabs to getting started page

* Review comments

Co-authored-by: Ryan <fauxpark@gmail.com>

* Align with current theme

* Update docs/newbs_getting_started.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
0b37c0df — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
Change include guards in tmk_core/ and drivers/ to pragma once (#11240)

ffd7e44e — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
Change include guards in quantum/ to pragma once (#11239)

6c366ccf — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
53eb7f07 — Drashna Jaelre 4 years ago
[Keyboard] Fix default keymaps for tunks/ergo33 (#11280)

* [Keyboard] Fix default keymap for tunks/ergo33

* Add prpro keymap too
a4866b31 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
5544bf85 — Takeshi ISHII 4 years ago
[Keymap] update rules.mk and config.h of `helix/rev2:five_rows` (#11302)

* update keyboards/helix/rev2/keymaps/five_rows/rules.mk: oled selection, led animation selection

* add OLED_UPDATE_INTERVAL support into keyboards/helix/rev2/keymaps/five_rows/oled_display.c

Support for OLED_UPDATE_INTERVAL, even for older types of OLED tasks.

* Add 'HELIX=debug/no-debug' option into 'helix/rev2/keymaps/five_rows/rules.mk'
Next