From 116dfa95a4d752d425090b90feca40c72030ce05 Mon Sep 17 00:00:00 2001 From: Jason Short <1596580+jashort@users.noreply.github.com> Date: Sat, 1 Apr 2023 23:04:00 -0700 Subject: [PATCH 1/3] Fix arrows in example config.properties (#85) --- config.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config.properties b/config.properties index c7dd1c3..527853b 100644 --- a/config.properties +++ b/config.properties @@ -21,9 +21,11 @@ KC_MINS=- _ KC_EQL== + KC_ALGR(KC_5)=€ KC_SLSH=/ ? -KC_COMM=, > +KC_COMM=, < KC_ASTR=* -KC_DOT=. < +KC_DOT=. > KC_BSLS=\ | KC_QUOT=' " -KC_SCLN=; : \ No newline at end of file +KC_SCLN=; : +KC_QUES=? +KC_COLN=: \ No newline at end of file From 402622294a358e7c1b6ff629789561e3ebfec75a Mon Sep 17 00:00:00 2001 From: yskoht Date: Sun, 2 Apr 2023 17:52:12 +0900 Subject: [PATCH 2/3] Add test-update-snapshot --- test/Makefile | 3 + test/test.py | 204 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 206 insertions(+), 1 deletion(-) diff --git a/test/Makefile b/test/Makefile index 96d9d71..a9d208d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,6 +1,9 @@ test: python test.py +test-update-snapshot: + python test.py -u + setup: git clone --depth 1 https://github.com/qmk/qmk_firmware.git diff --git a/test/test.py b/test/test.py index 7fa457f..d5a7366 100644 --- a/test/test.py +++ b/test/test.py @@ -2,7 +2,7 @@ import subprocess status = True - +updateSnapshot = '-u' in sys.argv def exe(cmd): global status @@ -23,6 +23,15 @@ def exe(cmd): exe('diff -u expect/crkbd_2.json crkbd_2.json') exe('diff -u expect/crkbd_3.json crkbd_3.json') +if updateSnapshot: + exe('cp crkbd.c expect/crkbd.c') + exe('cp crkbd_fancy.c expect/crkbd_fancy.c') + exe('cp crkbd_0.json expect/crkbd_0.json') + exe('cp crkbd_1.json expect/crkbd_1.json') + exe('cp crkbd_2.json expect/crkbd_2.json') + exe('cp crkbd_3.json expect/crkbd_3.json') + + # dactyl_manuform5x6 exe('keymapviz -k dactyl_manuform5x6 ./qmk_firmware/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c -o dactyl_manuform5x6.c') exe('keymapviz -k dactyl_manuform5x6 ./qmk_firmware/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c -o dactyl_manuform5x6_fancy.c -t fancy') @@ -32,6 +41,12 @@ def exe(cmd): exe('diff -u expect/dactyl_manuform5x6_fancy.c dactyl_manuform5x6_fancy.c') exe('diff -u expect/dactyl_manuform5x6_0.json dactyl_manuform5x6_0.json') +if updateSnapshot: + exe('cp dactyl_manuform5x6.c expect/dactyl_manuform5x6.c') + exe('cp dactyl_manuform5x6_fancy.c expect/dactyl_manuform5x6_fancy.c') + exe('cp dactyl_manuform5x6_0.json expect/dactyl_manuform5x6_0.json') + + # ergo42 exe('keymapviz ./qmk_firmware/keyboards/biacco42/ergo42/keymaps/default/keymap.c -o ergo42.c') exe('keymapviz ./qmk_firmware/keyboards/biacco42/ergo42/keymaps/default/keymap.c -o ergo42_fancy.c -t fancy') @@ -43,6 +58,14 @@ def exe(cmd): exe('diff -u expect/ergo42_1.json ergo42_1.json') exe('diff -u expect/ergo42_2.json ergo42_2.json') +if updateSnapshot: + exe('cp ergo42.c expect/ergo42.c') + exe('cp ergo42_fancy.c expect/ergo42_fancy.c') + exe('cp ergo42_0.json expect/ergo42_0.json') + exe('cp ergo42_1.json expect/ergo42_1.json') + exe('cp ergo42_2.json expect/ergo42_2.json') + + # ergodash exe('keymapviz ./qmk_firmware/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c -o ergodash.c') exe('keymapviz ./qmk_firmware/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c -o ergodash_fancy.c -t fancy') @@ -55,6 +78,15 @@ def exe(cmd): exe('diff -u expect/ergodash_2.json ergodash_2.json') exe('diff -u expect/ergodash_3.json ergodash_3.json') +if updateSnapshot: + exe('cp ergodash.c expect/ergodash.c') + exe('cp ergodash_fancy.c expect/ergodash_fancy.c') + exe('cp ergodash_0.json expect/ergodash_0.json') + exe('cp ergodash_1.json expect/ergodash_1.json') + exe('cp ergodash_2.json expect/ergodash_2.json') + exe('cp ergodash_3.json expect/ergodash_3.json') + + # ergodash (2u_inner) exe('keymapviz ./qmk_firmware/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c -l 2u_inner -o ergodash_L2u_inner.c') exe('keymapviz ./qmk_firmware/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c -l 2u_inner -o ergodash_L2u_inner_fancy.c -t fancy ') @@ -67,6 +99,15 @@ def exe(cmd): exe('diff -u expect/ergodash_L2u_inner_2.json ergodash_L2u_inner_2.json') exe('diff -u expect/ergodash_L2u_inner_3.json ergodash_L2u_inner_3.json') +if updateSnapshot: + exe('cp ergodash_L2u_inner.c expect/ergodash_L2u_inner.c') + exe('cp ergodash_L2u_inner_fancy.c expect/ergodash_L2u_inner_fancy.c') + exe('cp ergodash_L2u_inner_0.json expect/ergodash_L2u_inner_0.json') + exe('cp ergodash_L2u_inner_1.json expect/ergodash_L2u_inner_1.json') + exe('cp ergodash_L2u_inner_2.json expect/ergodash_L2u_inner_2.json') + exe('cp ergodash_L2u_inner_3.json expect/ergodash_L2u_inner_3.json') + + # ergodox_ez exe('keymapviz ./qmk_firmware/keyboards/ergodox_ez/keymaps/default/keymap.c -o ergodox.c') exe('keymapviz ./qmk_firmware/keyboards/ergodox_ez/keymaps/default/keymap.c -o ergodox_fancy.c -t fancy') @@ -78,6 +119,14 @@ def exe(cmd): exe('diff -u expect/ergodox_1.json ergodox_1.json') exe('diff -u expect/ergodox_2.json ergodox_2.json') +if updateSnapshot: + exe('cp ergodox.c expect/ergodox.c') + exe('cp ergodox_fancy.c expect/ergodox_fancy.c') + exe('cp ergodox_0.json expect/ergodox_0.json') + exe('cp ergodox_1.json expect/ergodox_1.json') + exe('cp ergodox_2.json expect/ergodox_2.json') + + # fortitude60 exe('keymapviz ./qmk_firmware/keyboards/fortitude60/keymaps/default/keymap.c -o fortitude60.c') exe('keymapviz ./qmk_firmware/keyboards/fortitude60/keymaps/default/keymap.c -o fortitude60_fancy.c -t fancy') @@ -92,6 +141,17 @@ def exe(cmd): exe('diff -u expect/fortitude60_4.json fortitude60_4.json') exe('diff -u expect/fortitude60_5.json fortitude60_5.json') +if updateSnapshot: + exe('cp fortitude60.c expect/fortitude60.c') + exe('cp fortitude60_fancy.c expect/fortitude60_fancy.c') + exe('cp fortitude60_0.json expect/fortitude60_0.json') + exe('cp fortitude60_1.json expect/fortitude60_1.json') + exe('cp fortitude60_2.json expect/fortitude60_2.json') + exe('cp fortitude60_3.json expect/fortitude60_3.json') + exe('cp fortitude60_4.json expect/fortitude60_4.json') + exe('cp fortitude60_5.json expect/fortitude60_5.json') + + # helix exe('keymapviz ./qmk_firmware/keyboards/helix/rev2/keymaps/default/keymap.c -o helix.c') exe('keymapviz ./qmk_firmware/keyboards/helix/rev2/keymaps/default/keymap.c -o helix_fancy.c -t fancy') @@ -112,6 +172,23 @@ def exe(cmd): exe('diff -u expect/helix_10.json helix_10.json') exe('diff -u expect/helix_11.json helix_11.json') +if updateSnapshot: + exe('cp helix.c expect/helix.c') + exe('cp helix_fancy.c expect/helix_fancy.c') + exe('cp helix_0.json expect/helix_0.json') + exe('cp helix_1.json expect/helix_1.json') + exe('cp helix_2.json expect/helix_2.json') + exe('cp helix_3.json expect/helix_3.json') + exe('cp helix_4.json expect/helix_4.json') + exe('cp helix_5.json expect/helix_5.json') + exe('cp helix_6.json expect/helix_6.json') + exe('cp helix_7.json expect/helix_7.json') + exe('cp helix_8.json expect/helix_8.json') + exe('cp helix_9.json expect/helix_9.json') + exe('cp helix_10.json expect/helix_10.json') + exe('cp helix_11.json expect/helix_11.json') + + # kaishi65 exe('keymapviz ./qmk_firmware/keyboards/kbdclack/kaishi65/keymaps/default/keymap.c -o kaishi65.c') exe('keymapviz ./qmk_firmware/keyboards/kbdclack/kaishi65/keymaps/default/keymap.c -o kaishi65_fancy.c -t fancy') @@ -122,6 +199,13 @@ def exe(cmd): exe('diff -u expect/kaishi65_0.json kaishi65_0.json') exe('diff -u expect/kaishi65_1.json kaishi65_1.json') +if updateSnapshot: + exe('cp kaishi65.c expect/kaishi65.c') + exe('cp kaishi65_fancy.c expect/kaishi65_fancy.c') + exe('cp kaishi65_0.json expect/kaishi65_0.json') + exe('cp kaishi65_1.json expect/kaishi65_1.json') + + # kinesis exe('keymapviz ./qmk_firmware/keyboards/kinesis/keymaps/default/keymap.c -o kinesis.c') exe('keymapviz ./qmk_firmware/keyboards/kinesis/keymaps/default/keymap.c -o kinesis_fancy.c -t fancy') @@ -131,6 +215,12 @@ def exe(cmd): exe('diff -u expect/kinesis_fancy.c kinesis_fancy.c') exe('diff -u expect/kinesis_0.json kinesis_0.json') +if updateSnapshot: + exe('cp kinesis.c expect/kinesis.c') + exe('cp kinesis_fancy.c expect/kinesis_fancy.c') + exe('cp kinesis_0.json expect/kinesis_0.json') + + # kyria exe('keymapviz ./qmk_firmware/keyboards/splitkb/kyria/keymaps/default/keymap.c -o kyria.c') exe('keymapviz ./qmk_firmware/keyboards/splitkb/kyria/keymaps/default/keymap.c -o kyria_fancy.c -t fancy') @@ -146,6 +236,18 @@ def exe(cmd): exe('diff -u expect/kyria_5.json kyria_5.json') exe('diff -u expect/kyria_6.json kyria_6.json') +if updateSnapshot: + exe('cp kyria.c expect/kyria.c') + exe('cp kyria_fancy.c expect/kyria_fancy.c') + exe('cp kyria_0.json expect/kyria_0.json') + exe('cp kyria_1.json expect/kyria_1.json') + exe('cp kyria_2.json expect/kyria_2.json') + exe('cp kyria_3.json expect/kyria_3.json') + exe('cp kyria_4.json expect/kyria_4.json') + exe('cp kyria_5.json expect/kyria_5.json') + exe('cp kyria_6.json expect/kyria_6.json') + + # lets_split exe('keymapviz ./qmk_firmware/keyboards/lets_split/keymaps/default/keymap.c -o lets_split.c') exe('keymapviz ./qmk_firmware/keyboards/lets_split/keymaps/default/keymap.c -o lets_split_fancy.c -t fancy') @@ -160,6 +262,17 @@ def exe(cmd): exe('diff -u expect/lets_split_4.json lets_split_4.json') exe('diff -u expect/lets_split_5.json lets_split_5.json') +if updateSnapshot: + exe('cp lets_split.c expect/lets_split.c') + exe('cp lets_split_fancy.c expect/lets_split_fancy.c') + exe('cp lets_split_0.json expect/lets_split_0.json') + exe('cp lets_split_1.json expect/lets_split_1.json') + exe('cp lets_split_2.json expect/lets_split_2.json') + exe('cp lets_split_3.json expect/lets_split_3.json') + exe('cp lets_split_4.json expect/lets_split_4.json') + exe('cp lets_split_5.json expect/lets_split_5.json') + + # lily58 exe('keymapviz ./qmk_firmware/keyboards/lily58/keymaps/default/keymap.c -o lily58.c') exe('keymapviz ./qmk_firmware/keyboards/lily58/keymaps/default/keymap.c -o lily58_fancy.c -t fancy') @@ -172,6 +285,15 @@ def exe(cmd): exe('diff -u expect/lily58_2.json lily58_2.json') exe('diff -u expect/lily58_3.json lily58_3.json') +if updateSnapshot: + exe('cp lily58.c expect/lily58.c') + exe('cp lily58_fancy.c expect/lily58_fancy.c') + exe('cp lily58_0.json expect/lily58_0.json') + exe('cp lily58_1.json expect/lily58_1.json') + exe('cp lily58_2.json expect/lily58_2.json') + exe('cp lily58_3.json expect/lily58_3.json') + + # mint60 exe('keymapviz ./qmk_firmware/keyboards/mint60/keymaps/default/keymap.c -o mint60.c') exe('keymapviz ./qmk_firmware/keyboards/mint60/keymaps/default/keymap.c -o mint60_fancy.c -t fancy') @@ -182,6 +304,12 @@ def exe(cmd): exe('diff -u expect/mint60_0.json mint60_0.json') exe('diff -u expect/mint60_1.json mint60_1.json') +if updateSnapshot: + exe('cp mint60.c expect/mint60.c') + exe('cp mint60_fancy.c expect/mint60_fancy.c') + exe('cp mint60_0.json expect/mint60_0.json') + exe('cp mint60_1.json expect/mint60_1.json') + # moonlander exe('keymapviz ./qmk_firmware/keyboards/moonlander/keymaps/default/keymap.c -o moonlander.c') exe('keymapviz ./qmk_firmware/keyboards/moonlander/keymaps/default/keymap.c -o moonlander_fancy.c -t fancy') @@ -193,6 +321,14 @@ def exe(cmd): exe('diff -u expect/moonlander_1.json moonlander_1.json') exe('diff -u expect/moonlander_2.json moonlander_2.json') +if updateSnapshot: + exe('cp moonlander.c expect/moonlander.c') + exe('cp moonlander_fancy.c expect/moonlander_fancy.c') + exe('cp moonlander_0.json expect/moonlander_0.json') + exe('cp moonlander_1.json expect/moonlander_1.json') + exe('cp moonlander_2.json expect/moonlander_2.json') + + # sofle exe('keymapviz ./qmk_firmware/keyboards/sofle/keymaps/default/keymap.c -o sofle.c') exe('keymapviz ./qmk_firmware/keyboards/sofle/keymaps/default/keymap.c -o sofle_fancy.c -t fancy') @@ -206,6 +342,14 @@ def exe(cmd): exe('diff -u expect/sofle_3.json sofle_3.json') exe('diff -u expect/sofle_4.json sofle_4.json') +if updateSnapshot: + exe('cp sofle.c expect/sofle.c') + exe('cp sofle_fancy.c expect/sofle_fancy.c') + exe('cp sofle_0.json expect/sofle_0.json') + exe('cp sofle_1.json expect/sofle_1.json') + exe('cp sofle_2.json expect/sofle_2.json') + + # sweet16 exe('keymapviz ./qmk_firmware/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c -o sweet16.c') exe('keymapviz ./qmk_firmware/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c -o sweet16_fancy.c -t fancy') @@ -215,17 +359,35 @@ def exe(cmd): exe('diff -u expect/sweet16_fancy.c sweet16_fancy.c') exe('diff -u expect/sweet16_0.json sweet16_0.json') +if updateSnapshot: + exe('cp sweet16.c expect/sweet16.c') + exe('cp sweet16_fancy.c expect/sweet16_fancy.c') + exe('cp sweet16_0.json expect/sweet16_0.json') + + # replace option exe('keymapviz -r -k lets_split ./input/replace_lets_split_keymap.c >/dev/null 2>&1') exe('diff -u expect/replace_lets_split_keymap.c input/replace_lets_split_keymap.c') +if updateSnapshot: + exe('cp input/replace_lets_split_keymap.c expect/replace_lets_split_keymap.c') + + exe('keymapviz -r -k lets_split -t fancy ./input/replace_lets_split_keymap_fancy.c >/dev/null 2>&1') exe('diff -u expect/replace_lets_split_keymap_fancy.c input/replace_lets_split_keymap_fancy.c') +if updateSnapshot: + exe('cp input/replace_lets_split_keymap_fancy.c expect/replace_lets_split_keymap_fancy.c') + + # custom config exe('keymapviz -k lets_split ./input/custom_legends_lets_split_keymap.c -c ./input/custom_legends_config.properties -o custom_legends_lets_split.c') exe('diff -u expect/custom_legends_lets_split.c custom_legends_lets_split.c') +if updateSnapshot: + exe('cp custom_legends_lets_split.c expect/custom_legends_lets_split.c') + + # planck (default/grid) exe('keymapviz ./qmk_firmware/keyboards/planck/keymaps/default/keymap.c -o planck_default.c') exe('keymapviz ./qmk_firmware/keyboards/planck/keymaps/default/keymap.c -o planck_default_fancy.c -t fancy') @@ -240,6 +402,17 @@ def exe(cmd): exe('diff -u expect/planck_grid_4.json planck_default_4.json') exe('diff -u expect/planck_grid_5.json planck_default_5.json') +if updateSnapshot: + exe('cp planck_default.c expect/planck_grid.c') + exe('cp planck_default_fancy.c expect/planck_grid_fancy.c') + exe('cp planck_default_0.json expect/planck_grid_0.json') + exe('cp planck_default_1.json expect/planck_grid_1.json') + exe('cp planck_default_2.json expect/planck_grid_2.json') + exe('cp planck_default_3.json expect/planck_grid_3.json') + exe('cp planck_default_4.json expect/planck_grid_4.json') + exe('cp planck_default_5.json expect/planck_grid_5.json') + + exe('keymapviz ./qmk_firmware/keyboards/planck/keymaps/default/keymap.c -o planck_grid.c -l grid') exe('keymapviz ./qmk_firmware/keyboards/planck/keymaps/default/keymap.c -o planck_grid_fancy.c -t fancy -l grid') exe('keymapviz ./qmk_firmware/keyboards/planck/keymaps/default/keymap.c -o planck_grid_{}.json -t json -l grid') @@ -253,6 +426,17 @@ def exe(cmd): exe('diff -u expect/planck_grid_4.json planck_grid_4.json') exe('diff -u expect/planck_grid_5.json planck_grid_5.json') +if updateSnapshot: + exe('cp planck_grid.c expect/planck_grid.c') + exe('cp planck_grid_fancy.c expect/planck_grid_fancy.c') + exe('cp planck_grid_0.json expect/planck_grid_0.json') + exe('cp planck_grid_1.json expect/planck_grid_1.json') + exe('cp planck_grid_2.json expect/planck_grid_2.json') + exe('cp planck_grid_3.json expect/planck_grid_3.json') + exe('cp planck_grid_4.json expect/planck_grid_4.json') + exe('cp planck_grid_5.json expect/planck_grid_5.json') + + # planck (mit) exe('keymapviz ./qmk_firmware/keyboards/planck/keymaps/rootiest/keymap.c -o planck_mit.c -l mit') exe('keymapviz ./qmk_firmware/keyboards/planck/keymaps/rootiest/keymap.c -o planck_mit_fancy.c -t fancy -l mit') @@ -267,6 +451,17 @@ def exe(cmd): exe('diff -u expect/planck_mit_4.json planck_mit_4.json') exe('diff -u expect/planck_mit_5.json planck_mit_5.json') +if updateSnapshot: + exe('cp planck_mit.c expect/planck_mit.c') + exe('cp planck_mit_fancy.c expect/planck_mit_fancy.c') + exe('cp planck_mit_0.json expect/planck_mit_0.json') + exe('cp planck_mit_1.json expect/planck_mit_1.json') + exe('cp planck_mit_2.json expect/planck_mit_2.json') + exe('cp planck_mit_3.json expect/planck_mit_3.json') + exe('cp planck_mit_4.json expect/planck_mit_4.json') + exe('cp planck_mit_5.json expect/planck_mit_5.json') + + # id75 exe('keymapviz ./qmk_firmware/keyboards/idobao/id75/keymaps/default/keymap.c -o id75.c') exe('keymapviz ./qmk_firmware/keyboards/idobao/id75/keymaps/default/keymap.c -o id75_fancy.c -t fancy') @@ -277,6 +472,13 @@ def exe(cmd): exe('diff -u expect/id75_0.json id75_0.json') exe('diff -u expect/id75_1.json id75_1.json') +if updateSnapshot: + exe('cp id75.c expect/id75.c') + exe('cp id75_fancy.c expect/id75_fancy.c') + exe('cp id75_0.json expect/id75_0.json') + exe('cp id75_1.json expect/id75_1.json') + + if status: print('\nAll tests were passed successfully!') sys.exit(0 if status else 1) From ee7ebbb5f843cb2f5eeb7afc2eed330c17468576 Mon Sep 17 00:00:00 2001 From: yskoht Date: Sun, 2 Apr 2023 17:57:02 +0900 Subject: [PATCH 3/3] Fix test --- test/expect/dactyl_manuform5x6.c | 6 +- test/expect/dactyl_manuform5x6_0.json | 2 +- test/expect/dactyl_manuform5x6_fancy.c | 6 +- test/expect/ergo42.c | 2 +- test/expect/ergo42_1.json | 4 +- test/expect/ergo42_fancy.c | 2 +- test/expect/ergodash.c | 2 +- test/expect/ergodash_3.json | 4 +- test/expect/ergodash_L2u_inner.c | 2 +- test/expect/ergodash_L2u_inner_3.json | 4 +- test/expect/ergodash_L2u_inner_fancy.c | 2 +- test/expect/ergodash_fancy.c | 2 +- test/expect/ergodox.c | 2 +- test/expect/ergodox_1.json | 2 +- test/expect/ergodox_fancy.c | 2 +- test/expect/kinesis.c | 2 +- test/expect/kinesis_0.json | 2 +- test/expect/kinesis_fancy.c | 2 +- test/expect/kyria.c | 2 +- test/expect/kyria_3.json | 2 +- test/expect/kyria_fancy.c | 2 +- test/expect/lily58.c | 2 +- test/expect/lily58_0.json | 2 +- test/expect/lily58_fancy.c | 2 +- test/expect/moonlander.c | 2 +- test/expect/moonlander_1.json | 2 +- test/expect/moonlander_fancy.c | 2 +- test/expect/planck_grid.c | 6 +- test/expect/planck_grid_fancy.c | 6 +- test/expect/planck_mit.c | 40 +++++------ test/expect/planck_mit_0.json | 6 +- test/expect/planck_mit_1.json | 6 +- test/expect/planck_mit_2.json | 6 +- test/expect/planck_mit_fancy.c | 40 +++++------ test/expect/sofle.c | 4 +- test/expect/sofle_0.json | 8 +-- test/expect/sofle_1.json | 8 +-- test/expect/sofle_fancy.c | 4 +- test/input/replace_lets_split_keymap.c | 70 +++++++++++++++++--- test/input/replace_lets_split_keymap_fancy.c | 57 ++++++++++++++-- 40 files changed, 211 insertions(+), 118 deletions(-) diff --git a/test/expect/dactyl_manuform5x6.c b/test/expect/dactyl_manuform5x6.c index 9f3142b..fe4171f 100644 --- a/test/expect/dactyl_manuform5x6.c +++ b/test/expect/dactyl_manuform5x6.c @@ -6,7 +6,7 @@ * |-------+-------| S | D | F | G | | H | J | K | L |-------+------| * | LSFT | A |-------+-------+-------+-------| |-------+-------+-------+-------| SCLN | QUOT | * |-------+-------| X | C | V | B | | N | M | COMM | DOT |-------+------| - * | LCTL | Z |-------+-------+---------------' `---------------+-------+-------| SLSH |BSLASH| + * | LCTL | Z |-------+-------+---------------' `---------------+-------+-------| SLSH | BSLS | * `---------------| LBRC | RBRC | | PLUS | EQL |--------------' * `---------------' `---------------' * ,---------------. ,---------------. @@ -37,8 +37,8 @@ /* ,-------------------------------. ,-------------------------------. * ,---------------| F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 |--------------. * | F12 | F1 |-------+-------+-------+-------| |-------+-------+-------+-------| F10 | F11 | - * |-------+-------| | | | LBRC | | RBRC | | NLCK | INS |-------+------| - * | | |-------+-------+-------+-------| |-------+-------+-------+-------| SLCK | MUTE | + * |-------+-------| | | | LBRC | | RBRC | | NUM | INS |-------+------| + * | | |-------+-------+-------+-------| |-------+-------+-------+-------| SCRL | MUTE | * |-------+-------| UP | DOWN | RGHT | LPRN | | RPRN | MPRV | MPLY | MNXT |-------+------| * | | LEFT |-------+-------+-------+-------| |-------+-------+-------+-------| | VOLU | * |-------+-------| | | | | | | | | |-------+------| diff --git a/test/expect/dactyl_manuform5x6_0.json b/test/expect/dactyl_manuform5x6_0.json index 8ab85e9..4f15db1 100644 --- a/test/expect/dactyl_manuform5x6_0.json +++ b/test/expect/dactyl_manuform5x6_0.json @@ -114,7 +114,7 @@ "x": 13.5 }, "SLSH", - "BSLASH" + "BSLS" ], [ { diff --git a/test/expect/dactyl_manuform5x6_fancy.c b/test/expect/dactyl_manuform5x6_fancy.c index adf1426..21aa609 100644 --- a/test/expect/dactyl_manuform5x6_fancy.c +++ b/test/expect/dactyl_manuform5x6_fancy.c @@ -6,7 +6,7 @@ * ├───────┼───────┤ S │ D │ F │ G │ │ H │ J │ K │ L ├───────┼──────┤ * │ LSFT │ A ├───────┼───────┼───────┼───────┤ ├───────┼───────┼───────┼───────┤ SCLN │ QUOT │ * ├───────┼───────┤ X │ C │ V │ B │ │ N │ M │ COMM │ DOT ├───────┼──────┤ - * │ LCTL │ Z ├───────┼───────┼───────┴───────┘ └───────┴───────┼───────┼───────┤ SLSH │BSLASH│ + * │ LCTL │ Z ├───────┼───────┼───────┴───────┘ └───────┴───────┼───────┼───────┤ SLSH │ BSLS │ * └───────┴───────┤ LBRC │ RBRC │ │ PLUS │ EQL ├───────┴──────┘ * └───────┴───────┘ └───────┴───────┘ * ┏━━━━━━━┳━━━━━━━┓ ┏━━━━━━━┳━━━━━━━┓ @@ -37,8 +37,8 @@ /* ┌───────┬───────┬───────┬───────┐ ┌───────┬───────┬───────┬───────┐ * ┌───────┬───────┤ F2 │ F3 │ F4 │ F5 │ │ F6 │ F7 │ F8 │ F9 ├───────┬──────┐ * │ F12 │ F1 ├───────┼───────┼───────┼───────┤ ├───────┼───────┼───────┼───────┤ F10 │ F11 │ - * ├───────┼───────┤ │ │ │ LBRC │ │ RBRC │ │ NLCK │ INS ├───────┼──────┤ - * │ │ ├───────┼───────┼───────┼───────┤ ├───────┼───────┼───────┼───────┤ SLCK │ MUTE │ + * ├───────┼───────┤ │ │ │ LBRC │ │ RBRC │ │ NUM │ INS ├───────┼──────┤ + * │ │ ├───────┼───────┼───────┼───────┤ ├───────┼───────┼───────┼───────┤ SCRL │ MUTE │ * ├───────┼───────┤ UP │ DOWN │ RGHT │ LPRN │ │ RPRN │ MPRV │ MPLY │ MNXT ├───────┼──────┤ * │ │ LEFT ├───────┼───────┼───────┼───────┤ ├───────┼───────┼───────┼───────┤ │ VOLU │ * ├───────┼───────┤ │ │ │ │ │ │ │ │ ├───────┼──────┤ diff --git a/test/expect/ergo42.c b/test/expect/ergo42.c index dd3fb5d..52cf643 100644 --- a/test/expect/ergo42.c +++ b/test/expect/ergo42.c @@ -14,7 +14,7 @@ * ,------------------------------------------------. ,------------------------------------------------. * |QK_BOO| 1 | 2 | 3 | 4 | 5 | LBRC | | RBRC | 6 | 7 | 8 | 9 | 0 | | * |------+------+------+------+------+------+------| |-------------+------+------+------+------+------| - * | | F1 | | MHEN | HENK | | | | LEFT | DOWN | UP | RGHT | | | | + * | | F1 | | INT5 | INT4 | | | | LEFT | DOWN | UP | RGHT | | | | * |------+------+------+------+------+------+------| |------|------+------+------+------+------+------| * | | F2 | F3 | F4 | F5 | F6 |S(KC_L| |S(KC_R| F7 | F8 | F9 | F10 | F11 | F12 | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| diff --git a/test/expect/ergo42_1.json b/test/expect/ergo42_1.json index b2443a7..319328d 100644 --- a/test/expect/ergo42_1.json +++ b/test/expect/ergo42_1.json @@ -25,8 +25,8 @@ "", "F1", "", - "MHEN", - "HENK", + "INT5", + "INT4", "", "", { diff --git a/test/expect/ergo42_fancy.c b/test/expect/ergo42_fancy.c index a54c72e..62a731c 100644 --- a/test/expect/ergo42_fancy.c +++ b/test/expect/ergo42_fancy.c @@ -14,7 +14,7 @@ * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐ * │QK_BOO│ 1 │ 2 │ 3 │ 4 │ 5 │ LBRC │ │ RBRC │ 6 │ 7 │ 8 │ 9 │ 0 │ │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │ │ F1 │ │ MHEN │ HENK │ │ │ │ LEFT │ DOWN │ UP │ RGHT │ │ │ │ + * │ │ F1 │ │ INT5 │ INT4 │ │ │ │ LEFT │ DOWN │ UP │ RGHT │ │ │ │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ * │ │ F2 │ F3 │ F4 │ F5 │ F6 │S(KC_L│ │S(KC_R│ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ diff --git a/test/expect/ergodash.c b/test/expect/ergodash.c index 1ac5d6a..0707ca4 100644 --- a/test/expect/ergodash.c +++ b/test/expect/ergodash.c @@ -43,7 +43,7 @@ * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| * | |QK_BOO|RGB_TO|RGB_MO|RGB_HU|RGB_HU| | | |RGB_SA|RGB_SA|RGB_VA|RGB_VA| | | * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | |BL_TOG|BL_BRT|BL_INC|BL_DEC| | | | | | | | | | + * | | |BL_TOG|BL_BRT|BL_UP |BL_DOW| | | | | | | | | | * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| * | | | | | | | | | | | | | | | | * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| diff --git a/test/expect/ergodash_3.json b/test/expect/ergodash_3.json index d30d709..0350369 100644 --- a/test/expect/ergodash_3.json +++ b/test/expect/ergodash_3.json @@ -153,7 +153,7 @@ { "x": 1 }, - "BL_INC", + "BL_UP", { "x": 5 }, @@ -172,7 +172,7 @@ { "x": 3 }, - "BL_DEC", + "BL_DOWN", { "x": 3 }, diff --git a/test/expect/ergodash_L2u_inner.c b/test/expect/ergodash_L2u_inner.c index 9bce8cb..cf85b8e 100644 --- a/test/expect/ergodash_L2u_inner.c +++ b/test/expect/ergodash_L2u_inner.c @@ -48,7 +48,7 @@ * |-------+-------+-------+-------+-------+-------| | | |-------+-------+-------+-------+-------+-------| * | |QK_BOOT|RGB_TOG|RGB_MOD|RGB_HUD|RGB_HUI|-------| |-------|RGB_SAD|RGB_SAI|RGB_VAD|RGB_VAI| | | * |-------+-------+-------+-------+-------+-------| | | |-------+-------+-------+-------+-------+-------| - * | | |BL_TOGG|BL_BRTG|BL_INC |BL_DEC |-------| |-------| | | | | | | + * | | |BL_TOGG|BL_BRTG| BL_UP |BL_DOWN|-------| |-------| | | | | | | * |-------+-------+-------+-------+-------+-------| | | |-------+-------+-------+-------+-------+-------| * | | | | | | |-------' `-------| | | | | | | * |-------+-------+-------+-------+---------------' `---------------+-------+-------+-------+-------| diff --git a/test/expect/ergodash_L2u_inner_3.json b/test/expect/ergodash_L2u_inner_3.json index 1202418..3469b67 100644 --- a/test/expect/ergodash_L2u_inner_3.json +++ b/test/expect/ergodash_L2u_inner_3.json @@ -66,8 +66,8 @@ "", "BL_TOGG", "BL_BRTG", - "BL_INC", - "BL_DEC", + "BL_UP", + "BL_DOWN", { "x": 4 }, diff --git a/test/expect/ergodash_L2u_inner_fancy.c b/test/expect/ergodash_L2u_inner_fancy.c index 5fa61c0..cc6cb47 100644 --- a/test/expect/ergodash_L2u_inner_fancy.c +++ b/test/expect/ergodash_L2u_inner_fancy.c @@ -48,7 +48,7 @@ * ├───────┼───────┼───────┼───────┼───────┼───────┤ │ │ ├───────┼───────┼───────┼───────┼───────┼───────┤ * │ │QK_BOOT│RGB_TOG│RGB_MOD│RGB_HUD│RGB_HUI├───────┤ ├───────┤RGB_SAD│RGB_SAI│RGB_VAD│RGB_VAI│ │ │ * ├───────┼───────┼───────┼───────┼───────┼───────┤ │ │ ├───────┼───────┼───────┼───────┼───────┼───────┤ - * │ │ │BL_TOGG│BL_BRTG│BL_INC │BL_DEC ├───────┤ ├───────┤ │ │ │ │ │ │ + * │ │ │BL_TOGG│BL_BRTG│ BL_UP │BL_DOWN├───────┤ ├───────┤ │ │ │ │ │ │ * ├───────┼───────┼───────┼───────┼───────┼───────┤ │ │ ├───────┼───────┼───────┼───────┼───────┼───────┤ * │ │ │ │ │ │ ├───────┘ └───────┤ │ │ │ │ │ │ * ├───────┼───────┼───────┼───────┼───────┴───────┘ └───────┴───────┼───────┼───────┼───────┼───────┤ diff --git a/test/expect/ergodash_fancy.c b/test/expect/ergodash_fancy.c index 3c48a6c..7925ce6 100644 --- a/test/expect/ergodash_fancy.c +++ b/test/expect/ergodash_fancy.c @@ -43,7 +43,7 @@ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼────────────────────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ * │ │QK_BOO│RGB_TO│RGB_MO│RGB_HU│RGB_HU│ │ │ │RGB_SA│RGB_SA│RGB_VA│RGB_VA│ │ │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼────────────────────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │ │ │BL_TOG│BL_BRT│BL_INC│BL_DEC│ │ │ │ │ │ │ │ │ │ + * │ │ │BL_TOG│BL_BRT│BL_UP │BL_DOW│ │ │ │ │ │ │ │ │ │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼────────────────────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├──────┼──────┼──────┼──────┼┬┬┬┬┬┬┼──────┼──────┼──────┬┬┬┬┬┬┬┬──────┼──────┼──────┼┬┬┬┬┬┬┼──────┼──────┼──────┼──────┤ diff --git a/test/expect/ergodox.c b/test/expect/ergodox.c index dc1bbd8..39086d1 100644 --- a/test/expect/ergodox.c +++ b/test/expect/ergodox.c @@ -26,7 +26,7 @@ * !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------! * | |PERC |CIRC |LBRC |RBRC |TILD | | ! |AMPR | 1 | 2 | 3 |BSLS | | * '-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------' - * |EEP_RS| | | | | ! | DOT | 0 | EQL | | + * |EE_CLR| | | | | ! | DOT | 0 | EQL | | * '------------------------------' '------------------------------' * .---------------. .---------------. * |RGB_MOD| | !RGB_TOG|RGB_M_P| diff --git a/test/expect/ergodox_1.json b/test/expect/ergodox_1.json index 85e2296..948c7af 100644 --- a/test/expect/ergodox_1.json +++ b/test/expect/ergodox_1.json @@ -315,7 +315,7 @@ "y": -0.75, "x": 0.5 }, - "EEP_RST", + "EE_CLR", "", { "x": 14.5 diff --git a/test/expect/ergodox_fancy.c b/test/expect/ergodox_fancy.c index 7c98854..0168f57 100644 --- a/test/expect/ergodox_fancy.c +++ b/test/expect/ergodox_fancy.c @@ -26,7 +26,7 @@ * ├───────┼─────┼─────┼─────┼─────┼─────┤ │ │ ├─────┼─────┼─────┼─────┼─────┼───────┤ * │ │PERC │CIRC │LBRC │RBRC │TILD │ │ │ │AMPR │ 1 │ 2 │ 3 │BSLS │ │ * └┬──────┼─────┼─────┼─────┼─────┼─────┴───────┘ └───────┴─────┼─────┼─────┼─────┼─────┼──────┬┘ - * │EEP_RS│ │ │ │ │ │ │ DOT │ 0 │ EQL │ │ + * │EE_CLR│ │ │ │ │ │ │ DOT │ 0 │ EQL │ │ * └──────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴──────┘ * ┌───────┬───────┐ ┌───────┬───────┐ * │RGB_MOD│ │ │RGB_TOG│RGB_M_P│ diff --git a/test/expect/kinesis.c b/test/expect/kinesis.c index 0f1d114..f7fa771 100644 --- a/test/expect/kinesis.c +++ b/test/expect/kinesis.c @@ -1,5 +1,5 @@ /* ,---------------------------------------------------------------------------------------------------------------------------------. - * | ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | PSCR | SLCK | PAUS | |QK_BOO | + * | ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | PSCR | SCRL | PAUS | |QK_BOO | * |--------+------+------+------+------+------+-----------------------------------------+------+------+------+------+------+--------| * | EQL | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | MINS | * |--------+------+------+------+------+------| +------+------+------+------+------+--------| diff --git a/test/expect/kinesis_0.json b/test/expect/kinesis_0.json index 17a8430..1693e55 100644 --- a/test/expect/kinesis_0.json +++ b/test/expect/kinesis_0.json @@ -90,7 +90,7 @@ "w": 0.675, "h": 0.85 }, - "SLCK", + "SCRL", { "x": 0.07499999999999929, "w": 0.675, diff --git a/test/expect/kinesis_fancy.c b/test/expect/kinesis_fancy.c index 4f84fae..104486e 100644 --- a/test/expect/kinesis_fancy.c +++ b/test/expect/kinesis_fancy.c @@ -1,5 +1,5 @@ /* ┌────────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬────────┐ - * │ ESC │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │ PSCR │ SLCK │ PAUS │ │QK_BOO │ + * │ ESC │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │ PSCR │ SCRL │ PAUS │ │QK_BOO │ * ├────────┼──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┴──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┼────────┤ * │ EQL │ 1 │ 2 │ 3 │ 4 │ 5 │ │ 6 │ 7 │ 8 │ 9 │ 0 │ MINS │ * ├────────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼────────┤ diff --git a/test/expect/kyria.c b/test/expect/kyria.c index f31eb94..b1c71d6 100644 --- a/test/expect/kyria.c +++ b/test/expect/kyria.c @@ -36,7 +36,7 @@ * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | LGUI | LALT | LCTL | LSFT | | | PGDN | LEFT | DOWN | RGHT | VOLD | INS | * |------+------+------+------+------+------+------+------. ,------+------+------+------+------+------+------+------| - * | | | | | | | | SLCK | | | |PAUSE | MPRV | MPLY | MNXT | MUTE | PSCR | + * | | | | | | | | SCRL | | | |PAUSE | MPRV | MPLY | MNXT | MUTE | PSCR | * `------+------+------+------+------+------+------+------. ,------+------+------+------+------+------+------+------' * | | | | | | | | | | | | * | | | | | | | | | | | | diff --git a/test/expect/kyria_3.json b/test/expect/kyria_3.json index 5f2ba04..6639d2e 100644 --- a/test/expect/kyria_3.json +++ b/test/expect/kyria_3.json @@ -216,7 +216,7 @@ "y": -2, "x": -0.5 }, - "SLCK" + "SCRL" ], [ { diff --git a/test/expect/kyria_fancy.c b/test/expect/kyria_fancy.c index 9db2bb1..10b89b3 100644 --- a/test/expect/kyria_fancy.c +++ b/test/expect/kyria_fancy.c @@ -36,7 +36,7 @@ * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ * │ │ LGUI │ LALT │ LCTL │ LSFT │ │ │ PGDN │ LEFT │ DOWN │ RGHT │ VOLD │ INS │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┬──────┐ ┌──────┬──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │ │ │ │ │ │ │ │ SLCK │ │ │ │PAUSE │ MPRV │ MPLY │ MNXT │ MUTE │ PSCR │ + * │ │ │ │ │ │ │ │ SCRL │ │ │ │PAUSE │ MPRV │ MPLY │ MNXT │ MUTE │ PSCR │ * └──────┴──────┴──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┴──────┴──────┘ * │ │ │ │ │ │ │ │ │ │ │ │ * │ │ │ │ │ │ │ │ │ │ │ │ diff --git a/test/expect/lily58.c b/test/expect/lily58.c index fdd1866..52b74e6 100644 --- a/test/expect/lily58.c +++ b/test/expect/lily58.c @@ -3,7 +3,7 @@ * |------+------+------+------+------+------| |------+------+------+------+------+------| * | TAB | Q | W | E | R | T | | Y | U | I | O | P | MINS | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |LCTRL | A | S | D | F | G | | H | J | K | L | SCLN | QUOT | + * | LCTL | A | S | D | F | G | | H | J | K | L | SCLN | QUOT | * |------+------+------+------+------+------|-------. ,-------|------+------+------+------+------+------| * | LSFT | Z | X | C | V | B | LBRC | | RBRC | N | M | COMM | DOT | SLSH | RSFT | * `------+------+------+------+------+------|-------/ \-------|------+------+------+------+------+------| diff --git a/test/expect/lily58_0.json b/test/expect/lily58_0.json index 4e2e796..e3fcebc 100644 --- a/test/expect/lily58_0.json +++ b/test/expect/lily58_0.json @@ -191,7 +191,7 @@ "a": 7, "f": 1 }, - "LCTRL", + "LCTL", { "x": 10.25, "f": 3 diff --git a/test/expect/lily58_fancy.c b/test/expect/lily58_fancy.c index 250be45..98aeb96 100644 --- a/test/expect/lily58_fancy.c +++ b/test/expect/lily58_fancy.c @@ -3,7 +3,7 @@ * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ * │ TAB │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ MINS │ * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ - * │LCTRL │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ SCLN │ QUOT │ + * │ LCTL │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ SCLN │ QUOT │ * ├──────┼──────┼──────┼──────┼──────┼──────┼───────┐ ┌───────┼──────┼──────┼──────┼──────┼──────┼──────┤ * │ LSFT │ Z │ X │ C │ V │ B │ LBRC │ │ RBRC │ N │ M │ COMM │ DOT │ SLSH │ RSFT │ * └──────┴──────┴───┬──┴───┬──┴───┬──┴───┬─┬┴──────┬┘ └┬──────┴┬──┬──┴───┬──┴───┬──┴───┬──┴──────┴──────┘ diff --git a/test/expect/moonlander.c b/test/expect/moonlander.c index c1c7dd4..0af0d63 100644 --- a/test/expect/moonlander.c +++ b/test/expect/moonlander.c @@ -24,7 +24,7 @@ * !-------+-----+-----+-----+-----+-----+-------' '-------+-----+-----+-----+-----+-----+-------! * | |PERC |CIRC |LBRC |RBRC |TILD | |AMPR | 1 | 2 | 3 |BSLS | | * !-------+-----+-----+-----+-----+-----' '-----+-----+-----+-----+-----+-------! - * |EEP_RST| | | | | | | DOT | 0 | EQL | | + * |EE_CLR | | | | | | | DOT | 0 | EQL | | * '-------------------------------' '-------------------------------' * .---------------. .---------------. * | RGB_VAI | ! RGB_TOG | diff --git a/test/expect/moonlander_1.json b/test/expect/moonlander_1.json index 0fc411a..c6b79e7 100644 --- a/test/expect/moonlander_1.json +++ b/test/expect/moonlander_1.json @@ -306,7 +306,7 @@ { "y": -0.9000000000000004 }, - "EEP_RST", + "EE_CLR", { "x": 15 }, diff --git a/test/expect/moonlander_fancy.c b/test/expect/moonlander_fancy.c index fd07c11..de8bb98 100644 --- a/test/expect/moonlander_fancy.c +++ b/test/expect/moonlander_fancy.c @@ -24,7 +24,7 @@ * ├───────┼─────┼─────┼─────┼─────┼─────┼───────┘ └───────┼─────┼─────┼─────┼─────┼─────┼───────┤ * │ │PERC │CIRC │LBRC │RBRC │TILD │ │AMPR │ 1 │ 2 │ 3 │BSLS │ │ * ├───────┼─────┼─────┼─────┼─────┼─────┘ └─────┼─────┼─────┼─────┼─────┼───────┤ - * │EEP_RST│ │ │ │ │ │ │ DOT │ 0 │ EQL │ │ + * │EE_CLR │ │ │ │ │ │ │ DOT │ 0 │ EQL │ │ * └───────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴───────┘ * ┌───────────────┐ ┌───────────────┐ * │ RGB_VAI │ │ RGB_TOG │ diff --git a/test/expect/planck_grid.c b/test/expect/planck_grid.c index 2a4cd11..4e19856 100644 --- a/test/expect/planck_grid.c +++ b/test/expect/planck_grid.c @@ -59,11 +59,11 @@ * `-----------------------------------------------------------------------------------' * generated by [keymapviz] */ /* ,-----------------------------------------------------------------------------------. - * | |QK_BOO|DEBUG |RGB_TO|RGB_MO|RGB_HU|RGB_HU|RGB_SA|RGB_SA|RGB_VA|RGB_VA| DEL | + * | |QK_BOO|DB_TOG|RGB_TO|RGB_MO|RGB_HU|RGB_HU|RGB_SA|RGB_SA|RGB_VA|RGB_VA| DEL | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | |MU_MOD|AU_ON |AU_OFF|AG_NOR|AG_SWA|QWERTY|COLEMA|DVORAK|PLOVER| | + * | | |MU_NEX|AU_ON |AU_OFF|AG_NOR|AG_SWA|QWERTY|COLEMA|DVORAK|PLOVER| | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | |MUV_DE|MUV_IN|MU_ON |MU_OFF|MI_ON |MI_OFF| | | | | | + * | |AU_PRE|AU_NEX|MU_ON |MU_OFF|MI_ON |MI_OFF| | | | | | * |------+------+------+------+------+-------------+------+------+------+------+------| * | | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' diff --git a/test/expect/planck_grid_fancy.c b/test/expect/planck_grid_fancy.c index 4846598..40ddb53 100644 --- a/test/expect/planck_grid_fancy.c +++ b/test/expect/planck_grid_fancy.c @@ -59,11 +59,11 @@ * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘ * generated by [keymapviz] */ /* ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐ - * │ │QK_BOO│DEBUG │RGB_TO│RGB_MO│RGB_HU│RGB_HU│RGB_SA│RGB_SA│RGB_VA│RGB_VA│ DEL │ + * │ │QK_BOO│DB_TOG│RGB_TO│RGB_MO│RGB_HU│RGB_HU│RGB_SA│RGB_SA│RGB_VA│RGB_VA│ DEL │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │ │ │MU_MOD│AU_ON │AU_OFF│AG_NOR│AG_SWA│QWERTY│COLEMA│DVORAK│PLOVER│ │ + * │ │ │MU_NEX│AU_ON │AU_OFF│AG_NOR│AG_SWA│QWERTY│COLEMA│DVORAK│PLOVER│ │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │ │MUV_DE│MUV_IN│MU_ON │MU_OFF│MI_ON │MI_OFF│ │ │ │ │ │ + * │ │AU_PRE│AU_NEX│MU_ON │MU_OFF│MI_ON │MI_OFF│ │ │ │ │ │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ * │ │ │ │ │ │ │ │ │ │ │ │ │ * └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘ diff --git a/test/expect/planck_mit.c b/test/expect/planck_mit.c index 1ff7b30..1cb6fb2 100644 --- a/test/expect/planck_mit.c +++ b/test/expect/planck_mit.c @@ -1,31 +1,31 @@ /* ,-----------------------------------------------------------------------------------. - * | GESC | Q | W | E | R | T | Y | U | I | O | P | BSPC | + * |QK_GES| Q | W | E | R | T | Y | U | I | O | P | BSPC | * |------+------+------+------+------+-------------+------+------+------+------+------| * |LT(_TA| A | S | D | F | G | H | J | K | L | SCLN | QUOT | * |------+------+------+------+------+-------------+------+------+------+------+------| - * |TD(TD_| Z | X | C | V | B | N | M | COMM | DOT | SLSH |SFTENT| + * |TD(TD_| Z | X | C | V | B | N | M | COMM | DOT | SLSH |SC_SEN| * |------+------+------+------+------+-------------+------+------+------+------+------| - * |TD(TD_| LEAD | LGUI |TD(TD_|MO(_SY| SPC |MO(_NU| LEFT | DOWN | UP | RGHT | + * |TD(TD_|QK_LEA| LGUI |TD(TD_|MO(_SY| SPC |MO(_NU| LEFT | DOWN | UP | RGHT | * `-----------------------------------------------------------------------------------' * generated by [keymapviz] */ /* ,-----------------------------------------------------------------------------------. - * | GESC | Q | W | F | P | G | J | L | U | Y | SCLN | BSPC | + * |QK_GES| Q | W | F | P | G | J | L | U | Y | SCLN | BSPC | * |------+------+------+------+------+-------------+------+------+------+------+------| * |LT(_TA| A | R | S | T | D | H | N | E | I | O | QUOT | * |------+------+------+------+------+-------------+------+------+------+------+------| - * |TD(TD_| Z | X | C | V | B | K | M | COMM | DOT | SLSH |SFTENT| + * |TD(TD_| Z | X | C | V | B | K | M | COMM | DOT | SLSH |SC_SEN| * |------+------+------+------+------+-------------+------+------+------+------+------| - * |TD(TD_| LEAD | LGUI |TD(TD_|MO(_SY| SPC |MO(_NU| LEFT | DOWN | UP | RGHT | + * |TD(TD_|QK_LEA| LGUI |TD(TD_|MO(_SY| SPC |MO(_NU| LEFT | DOWN | UP | RGHT | * `-----------------------------------------------------------------------------------' * generated by [keymapviz] */ /* ,-----------------------------------------------------------------------------------. - * | GESC | QUOT | COMM | DOT | P | Y | F | G | C | R | L | BSPC | + * |QK_GES| QUOT | COMM | DOT | P | Y | F | G | C | R | L | BSPC | * |------+------+------+------+------+-------------+------+------+------+------+------| * |LT(_TA| A | O | E | U | I | D | H | T | | S | SLSH | * |------+------+------+------+------+-------------+------+------+------+------+------| - * |TD(TD_| SCLN | Q | J | K | X | B | M | W | V | Z |SFTENT| + * |TD(TD_| SCLN | Q | J | K | X | B | M | W | V | Z |SC_SEN| * |------+------+------+------+------+-------------+------+------+------+------+------| - * |TD(TD_| LEAD | LGUI |TD(TD_|MO(_SY| SPC |MO(_NU| LEFT | DOWN | UP | RGHT | + * |TD(TD_|QK_LEA| LGUI |TD(TD_|MO(_SY| SPC |MO(_NU| LEFT | DOWN | UP | RGHT | * `-----------------------------------------------------------------------------------' * generated by [keymapviz] */ /* ,-----------------------------------------------------------------------------------. @@ -59,11 +59,11 @@ * `-----------------------------------------------------------------------------------' * generated by [keymapviz] */ /* ,-----------------------------------------------------------------------------------. - * |LCTL(L|DO_RES|DEBUG |RGB_TO|RGB_MO|RGB_HU|RGB_HU|RGB_SA|RGB_SA|TD(TD_|TD(TD_| DEL | + * |LCTL(L|DO_RES|DB_TOG|RGB_TO|RGB_MO|RGB_HU|RGB_HU|RGB_SA|RGB_SA|TD(TD_|TD(TD_| DEL | * |------+------+------+------+------+-------------+------+------+------+------+------| - * |RGB_VA|RGB_VA|MU_MOD|AU_ON |AU_OFF|AG_NOR|AG_SWA|DF(_BA|DF(_CO|DF(_DV|TO(_PL|MY_RGB| + * |RGB_VA|RGB_VA|MU_NEX|AU_ON |AU_OFF|AG_NOR|AG_SWA|DF(_BA|DF(_CO|DF(_DV|TO(_PL|MY_RGB| * |------+------+------+------+------+-------------+------+------+------+------+------| - * | |MUV_DE|MUV_IN|MU_ON |MU_OFF|MI_ON |MI_OFF|TERM_O|TERM_O|CK_ON |CK_OFF|ENTER | + * | |AU_PRE|AU_NEX|MU_ON |MU_OFF|MI_ON |MI_OFF| | |CK_ON |CK_OFF|ENTER | * |------+------+------+------+------+-------------+------+------+------+------+------| * | | | | | | TG(_MOU | | | | | | * `-----------------------------------------------------------------------------------' @@ -75,25 +75,25 @@ * |------+------+------+------+------+-------------+------+------+------+------+------| * | LSFT | SLSH | CUT | COPY |PASTE | LT | GT | PAST | P1 | P2 | P3 | PPLS | * |------+------+------+------+------+-------------+------+------+------+------+------| - * |TO(_BA| LEAD | LGUI | LALT | LCPO | SPC | RCPC | HASH | P0 | PDOT | PENT | + * |TO(_BA|QK_LEA| LGUI | LALT |SC_LCP| SPC |SC_RCP| HASH | P0 | PDOT | PENT | * `-----------------------------------------------------------------------------------' * generated by [keymapviz] */ /* ,-----------------------------------------------------------------------------------. - * | ESC |ALTF4 |VLK_TO|PRINT_|WAKE_A|WAKE_A| REDO |UC_MOD|UC_M_W|CG_TOG|AG_TOG|DLINE | + * | ESC |ALTF4 |VK_TOG|PRINT_|WAKE_A|WAKE_A| REDO |UC_NEX|UC_WIN|CG_TOG|AG_TOG|DLINE | * |------+------+------+------+------+-------------+------+------+------+------+------| - * |NXTAB |SLCTAL| SAVE | | FIND |SH_TG |SH_TG |IRONY | LCUT |LCOPY | | KILL | + * |NXTAB |SLCTAL| SAVE | | FIND |SH_TOG|SH_TOG|IRONY | LCUT |LCOPY | | KILL | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | LSFT | UNDO | CUT | COPY |PASTE |PRVWD |NXTWD |TG(_MO| | HOME | END |SFTENT| + * | LSFT | UNDO | CUT | COPY |PASTE |PRVWD |NXTWD |TG(_MO| | HOME | END |SC_SEN| * |------+------+------+------+------+-------------+------+------+------+------+------| - * |TO(_BA| LCTL | LGUI | LALT | LSPO | ALT_TAB | RSPC |PRVWD | BRID | BRIU |NXTWD | + * |TO(_BA| LCTL | LGUI | LALT |SC_LSP| ALT_TAB |SC_RSP|PRVWD | BRID | BRIU |NXTWD | * `-----------------------------------------------------------------------------------' * generated by [keymapviz] */ /* ,-----------------------------------------------------------------------------------. - * | ESC | BTN1 | MS_U | BTN2 | | | |UC_MOD|UC_M_W|CG_TOG|AG_TOG| BSPC | + * | ESC | BTN1 | MS_U | BTN2 | | | |UC_NEX|UC_WIN|CG_TOG|AG_TOG| BSPC | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | TAB | MS_L | MS_D | MS_R | | | |IRONY |VLK_TO| | | | + * | TAB | MS_L | MS_D | MS_R | | | |IRONY |VK_TOG| | | | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | LSFT | UNDO | CUT | COPY |PASTE |PRVWD |NXTWD | | HOME | BTN3 | END |SFTENT| + * | LSFT | UNDO | CUT | COPY |PASTE |PRVWD |NXTWD | | HOME | BTN3 | END |SC_SEN| * |------+------+------+------+------+-------------+------+------+------+------+------| * |TO(_BA| LCTL | LGUI | LALT | BTN1 | ALT_TAB | BTN2 | WH_L | WH_D | WH_U | WH_R | * `-----------------------------------------------------------------------------------' diff --git a/test/expect/planck_mit_0.json b/test/expect/planck_mit_0.json index 2248ea6..4d7608c 100644 --- a/test/expect/planck_mit_0.json +++ b/test/expect/planck_mit_0.json @@ -3,7 +3,7 @@ { "a": 7 }, - "GESC", + "QK_GESC", "Q", "W", "E", @@ -42,11 +42,11 @@ "COMM", "DOT", "SLSH", - "SFTENT" + "SC_SENT" ], [ "TD(TD_LCTL_STICKY)", - "LEAD", + "QK_LEAD", "LGUI", "TD(TD_LALT_STICKY)", "MO(_SYMBLS)", diff --git a/test/expect/planck_mit_1.json b/test/expect/planck_mit_1.json index 2facdc0..7327d84 100644 --- a/test/expect/planck_mit_1.json +++ b/test/expect/planck_mit_1.json @@ -3,7 +3,7 @@ { "a": 7 }, - "GESC", + "QK_GESC", "Q", "W", "F", @@ -42,11 +42,11 @@ "COMM", "DOT", "SLSH", - "SFTENT" + "SC_SENT" ], [ "TD(TD_LCTL_STICKY)", - "LEAD", + "QK_LEAD", "LGUI", "TD(TD_LALT_STICKY)", "MO(_SYMBLS)", diff --git a/test/expect/planck_mit_2.json b/test/expect/planck_mit_2.json index 499a9d7..6168ef3 100644 --- a/test/expect/planck_mit_2.json +++ b/test/expect/planck_mit_2.json @@ -3,7 +3,7 @@ { "a": 7 }, - "GESC", + "QK_GESC", "QUOT", "COMM", "DOT", @@ -42,11 +42,11 @@ "W", "V", "Z", - "SFTENT" + "SC_SENT" ], [ "TD(TD_LCTL_STICKY)", - "LEAD", + "QK_LEAD", "LGUI", "TD(TD_LALT_STICKY)", "MO(_SYMBLS)", diff --git a/test/expect/planck_mit_fancy.c b/test/expect/planck_mit_fancy.c index 969182f..685e919 100644 --- a/test/expect/planck_mit_fancy.c +++ b/test/expect/planck_mit_fancy.c @@ -1,31 +1,31 @@ /* ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐ - * │ GESC │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ BSPC │ + * │QK_GES│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ BSPC │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ * │LT(_TA│ A │ S │ D │ F │ G │ H │ J │ K │ L │ SCLN │ QUOT │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │TD(TD_│ Z │ X │ C │ V │ B │ N │ M │ COMM │ DOT │ SLSH │SFTENT│ + * │TD(TD_│ Z │ X │ C │ V │ B │ N │ M │ COMM │ DOT │ SLSH │SC_SEN│ * ├──────┼──────┼──────┼──────┼──────┼──────┴──────┼──────┼──────┼──────┼──────┼──────┤ - * │TD(TD_│ LEAD │ LGUI │TD(TD_│MO(_SY│ SPC │MO(_NU│ LEFT │ DOWN │ UP │ RGHT │ + * │TD(TD_│QK_LEA│ LGUI │TD(TD_│MO(_SY│ SPC │MO(_NU│ LEFT │ DOWN │ UP │ RGHT │ * └──────┴──────┴──────┴──────┴──────┴─────────────┴──────┴──────┴──────┴──────┴──────┘ * generated by [keymapviz] */ /* ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐ - * │ GESC │ Q │ W │ F │ P │ G │ J │ L │ U │ Y │ SCLN │ BSPC │ + * │QK_GES│ Q │ W │ F │ P │ G │ J │ L │ U │ Y │ SCLN │ BSPC │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ * │LT(_TA│ A │ R │ S │ T │ D │ H │ N │ E │ I │ O │ QUOT │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │TD(TD_│ Z │ X │ C │ V │ B │ K │ M │ COMM │ DOT │ SLSH │SFTENT│ + * │TD(TD_│ Z │ X │ C │ V │ B │ K │ M │ COMM │ DOT │ SLSH │SC_SEN│ * ├──────┼──────┼──────┼──────┼──────┼──────┴──────┼──────┼──────┼──────┼──────┼──────┤ - * │TD(TD_│ LEAD │ LGUI │TD(TD_│MO(_SY│ SPC │MO(_NU│ LEFT │ DOWN │ UP │ RGHT │ + * │TD(TD_│QK_LEA│ LGUI │TD(TD_│MO(_SY│ SPC │MO(_NU│ LEFT │ DOWN │ UP │ RGHT │ * └──────┴──────┴──────┴──────┴──────┴─────────────┴──────┴──────┴──────┴──────┴──────┘ * generated by [keymapviz] */ /* ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐ - * │ GESC │ QUOT │ COMM │ DOT │ P │ Y │ F │ G │ C │ R │ L │ BSPC │ + * │QK_GES│ QUOT │ COMM │ DOT │ P │ Y │ F │ G │ C │ R │ L │ BSPC │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ * │LT(_TA│ A │ O │ E │ U │ I │ D │ H │ T │ │ S │ SLSH │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │TD(TD_│ SCLN │ Q │ J │ K │ X │ B │ M │ W │ V │ Z │SFTENT│ + * │TD(TD_│ SCLN │ Q │ J │ K │ X │ B │ M │ W │ V │ Z │SC_SEN│ * ├──────┼──────┼──────┼──────┼──────┼──────┴──────┼──────┼──────┼──────┼──────┼──────┤ - * │TD(TD_│ LEAD │ LGUI │TD(TD_│MO(_SY│ SPC │MO(_NU│ LEFT │ DOWN │ UP │ RGHT │ + * │TD(TD_│QK_LEA│ LGUI │TD(TD_│MO(_SY│ SPC │MO(_NU│ LEFT │ DOWN │ UP │ RGHT │ * └──────┴──────┴──────┴──────┴──────┴─────────────┴──────┴──────┴──────┴──────┴──────┘ * generated by [keymapviz] */ /* ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐ @@ -59,11 +59,11 @@ * └──────┴──────┴──────┴──────┴──────┴─────────────┴──────┴──────┴──────┴──────┴──────┘ * generated by [keymapviz] */ /* ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐ - * │LCTL(L│DO_RES│DEBUG │RGB_TO│RGB_MO│RGB_HU│RGB_HU│RGB_SA│RGB_SA│TD(TD_│TD(TD_│ DEL │ + * │LCTL(L│DO_RES│DB_TOG│RGB_TO│RGB_MO│RGB_HU│RGB_HU│RGB_SA│RGB_SA│TD(TD_│TD(TD_│ DEL │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │RGB_VA│RGB_VA│MU_MOD│AU_ON │AU_OFF│AG_NOR│AG_SWA│DF(_BA│DF(_CO│DF(_DV│TO(_PL│MY_RGB│ + * │RGB_VA│RGB_VA│MU_NEX│AU_ON │AU_OFF│AG_NOR│AG_SWA│DF(_BA│DF(_CO│DF(_DV│TO(_PL│MY_RGB│ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │ │MUV_DE│MUV_IN│MU_ON │MU_OFF│MI_ON │MI_OFF│TERM_O│TERM_O│CK_ON │CK_OFF│ENTER │ + * │ │AU_PRE│AU_NEX│MU_ON │MU_OFF│MI_ON │MI_OFF│ │ │CK_ON │CK_OFF│ENTER │ * ├──────┼──────┼──────┼──────┼──────┼──────┴──────┼──────┼──────┼──────┼──────┼──────┤ * │ │ │ │ │ │ TG(_MOU │ │ │ │ │ │ * └──────┴──────┴──────┴──────┴──────┴─────────────┴──────┴──────┴──────┴──────┴──────┘ @@ -75,25 +75,25 @@ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ * │ LSFT │ SLSH │ CUT │ COPY │PASTE │ LT │ GT │ PAST │ P1 │ P2 │ P3 │ PPLS │ * ├──────┼──────┼──────┼──────┼──────┼──────┴──────┼──────┼──────┼──────┼──────┼──────┤ - * │TO(_BA│ LEAD │ LGUI │ LALT │ LCPO │ SPC │ RCPC │ HASH │ P0 │ PDOT │ PENT │ + * │TO(_BA│QK_LEA│ LGUI │ LALT │SC_LCP│ SPC │SC_RCP│ HASH │ P0 │ PDOT │ PENT │ * └──────┴──────┴──────┴──────┴──────┴─────────────┴──────┴──────┴──────┴──────┴──────┘ * generated by [keymapviz] */ /* ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐ - * │ ESC │ALTF4 │VLK_TO│PRINT_│WAKE_A│WAKE_A│ REDO │UC_MOD│UC_M_W│CG_TOG│AG_TOG│DLINE │ + * │ ESC │ALTF4 │VK_TOG│PRINT_│WAKE_A│WAKE_A│ REDO │UC_NEX│UC_WIN│CG_TOG│AG_TOG│DLINE │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │NXTAB │SLCTAL│ SAVE │ │ FIND │SH_TG │SH_TG │IRONY │ LCUT │LCOPY │ │ KILL │ + * │NXTAB │SLCTAL│ SAVE │ │ FIND │SH_TOG│SH_TOG│IRONY │ LCUT │LCOPY │ │ KILL │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │ LSFT │ UNDO │ CUT │ COPY │PASTE │PRVWD │NXTWD │TG(_MO│ │ HOME │ END │SFTENT│ + * │ LSFT │ UNDO │ CUT │ COPY │PASTE │PRVWD │NXTWD │TG(_MO│ │ HOME │ END │SC_SEN│ * ├──────┼──────┼──────┼──────┼──────┼──────┴──────┼──────┼──────┼──────┼──────┼──────┤ - * │TO(_BA│ LCTL │ LGUI │ LALT │ LSPO │ ALT_TAB │ RSPC │PRVWD │ BRID │ BRIU │NXTWD │ + * │TO(_BA│ LCTL │ LGUI │ LALT │SC_LSP│ ALT_TAB │SC_RSP│PRVWD │ BRID │ BRIU │NXTWD │ * └──────┴──────┴──────┴──────┴──────┴─────────────┴──────┴──────┴──────┴──────┴──────┘ * generated by [keymapviz] */ /* ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┬──────┐ - * │ ESC │ BTN1 │ MS_U │ BTN2 │ │ │ │UC_MOD│UC_M_W│CG_TOG│AG_TOG│ BSPC │ + * │ ESC │ BTN1 │ MS_U │ BTN2 │ │ │ │UC_NEX│UC_WIN│CG_TOG│AG_TOG│ BSPC │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │ TAB │ MS_L │ MS_D │ MS_R │ │ │ │IRONY │VLK_TO│ │ │ │ + * │ TAB │ MS_L │ MS_D │ MS_R │ │ │ │IRONY │VK_TOG│ │ │ │ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┤ - * │ LSFT │ UNDO │ CUT │ COPY │PASTE │PRVWD │NXTWD │ │ HOME │ BTN3 │ END │SFTENT│ + * │ LSFT │ UNDO │ CUT │ COPY │PASTE │PRVWD │NXTWD │ │ HOME │ BTN3 │ END │SC_SEN│ * ├──────┼──────┼──────┼──────┼──────┼──────┴──────┼──────┼──────┼──────┼──────┼──────┤ * │TO(_BA│ LCTL │ LGUI │ LALT │ BTN1 │ ALT_TAB │ BTN2 │ WH_L │ WH_D │ WH_U │ WH_R │ * └──────┴──────┴──────┴──────┴──────┴─────────────┴──────┴──────┴──────┴──────┴──────┘ diff --git a/test/expect/sofle.c b/test/expect/sofle.c index 26c04b9..b3d0b4f 100644 --- a/test/expect/sofle.c +++ b/test/expect/sofle.c @@ -7,7 +7,7 @@ * |------+------+------+------+------+------|| MUTE | | ||------+------+------+------+------+------| * | LSFT | Z | X | C | V | B |`------' `------'| N | M | COMM | DOT | SLSH | RSFT | * `-------------+------+------+------+-.------------. ,------------.-+------+------+------+-------------' - * | LGUI | LALT |LCTRL |/LOWER / ENT / \ SPC \RAISE \|RCTRL | RALT | RGUI | + * | LGUI | LALT | LCTL |/MO(_LO/ ENT / \ SPC \MO(_RA\| RCTL | RALT | RGUI | * | | | / / / \ \ \ | | | * `---------------------------------' `---------------------------------' * generated by [keymapviz] */ @@ -20,7 +20,7 @@ * |------+------+------+------+------+------|| MUTE | | ||------+------+------+------+------+------| * | LSFT | Z | X | C | V | B |`------' `------'| K | M | COMM | DOT | SLSH | RSFT | * `-------------+------+------+------+-.------------. ,------------.-+------+------+------+-------------' - * | LGUI | LALT |LCTRL |/LOWER / ENT / \ SPC \RAISE \|RCTRL | RALT | RGUI | + * | LGUI | LALT | LCTL |/MO(_LO/ ENT / \ SPC \MO(_RA\| RCTL | RALT | RGUI | * | | | / / / \ \ \ | | | * `---------------------------------' `---------------------------------' * generated by [keymapviz] */ diff --git a/test/expect/sofle_0.json b/test/expect/sofle_0.json index baed3ba..a1121e4 100644 --- a/test/expect/sofle_0.json +++ b/test/expect/sofle_0.json @@ -231,11 +231,11 @@ "x": 2.75 }, "LALT", - "LCTRL", + "LCTL", { "x": 5.5 }, - "RCTRL" + "RCTL" ], [ { @@ -267,7 +267,7 @@ "y": 3.25, "x": 5.25 }, - "LOWER" + "MO(_LOWER)" ], [ { @@ -296,6 +296,6 @@ "y": 6.9, "x": 7.5 }, - "RAISE" + "MO(_RAISE)" ] ] diff --git a/test/expect/sofle_1.json b/test/expect/sofle_1.json index 5948c42..d64db86 100644 --- a/test/expect/sofle_1.json +++ b/test/expect/sofle_1.json @@ -231,11 +231,11 @@ "x": 2.75 }, "LALT", - "LCTRL", + "LCTL", { "x": 5.5 }, - "RCTRL" + "RCTL" ], [ { @@ -267,7 +267,7 @@ "y": 3.25, "x": 5.25 }, - "LOWER" + "MO(_LOWER)" ], [ { @@ -296,6 +296,6 @@ "y": 6.9, "x": 7.5 }, - "RAISE" + "MO(_RAISE)" ] ] diff --git a/test/expect/sofle_fancy.c b/test/expect/sofle_fancy.c index 28aa67b..e04f431 100644 --- a/test/expect/sofle_fancy.c +++ b/test/expect/sofle_fancy.c @@ -7,7 +7,7 @@ * ├──────┼──────┼──────┼──────┼──────┼──────┤│ MUTE │ │ │├──────┼──────┼──────┼──────┼──────┼──────┤ * │ LSFT │ Z │ X │ C │ V │ B │└──────┘ └──────┘│ N │ M │ COMM │ DOT │ SLSH │ RSFT │ * └──────┴──────┼──────┼──────┼──────┼──────┼───────┐ ┌───────┼──────┼──────┼──────┼──────┼──────┴──────┘ - * │ LGUI │ LALT │LCTRL │LOWER │ ENT │ │ SPC │RAISE │RCTRL │ RALT │ RGUI │ + * │ LGUI │ LALT │ LCTL │MO(_LO│ ENT │ │ SPC │MO(_RA│ RCTL │ RALT │ RGUI │ * │ │ │ │ │ │ │ │ │ │ │ │ * └──────┴──────┴──────┴──────┴───────┘ └───────┴──────┴──────┴──────┴──────┘ * generated by [keymapviz] */ @@ -20,7 +20,7 @@ * ├──────┼──────┼──────┼──────┼──────┼──────┤│ MUTE │ │ │├──────┼──────┼──────┼──────┼──────┼──────┤ * │ LSFT │ Z │ X │ C │ V │ B │└──────┘ └──────┘│ K │ M │ COMM │ DOT │ SLSH │ RSFT │ * └──────┴──────┼──────┼──────┼──────┼──────┼───────┐ ┌───────┼──────┼──────┼──────┼──────┼──────┴──────┘ - * │ LGUI │ LALT │LCTRL │LOWER │ ENT │ │ SPC │RAISE │RCTRL │ RALT │ RGUI │ + * │ LGUI │ LALT │ LCTL │MO(_LO│ ENT │ │ SPC │MO(_RA│ RCTL │ RALT │ RGUI │ * │ │ │ │ │ │ │ │ │ │ │ │ * └──────┴──────┴──────┴──────┴───────┘ └───────┴──────┴──────┴──────┴──────┘ * generated by [keymapviz] */ diff --git a/test/input/replace_lets_split_keymap.c b/test/input/replace_lets_split_keymap.c index 8476248..566d12e 100644 --- a/test/input/replace_lets_split_keymap.c +++ b/test/input/replace_lets_split_keymap.c @@ -1,7 +1,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* - * [keymapviz] - */ +/* ,-----------------------------------------. ,-----------------------------------------. + * | TAB | Q | W | E | R | T | | Y | U | I | O | P | BSPC | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ESC | A | S | D | F | G | | H | J | K | L | SCLN | QUOT | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | LSFT | Z | X | C | V | B | | N | M | COMM | DOT | SLSH | ENT | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |ADJUST| LCTL | LALT | LGUI |LOWER | SPC | | SPC |RAISE | LEFT | DOWN | UP | RGHT | + * `-----------------------------------------' `-----------------------------------------' + * generated by [keymapviz] */ [_QWERTY] = LAYOUT_ortho_4x12( KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ @@ -9,7 +16,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), -/* [keymapviz] */ +/* ,-----------------------------------------. ,-----------------------------------------. + * | TAB | Q | W | F | P | G | | J | L | U | Y | SCLN | BSPC | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ESC | A | R | S | T | D | | H | N | E | I | O | QUOT | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | LSFT | Z | X | C | V | B | | K | M | COMM | DOT | SLSH | ENT | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |ADJUST| LCTL | LALT | LGUI |LOWER | SPC | | SPC |RAISE | LEFT | DOWN | UP | RGHT | + * `-----------------------------------------' `-----------------------------------------' + * generated by [keymapviz] */ [_COLEMAK] = LAYOUT_ortho_4x12( \ KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ @@ -17,9 +33,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), -/* -[keymapviz] - */ +/* ,-----------------------------------------. ,-----------------------------------------. + * | TAB | QUOT | COMM | DOT | P | Y | | F | G | C | R | L | BSPC | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ESC | A | O | E | U | I | | D | H | T | N | S | SLSH | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | LSFT | SCLN | Q | J | K | X | | B | M | W | V | Z | ENT | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |ADJUST| LCTL | LALT | LGUI |LOWER | SPC | | SPC |RAISE | LEFT | DOWN | UP | RGHT | + * `-----------------------------------------' `-----------------------------------------' + * generated by [keymapviz] */ [_DVORAK] = LAYOUT_ortho_4x12( \ KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ @@ -33,13 +56,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), -/*[keymapviz]*/ +/* ,-----------------------------------------. ,-----------------------------------------. + * | TILD | EXLM | AT | HASH | DLR | PERC | | CIRC | AMPR | ASTR | LPRN | RPRN | DEL | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | DEL | F1 | F2 | F3 | F4 | F5 | | F6 | UNDS | PLUS | LCBR | RCBR | PIPE | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | | F12 |S(KC_N|S(KC_N| | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | | | | | MNXT | VOLD | VOLU | MPLY | + * `-----------------------------------------' `-----------------------------------------' + * generated by [keymapviz] */ /* * other comment */ -/*[keymapviz]*/ +/* ,-----------------------------------------. ,-----------------------------------------. + * | GRV | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | DEL | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | DEL | F1 | F2 | F3 | F4 | F5 | | F6 | MINS | EQL | LBRC | RBRC | BSLS | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | | F12 | NUHS | NUBS | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | | | | | MNXT | VOLD | VOLU | MPLY | + * `-----------------------------------------' `-----------------------------------------' + * generated by [keymapviz] */ [_RAISE] = LAYOUT_ortho_4x12( \ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ @@ -51,7 +92,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * */ -/*[keymapviz]*/ +/* ,-----------------------------------------. ,-----------------------------------------. + * | |RESET | | | | | | | | | | | DEL | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | |AU_ON |AU_OFF|AG_NOR| |AG_SWA|QWERTY|COLEMA|DVORAK| | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | | | | | | | | | + * `-----------------------------------------' `-----------------------------------------' + * generated by [keymapviz] */ [_ADJUST] = LAYOUT_ortho_4x12( \ _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ diff --git a/test/input/replace_lets_split_keymap_fancy.c b/test/input/replace_lets_split_keymap_fancy.c index 7a1ce18..77cfd85 100644 --- a/test/input/replace_lets_split_keymap_fancy.c +++ b/test/input/replace_lets_split_keymap_fancy.c @@ -16,7 +16,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), -/* [keymapviz] */ +/* ┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐ + * │ TAB │ Q │ W │ F │ P │ G │ │ J │ L │ U │ Y │ SCLN │ BSPC │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ ESC │ A │ R │ S │ T │ D │ │ H │ N │ E │ I │ O │ QUOT │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ LSFT │ Z │ X │ C │ V │ B │ │ K │ M │ COMM │ DOT │ SLSH │ ENT │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ADJUST│ LCTL │ LALT │ LGUI │LOWER │ SPC │ │ SPC │RAISE │ LEFT │ DOWN │ UP │ RGHT │ + * └──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘ + * generated by [keymapviz] */ [_COLEMAK] = LAYOUT_ortho_4x12( \ KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ @@ -24,9 +33,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ ), -/* -[keymapviz] - */ +/* ┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐ + * │ TAB │ QUOT │ COMM │ DOT │ P │ Y │ │ F │ G │ C │ R │ L │ BSPC │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ ESC │ A │ O │ E │ U │ I │ │ D │ H │ T │ N │ S │ SLSH │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ LSFT │ SCLN │ Q │ J │ K │ X │ │ B │ M │ W │ V │ Z │ ENT │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ADJUST│ LCTL │ LALT │ LGUI │LOWER │ SPC │ │ SPC │RAISE │ LEFT │ DOWN │ UP │ RGHT │ + * └──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘ + * generated by [keymapviz] */ [_DVORAK] = LAYOUT_ortho_4x12( \ KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ @@ -40,13 +56,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ ), -/*[keymapviz]*/ +/* ┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐ + * │ TILD │ EXLM │ AT │ HASH │ DLR │ PERC │ │ CIRC │ AMPR │ ASTR │ LPRN │ RPRN │ DEL │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ DEL │ F1 │ F2 │ F3 │ F4 │ F5 │ │ F6 │ UNDS │ PLUS │ LCBR │ RCBR │ PIPE │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ │ F7 │ F8 │ F9 │ F10 │ F11 │ │ F12 │S(KC_N│S(KC_N│ │ │ │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ │ │ │ │ │ │ │ │ │ MNXT │ VOLD │ VOLU │ MPLY │ + * └──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘ + * generated by [keymapviz] */ /* * other comment */ -/*[keymapviz]*/ +/* ┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐ + * │ GRV │ 1 │ 2 │ 3 │ 4 │ 5 │ │ 6 │ 7 │ 8 │ 9 │ 0 │ DEL │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ DEL │ F1 │ F2 │ F3 │ F4 │ F5 │ │ F6 │ MINS │ EQL │ LBRC │ RBRC │ BSLS │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ │ F7 │ F8 │ F9 │ F10 │ F11 │ │ F12 │ NUHS │ NUBS │ │ │ │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ │ │ │ │ │ │ │ │ │ MNXT │ VOLD │ VOLU │ MPLY │ + * └──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘ + * generated by [keymapviz] */ [_RAISE] = LAYOUT_ortho_4x12( \ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ @@ -58,7 +92,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * */ -/*[keymapviz]*/ +/* ┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐ + * │ │RESET │ │ │ │ │ │ │ │ │ │ │ DEL │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ │ │ │AU_ON │AU_OFF│AG_NOR│ │AG_SWA│QWERTY│COLEMA│DVORAK│ │ │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘ + * generated by [keymapviz] */ [_ADJUST] = LAYOUT_ortho_4x12( \ _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \