Commit Graph

10563 Commits (08ce0142bad40f22d05d33fdef8a7c8907154e96)

Author SHA1 Message Date
Zach White 08ce0142ba
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>
2021-11-22 11:11:35 -08:00
QMK Bot 8181b155db Merge remote-tracking branch 'origin/master' into develop 2021-11-21 22:39:00 +00:00
James Young e864786c0b
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.
2021-11-21 14:38:31 -08:00
QMK Bot 79af7046ca Merge remote-tracking branch 'origin/master' into develop 2021-11-21 22:30:04 +00:00
James Young d1cf21bede
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
2021-11-21 14:29:37 -08:00
QMK Bot 2bdae2356b Merge remote-tracking branch 'origin/master' into develop 2021-11-21 22:21:52 +00:00
James Young debb0ecb5d
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.
2021-11-21 14:21:20 -08:00
QMK Bot 3242ac3092 Merge remote-tracking branch 'origin/master' into develop 2021-11-21 22:17:09 +00:00
James Young c491af01d5
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.
2021-11-21 14:16:37 -08:00
QMK Bot d11d2459ce Merge remote-tracking branch 'origin/master' into develop 2021-11-20 04:15:27 +00:00
ForeverAnApple eff9288759
[Keymap] Initial simple keymap for ForeverAnApple (#14654)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-19 20:14:54 -08:00
QMK Bot fb953fb5c3 Merge remote-tracking branch 'origin/master' into develop 2021-11-20 03:48:28 +00:00
jels 60b032e3bf
[Keyboard] Added Jels88 (#15090)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-19 19:47:58 -08:00
QMK Bot d08a33a45b Merge remote-tracking branch 'origin/master' into develop 2021-11-20 03:44:47 +00:00
James Young f7b24e2965
Meletrix Zoom65 Refactor (#15222) 2021-11-19 19:44:23 -08:00
James Young 9ccd22e8de
Minimon Index Tab touch-up (#15224) 2021-11-19 19:44:10 -08:00
QMK Bot 123015952f Merge remote-tracking branch 'origin/master' into develop 2021-11-20 03:42:54 +00:00
James Young 5de50cf645
Undead60M touch-up (#15214) 2021-11-19 19:42:44 -08:00
James Young 0facda9ecb
Lime rev1: fix Configurator implementation (#15213) 2021-11-19 19:42:27 -08:00
QMK Bot 9670a85163 Merge remote-tracking branch 'origin/master' into develop 2021-11-20 03:40:32 +00:00
Drashna Jaelre 7343a2fc93
[Keyboard] Fix xox70 via layout (#15220) 2021-11-19 19:40:02 -08:00
Joel Challis 2728603fe6
Move tmk_core/common/<plat> (#13918) 2021-11-19 10:41:02 -08:00
QMK Bot 43b9e23bae Merge remote-tracking branch 'origin/master' into develop 2021-11-19 17:54:22 +00:00
James Young 0107d77c24
Handwired Split65: Fix QMK Configurator Implementation (#15209) 2021-11-19 09:53:42 -08:00
QMK Bot 1888661ed9 Merge remote-tracking branch 'origin/master' into develop 2021-11-19 17:53:12 +00:00
rhmokey 6b3b302dfe
[Keyboard] Add xox70 (#15098) 2021-11-19 09:53:00 -08:00
QMK Bot eccdba0124 Merge remote-tracking branch 'origin/master' into develop 2021-11-19 17:52:54 +00:00
HellTM fa35df0374
[Keymap] 3w6 helltm keymap (with ascii art) (#15146)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-19 09:52:33 -08:00
QMK Bot 655015da4e Merge remote-tracking branch 'origin/master' into develop 2021-11-19 17:52:24 +00:00
Andy 3491a386da
[Keymap] Sofle RGB - fixed switch and numpad layers (#15094) 2021-11-19 09:52:15 -08:00
QMK Bot f5e2eda764 Merge remote-tracking branch 'origin/master' into develop 2021-11-19 17:52:05 +00:00
Callum Hart 802d7e5e15
[Keyboard] Add Keebcats Denis PCB (#15154) 2021-11-19 09:51:42 -08:00
QMK Bot 070ef07a34 Merge remote-tracking branch 'origin/master' into develop 2021-11-19 17:51:36 +00:00
jels 5c3afe3e6b
[Keyboard] Add b87 keyboard (#15091)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-19 09:51:21 -08:00
Ramon Imbao 817a82378b
[Keyboard] Add TKL-FF v2 (#15144)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-11-19 09:51:00 -08:00
QMK Bot 8011cbcc50 Merge remote-tracking branch 'origin/master' into develop 2021-11-19 17:50:51 +00:00
Nick Abe 66792b0769
[Keyboard] Aozora update (#15201)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-19 09:50:10 -08:00
Drashna Jael're 4be9919e9f
Merge remote-tracking branch 'origin/master' into develop 2021-11-19 09:48:23 -08:00
Yoshihiro Saito 94b5350246
[Keymap] Add yoshimaru46's keymap for Ergodash mini (#15191) 2021-11-19 09:42:39 -08:00
Callum Hart 10c36032a0
[Keyboard] Add Keebcats Dougal PCB (#15168) 2021-11-19 09:41:12 -08:00
Kyle Gieselman 58e7527e60
[Keyboard] Add MTBKeys MTB60 Keyboard (Solderable and Hotswap edition) (#14222)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-19 08:02:19 -08:00
James Young 4f764519ab
Chalice: Fix QMK Configurator Implementation (#15206) 2021-11-18 22:13:05 -08:00
James Young 9cdbc040cd
FFKeebs Púca Refactor (#15208) 2021-11-18 22:12:49 -08:00
James Young 26ae432190
handwired/split89 Layout Macro Refactor (#15210) 2021-11-18 22:12:21 -08:00
jfescobar18 d2b20692fb
[Keyboard] Add miniashen40 (#14238)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-18 21:03:56 -08:00
peepeetee c5f1e9797a
rename kprepublic bm keyboards to have a standardized naming format (#15047)
* change missed kprepublic readmes

* fix xiudi readmes

* initial change, see pr description

* change readmes

* changes names in readmes and device descriptors
2021-11-18 08:37:23 +11:00
QMK Bot 121a2e0f07 Merge remote-tracking branch 'origin/master' into develop 2021-11-17 20:54:48 +00:00
Drashna Jaelre 10e896630c
[Keyboard] Move encoder hacks into via keymaps for Work Louder boards (#15192) 2021-11-17 20:54:12 +00:00
QMK Bot b47f3b1853 Merge remote-tracking branch 'origin/master' into develop 2021-11-17 20:46:24 +00:00
Drashna Jaelre 254e26554b
[Keymap] updates for oled, and diablo 2 layer - Drashna (#15194) 2021-11-17 12:45:50 -08:00