~ruther/qmk_firmware

3f656d54 — Drashna Jaelre 3 years ago
[Keyboard] Disable console on Keebio foldkb and iris rev3 (#15260)

3fd6ae93 — QMK Bot 3 years ago
Merge remote-tracking branch 'origin/master' into develop
97a32eed — precondition 3 years ago
layer_combo → sd_combo (#15266)

e8ce66a0 — Drashna Jaelre 3 years ago
[Keymap] Disable console on Sofle default keymap (#15261)

a726b87d — Drashna Jaelre 3 years ago
[Keyboard] Enable LTO on viktus/sp_mini via keymap (#15263)

08ce0142 — Zach White 3 years ago
Macros in JSON keymaps (#14374)

* macros in json keymaps

* add advanced macro support to json

* add a note about escaping macro strings

* add simple examples

* format json

* add support for language specific keymap extras

* switch to dictionaries instead of inline text for macros

* use SS_TAP on the innermost tap keycode

* add the new macro format to the schema

* document the macro limit

* add the json keyword for syntax highlighting

* fix format that vscode screwed up

* Update feature_macros.md

* add tests for macros

* change ding to beep

* add json support for SENDSTRING_BELL

* update doc based on feedback from sigprof

* document host_layout

* remove unused var

* improve carriage return handling

* support tab characters as well

* Update docs/feature_macros.md

Co-authored-by: Nick Brassel <nick@tzarc.org>

* escape backslash characters

* format

* flake8

* Update quantum/quantum_keycodes.h

Co-authored-by: Nick Brassel <nick@tzarc.org>
8181b155 — QMK Bot 3 years ago
Merge remote-tracking branch 'origin/master' into develop
e864786c — James Young 3 years ago
Ocean Wang Ergo: Fix QMK Configurator Implementation (#15249)

* info.json: apply friendly formatting

* info.json: update labels; reposition keys

* wang_ergo.h: use XXX for KC_NO

* wang_ergo.h: add matrix diagram

* rename LAYOUT to LAYOUT_all

* move Backspace keycode to top row

Moves the matrix argument/keycode for Backspace to its proper position at the end of the top row.

* add LAYOUT_2x2u with keymap

* info.json: update maintainer field

Use the maintainer's GitHub username.
79af7046 — QMK Bot 3 years ago
Merge remote-tracking branch 'origin/master' into develop
d1cf21be — James Young 3 years ago
Mokey Ginkgo65 Layout Macro Refactor (#15233)

* rename LAYOUT to LAYOUT_65_ansi_blocker; enable Community Layout support

* refactor default keymaps

Updates grid alignment of keycodes, and adds a Function layer to the default keymap.

* refactor LAYOUT_iso into LAYOUT_65_iso_blocker_split_bs

Adds missing KC_NUBS position, and moves Enter keycode to home row (consistent with QMK Community Layout).

* remove LAYOUT_split_left_shift

With the changes to LAYOUT_65_iso_blocker_split_bs, LAYOUT_split_left_shift maps all the same positions, but in a different sequence, making it redundant.

* refactor LAYOUT_7u_space to LAYOUT_65_iso_blocker_tsangan_split_bs

Moves Enter keycode to home row.

* remove LAYOUT_split_space_1

LAYOUT_split_space_1 differs from LAYOUT_split_space_2 only in the sizes of the split spacebars, and I like the layout rendering of LAYOUT_split_space_2 better. :)

* refactor LAYOUT_split_space_2 into LAYOUT_all

ANSI Enter, split Backspace, split Left Shift, and Split Spacebar.

* add LAYOUT_65_ansi_blocker_split_bs

* add LAYOUT_65_ansi_blocker_tsangan_split_bs

* add LAYOUT_65_iso_blocker

* ginkgo65.h: touch-up block diagrams

* info.json: use maintainer's GitHub username

* bugfix layout macros

Position k1D wasn't being assigned on the ISO layouts or LAYOUT_all.

* rules.mk: update Community Layout support
2bdae235 — QMK Bot 3 years ago
Merge remote-tracking branch 'origin/master' into develop
debb0ecb — James Young 3 years ago
MW65 RGB Layout Macro Refactor (#15246)

* mw65_rgb.h: use QMK 3-character notation for matrix identifiers

* mw65_rgb.h: add matrix diagram

* info.json: apply friendly formatting

Update key labels for QMK CLI rendering.

* move rotary encoder keycodes to top row

* info.json: update maintainer field

Use the maintainer's GitHub username.
3242ac30 — QMK Bot 3 years ago
Merge remote-tracking branch 'origin/master' into develop
c491af01 — James Young 3 years ago
MW75 Layout Macro Refactor (#15247)

* mw75.h: use QMK 3-character matrix identifiers

* update stock keymaps

Use QMK-native keycode aliases, and update grid alignment of keycodes.

* mw75.h: add matrix diagram

* info.json: apply friendly formatting

* move rotary encoder keycodes to top row

* info.json: update maintainer field

Use the maintainer's GitHub username.
12ece58f — QMK Bot 3 years ago
Merge remote-tracking branch 'origin/master' into develop
739bf621 — Joel Challis 3 years ago
Tidy CI format error message (#15242)

* Tidy format error message
b47bdee9 — QMK Bot 3 years ago
Merge remote-tracking branch 'origin/master' into develop
2d71ac75 — Sergey Vlasov 3 years ago
Add Keyboardio Atreus 2 Bootloader to udev rules (#15241)

The Keyboardio Atreus 2 Bootloader is a clone of the Caterina bootloader
with different USB VID:PID values (1209:2302):

  https://github.com/keyboardio/Atreus2-Bootloader
eeab6f15 — Joel Challis 3 years ago
Short term bodge for PRODUCT warning (#15240)

06f18e22 — Balz Guenat 3 years ago
fix broken macro in transport.h (#15239)

Next