summaryrefslogtreecommitdiff
path: root/layouts
diff options
context:
space:
mode:
Diffstat (limited to 'layouts')
-rw-r--r--layouts/community/60_ansi/mechmerlin-ansi/keymap.c8
-rw-r--r--layouts/community/60_ansi/readme.md4
-rw-r--r--layouts/community/60_ansi/stanrc85-ansi/keymap.c2
-rw-r--r--layouts/community/60_ansi/xyverz/keymap.c2
-rw-r--r--layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c6
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c4
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c8
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c2
-rw-r--r--layouts/community/60_hhkb/yanfali/keymap.c2
-rwxr-xr-xlayouts/community/60_iso/bifbofii/keymap.c12
-rw-r--r--layouts/community/60_iso/unxmaal/config.h11
-rw-r--r--layouts/community/60_tsangan_hhkb/bcat/keymap.c4
-rw-r--r--layouts/community/60_tsangan_hhkb/dohmain/keymap.c2
-rw-r--r--layouts/community/60_tsangan_hhkb/yanfali/keymap.c2
-rw-r--r--layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c2
-rw-r--r--layouts/community/65_ansi/mechmerlin/keymap.c4
-rw-r--r--layouts/community/65_ansi_blocker/brandonschlack/keymap.c4
-rw-r--r--layouts/community/65_ansi_blocker/mechmerlin/keymap.c4
-rw-r--r--layouts/community/65_ansi_blocker/spidey3/keymap.c18
-rw-r--r--layouts/community/65_ansi_blocker/stanrc85/keymap.c2
-rw-r--r--layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c2
-rw-r--r--layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c3
-rw-r--r--layouts/community/66_ansi/mechmerlin/keymap.c6
-rw-r--r--layouts/community/66_ansi/skully/keymap.c2
-rw-r--r--layouts/community/66_ansi/xyverz/keymap.c10
-rw-r--r--layouts/community/68_ansi/mechmerlin/keymap.c4
-rw-r--r--layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c4
-rw-r--r--layouts/community/75_ansi/spidey3/keymap.c12
-rw-r--r--layouts/community/75_ansi/yanfali/keymap.c4
-rw-r--r--layouts/community/alice/stanrc85-alice/keymap.c2
-rw-r--r--layouts/community/ergodox/333fred/keymap.c4
-rw-r--r--layouts/community/ergodox/ab/keyboard-layout.json387
-rw-r--r--layouts/community/ergodox/ab/keymap.c152
-rw-r--r--layouts/community/ergodox/ab/readme.md21
-rw-r--r--layouts/community/ergodox/ab/rules.mk7
-rw-r--r--layouts/community/ergodox/absenth/keymap.c179
-rw-r--r--layouts/community/ergodox/absenth/readme.md11
-rw-r--r--layouts/community/ergodox/adam/config.h5
-rw-r--r--layouts/community/ergodox/adam/keymap.c144
-rw-r--r--layouts/community/ergodox/adam/readme.md3
-rw-r--r--layouts/community/ergodox/adnw_p_u_q/keymap.c8
-rw-r--r--layouts/community/ergodox/albert/config.h7
-rw-r--r--layouts/community/ergodox/albert/keymap.c661
-rw-r--r--layouts/community/ergodox/albert/readme.md188
-rw-r--r--layouts/community/ergodox/albert/rules.mk2
-rw-r--r--layouts/community/ergodox/alexjj/keymap.c231
-rw-r--r--layouts/community/ergodox/alexjj/readme.md179
-rw-r--r--layouts/community/ergodox/belak/keymap.c4
-rw-r--r--layouts/community/ergodox/bepo/keymap.c368
-rw-r--r--layouts/community/ergodox/bepo/readme.md36
-rw-r--r--layouts/community/ergodox/bepo/rules.mk7
-rw-r--r--layouts/community/ergodox/bepo_alt/keymap.c12
-rw-r--r--layouts/community/ergodox/bepo_csa/keymap.c524
-rw-r--r--layouts/community/ergodox/bepo_csa/readme.md162
-rw-r--r--layouts/community/ergodox/berfarah/keymap.c4
-rw-r--r--layouts/community/ergodox/bryan/keymap.c222
-rw-r--r--layouts/community/ergodox/choromanski/keymap.c4
-rw-r--r--layouts/community/ergodox/colemak_code_friendly/keymap.c4
-rw-r--r--layouts/community/ergodox/colemak_programmer/keymap.c4
-rw-r--r--layouts/community/ergodox/common_nighthawk/keymap.c212
-rw-r--r--layouts/community/ergodox/common_nighthawk/rules.mk4
-rw-r--r--layouts/community/ergodox/csharp_dev/keymap.c235
-rw-r--r--layouts/community/ergodox/csharp_dev/readme.md48
-rw-r--r--layouts/community/ergodox/dave/keymap.c4
-rw-r--r--layouts/community/ergodox/deadcyclo/keymap.c4
-rw-r--r--layouts/community/ergodox/drashna/config.h2
-rw-r--r--layouts/community/ergodox/drashna/keymap.c2
-rw-r--r--layouts/community/ergodox/dvorak_emacs/keymap.c6
-rw-r--r--layouts/community/ergodox/dvorak_intl_squisher/keymap.c2
-rw-r--r--layouts/community/ergodox/dvorak_programmer/README.md39
-rw-r--r--layouts/community/ergodox/dvorak_programmer/keymap.c406
-rw-r--r--layouts/community/ergodox/dvorak_programmer/rules.mk8
-rw-r--r--layouts/community/ergodox/dvorak_programmer_swe/keymap.c328
-rw-r--r--layouts/community/ergodox/dvorak_programmer_swe/readme.md57
-rw-r--r--layouts/community/ergodox/dvorak_spanish/keymap.c279
-rw-r--r--layouts/community/ergodox/dvorak_spanish/readme.md98
-rw-r--r--layouts/community/ergodox/dvorak_svorak_a5/keymap.c6
-rw-r--r--layouts/community/ergodox/emacs_osx_dk/keymap.c4
-rw-r--r--layouts/community/ergodox/french_hacker/keymap.c168
-rw-r--r--layouts/community/ergodox/french_hacker/readme.md27
-rw-r--r--layouts/community/ergodox/galson/keymap.c179
-rw-r--r--layouts/community/ergodox/galson/readme.md11
-rw-r--r--layouts/community/ergodox/galson/rules.mk2
-rw-r--r--layouts/community/ergodox/german-kinergo/keymap.c6
-rw-r--r--layouts/community/ergodox/german-lukas/keymap.c6
-rw-r--r--layouts/community/ergodox/german-manuneo/compile_keymap.py684
-rw-r--r--layouts/community/ergodox/german-manuneo/keymap.c781
-rw-r--r--layouts/community/ergodox/german-manuneo/keymap.md188
-rw-r--r--layouts/community/ergodox/guni/keymap.c2
-rw-r--r--layouts/community/ergodox/guni/readme.txt2
-rw-r--r--layouts/community/ergodox/haegin/keymap.c4
-rw-r--r--layouts/community/ergodox/ishigoya-jp/keymap.c958
-rw-r--r--layouts/community/ergodox/ishigoya-jp/readme.md54
-rw-r--r--layouts/community/ergodox/issmirnov/README.md2
-rw-r--r--layouts/community/ergodox/issmirnov/keymap.c8
-rw-r--r--layouts/community/ergodox/italian/keymap.c219
-rw-r--r--layouts/community/ergodox/italian/readme.md72
-rw-r--r--layouts/community/ergodox/jackhumbert/config.h11
-rw-r--r--layouts/community/ergodox/jacobono/keymap.c4
-rw-r--r--layouts/community/ergodox/jafo/jafo-layout.pdfbin185412 -> 0 bytes
-rw-r--r--layouts/community/ergodox/jjerrell/config.h2
-rw-r--r--layouts/community/ergodox/josh/keymap.c210
-rw-r--r--layouts/community/ergodox/josh/readme.md8
-rw-r--r--layouts/community/ergodox/kastyle/keymap.c2
-rw-r--r--layouts/community/ergodox/kines-ish/keymap.c2
-rw-r--r--layouts/community/ergodox/kristian/keymap.c75
-rw-r--r--layouts/community/ergodox/maz/keymap.c12
-rw-r--r--layouts/community/ergodox/mclennon_osx/keymap.c8
-rw-r--r--layouts/community/ergodox/meagerfindings/config.h4
-rw-r--r--layouts/community/ergodox/meagerfindings/keymap.c14
-rw-r--r--layouts/community/ergodox/mpiechotka/keymap.c8
-rw-r--r--layouts/community/ergodox/ordinary/keymap.c4
-rw-r--r--layouts/community/ergodox/ordinary_osx/keymap.c4
-rw-r--r--layouts/community/ergodox/osx_de/keymap.c359
-rw-r--r--layouts/community/ergodox/osx_de/osx_de_highres.png.md1
-rw-r--r--layouts/community/ergodox/osx_de/readme.md40
-rw-r--r--layouts/community/ergodox/osx_de_experimental/keymap.c592
-rw-r--r--layouts/community/ergodox/osx_de_experimental/osx_de_experimental_highres.png.md1
-rw-r--r--layouts/community/ergodox/osx_de_experimental/readme.md21
-rw-r--r--layouts/community/ergodox/osx_kinesis_pnut/keymap.c2
-rw-r--r--layouts/community/ergodox/osx_neo2/keymap.c86
-rw-r--r--layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c2
-rw-r--r--layouts/community/ergodox/qwerty_code_friendly/keymap.c10
-rw-r--r--layouts/community/ergodox/replicaJunction/keymap.c12
-rw-r--r--layouts/community/ergodox/romanzolotarev-norman-osx/keymap.c2
-rw-r--r--layouts/community/ergodox/sethbc/keymap.c2
-rw-r--r--layouts/community/ergodox/siroken3/keymap.c6
-rw-r--r--layouts/community/ergodox/swedish-lindhe/keymap.c2
-rw-r--r--layouts/community/ergodox/swissgerman/keyboard-layout.json419
-rw-r--r--layouts/community/ergodox/swissgerman/keyboard-layout_1_2.json436
-rw-r--r--layouts/community/ergodox/swissgerman/keymap.c283
-rw-r--r--layouts/community/ergodox/swissgerman/readme.md15
-rw-r--r--layouts/community/ergodox/teckinesis/keymap.c2
-rw-r--r--layouts/community/ergodox/tm2030/keymap.c239
-rw-r--r--layouts/community/ergodox/tm2030/readme.md136
-rw-r--r--layouts/community/ergodox/townk_osx/config.h40
-rw-r--r--layouts/community/ergodox/townk_osx/keymap.c279
-rw-r--r--layouts/community/ergodox/townk_osx/readme.md77
-rw-r--r--layouts/community/ergodox/townk_osx/rules.mk2
-rw-r--r--layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c24
-rw-r--r--layouts/community/ergodox/twey/keymap.c232
-rw-r--r--layouts/community/ergodox/twey/readme.md14
-rw-r--r--layouts/community/ergodox/twey/rules.mk4
-rw-r--r--layouts/community/ergodox/videck/keymap.c2
-rw-r--r--layouts/community/ergodox/win10_writers-block/config.h30
-rw-r--r--layouts/community/ergodox/win10_writers-block/keymap.c324
-rw-r--r--layouts/community/ergodox/win10_writers-block/readme.md113
-rw-r--r--layouts/community/ergodox/win10_writers-block/rules.mk7
-rw-r--r--layouts/community/ergodox/xyverz/keymap.c2
-rw-r--r--layouts/community/ergodox/zweihander-macos/keymap.c4
-rw-r--r--layouts/community/numpad_5x4/mrsendyyk/keymap.c2
-rw-r--r--layouts/community/numpad_5x6/bjohnson/config.h11
-rw-r--r--layouts/community/numpad_5x6/bjohnson/keymap.c2
-rw-r--r--layouts/community/numpad_5x6/drashna/config.h2
-rw-r--r--layouts/community/numpad_5x6/drashna/keymap.c2
-rw-r--r--layouts/community/ortho_3x10/bbaserdem/config.h21
-rw-r--r--layouts/community/ortho_3x10/bbaserdem/keymap.c98
-rw-r--r--layouts/community/ortho_3x10/bbaserdem/readme.md19
-rwxr-xr-xlayouts/community/ortho_3x10/bbaserdem/rules.mk23
-rw-r--r--layouts/community/ortho_4x12/ajp10304/keymap.c28
-rw-r--r--layouts/community/ortho_4x12/bakingpy/config.h11
-rwxr-xr-xlayouts/community/ortho_4x12/bbaserdem/config.h26
-rwxr-xr-xlayouts/community/ortho_4x12/bbaserdem/keymap.c88
-rw-r--r--layouts/community/ortho_4x12/bbaserdem/readme.md12
-rwxr-xr-xlayouts/community/ortho_4x12/bbaserdem/rules.mk26
-rw-r--r--layouts/community/ortho_4x12/bifbofii/keymap.c10
-rw-r--r--layouts/community/ortho_4x12/brandonschlack/keymap.c4
-rw-r--r--layouts/community/ortho_4x12/bredfield/keymap.c8
-rw-r--r--layouts/community/ortho_4x12/bredfield/readme.md2
-rw-r--r--layouts/community/ortho_4x12/buswerks/config.h15
-rw-r--r--layouts/community/ortho_4x12/buswerks/keymap.c2
-rw-r--r--layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h5
-rw-r--r--layouts/community/ortho_4x12/crs/config.h32
-rw-r--r--layouts/community/ortho_4x12/crs/keymap.c253
-rw-r--r--layouts/community/ortho_4x12/crs/readme.md15
-rw-r--r--layouts/community/ortho_4x12/drashna/config.h10
-rw-r--r--layouts/community/ortho_4x12/ergodoxish/config.h5
-rw-r--r--layouts/community/ortho_4x12/grahampheath/config.h5
-rw-r--r--layouts/community/ortho_4x12/grahampheath/keymap.c2
-rw-r--r--layouts/community/ortho_4x12/greatwizard/keymap.c2
-rw-r--r--layouts/community/ortho_4x12/jackhumbert/keymap.c10
-rw-r--r--layouts/community/ortho_4x12/jarred/keymap.c3
-rw-r--r--layouts/community/ortho_4x12/jjerrell/config.h2
-rw-r--r--layouts/community/ortho_4x12/jjerrell/keymap.c2
-rw-r--r--layouts/community/ortho_4x12/jotix/keymap.c6
-rw-r--r--layouts/community/ortho_4x12/juno/keymap.c4
-rw-r--r--layouts/community/ortho_4x12/junonum/keymap.c8
-rw-r--r--layouts/community/ortho_4x12/mguterl/keymap.c12
-rw-r--r--layouts/community/ortho_4x12/symbolic/config.h7
-rw-r--r--layouts/community/ortho_4x12/wanleg/config.h3
-rw-r--r--layouts/community/ortho_4x12/xyverz/config.h13
-rw-r--r--layouts/community/ortho_4x4/jotix/keymap.c4
-rw-r--r--layouts/community/ortho_5x12/333fred/config.h1
-rw-r--r--layouts/community/ortho_5x12/333fred/keymap.c6
-rw-r--r--layouts/community/ortho_5x12/brandonschlack/keymap.c4
-rw-r--r--layouts/community/ortho_5x12/drashna/config.h13
-rw-r--r--layouts/community/ortho_5x12/greatwizard/keymap.c2
-rw-r--r--layouts/community/ortho_5x12/riblee/keymap.c2
-rw-r--r--layouts/community/ortho_5x12/xyverz/config.h12
-rw-r--r--layouts/community/ortho_5x12/xyverz/keymap.c4
-rw-r--r--layouts/community/ortho_5x14/peej/keymap.c2
-rw-r--r--layouts/community/ortho_5x14/yet-another-developer/config.h13
-rw-r--r--layouts/community/ortho_5x14/yet-another-developer/keymap.c4
-rw-r--r--layouts/community/ortho_5x15/wanleg/keymap.c6
-rw-r--r--layouts/community/planck_mit/guidoism/guidoism.json2
-rw-r--r--layouts/community/planck_mit/guidoism/keymap.c2
-rw-r--r--layouts/community/planck_mit/guidoism/keys.json52
-rw-r--r--layouts/community/split_3x5_3/bbaserdem/config.h35
-rw-r--r--layouts/community/split_3x5_3/bbaserdem/keymap.c117
-rw-r--r--layouts/community/split_3x5_3/bbaserdem/readme.md18
-rw-r--r--layouts/community/split_3x5_3/bbaserdem/rules.mk22
-rw-r--r--layouts/community/split_3x6_3/bbaserdem/chconf.h23
-rw-r--r--layouts/community/split_3x6_3/bbaserdem/config.h77
-rw-r--r--layouts/community/split_3x6_3/bbaserdem/halconf.h24
-rw-r--r--layouts/community/split_3x6_3/bbaserdem/keymap.c191
-rw-r--r--layouts/community/split_3x6_3/bbaserdem/mcuconf.h25
-rw-r--r--layouts/community/split_3x6_3/bbaserdem/readme.md15
-rw-r--r--layouts/community/split_3x6_3/bbaserdem/rules.mk47
-rw-r--r--layouts/community/split_3x6_3/bbaserdem/ssd1306.c16
-rw-r--r--layouts/community/split_3x6_3/bcat/keymap.c4
-rw-r--r--layouts/community/split_3x6_3/drashna/config.h7
-rw-r--r--layouts/community/tkl_ansi/brandonschlack/config.h11
-rw-r--r--layouts/community/tkl_ansi/xyverz/keymap.c6
-rw-r--r--layouts/community/tkl_ansi/yanfali/keymap.c4
-rw-r--r--layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c2
-rw-r--r--layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c2
-rw-r--r--layouts/default/65_ansi/default_65_ansi/keymap.c2
-rw-r--r--layouts/default/65_ansi_blocker/default_65_ansi_blocker/keymap.c2
-rw-r--r--layouts/default/65_ansi_blocker_split_bs/default_65_ansi_blocker_split_bs/keymap.c2
-rw-r--r--layouts/default/65_ansi_blocker_tsangan/default_65_ansi_blocker_tsangan/keymap.c2
-rw-r--r--layouts/default/65_ansi_blocker_tsangan_split_bs/default_65_ansi_blocker_tsangan_split_bs/keymap.c2
-rw-r--r--layouts/default/65_ansi_split_bs/default_65_ansi_split_bs/keymap.c2
-rw-r--r--layouts/default/65_iso/default_65_iso/keymap.c2
-rw-r--r--layouts/default/65_iso_blocker/default_65_iso_blocker/keymap.c2
-rw-r--r--layouts/default/65_iso_blocker_split_bs/default_65_iso_blocker_split_bs/keymap.c2
-rw-r--r--layouts/default/65_iso_blocker_tsangan/default_65_iso_blocker_tsangan/keymap.c2
-rw-r--r--layouts/default/65_iso_blocker_tsangan_split_bs/default_65_iso_blocker_tsangan_split_bs/keymap.c2
-rw-r--r--layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c2
238 files changed, 461 insertions, 14148 deletions
diff --git a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
index f87c294c4c..eeb2c55d15 100644
--- a/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
+++ b/layouts/community/60_ansi/mechmerlin-ansi/keymap.c
@@ -3,8 +3,8 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BL] = LAYOUT_60_ansi(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, \
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \
KC_CTCP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_FNX, KC_RALT, KC_RGUI, KC_RCTL),
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, \
BL_TOGG, BL_INC, BL_DEC, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, \
- VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, \
+ VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, \
_______, _______, _______, MO(_CL), _______, _______, _______, _______),
[_AL] = LAYOUT_60_ansi(
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_CL] = LAYOUT_60_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, EE_CLR, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, KC_VER, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______),
diff --git a/layouts/community/60_ansi/readme.md b/layouts/community/60_ansi/readme.md
index 9e81c96153..fe3374ef05 100644
--- a/layouts/community/60_ansi/readme.md
+++ b/layouts/community/60_ansi/readme.md
@@ -49,8 +49,8 @@ This keymap must have a `LAYOUT_60_ansi` layout defined.
```c
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT_60_ansi(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, \
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
KC_LCTL, KC_LALT, KC_LGUI, KC_SPACE, MO(1), KC_RALT, KC_RGUI, KC_RCTL),
diff --git a/layouts/community/60_ansi/stanrc85-ansi/keymap.c b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
index 32542352ca..42f6675282 100644
--- a/layouts/community/60_ansi/stanrc85-ansi/keymap.c
+++ b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, LT_SPCF, KC_RALT, TD_TWIN, MO(_FN2_60), TD_TCTL),
[_DEFAULT] = LAYOUT_60_ansi(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
diff --git a/layouts/community/60_ansi/xyverz/keymap.c b/layouts/community/60_ansi/xyverz/keymap.c
index 61176ef2b6..c975c8b24d 100644
--- a/layouts/community/60_ansi/xyverz/keymap.c
+++ b/layouts/community/60_ansi/xyverz/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Layer 3: Functions */
[_FL] = LAYOUT_60_ansi(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,
- _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+ _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,
KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_END, _______, _______, _______, _______, _______,
QWERTY, DVORAK, COLEMAK, _______, _______, _______, _______, _______
diff --git a/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c b/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
index 07cc46ac77..3af6af5091 100644
--- a/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
+++ b/layouts/community/60_ansi_arrow_split_bs_7u_spc/mrsendyyk/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
*/
[_BASE] = LAYOUT_60_ansi_arrow_split_bs_7u_spc(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH,
@@ -65,8 +65,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FN] = LAYOUT_60_ansi_arrow_split_bs_7u_spc(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_EJCT,
_______, _______, _______, KC_END, RGB_TOG, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, KC_MUTE,
- _______, _______, KC_SLCK, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, KC_PAUS,
- KC_VOLU, _______, _______, KC_CALC, _______, BL_TOGG, KC_NLCK, KC_MAIL, _______, _______, MO(_RESET), KC_PGUP, KC_MSTP,
+ _______, _______, KC_SCRL, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, KC_PAUS,
+ KC_VOLU, _______, _______, KC_CALC, _______, BL_TOGG, KC_NUM, KC_MAIL, _______, _______, MO(_RESET), KC_PGUP, KC_MSTP,
KC_VOLD, KC_MRWD, KC_MFFD, KC_MPLY, _______, KC_MPRV, KC_PGDN, KC_MNXT
),
/*
diff --git a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
index acf16f41d9..e3f06e03be 100644
--- a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Function 1 layer: http://www.keyboard-layout-editor.com/#/gists/c7a55e75285d474b6301140eaf53f915 */
[LAYER_FUNCTION_1] = LAYOUT_60_ansi_split_bs_rshift(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
- KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______,
+ KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
_______, KC_APP, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c */
[LAYER_FUNCTION_2] = LAYOUT_60_ansi_split_bs_rshift(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
- _______, _______, KC_MPLY, KC_VOLU, KC_MSTP, BL_BRTG, EEP_RST, QK_BOOT, _______, _______, _______, RGB_VAI, _______, _______,
+ _______, _______, KC_MPLY, KC_VOLU, KC_MSTP, BL_BRTG, EE_CLR, QK_BOOT, _______, _______, _______, RGB_VAI, _______, _______,
_______, _______, KC_MPRV, KC_VOLD, KC_MNXT, BL_INC, _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_TOG,
_______, _______, _______, KC_MUTE, _______, BL_DEC, _______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
index f48b53e303..3b80fa4acf 100644
--- a/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/mechmerlin-split/keymap.c
@@ -3,8 +3,8 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BL] = LAYOUT_60_ansi_split_bs_rshift(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, \
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, \
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, \
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \
KC_CTCP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TG(_AL), \
KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, MO(_FL), KC_RALT, KC_RGUI, KC_RCTL),
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, \
BL_TOGG, BL_INC, BL_DEC, BL_STEP, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, \
- VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, \
+ VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, \
_______, _______, _______, MO(_CL), _______, _______, _______, _______),
[_AL] = LAYOUT_60_ansi_split_bs_rshift(
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_CL] = LAYOUT_60_ansi_split_bs_rshift(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, EE_CLR, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, KC_VER, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______)
diff --git a/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c b/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c
index 77921f9b1a..0cf20af5c6 100644
--- a/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[YFL] = LAYOUT_60_ansi_split_bs_rshift(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, QK_BOOT, \
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, QK_BOOT, \
KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______),
diff --git a/layouts/community/60_hhkb/yanfali/keymap.c b/layouts/community/60_hhkb/yanfali/keymap.c
index 7e56d5b5ac..8dd74edb7e 100644
--- a/layouts/community/60_hhkb/yanfali/keymap.c
+++ b/layouts/community/60_hhkb/yanfali/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[FN]= LAYOUT_60_hhkb(
KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \
- _______, RGB_TOG, KC_UP, RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, QK_BOOT, \
+ _______, RGB_TOG, KC_UP, RGB_RMOD, BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, QK_BOOT, \
KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \
KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, \
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
diff --git a/layouts/community/60_iso/bifbofii/keymap.c b/layouts/community/60_iso/bifbofii/keymap.c
index 9c95384360..7365f98e97 100755
--- a/layouts/community/60_iso/bifbofii/keymap.c
+++ b/layouts/community/60_iso/bifbofii/keymap.c
@@ -80,11 +80,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------------'
*/
[FUNCTIONS_1] = LAYOUT_60_iso(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
- _______, _______, _______, _______, _______, KC__MUTE, KC_MPRV, KC__VOLDOWN, KC_VOLU, KC_MNXT, KC_MEDIA_PLAY_PAUSE, _______, _______,
- KC_CAPS, _______, KC_WBAK, _______, _______, KC_WFWD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, KC_ENT,
- KC_LSFT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, MO(FUNCTIONS_2),
- KC_LCTL, KC_LGUI, KC_LALT, _______, KC_RALT, KC_RGUI, KC_RCTL, _______
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
+ _______, _______, _______, _______, _______, KC_MUTE, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, KC_MEDIA_PLAY_PAUSE, _______, _______,
+ KC_CAPS, _______, KC_WBAK, _______, _______, KC_WFWD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, KC_ENT,
+ KC_LSFT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, MO(FUNCTIONS_2),
+ KC_LCTL, KC_LGUI, KC_LALT, _______, KC_RALT, KC_RGUI, KC_RCTL, _______
),
/* More Function keys
@@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[SPECIALS] = LAYOUT_60_iso(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_VAI, XXXXXXX,
- XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_OS, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_MA, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(GAMING), XXXXXXX, XXXXXXX, XXXXXXX, UC_M_LN, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS
diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h
index 4a90186ee9..026f20dc8f 100644
--- a/layouts/community/60_iso/unxmaal/config.h
+++ b/layouts/community/60_iso/unxmaal/config.h
@@ -19,7 +19,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef RGB_DI_PIN
#define RGB_DI_PIN F4
- #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 8 // Number of LEDs
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/layouts/community/60_tsangan_hhkb/bcat/keymap.c b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
index ae35f947e8..96bb4ef205 100644
--- a/layouts/community/60_tsangan_hhkb/bcat/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Function 1 layer: http://www.keyboard-layout-editor.com/#/gists/f6311fd7e315de781143b80eb040a551 */
[LAYER_FUNCTION_1] = LAYOUT_60_tsangan_hhkb(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
- KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______,
+ KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
_______, KC_APP, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______,
_______, _______, _______, _______, _______, _______, _______
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4 */
[LAYER_FUNCTION_2] = LAYOUT_60_tsangan_hhkb(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
- _______, _______, KC_MPLY, KC_VOLU, KC_MSTP, BL_BRTG, EEP_RST, QK_BOOT, _______, _______, _______, RGB_VAI, _______, _______,
+ _______, _______, KC_MPLY, KC_VOLU, KC_MSTP, BL_BRTG, EE_CLR, QK_BOOT, _______, _______, _______, RGB_VAI, _______, _______,
_______, _______, KC_MPRV, KC_VOLD, KC_MNXT, BL_INC, _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_TOG,
_______, _______, _______, KC_MUTE, _______, BL_DEC, _______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,
_______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/60_tsangan_hhkb/dohmain/keymap.c b/layouts/community/60_tsangan_hhkb/dohmain/keymap.c
index d6c0d9ec30..9dcb34ea39 100644
--- a/layouts/community/60_tsangan_hhkb/dohmain/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/dohmain/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[FUNCTION] = LAYOUT_60_tsangan_hhkb(
XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, KC_MPLY, KC_MPRV, KC_MNXT, XXXXXXX, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX,
+ XXXXXXX, XXXXXXX, KC_MPLY, KC_MPRV, KC_MNXT, XXXXXXX, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_PSCR, KC_SCRL, KC_PAUS, XXXXXXX,
_______, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_INS, _______,
_______, KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, KC_AGIN, XXXXXXX, XXXXXXX, KC_WBAK, KC_WFWD, KC_WREF, _______, KC_WHOM,
_______, _______, _______, _______, _______, KC_APP, _______
diff --git a/layouts/community/60_tsangan_hhkb/yanfali/keymap.c b/layouts/community/60_tsangan_hhkb/yanfali/keymap.c
index 1af9eebf5b..a6b0154211 100644
--- a/layouts/community/60_tsangan_hhkb/yanfali/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/yanfali/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[FN] = LAYOUT_60_tsangan_hhkb(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
- _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, QK_BOOT,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, QK_BOOT,
KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c b/layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c
index 19d14eb374..7dd7aeffea 100644
--- a/layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/yanfali_wkl/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[FN] = LAYOUT_60_tsangan_hhkb(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
- _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, QK_BOOT,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, QK_BOOT,
KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/65_ansi/mechmerlin/keymap.c b/layouts/community/65_ansi/mechmerlin/keymap.c
index 9e3e0752b5..23d42b6d8c 100644
--- a/layouts/community/65_ansi/mechmerlin/keymap.c
+++ b/layouts/community/65_ansi/mechmerlin/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
*/
[_BL] = LAYOUT_65_ansi(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_CL] = LAYOUT_65_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, EE_CLR, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, KC_VER, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
index ea39959d7e..bd5431a5b8 100644
--- a/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
+++ b/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
@@ -106,12 +106,12 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
}
#ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, RGB_GREEN);
} else if (!HAS_ANY_FLAGS(rgb_matrix_get_flags(), LED_FLAG_KEYS)){
rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, 0, 0, 0);
}
+ return false;
}
#endif
-
diff --git a/layouts/community/65_ansi_blocker/mechmerlin/keymap.c b/layouts/community/65_ansi_blocker/mechmerlin/keymap.c
index 6371153066..f95f64e4b5 100644
--- a/layouts/community/65_ansi_blocker/mechmerlin/keymap.c
+++ b/layouts/community/65_ansi_blocker/mechmerlin/keymap.c
@@ -18,7 +18,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BL] = LAYOUT_65_ansi_blocker(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
KC_CTCP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_CL] = LAYOUT_65_ansi_blocker(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, EE_CLR, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, KC_VER, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/65_ansi_blocker/spidey3/keymap.c b/layouts/community/65_ansi_blocker/spidey3/keymap.c
index e682a281aa..e4a417ef90 100644
--- a/layouts/community/65_ansi_blocker/spidey3/keymap.c
+++ b/layouts/community/65_ansi_blocker/spidey3/keymap.c
@@ -8,7 +8,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Base
[_BASE] = LAYOUT_65_ansi_blocker(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
@@ -16,24 +16,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
// Numpad
[_NUMPAD] = LAYOUT_65_ansi_blocker(
- XXXXXXX, XXXXXXX, XXXXXXX, KC_NUMLOCK, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, KC_PMNS, KC_PEQL, _______, _______,
+ XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, KC_PMNS, KC_PEQL, _______, _______,
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, KC_PCMM, _______, _______, _______, _______,
- KC_NUMLOCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PPLS, KC_PAST, KC_PENT, _______,
+ KC_NUM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PPLS, KC_PAST, KC_PENT, _______,
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_0, SPI_KP_00, KC_PDOT, KC_PSLS, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
// FN
[_FN] = LAYOUT_65_ansi_blocker(
- KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_SLCK,
- XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, SPI_GLO, VLK_TOG, CH_SUSP, KC_SLEP, KC_PWR, KC_BRIU,
- MO(_GLYPH), RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_G, RGB_M_TW, UC_M_LN, XXXXXXX, XXXXXXX, CH_CPNL, KC_BRID,
- _______, XXXXXXX, UC_M_EM, UC_M_WC, UC_MOD, NK_TOGG, TG(_NUMPAD),UC_M_MA, XXXXXXX, XXXXXXX, DEBUG, _______, KC_VOLU, KC_MUTE,
- _______, _______, _______, KC_MPLY, CH_ASST, _______, KC_MPRV, KC_VOLD, KC_MNXT
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_SCRL,
+ XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, SPI_GLO, VK_TOGG, CH_SUSP, KC_SLEP, KC_PWR, KC_BRIU,
+ MO(_GLYPH), RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_G, RGB_M_TW, UC_M_LN, XXXXXXX, XXXXXXX, KC_CPNL, KC_BRID,
+ _______, XXXXXXX, UC_M_EM, UC_M_WC, UC_MOD, NK_TOGG, TG(_NUMPAD),UC_M_MA, XXXXXXX, XXXXXXX, DB_TOGG, _______, KC_VOLU, KC_MUTE,
+ _______, _______, _______, KC_MPLY, KC_ASST, _______, KC_MPRV, KC_VOLD, KC_MNXT
),
// Glyph Transformation
[_GLYPH] = LAYOUT_65_ansi_blocker(
QK_BOOT, X(SAD), X(MEH), X(HAPPY), X(ANGRY), X(THUMBDN), X(THUMBUP), X(SPIDER), X_BUL, X(LOL), X(SURPRISE),X_DASH, SPI_GFLOCK, XXXXXXX, XXXXXXX,
- EEP_RST, SPI_NORMAL, SPI_WIDE, SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD, SPI_MATH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ EE_CLR, SPI_NORMAL, SPI_WIDE, SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD, SPI_MATH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, X(LARR), X(RARR), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/layouts/community/65_ansi_blocker/stanrc85/keymap.c b/layouts/community/65_ansi_blocker/stanrc85/keymap.c
index ce6efb235e..a9132fcb40 100644
--- a/layouts/community/65_ansi_blocker/stanrc85/keymap.c
+++ b/layouts/community/65_ansi_blocker/stanrc85/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_DEFAULT] = LAYOUT_65_ansi_blocker(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
diff --git a/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
index 37111c9508..d9e88a7b55 100644
--- a/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
+++ b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */
[LAYER_FUNCTION_1] = LAYOUT_65_ansi_blocker_split_bs(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, _______,
- KC_CAPS, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, QK_BOOT, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______,
+ KC_CAPS, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, EE_CLR, QK_BOOT, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______,
_______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_APP, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
index 2d76ce1d15..5a32962baa 100644
--- a/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
+++ b/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
@@ -94,11 +94,12 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
}
#ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, RGB_GREEN);
} else if (!HAS_ANY_FLAGS(rgb_matrix_get_flags(), LED_FLAG_KEYS)){
rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, 0, 0, 0);
}
+ return false;
}
#endif
diff --git a/layouts/community/66_ansi/mechmerlin/keymap.c b/layouts/community/66_ansi/mechmerlin/keymap.c
index 050c93a57e..c2387ae2f1 100644
--- a/layouts/community/66_ansi/mechmerlin/keymap.c
+++ b/layouts/community/66_ansi/mechmerlin/keymap.c
@@ -3,7 +3,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BL] = LAYOUT_66_ansi(
- KC_GESC,KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_PGUP, \
+ QK_GESC,KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_PGUP, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS, KC_PGDN, \
KC_CTCP,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \
@@ -18,8 +18,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_CL] = LAYOUT_66_ansi(
BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, _______, RGB_VAI, \
- _______,_______,_______,EEP_RST,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, \
+ _______,_______,_______,EE_CLR, QK_BOOT,_______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, \
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, \
- VLK_TOG, _______,_______,_______,KC_VER,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, \
+ VK_TOGG, _______,_______,_______,KC_VER,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, \
CK_TOGG,_______,_______, _______, _______,_______,_______,RGB_HUD,RGB_SAD,RGB_HUI),
};
diff --git a/layouts/community/66_ansi/skully/keymap.c b/layouts/community/66_ansi/skully/keymap.c
index fa138ce445..927352797b 100644
--- a/layouts/community/66_ansi/skully/keymap.c
+++ b/layouts/community/66_ansi/skully/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap _BL: Base Layer (Default Layer)
*/
[_BL] = LAYOUT_66_ansi(
- KC_GESC,KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_PGUP,
+ QK_GESC,KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS, KC_PGDN,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_ENT,
MO(_FL), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT, KC_UP,
diff --git a/layouts/community/66_ansi/xyverz/keymap.c b/layouts/community/66_ansi/xyverz/keymap.c
index 3f9594f78a..ef330af942 100644
--- a/layouts/community/66_ansi/xyverz/keymap.c
+++ b/layouts/community/66_ansi/xyverz/keymap.c
@@ -18,7 +18,7 @@ enum planck_keycodes {
};
// Useful defines
-#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
+#define MODS_CTRL_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
#define FN_CAPS LT(_FL, KC_CAPS) // Tap for Caps Lock, Hold for Function Layer
// clang-format off
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_QWERTY] = LAYOUT_66_ansi (
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, \
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, \
FN_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `------------------------------------------------------------------'
*/
[_COLEMAK] = LAYOUT_66_ansi (
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, \
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, \
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, \
FN_CAPS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `------------------------------------------------------------------'
*/
[_DVORAK] = LAYOUT_66_ansi (
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, \
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, \
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_PGDN, \
FN_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, \
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_UP, \
@@ -88,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_FL] = LAYOUT_66_ansi (
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, BL_STEP, \
- _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, \
_______, _______, MO(_CL), _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PGUP, \
_______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END),
diff --git a/layouts/community/68_ansi/mechmerlin/keymap.c b/layouts/community/68_ansi/mechmerlin/keymap.c
index 63bdb6f69e..0f2f8d90eb 100644
--- a/layouts/community/68_ansi/mechmerlin/keymap.c
+++ b/layouts/community/68_ansi/mechmerlin/keymap.c
@@ -3,7 +3,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BL] = LAYOUT_68_ansi(\
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_PGUP,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_PGDN,
KC_CTCP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_CL] = LAYOUT_68_ansi(\
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VER, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
index 57d4517acf..586d0a822f 100644
--- a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
+++ b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
@@ -16,13 +16,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_TOGG, BL_INC, BL_DEC, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
- VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______,
+ VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______,
_______, _______, _______, MO(_CL), _______, _______, _______, KC_HOME, KC_PGDN, KC_END),
[_CL] = LAYOUT_75_ansi(\
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, EE_CLR, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, KC_VER, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c
index 5ede802676..65656173a4 100644
--- a/layouts/community/75_ansi/spidey3/keymap.c
+++ b/layouts/community/75_ansi/spidey3/keymap.c
@@ -15,19 +15,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Numpad
[_NUMPAD] = LAYOUT_75_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- XXXXXXX, XXXXXXX, XXXXXXX, KC_NUMLOCK, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, KC_PMNS, KC_PEQL, _______, _______,
+ XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_0, KC_PMNS, KC_PEQL, _______, _______,
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, KC_PCMM, _______, _______, _______, _______,
- KC_NUMLOCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PPLS, KC_PAST, KC_PENT, _______,
+ KC_NUM, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PPLS, KC_PAST, KC_PENT, _______,
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_KP_0, SPI_KP_00, KC_PDOT, KC_PSLS, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
// FN
[_FN] = LAYOUT_75_ansi(
QK_BOOT, SPI_NORMAL, SPI_WIDE, SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, SPI_BOLD, SPI_MATH, XXXXXXX, SPI_GFLOCK, KC_SLEP, CH_SUSP, KC_PWR,
- EEP_RST, X(SAD), X(MEH), X(HAPPY), X(ANGRY), X(THUMBDN), X(THUMBUP), X(SPIDER), X_BUL, X(LOL), X(SURPRISE),X_DASH, XXXXXXX, KC_PAUS, KC_SLCK,
- XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, SPI_GLO, VLK_TOG, XXXXXXX, XXXXXXX, XXXXXXX, KC_BRIU,
+ EE_CLR, X(SAD), X(MEH), X(HAPPY), X(ANGRY), X(THUMBDN), X(THUMBUP), X(SPIDER), X_BUL, X(LOL), X(SURPRISE),X_DASH, XXXXXXX, KC_PAUS, KC_SCRL,
+ XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, SPI_GLO, VK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, KC_BRIU,
XXXXXXX, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_G, RGB_M_TW, UC_M_LN, XXXXXXX, XXXXXXX, XXXXXXX, KC_BRID,
- _______, XXXXXXX, UC_M_EM, UC_M_WC, UC_MOD, NK_TOGG, TG(_NUMPAD),UC_M_MA, X(LARR), X(RARR), DEBUG, _______, KC_VOLU, KC_MUTE,
- _______, _______, _______, KC_MPLY, CH_ASST, _______, CH_CPNL, KC_MPRV, KC_VOLD, KC_MNXT
+ _______, XXXXXXX, UC_M_EM, UC_M_WC, UC_MOD, NK_TOGG, TG(_NUMPAD),UC_M_MA, X(LARR), X(RARR), DB_TOGG, _______, KC_VOLU, KC_MUTE,
+ _______, _______, _______, KC_MPLY, KC_ASST, _______, KC_CPNL, KC_MPRV, KC_VOLD, KC_MNXT
)
};
diff --git a/layouts/community/75_ansi/yanfali/keymap.c b/layouts/community/75_ansi/yanfali/keymap.c
index 66ff76555c..a1893a9798 100644
--- a/layouts/community/75_ansi/yanfali/keymap.c
+++ b/layouts/community/75_ansi/yanfali/keymap.c
@@ -18,8 +18,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[FN] = LAYOUT_75_ansi(\
_______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_INC, BL_DEC, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, QK_BOOT, _______,
+ BL_TOGG, BL_INC, BL_DEC, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, QK_BOOT, _______,
RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
- VLK_TOG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PGUP, _______,
+ VK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PGUP, _______,
_______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END)
};
diff --git a/layouts/community/alice/stanrc85-alice/keymap.c b/layouts/community/alice/stanrc85-alice/keymap.c
index dcbd570777..07e056deda 100644
--- a/layouts/community/alice/stanrc85-alice/keymap.c
+++ b/layouts/community/alice/stanrc85-alice/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FN2_60] = LAYOUT_alice(
BL_TOGG, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______,
- BL_INC, VLK_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+ BL_INC, VK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
BL_DEC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, TG(_DEFAULT)
diff --git a/layouts/community/ergodox/333fred/keymap.c b/layouts/community/ergodox/333fred/keymap.c
index 5dee9a1e3f..01fcf8916c 100644
--- a/layouts/community/ergodox/333fred/keymap.c
+++ b/layouts/community/ergodox/333fred/keymap.c
@@ -220,7 +220,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_LSFT, KC_Z, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_ENT, _______, _______, KC_LOCK, KC_BSPC, _______, _______, _______, _______, _______,
+ KC_ENT, _______, _______, QK_LOCK, KC_BSPC, _______, _______, _______, _______, _______,
KC_F5, KC_F6, LCTL(KC_C), LCTL(KC_V),
_______, KC_UP,
KC_LALT, KC_SPC, OSM(SYMB), KC_DOWN, _______, _______
@@ -254,7 +254,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______,
KC_LSFT, KC_Z, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_ENT, _______, _______, KC_LOCK, KC_BSPC, _______, _______, _______, _______, _______,
+ KC_ENT, _______, _______, QK_LOCK, KC_BSPC, _______, _______, _______, _______, _______,
KC_F5, KC_F6, LCTL(KC_C), LCTL(KC_V),
_______, KC_UP,
KC_LALT, KC_SPC, OSM(SYMB), KC_DOWN, _______, _______
diff --git a/layouts/community/ergodox/ab/keyboard-layout.json b/layouts/community/ergodox/ab/keyboard-layout.json
deleted file mode 100644
index e2badad4de..0000000000
--- a/layouts/community/ergodox/ab/keyboard-layout.json
+++ /dev/null
@@ -1,387 +0,0 @@
-[
- {
- "name": "Beginner's Keymap for Ergodox-EZ",
- "author": "Anand Babu Periasamy"
- },
- [
- {
- "x": 3.5
- },
- "#\n3\n\n\nF3",
- {
- "x": 10.5
- },
- ")\n0\n\n\nF10"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5
- },
- "@\n2\n\n\nF2",
- {
- "x": 1
- },
- "$\n4\n\n\nF4",
- {
- "x": 8.5
- },
- "(\n9\n\n\nF9",
- {
- "x": 1
- },
- "_\n-\n\n\nF11"
- ],
- [
- {
- "y": -0.875,
- "x": 5.5
- },
- "%\n5\n\n\nF5",
- "^\n6\n\n\nF6",
- {
- "x": 4.5
- },
- "&\n7\n\n\nF7",
- "*\n8\n\n\nF8"
- ],
- [
- {
- "y": -0.875,
- "w": 1.5
- },
- "~\n`\n\n\nEsc",
- "!\n1\n\n\nF1",
- {
- "x": 14.5
- },
- "+\n=\n\n\nF12",
- {
- "a": 7,
- "w": 1.5
- },
- "Backspace\n\n\n\nBackspace"
- ],
- [
- {
- "y": -0.375,
- "x": 3.5
- },
- "E\n\n\n\n<i class=\"fa fa-caret-up\" aria-hidden=\"true\"></i>",
- {
- "x": 10.5
- },
- "I"
- ],
- [
- {
- "y": -0.8799999999999999,
- "x": 2.5
- },
- "W"
- ],
- [
- {
- "y": -0.9950000000000001,
- "x": 4.5,
- "a": 4
- },
- "R",
- {
- "x": 8.5,
- "a": 7
- },
- "U",
- {
- "x": 1
- },
- "O"
- ],
- [
- {
- "y": -0.875,
- "x": 5.5
- },
- "T",
- {
- "h": 1.5
- },
- "<i class=\"fa fa-chevron-circle-left\" aria-hidden=\"true\"></i>",
- {
- "x": 4.5,
- "h": 1.5
- },
- "<i class=\"fa fa-chevron-circle-right\" aria-hidden=\"true\"></i>",
- "Y"
- ],
- [
- {
- "y": -0.875,
- "a": 6,
- "w": 1.5
- },
- "Tab",
- {
- "a": 7
- },
- "Q",
- {
- "x": 14.5
- },
- "P",
- {
- "a": 4,
- "w": 1.5
- },
- "|\n\\"
- ],
- [
- {
- "y": -0.375,
- "x": 3.5,
- "a": 7
- },
- "D\n\n\n\n<i class=\"fa fa-caret-down\" aria-hidden=\"true\"></i>",
- {
- "x": 10.5
- },
- "K"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5
- },
- "S\n\n\n\n<i class=\"fa fa-caret-left\" aria-hidden=\"true\"></i>",
- {
- "x": 1,
- "c": "#c4bcbc"
- },
- "F\n\n\n\n<i class=\"fa fa-caret-right\" aria-hidden=\"true\"></i>",
- {
- "x": 8.5
- },
- "J",
- {
- "x": 1,
- "c": "#cccccc"
- },
- "L"
- ],
- [
- {
- "y": -0.875,
- "x": 5.5
- },
- "G",
- {
- "x": 6.5
- },
- "H"
- ],
- [
- {
- "y": -0.875,
- "a": 4,
- "fa": [
- 0,
- 0,
- 0,
- 2
- ],
- "w": 1.5
- },
- "\n\n\nCtrl\n\n\nCaps",
- {
- "a": 7
- },
- "A",
- {
- "x": 14.5,
- "a": 4
- },
- ":\n;",
- {
- "a": 7,
- "w": 1.5
- },
- "Enter"
- ],
- [
- {
- "y": -0.625,
- "x": 6.5,
- "h": 1.5
- },
- "PgDn",
- {
- "x": 4.5,
- "h": 1.5
- },
- "PgUp"
- ],
- [
- {
- "y": -0.75,
- "x": 3.5
- },
- "C\n\n\n\n<i class=\"fa fa-hand-o-up\" aria-hidden=\"true\"></i>",
- {
- "x": 10.5,
- "a": 4
- },
- "<\n,"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5,
- "a": 7
- },
- "X\n\n\n\n<i class=\"fa fa-hand-o-left\" aria-hidden=\"true\"></i>",
- {
- "x": 1
- },
- "V\n\n\n\n<i class=\"fa fa-hand-o-right\" aria-hidden=\"true\"></i>",
- {
- "x": 8.5
- },
- "M",
- {
- "x": 1,
- "a": 4
- },
- ">\n."
- ],
- [
- {
- "y": -0.875,
- "x": 5.5,
- "a": 7
- },
- "B",
- {
- "x": 6.5
- },
- "N"
- ],
- [
- {
- "y": -0.875,
- "w": 1.5
- },
- "Shift",
- "Z",
- {
- "x": 14.5,
- "a": 4
- },
- "?\n/",
- {
- "w": 1.5
- },
- "\"\n'"
- ],
- [
- {
- "y": -0.375,
- "x": 3.5,
- "a": 7
- },
- "Alt\n\n\n\n<i class=\"fa fa-search-minus\" aria-hidden=\"true\"></i>",
- {
- "x": 10.5
- },
- "<i class=\"fa fa-long-arrow-down\" aria-hidden=\"true\"></i>\n\n\n\n<i class='fa fa-volume-down'></i>"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5
- },
- "<i class='fa fa-linux'></i>\n\n\n\n<i class=\"fa fa-search\" aria-hidden=\"true\"></i>",
- {
- "x": 1
- },
- "Alt\n\n\n\n<i class=\"fa fa-search-plus\" aria-hidden=\"true\"></i>",
- {
- "x": 8.5
- },
- "<i class=\"fa fa-long-arrow-left\" aria-hidden=\"true\"></i>\n\n\n\n<i class=\"fa fa-undo\" aria-hidden=\"true\"></i>",
- {
- "x": 1
- },
- "<i class=\"fa fa-long-arrow-up\" aria-hidden=\"true\"></i>\n\n\n\n<i class='fa fa-volume-up'></i>"
- ],
- [
- {
- "y": -0.75,
- "x": 0.5
- },
- "Ctrl\n\n\n\n<i class='fa fa-download'></i>",
- "Esc",
- {
- "x": 14.5
- },
- "<i class=\"fa fa-long-arrow-right\" aria-hidden=\"true\"></i>\n\n\n\n<i class='fa fa-volume-off'></i>",
- "Fn"
- ],
- [
- {
- "r": 30,
- "rx": 6.5,
- "ry": 4.25,
- "y": -1,
- "x": 1
- },
- "<i class=\"fa fa-clone\" aria-hidden=\"true\"></i>",
- "("
- ],
- [
- {
- "h": 2
- },
- "Space",
- {
- "h": 2
- },
- "Del",
- "["
- ],
- [
- {
- "x": 2
- },
- "{"
- ],
- [
- {
- "r": -30,
- "rx": 13,
- "y": -1,
- "x": -3
- },
- ")",
- "<i class=\"fa fa-paste\" aria-hidden=\"true\"></i>"
- ],
- [
- {
- "x": -3
- },
- "]",
- {
- "h": 2
- },
- "Enter",
- {
- "h": 2
- },
- "<i class=\"fa fa-chevron-left\" aria-hidden=\"true\"></i>"
- ],
- [
- {
- "x": -3
- },
- "}"
- ]
-] \ No newline at end of file
diff --git a/layouts/community/ergodox/ab/keymap.c b/layouts/community/ergodox/ab/keymap.c
deleted file mode 100644
index 0046f5ed21..0000000000
--- a/layouts/community/ergodox/ab/keymap.c
+++ /dev/null
@@ -1,152 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-
-#define BASE 0 // default layer
-#define FN1 1 // media layer
-
-#define CAPS_CTL CTL_T(KC_CAPS) // Caps on tap, Ctrl on hold.
-#define COPY LCTL(KC_V) // C-c Copy
-#define PASTE LCTL(KC_V) // C-v Paste
-#define ZM_NRM LCTL(KC_0) // C-0 Zoom Normal
-#define ZM_OUT LCTL(KC_MINS) // C-- Zoom Out
-#define ZM_IN LCTL(KC_PLUS) // C-+ Zoom In
-#define EM_UNDO LCTL(KC_UNDS) // C-_ Emacs Undo
-
-#define _MOB 1 // Mobile#
-#define _CUS1 2 // Custom macro 1
-#define _CUS2 3 // Custom macro 2
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BSpace |
- * |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
- * | Tab | Q | W | E | R | T | Fwd | | Back | Y | U | I | O | P | \ |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * |Caps/Ctl| A | S | D | F | G |------| |------| H | J | K | L | ; | Enter |
- * |--------+------+------+------+------+------| PgDn | | PgUp |------+------+------+------+------+--------|
- * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | ' |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | Ctrl | Esc | LGui | Alt | Alt | | Left | Dn | Up | Right| Fn |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | Copy | ( | | ) | Paste|
- * ,------|------+------| |------+------+------.
- * | | | [ | | ] | | |
- * |Space | Del |------| |------| Enter|BSpace|
- * | | | { | | } | | |
- * `--------------------' `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
- [BASE] = LAYOUT_ergodox( // layer 0 : default
- // Left hand
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_WBAK,
- CAPS_CTL, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_PGDN,
- KC_LCTL, KC_ESC, KC_LGUI, KC_LALT, KC_LALT,
- COPY, KC_LCBR,
- KC_LPRN,
- KC_SPC, KC_DEL, KC_LBRC,
- // Right hand
- KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
- KC_WFWD, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
- KC_PGUP, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
- KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, TG(FN1),
- KC_RCBR, PASTE,
- KC_RPRN,
- KC_RBRC, KC_ENT, KC_BSPC),
-/* Keymap 1: Fn Keys, media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | Esc | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | BSpace |
- * |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | LClk | MClk | RClk | | | | | | | | | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |Teensy| | ZmNrm| ZmOut| ZmIn | | Undo |VolDn |VolUp | Mute | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------+------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// FN1 Layer
- [FN1] = LAYOUT_ergodox(
- // Left hand
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN3, KC_BTN2, KC_TRNS, KC_TRNS,
- QK_BOOT, KC_TRNS, ZM_NRM, ZM_OUT, ZM_IN,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // Right hand
- KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
- KC_TRNS, M(_MOB), KC_TRNS, M(_CUS1),M(_CUS2),KC_TRNS, KC_TRNS,
- EM_UNDO, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
- ),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case _MOB: // Your mobile# here.
- return MACRODOWN(T(1), T(2), T(3), T(MINS),
- T(1), T(2), T(3), T(MINS),
- T(1), T(2), T(3), T(4),
- END);
- case _CUS1: // Your custom macro 1
- return MACRODOWN(T(E), T(M), T(A), T(C), T(S), T(SPC), END);
- case _CUS2: // Your custom macro 2
- return MACRODOWN(T(L), T(S), T(SPC), T(MINS), T(L), T(ENT), END);
- };
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- // TODO: Make this relevant to the ErgoDox EZ.
- case 1:
- ergodox_right_led_1_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- default:
- // none
- break;
- }
-
-};
diff --git a/layouts/community/ergodox/ab/readme.md b/layouts/community/ergodox/ab/readme.md
deleted file mode 100644
index 22a7922d97..0000000000
--- a/layouts/community/ergodox/ab/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Beginner's keymap for Ergodox-EZ
-Beginner's keymap emulates standard QWERTY keyboard for beginners. Once you get comfortable with the Ergodox-EZ, you may fork this keymap and customize it for your own needs or find a suitable one from the community contributed keymaps.
-
-![Beginner's Keymap](https://i.imgur.com/dAIocc8.png)
-
-#### Pros
-* Easier to switch between regular keyboards and Ergodox-EZ.
-* Easy on beginners. It has everything you need for your day to day usage.
-
-#### Cons
-* Keys are not ergonomically placed to take full advantage of Ergodox-EZ. Take a look at this [Default Keymap](https://github.com/qmk/qmk_firmware/blob/master/layouts/default/ergodox/default_ergodox/keymap.c)
-* While multiple layers are possible, beginner's keymap only uses one additional layer for mouse, function and volume keys.
-
-#### Notes
-* Ideally number key [6] should have started from the right-hand side of the keyboard. Doing so breaks the familiar QWERTY layout.
-* Quote key ['] should have been placed between [:] and [Enter]. Due to lack of key space, it is placed below [Enter].
-* Double [Alt] keys are placed adjacent to each other for convenience.
-* [CapsLock] also acts as [Ctrl] key when you press and hold. It is convenient for GNU Emacs users.
-* Additional bracket keys are placed in the center of the keyboard for programmer's convenience.
-
-
diff --git a/layouts/community/ergodox/ab/rules.mk b/layouts/community/ergodox/ab/rules.mk
deleted file mode 100644
index 839dd82e1e..0000000000
--- a/layouts/community/ergodox/ab/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Having a file like this allows you to override Makefile definitions
-# for your own particular keymap
-
-SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-COMMAND_ENABLE = no # Commands for debug and configuration
-
-
diff --git a/layouts/community/ergodox/absenth/keymap.c b/layouts/community/ergodox/absenth/keymap.c
deleted file mode 100644
index 884167aa31..0000000000
--- a/layouts/community/ergodox/absenth/keymap.c
+++ /dev/null
@@ -1,179 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Del | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | BkSp | A/L2 | S | D | F | G |------| |------| H | J | K | L |; / L2|' / Cmd |
- * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------|
- * | LS/PO |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RS/PC |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | App | LGui | | Alt |Ctrl/Esc|
- * ,------|------|------| |------+--------+------.
- * | | | Home | | PgUp | | |
- * | Space|Backsp|------| |------| Tab |Enter |
- * | |ace | End | | PgDn | | |
- * `--------------------' `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
- KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
- KC_BSPC, LT(MDIA, KC_A), KC_S, KC_D, KC_F, KC_G,
- KC_LSPO, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO),
- LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT,
- ALT_T(KC_APP), KC_LGUI,
- KC_HOME,
- KC_SPC,KC_BSPC,KC_END,
- // right hand
- KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
- MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSPC,
- KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, TT(SYMB),
- KC_LALT, CTL_T(KC_ESC),
- KC_PGUP,
- KC_PGDN,KC_TAB, KC_ENT
- ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | . | 0 | = | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
- // left hand
- M(0), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
- KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
- KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
- KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
- KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
- KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| left | down | up | down | | Play |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | Prev | Next | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | |Brwser|
- * | Lclk | Rclk |------| |------| |Back |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_BTN1, KC_BTN2, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,KC_TRNS, KC_MPLY,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- break;
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- // TODO: Make this relevant to the ErgoDox EZ.
- case 1:
- ergodox_right_led_1_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- default:
- // none
- break;
- }
-
-};
diff --git a/layouts/community/ergodox/absenth/readme.md b/layouts/community/ergodox/absenth/readme.md
deleted file mode 100644
index 744c67afea..0000000000
--- a/layouts/community/ergodox/absenth/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# ErgoDox EZ Absenth Configuration
-
-## Changelog
-
-
-* Sept. 14, 2016 (V0.2):
- * Added Space Cadet to Left and Right Shift. Pressing Left shift with no other key adds an "(" and pressing Right shift with no other key adds an ")"
-* Sept. 8, 2016 (V0.1):
- * Made A key double as MEDIA Layer change when you hold it. Added mouse buttons to the large thumb buttons on the left side on the Media Layer. Added vi/vim style arrow keys on HJKL on media layer.
-
-![Absenth](https://i.imgur.com/D1enl2x.jpg)
diff --git a/layouts/community/ergodox/adam/config.h b/layouts/community/ergodox/adam/config.h
deleted file mode 100644
index 1555ae11fd..0000000000
--- a/layouts/community/ergodox/adam/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/ergodox/adam/keymap.c b/layouts/community/ergodox/adam/keymap.c
deleted file mode 100644
index 9dd611e03e..0000000000
--- a/layouts/community/ergodox/adam/keymap.c
+++ /dev/null
@@ -1,144 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-
-#define BASE 0 // default layer
-#define FLOCK 1 // symbols arrows and F keys on F held down
-#define JLOCK 2 // same as Flock but with fall thru J and mapped to J held down
-#define CAPLOCK 3 //caps on until space / enter / esc
-#define SFLOCK 11 // symbols arrows and F keys on F held down
-#define SJLOCK 12 // same as Flock but with fall thru J and mapped to J held down
-
-// Sends macro when key is tapped, presses mod when key is held
-#define tap_mod_macro(record, mod, macro) ( ((record)->event.pressed) ? \
- ( ((record)->tap.count <= 0 || (record)->tap.interrupted) ? MACRO(D(mod), END) : MACRO_NONE ) : \
- ( ((record)->tap.count > 0 && !((record)->tap.interrupted)) ? (macro) : MACRO(U(mod), END) ) )
-
-#define tap_mod_shift(record, mod, macro) ( ((record)->event.pressed) ? \
- ( ((record)->tap.count <= 0 || (record)->tap.interrupted) ? MACRO(D(mod), END) : MACRO_NONE ) : \
- ( ((record)->tap.count > 0 && !((record)->tap.interrupted)) ? (MACRO( D(LSFT), T(LBRC), U(LSFT), END)) : MACRO(U(mod), END) ) )
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Layout
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | Q | W | E | R | T | | | | Y | U | I | O | P | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | A | S | D | F | G |------| |------| H | J | K | L |; | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | Z | X | C | V | B | | | | N | M | , | . | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+--------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `----------------------'
- */
- [BASE] = LAYOUT_ergodox(
- // left hand
- GUI_T(KC_ESC), KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS,
- _______, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_TAB,
- _______, SFT_T(KC_A), ALT_T(KC_S), CTL_T(KC_D), F(FLOCK), GUI_T(KC_G),
- _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BSPC,
- _______, _______, _______, _______ ,_______,
- _______, _______,
- _______,
- KC_SPC, _______, _______ ,
-
- // right hand
- KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
- KC_TAB, KC_Y, KC_U, KC_I, KC_O, KC_P, _______,
- GUI_T(KC_H), F(JLOCK), CTL_T(KC_K), ALT_T(KC_L), SFT_T(KC_SCLN), _______,
- KC_DELETE, KC_N, KC_M, KC_COMM,KC_DOT, KC_QUOT, _______,
- _______, _______,_______,_______, _______,
- _______, _______,
- _______,
- _______,_______, KC_ENT
- ),
- [FLOCK] = LAYOUT_ergodox(
- // left hand
- XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
- XXXXXXX,KC_LBRC,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
- XXXXXXX,S(KC_LBRC),XXXXXXX, XXXXXXX,_______,XXXXXXX,
- XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,TO(CAPLOCK),XXXXXXX,
- XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
- XXXXXXX,XXXXXXX,
- XXXXXXX,
- KC_ESC,XXXXXXX,XXXXXXX,
- // right hand
- KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,
- XXXXXXX, XXXXXXX, KC_HOME, KC_PGUP, XXXXXXX, KC_RBRC, XXXXXXX,
- KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, S(KC_RBRC), XXXXXXX,
- XXXXXXX, XXXXXXX, KC_END, KC_PGDOWN, KC_QUES, KC_SLSH, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX,
- XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX
- ),
- [JLOCK] = LAYOUT_ergodox(
- // left hand
- XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
- XXXXXXX,KC_LBRC,KC_GRV, KC_TILD,XXXXXXX,XXXXXXX,XXXXXXX,
- XXXXXXX,S(KC_LBRC),XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,
- XXXXXXX,KC_BSLS,KC_PIPE,XXXXXXX,XXXXXXX,TO(CAPLOCK),XXXXXXX,
- XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
- XXXXXXX,XXXXXXX,
- XXXXXXX,
- KC_ESC,XXXXXXX,XXXXXXX,
- // right hand
- KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RBRC, XXXXXXX,
- XXXXXXX, _______, XXXXXXX, XXXXXXX, S(KC_RBRC), XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX,
- XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX
- ),
- [CAPLOCK] = LAYOUT_ergodox(
- // left hand
- TO(BASE), _______, _______, _______, _______, _______, _______,
- _______, S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), _______,
- // _______, SFT_T(S(KC_A)), ALT_T(KC_S), CTL_T(KC_D), F(FLOCK), GUI_T(KC_G),
- _______, S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G),
- _______, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), _______,
- _______, _______, _______, _______ ,_______,
- _______, _______,
- _______,
- TO(BASE), _______, _______ ,
-
- // right hand
- _______, _______, _______, _______, _______, _______, _______,
- _______, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P), _______,
- S(KC_H), S(KC_J), S(KC_K), S(KC_L), S(KC_SCLN), _______,
- _______, S(KC_N), S(KC_M), S(KC_COMM),S(KC_DOT), S(KC_QUOT), _______,
- _______, _______,_______,_______, _______,
- _______, _______,
- _______,
- _______,_______, TO(BASE)
- )
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
- uint8_t layer = get_highest_layer(layer_state);
-
- switch (layer) {
- // TODO: Make this relevant to the ErgoDox EZ.
- case 1:
- break;
- case 2:
- break;
- default:
- // none
- break;
- }
-};
diff --git a/layouts/community/ergodox/adam/readme.md b/layouts/community/ergodox/adam/readme.md
deleted file mode 100644
index 9d03df5d57..0000000000
--- a/layouts/community/ergodox/adam/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Adam's ErgoDox
-
-Currently only really uses keys available on Let's Split, for ease of switching
diff --git a/layouts/community/ergodox/adnw_p_u_q/keymap.c b/layouts/community/ergodox/adnw_p_u_q/keymap.c
index cf2ab93589..e5856f4894 100644
--- a/layouts/community/ergodox/adnw_p_u_q/keymap.c
+++ b/layouts/community/ergodox/adnw_p_u_q/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TG(SYMBOLS), DE_P, DE_U, OSL(DIAK), DE_COMM, DE_Q, LSFT(DE_G),
OSL(SYMBOLS), DE_H, DE_I, DE_E, DE_A, DE_O,
SFT_T(KC_TAB), DE_K, DE_Y, DE_DOT, DE_QUOT, DE_X, LCTL(DE_D),
- KC_LCTRL, KC_LALT, KC_NO, KC_NO, KC_NO,
+ KC_LCTL, KC_LALT, KC_NO, KC_NO, KC_NO,
// left hand thumb-cluster
@@ -57,12 +57,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
DE_G, DE_V, DE_C, DE_L, DE_M, DE_B, KC_NO,
DE_D, DE_T, DE_R, DE_N, DE_S, TG(ARW),
LCTL(DE_U), DE_J, DE_G, DE_Z, DE_W, DE_F, KC_RSFT,
- KC_H, KC_J, KC_K, KC_L, KC_RCTRL,
+ KC_H, KC_J, KC_K, KC_L, KC_RCTL,
// right thumb-cluster
DE_QUES, DE_DLR,
LCTL(DE_C),
- KC_ESCAPE, KC_ENTER, KC_BSPACE
+ KC_ESCAPE, KC_ENTER, KC_BSPC
),
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDOWN,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_HOME, KC_TRNS,
KC_TRNS,
diff --git a/layouts/community/ergodox/albert/config.h b/layouts/community/ergodox/albert/config.h
deleted file mode 100644
index f0f524b306..0000000000
--- a/layouts/community/ergodox/albert/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* using UK layout for space-cadet-shift */
-#define LSPO_KEY KC_9
-#define RSPC_KEY KC_0
-
-#define LEADER_TIMEOUT 800 // leader key sequence timeout in millis
diff --git a/layouts/community/ergodox/albert/keymap.c b/layouts/community/ergodox/albert/keymap.c
deleted file mode 100644
index 8b73424d45..0000000000
--- a/layouts/community/ergodox/albert/keymap.c
+++ /dev/null
@@ -1,661 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#include <stdarg.h>
-
-/* use UK keymap */
-
-#define UK_HASH KC_NONUS_HASH
-#define UK_BSLS KC_NONUS_BSLASH
-#define UK_PIPE LSFT(UK_BSLS)
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define NUMB 2 // numbers and hex
-#define CRSR 3 // cursor keys
-#define MOUS 4 // mouse keys
-#define KEYW 5 // keyword macros
-#define EMAC 6 // emacs
-
-// my macros
-#define UM_ECET M(0) // { }
-#define UM_0x M(1)
-#define UM_PUB M(2)
-#define UM_PRO M(3)
-#define UM_PRV M(4)
-#define UM_CLS M(5)
-#define UM_STR M(6)
-#define UM_RET M(7)
-#define UM_INC M(8)
-#define UM_OBJ M(9)
-#define UM_GITLOG M(10)
-#define UM_GOODM M(11)
-#define UM_NAMESP M(12)
-#define UM_EMTR M(14) // emacs toggle read-only
-#define UM_EMWR M(15) // emacs write buffer (save)
-#define UM_EMUN M(16) // emacs undo
-#define UM_EMRE M(17) // emacs redo
-#define UM_EMPB M(18) // emacs previous buffer
-#define UM_EMNB M(19) // emacs next buffer
-#define UM_GOODN M(20)
-#define UM_ECETS M(22) // { };
-#define UM_TMPL M(23)
-#define UM_TYPN M(24)
-#define UM_CONT M(25)
-#define UM_BREAK M(26)
-#define UM_CONST M(27)
-#define UM_SMILY M(28)
-#define UM_SADF M(29)
-#define UM_SCARF M(30)
-#define UM_DECAF M(31)
-#define UM_OPER M(32)
-#define UM_NULP M(33)
-#define UM_EXTR M(34)
-#define UM_VIRT M(35)
-#define UM_EMFB M(36) // emacs font bigger
-#define UM_EMFS M(37) // emacs font smaller
-#define UM_VOLAT M(38)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Base layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ESC | 1 | 2 | 3 | 4 | 5 | SfLt | | SfRt | 6 | 7 | 8 | 9 | 0 | BkSp |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Tab | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | Del |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | Caps/L2| A | S | D | F | G |------| |------| H | J | K | L | ; |Enter/L2|
- * |--------+------+------+------+------+------| L6 | | L6 |------+------+------+------+------+--------|
- * | LSft/( | Z | X | C | V/L3 | B/L4 | | | | N/L4 | M/L3 | , | . | / | RSft/) |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |Ctrl/[| Alt/]| # | Left |Right | | Up | Down | - | Alt/[|Ctrl/]|
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | L2 | lead | | lead | Ins |
- * ,------|------|------| |------+------+------.
- * | Space| BkSp | Home | | PgUp | Enter|Space |
- * | / | / |------| |------| / | / |
- * | Ctrl | Alt |End/L5| |PDn/L5| Alt | Ctrl |
- * `--------------------' `--------------------'
- */
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LSFT(KC_LEFT),
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(SYMB),
- LT(NUMB, KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSPO, KC_Z, KC_X, KC_C, LT(CRSR, KC_V), LT(MOUS, KC_B), MO(EMAC),
- CTL_T(KC_LBRC), ALT_T(KC_RBRC), UK_HASH, KC_LEFT, KC_RGHT,
- TG(NUMB), KC_LEAD,
- KC_HOME,
- CTL_T(KC_SPC), ALT_T(KC_BSPC), LT(KEYW, KC_END),
- // right hand
- LSFT(KC_RGHT), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- MO(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(NUMB, KC_ENT),
- MO(EMAC), LT(MOUS, KC_N), LT(CRSR, KC_M), KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
- KC_UP, KC_DOWN, KC_MINS, ALT_T(KC_LBRC), CTL_T(KC_RBRC),
- KC_LEAD, KC_INS,
- KC_PGUP,
- LT(KEYW, KC_PGDN), ALT_T(KC_ENT), CTL_T(KC_SPC)
- ),
-/* Keymap 1: Symbol Layer with F keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ## | F1 | F2 | F3 | F4 | F5 | ## | | ## | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
- * | ## | ! | " | £ | $ | % | ## | | ## | - | + | = | @ | ~ | F12 |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | ## | ^ | & | * | _ | # |------| |------| { | } | ; | ' | # | ## |
- * |--------+------+------+------+------+------| ## | | ## |------+------+------+------+------+--------|
- * | ## | \ | | | ` | - | / | | | | [ | ] | < | > | ? | ## |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | ## | ## | ## | ## | ## | | ## | ## | ## | ## | ## |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | ## | ## | | ## | ## |
- * ,------|------|------| |------+------+------.
- * | | | ## | | ## | | |
- * | ## | ## |------| |------| ## | ## |
- * | | | ## | | ## | | |
- * `--------------------' `--------------------'
- */
-[SYMB] = LAYOUT_ergodox(
- // left hand
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS, KC_EXLM, LSFT(KC_2), LSFT(KC_3), LSFT(KC_4), LSFT(KC_5), KC_TRNS,
- KC_TRNS, LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_MINS), UK_HASH,
- KC_TRNS, UK_BSLS, UK_PIPE, KC_GRV, KC_MINS, KC_SLSH, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, KC_MINS, KC_PLUS, KC_EQL, LSFT(KC_QUOT), LSFT(UK_HASH), KC_F12,
- KC_LCBR, KC_RCBR, KC_SCLN, KC_QUOT, UK_HASH, KC_TRNS,
- KC_TRNS, KC_LBRC, KC_RBRC, LSFT(KC_COMM), LSFT(KC_DOT), LSFT(KC_SLSH), KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
- ),
-/* Keymap 2: Numerics and hex
- *
- * ,---------------------------------------------------. ,--------------------------------------------------.
- * | ## | A | B | C | D | E | F | | A | B | C | D | E | F | ## |
- * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
- * | ## | * | 7 | 8 | 9 | * | 0x | | 0x | * | 7 | 8 | 9 | * | ## |
- * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | ## | / | 4 | 5 | 6 | / |------| |------| / | 4 | 5 | 6 | / | ## |
- * |---------+------+------+------+------+------| ## | | ## |------+------+------+------+------+--------|
- * | ## | - | 1 | 2 | 3 | - | | | | - | 1 | 2 | 3 | - | ## |
- * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | = | + | 0 | , | . | | 0 | , | . | + | = |
- * `-----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | ## | ## | | ## | ## |
- * ,------|------|------| |------+------+------.
- * | | | ## | | ## | | |
- * | ## | ## |------| |------| ## | ## |
- * | | | ## | | ## | | |
- * `--------------------' `--------------------'
- */
-[NUMB] = LAYOUT_ergodox(
- // left hand
- KC_TRNS, KC_A, KC_B, KC_C, KC_D, KC_E, KC_F,
- KC_TRNS, KC_ASTR, KC_7, KC_8, KC_9, KC_ASTR, UM_0x,
- KC_TRNS, KC_SLSH, KC_4, KC_5, KC_6, KC_SLSH,
- KC_TRNS, KC_MINS, KC_1, KC_2, KC_3, KC_MINS, KC_TRNS,
- KC_EQL, KC_PLUS, KC_0, KC_COMM, KC_DOT,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_TRNS,
- UM_0x, KC_ASTR, KC_7, KC_8, KC_9, KC_ASTR, KC_TRNS,
- KC_SLSH, KC_4, KC_5, KC_6, KC_SLSH, KC_TRNS,
- KC_TRNS, KC_MINS, KC_1, KC_2, KC_3, KC_MINS, KC_TRNS,
- KC_0, KC_COMM, KC_DOT, KC_PLUS, KC_EQL,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
- ),
-/* Keymap 3: Cursor movement
- *
- * ,---------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
- * | | Home | | Up | | PgUp | | | | PgUp | | Up | | Home | |
- * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | End | Left | Down | Right| PgDn |------| |------| PgDn | Left | Down | Right| End | |
- * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | ## | Up | | Down | ## | | | | | | ## | Down | | Up | ## |
- * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | Left | Down | Right| | | | | | Left | Down | Right|
- * `-----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | ## | ## |------| |------| ## | ## |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-[CRSR] = LAYOUT_ergodox(
- // left hand
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_HOME, KC_NO, KC_UP, KC_NO, KC_PGUP, KC_NO,
- KC_NO, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
- KC_TRNS, KC_UP, KC_NO, KC_DOWN, KC_TRNS, KC_NO, KC_NO,
- KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_TRNS, KC_TRNS, KC_NO,
- // right hand
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_PGUP, KC_NO, KC_UP, KC_NO, KC_HOME, KC_NO,
- KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_NO,
- KC_NO, KC_NO, KC_TRNS, KC_DOWN, KC_NO, KC_UP, KC_TRNS,
- KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_TRNS, KC_TRNS
- ),
-/* Keymap 4: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | Lclk | MsUp | Rclk | | | | | | Lclk | MsUp | Rclk | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| |MsLeft|MsDown|MsRght| | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | Lclk | MsUp | Rclk |MsDown| | ## | | | | ## | |MsDown| Lclk | MsUp | Rclk |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |MsLeft|MsDown|MsRight | | | | |MsLeft|MsDown|MsRght|
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-[MOUS] = LAYOUT_ergodox(
- // left hand
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_BTN1, KC_MS_U, KC_BTN2, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,
- KC_BTN1, KC_MS_U, KC_BTN2, KC_MS_D, KC_NO, KC_TRNS, KC_NO,
- KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_NO,
- // right hand
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_BTN1, KC_MS_U, KC_BTN2, KC_NO, KC_NO,
- KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
- KC_NO, KC_TRNS, KC_NO, KC_MS_D, KC_BTN1, KC_MS_U, KC_BTN2,
- KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_NO
- ),
-/* Keymap 5: Keywords
- *
- * ,---------------------------------------------------. ,--------------------------------------------------.
- * | | | | scarf| sadf | smily| | | | decaf| | | | | |
- * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
- * | | const| volat| oper | ret | tmpl | | | | typen| cont | prv | pro | pub | |
- * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | str | obj | | gitl |------| |------| | | | nulp | | |
- * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | extr | cls | virt | break| | | |namesp| goodm| goodn| | | |
- * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | inc | | | | | | | | |
- * `-----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | ecet | ecets|
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | ## | | ## | | |
- * `--------------------' `--------------------'
- */
-[KEYW] = LAYOUT_ergodox(
- // left hand
- KC_NO, KC_NO, KC_NO, UM_SCARF, UM_SADF, UM_SMILY, KC_NO,
- KC_NO, UM_CONST, UM_VOLAT, UM_OPER, UM_RET, UM_TMPL, KC_NO,
- KC_NO, KC_NO, UM_STR, UM_OBJ, KC_NO, UM_GITLOG,
- KC_NO, KC_NO, UM_EXTR, UM_CLS, UM_VIRT, UM_BREAK, KC_NO,
- KC_NO, KC_NO, UM_INC, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_TRNS,
- // right hand
- KC_NO, UM_DECAF, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, UM_TYPN, UM_CONT, UM_PRV, UM_PRO, UM_PUB, KC_NO,
- KC_NO, KC_NO, KC_NO, UM_NULP, KC_NO, KC_NO,
- KC_NO, UM_NAMESP, UM_GOODM, UM_GOODN, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- UM_ECET, UM_ECETS,
- KC_NO,
- KC_TRNS, KC_NO, KC_NO
- ),
-/* Keymap 6: emacs
- *
- * ,---------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | empb | | emnb | emfs | emfb | | | | |
- * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
- * | | emtr | | | | | | | | emun | emre | w-up | | | |
- * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | emwr | | | |------| |------| |w-left|w-down|w-rght| | |
- * |---------+------+------+------+------+------| ## | | ## |------+------+------+------+------+--------|
- * | | | | | | | | | | | |w-down| | | |
- * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `-----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-[EMAC] = LAYOUT_ergodox(
- // left hand
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, UM_EMPB,
- KC_NO, UM_EMTR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, UM_EMWR, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_NO,
- // right hand
- UM_EMNB, UM_EMFS, UM_EMFB, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, UM_EMUN, UM_EMRE, LSFT(KC_UP), KC_NO, KC_NO, KC_NO,
- KC_NO, LSFT(KC_LEFT), LSFT(KC_DOWN), LSFT(KC_RGHT), KC_NO, KC_NO,
- KC_TRNS, KC_NO, KC_NO, LSFT(KC_DOWN), KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_NO
- ),
-};
-
-enum next_key_down_up {
- NK_DOWN_UP,
- NK_DOWN,
- NK_UP // a bit of a hack, this works as long as NK_UP < KC_A
-};
-
-void send_keystrokes(uint8_t key, ...)
-{
- va_list vl;
- va_start(vl, key);
- enum next_key_down_up nkdu = NK_DOWN_UP;
- while (key != KC_NO) {
- if (key < KC_A) {
- nkdu = key;
- } else {
- switch (nkdu) {
- case NK_DOWN_UP:
- register_code(key);
- case NK_UP:
- unregister_code(key);
- break;
- case NK_DOWN:
- register_code(key);
- }
- nkdu = NK_DOWN_UP;
- }
- key = va_arg(vl, int);
- }
- va_end(vl);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0: // { }
- if (record->event.pressed) {
- return MACRO(T(ENT), D(LSFT), T(LBRC), U(LSFT), T(ENT),
- D(LSFT), T(RBRC), U(LSFT), T(UP),
- T(TAB), END);
- }
- break;
- case 1:
- if (record->event.pressed) {
- return MACRO(T(0), T(X), END);
- }
- break;
- case 2:
- if (record->event.pressed) {
- SEND_STRING("public");
- }
- break;
- case 3:
- if (record->event.pressed) {
- SEND_STRING("protected");
- }
- break;
- case 4:
- if (record->event.pressed) {
- SEND_STRING("private");
- }
- break;
- case 5: // class
- if (record->event.pressed) {
- return MACRO(T(C), T(L), T(A), T(S), T(S), T(ENT),
- D(LSFT), T(LBRC), U(LSFT), T(ENT),
- T(P), T(U), T(B), T(L), T(I), T(C),
- D(LSFT), T(SCLN), U(LSFT), T(ENT), T(ENT),
- T(P), T(R), T(I), T(V), T(A), T(T), T(E),
- D(LSFT), T(SCLN), U(LSFT), T(ENT),
- D(LSFT), T(RBRC), U(LSFT), T(SCLN), T(ENT),
- T(UP), T(UP), T(UP), T(UP), T(UP), T(UP), T(UP),
- T(END), T(SPC), END);
- }
- break;
- case 6: // struct
- if (record->event.pressed) {
- return MACRO(T(S), T(T), T(R), T(U), T(C), T(T), T(ENT),
- D(LSFT), T(LBRC), U(LSFT), T(ENT),
- D(LSFT), T(RBRC), U(LSFT), T(SCLN), T(ENT),
- T(UP), T(UP), T(UP), T(UP),
- T(END), T(SPC), END);
- }
- break;
- case 7:
- if (record->event.pressed) {
- SEND_STRING("return");
- }
- break;
- case 8: // #include
- if (record->event.pressed) {
- return MACRO(T(NONUS_HASH), T(I), T(N), T(C), T(L), T(U), T(D), T(E), END);
- }
- break;
- case 9:
- if (record->event.pressed) {
- SEND_STRING("objdump -CT -x -d");
- }
- break;
- case 10:
- if (record->event.pressed) {
- SEND_STRING("git log --oneline --graph --decorate=short");
- }
- break;
- case 11:
- if (record->event.pressed) {
- SEND_STRING("good morning");
- }
- break;
- case 12:
- if (record->event.pressed) {
- SEND_STRING("namespace");
- }
- break;
- case 14: // emacs toggle read-only
- if (record->event.pressed) {
- return MACRO(D(LCTL), T(X), T(Q), U(LCTL), END);
- }
- break;
- case 15: // emacs write buffer
- if (record->event.pressed) {
- return MACRO(D(LCTL), T(X), T(S), U(LCTL), END);
- }
- break;
- case 16: // emacs undo
- if (record->event.pressed) {
- return MACRO(D(LCTL), D(LSFT), T(MINS), U(LSFT), U(LCTL), END);
- }
- break;
- case 17: // emacs redo
- if (record->event.pressed) {
- return MACRO(D(LALT), D(LSFT), T(MINS), U(LSFT), U(LALT), END);
- }
- break;
- case 18: // emacs previous buffer
- if (record->event.pressed) {
- return MACRO(D(LCTL), T(X), U(LCTL), T(LEFT), END);
- }
- break;
- case 19: // emacs next buffer
- if (record->event.pressed) {
- return MACRO(D(LCTL), T(X), U(LCTL), T(RGHT), END);
- }
- break;
- case 20:
- if (record->event.pressed) {
- SEND_STRING("good night");
- }
- break;
- case 22: // { };
- if (record->event.pressed) {
- return MACRO(T(ENT), D(LSFT), T(LBRC), U(LSFT), T(ENT),
- D(LSFT), T(RBRC), U(LSFT), T(SCLN), T(UP),
- T(TAB), END);
- }
- break;
- case 23:
- if (record->event.pressed) {
- SEND_STRING("template");
- }
- break;
- case 24:
- if (record->event.pressed) {
- SEND_STRING("typename");
- }
- break;
- case 25:
- if (record->event.pressed) {
- SEND_STRING("continue");
- return MACRO(T(SCLN), END);
- }
- break;
- case 26:
- if (record->event.pressed) {
- SEND_STRING("break");
- return MACRO(T(SCLN), END);
- }
- break;
- case 27:
- if (record->event.pressed) {
- SEND_STRING("const");
- }
- break;
- case 28:
- if (record->event.pressed) {
- SEND_STRING(":-)");
- }
- break;
- case 29:
- if (record->event.pressed) {
- SEND_STRING(":-(");
- }
- break;
- case 30: // dazed
- if (record->event.pressed) {
- send_keystrokes(NK_DOWN, KC_LSFT, KC_8, KC_MINS, KC_8, NK_UP, KC_LSFT, KC_NO);
- }
- break;
- case 31: // decaf
- if (record->event.pressed) {
- send_keystrokes(NK_DOWN, KC_LSFT, KC_C, KC_9, KC_MINS, KC_0, NK_UP, KC_LSFT, KC_NO);
- }
- break;
- case 32:
- if (record->event.pressed) {
- SEND_STRING("operator");
- }
- break;
- case 33:
- if (record->event.pressed) {
- SEND_STRING("nullptr");
- }
- break;
- case 34:
- if (record->event.pressed) {
- SEND_STRING("extern");
- }
- break;
- case 35:
- if (record->event.pressed) {
- SEND_STRING("virtual");
- }
- break;
- case 36: // emacs font smaller
- if (record->event.pressed) {
- return MACRO(D(LCTL), T(X), T(EQL), U(LCTL), END);
- }
- break;
- case 37: // emacs font bigger
- if (record->event.pressed) {
- return MACRO(D(LCTL), T(X), T(MINS), U(LCTL), END);
- }
- break;
- case 38:
- if (record->event.pressed) {
- SEND_STRING("volatile");
- }
- break;
- }
- return MACRO_NONE;
-}
-
-LEADER_EXTERNS();
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- LEADER_DICTIONARY() {
- leading = false;
- leader_end();
-
- SEQ_TWO_KEYS(KC_G, KC_A) {
- SEND_STRING("git add .");
- }
- SEQ_TWO_KEYS(KC_G, KC_D) {
- SEND_STRING("git diff");
- }
- SEQ_THREE_KEYS(KC_G, KC_D, KC_S) {
- SEND_STRING("git diff --staged");
- }
- SEQ_TWO_KEYS(KC_G, KC_L) {
- SEND_STRING("git log");
- }
- SEQ_THREE_KEYS(KC_G, KC_L, KC_O) {
- SEND_STRING("git log --oneline");
- }
- SEQ_TWO_KEYS(KC_G, KC_F) {
- SEND_STRING("git fetch");
- }
- SEQ_TWO_KEYS(KC_G, KC_O) {
- SEND_STRING("git checkout");
- }
- SEQ_TWO_KEYS(KC_G, KC_P) {
- SEND_STRING("git pull");
- }
- SEQ_TWO_KEYS(KC_G, KC_S) {
- SEND_STRING("git status");
- }
- SEQ_TWO_KEYS(KC_G, KC_C) {
- SEND_STRING("git commit -m ''");
- send_keystrokes(KC_LEFT, KC_NO);
- }
- SEQ_THREE_KEYS(KC_G, KC_C, KC_A) {
- SEND_STRING("git commit --amend");
- }
-
- SEQ_TWO_KEYS(KC_C, KC_C) {
- SEND_STRING("const_cast<>");
- send_keystrokes(KC_LEFT, KC_NO);
- }
- SEQ_TWO_KEYS(KC_C, KC_D) {
- SEND_STRING("dynamic_cast<>");
- send_keystrokes(KC_LEFT, KC_NO);
- }
- SEQ_TWO_KEYS(KC_C, KC_R) {
- SEND_STRING("reinterpret_cast<>");
- send_keystrokes(KC_LEFT, KC_NO);
- }
- SEQ_TWO_KEYS(KC_C, KC_S) {
- SEND_STRING("static_cast<>");
- send_keystrokes(KC_LEFT, KC_NO);
- }
-
- SEQ_ONE_KEY(KC_SLSH) {
- send_keystrokes(KC_SLSH, NK_DOWN, KC_LSFT, KC_8, KC_8, NK_UP, KC_LSFT, KC_ENT,
- NK_DOWN, KC_LSFT, KC_8, NK_UP, KC_LSFT, KC_ENT,
- NK_DOWN, KC_LSFT, KC_8, NK_UP, KC_LSFT, KC_SLSH, KC_UP, KC_END, KC_SPC,
- KC_NO);
- }
- }
-}
diff --git a/layouts/community/ergodox/albert/readme.md b/layouts/community/ergodox/albert/readme.md
deleted file mode 100644
index e20e047ac6..0000000000
--- a/layouts/community/ergodox/albert/readme.md
+++ /dev/null
@@ -1,188 +0,0 @@
-# ErgoDox EZ Configuration for typing like a boss.
-
-This layout has 7 layers:
-0. Base layers
-1. Symbols and F-keys
-2. Number pad (with hexadecimal)
-3. Cursor keys
-4. Mouse movement and clicks
-5. Keyword macros
-6. Emacs
-
-There are also some leader keys defined for frequently used commands (git etc).
-
-## The layers
-
-Double hashes (`##`) indicate transparent keys (`KC_TRNS`) and blanks indicate no key (`KC_NO`).
-
-### 0. Base layer
-
-```
-,--------------------------------------------------. ,--------------------------------------------------.
-| ESC | 1 | 2 | 3 | 4 | 5 | SfLt | | SfRt | 6 | 7 | 8 | 9 | 0 | BkSp |
-|--------|------|------|------|------|-------------| |------|------|------|------|------|------|--------|
-| Tab | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | Del |
-|--------|------|------|------|------|------| | | |------|------|------|------|------|--------|
-| Caps/L2| A | S | D | F | G |------| |------| H | J | K | L | ; |Enter/L2|
-|--------|------|------|------|------|------| L6 | | L6 |------|------|------|------|------|--------|
-| LSft/( | Z | X | C | V/L3 | B/L4 | | | | N/L4 | M/L3 | , | . | / | RSft/) |
-`--------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
- |Ctrl/[| Alt/]| # | Left |Right | | Up | Down | - | Alt/[|Ctrl/]|
- `----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | L2 | lead | | lead | Ins |
- ,------|------|------| |------|------|------.
- | Space| BkSp | Home | | PgUp | Enter|Space |
- | / | / |------| |------| / | / |
- | Ctrl | Alt |End/L5| |PDn/L5| Alt | Ctrl |
- `--------------------' `--------------------'
-```
-
-Space Cadet shift is enabled. Ctrl and Alt doubles up as normal keys when tapped.
-SfLt and SfRt sends Shift + left and Shift + Right respectively - for use with emacs with `windmove-default-keybindings`.
-Caps and Enter may be held down to activate layer 2 (hexadecimal number pad).
-Please see `matrix_scan_user` function in `keymap.c` for list of commands available via `lead` key.
-
-### 1. Symbols and F-keys
-
-```
-,--------------------------------------------------. ,--------------------------------------------------.
-| ## | F1 | F2 | F3 | F4 | F5 | ## | | ## | F6 | F7 | F8 | F9 | F10 | F11 |
-|--------|------|------|------|------|------|------| |------|------|------|------|------|------|--------|
-| ## | ! | " | £ | $ | % | ## | | ## | - | + | = | @ | ~ | F12 |
-|--------|------|------|------|------|------| | | |------|------|------|------|------|--------|
-| ## | ^ | & | * | _ | # |------| |------| { | } | ; | ' | # | ## |
-|--------|------|------|------|------|------| ## | | ## |------|------|------|------|------|--------|
-| ## | \ | | | ` | - | / | | | | [ | ] | < | > | ? | ## |
-`--------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
- | ## | ## | ## | ## | ## | | ## | ## | ## | ## | ## |
- `----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | ## | ## | | ## | ## |
- ,------|------|------| |------|------|------.
- | | | ## | | ## | | |
- | ## | ## |------| |------| ## | ## |
- | | | ## | | ## | | |
- `--------------------' `--------------------'
-```
-
-### 2. Number pad (with hexadecimal)
-
-```
-,---------------------------------------------------. ,--------------------------------------------------.
-| ## | A | B | C | D | E | F | | A | B | C | D | E | F | ## |
-|---------|------|------|------|------|------|------| |------|------|------|------|------|------|--------|
-| ## | * | 7 | 8 | 9 | * | 0x | | 0x | * | 7 | 8 | 9 | * | ## |
-|---------|------|------|------|------|------| | | |------|------|------|------|------|--------|
-| ## | / | 4 | 5 | 6 | / |------| |------| / | 4 | 5 | 6 | / | ## |
-|---------|------|------|------|------|------| ## | | ## |------|------|------|------|------|--------|
-| ## | - | 1 | 2 | 3 | - | | | | - | 1 | 2 | 3 | - | ## |
-`---------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
- | = | + | 0 | , | . | | 0 | , | . | + | = |
- `-----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | ## | ## | | ## | ## |
- ,------|------|------| |------|------|------.
- | | | ## | | ## | | |
- | ## | ## |------| |------| ## | ## |
- | | | ## | | ## | | |
- `--------------------' `--------------------'
-```
-
-### 3. Cursor keys
-
-```
-,---------------------------------------------------. ,--------------------------------------------------.
-| | | | | | | | | | | | | | | |
-|---------|------|------|------|------|------|------| |------|------|------|------|------|------|--------|
-| | Home | | Up | | PgUp | | | | PgUp | | Up | | Home | |
-|---------|------|------|------|------|------| | | |------|------|------|------|------|--------|
-| | End | Left | Down | Right| PgDn |------| |------| PgDn | Left | Down | Right| End | |
-|---------|------|------|------|------|------| | | |------|------|------|------|------|--------|
-| ## | Up | | Down | ## | | | | | | ## | Down | | Up | ## |
-`---------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
- | Left | Down | Right| | | | | | Left | Down | Right|
- `-----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | | | | | |
- ,------|------|------| |------|------|------.
- | | | | | | | |
- | ## | ## |------| |------| ## | ## |
- | | | | | | | |
- `--------------------' `--------------------'
-```
-
-### 4. Mouse movement and clicks
-
-```
-,--------------------------------------------------. ,--------------------------------------------------.
-| | | | | | | | | | | | | | | |
-|--------|------|------|------|------|-------------| |------|------|------|------|------|------|--------|
-| | | Lclk | MsUp | Rclk | | | | | | Lclk | MsUp | Rclk | | |
-|--------|------|------|------|------|------| | | |------|------|------|------|------|--------|
-| | |MsLeft|MsDown|MsRght| |------| |------| |MsLeft|MsDown|MsRght| | |
-|--------|------|------|------|------|------| | | |------|------|------|------|------|--------|
-| Lclk | MsUp | Rclk |MsDown| | ## | | | | ## | |MsDown| Lclk | MsUp | Rclk |
-`--------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
- |MsLeft|MsDown|MsRight | | | | |MsLeft|MsDown|MsRght|
- `----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | | | | | |
- ,------|------|------| |------|------|------.
- | | | | | | | |
- | | |------| |------| | |
- | | | | | | | |
- `--------------------' `--------------------'
-```
-
-### 5. Keyword macros
-
-```
-,---------------------------------------------------. ,--------------------------------------------------.
-| | | | scarf| sadf | smily| | | | decaf| | | | | |
-|---------|------|------|------|------|------|------| |------|------|------|------|------|------|--------|
-| | const| volat| oper | ret | tmpl | | | | typen| cont | prv | pro | pub | |
-|---------|------|------|------|------|------| | | |------|------|------|------|------|--------|
-| | | str | obj | | gitl |------| |------| | | | nulp | | |
-|---------|------|------|------|------|------| | | |------|------|------|------|------|--------|
-| | | extr | cls | virt | break| | | |namesp| goodm| goodn| | | |
-`---------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
- | | | inc | | | | | | | | |
- `-----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | | | | ecet | ecets|
- ,------|------|------| |------|------|------.
- | | | | | | | |
- | | |------| |------| | |
- | | | ## | | ## | | |
- `--------------------' `--------------------'
-```
-Please see `keymap.c` for the keywords/commands.
-Some are const, volatile, operator, return, template, typename, continue, private,
-protected, public, struct, class, extern, virtual, break, namespace.
-Also a git log command I use a lot (`git log --oneline --graph --decorate=short` (I know git can be configured but that is boring)).
-
-### 6. Emacs
-
-```
-,---------------------------------------------------. ,--------------------------------------------------.
-| | | | | | | empb | | emnb | emfs | emfb | | | | |
-|---------|------|------|------|------|------|------| |------|------|------|------|------|------|--------|
-| | emtr | | | | | | | | emun | emre | w-up | | | |
-|---------|------|------|------|------|------| | | |------|------|------|------|------|--------|
-| | | emwr | | | |------| |------| |w-left|w-down|w-rght| | |
-|---------|------|------|------|------|------| ## | | ## |------|------|------|------|------|--------|
-| | | | | | | | | | | |w-down| | | |
-`---------|------|------|------|------|-------------' `-------------|------|------|------|------|--------'
- | | | | | | | | | | | |
- `-----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | | | | | |
- ,------|------|------| |------|------|------.
- | | | | | | | |
- | | |------| |------| | |
- | | | | | | | |
- `--------------------' `--------------------'
-```
-Some emacs shortcuts like toggle read/write mode (emtr), write file (emwr), previous-buffer (empb),
-next-buffer (emnb), smaller font(emfs), larger font (emfb), undo (emun), redo (emre) and switching between windows in a frame.
diff --git a/layouts/community/ergodox/albert/rules.mk b/layouts/community/ergodox/albert/rules.mk
deleted file mode 100644
index 47549b50f6..0000000000
--- a/layouts/community/ergodox/albert/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMMAND_ENABLE = no # Commands for debug and configuration
-LEADER_ENABLE = yes
diff --git a/layouts/community/ergodox/alexjj/keymap.c b/layouts/community/ergodox/alexjj/keymap.c
deleted file mode 100644
index 77250e6ded..0000000000
--- a/layouts/community/ergodox/alexjj/keymap.c
+++ /dev/null
@@ -1,231 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-#define UNIC 3 // unicode entry layer
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ESC | 1! | 2@ | 3# | 4$ | 5% | 6^ | | 7& | 8* | 9( | 0) | -_ | += | BkSp |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Tab | Q | W | E | R | T | { | | } | Y | U | I | O | P | |\ |
- * |--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
- * | Win | A | S | D | F | G |------| |------| H | J | K | L | :; | '" |
- * |--------+------+------+------+------+------| Home | | End |------+------+------+------+------+--------|
- * | LShift |Z/Alt | X | C | V | B | | | | N | M | , | . | Alt | RShift |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |LCtrl | COPY | PASTE| Left | Right| | Down | Up |Hyper | `~ | RCtrl |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * Hyper = Ctrl+Super+Alt+Shift | ~L3 | F5 | | F2 | ~L2 |
- * ,------|------|------| |------+------+------.
- * | | | PgUp | | Ins | | |
- * | Enter| BkSp |------| |------| ~L1 |Space |
- * | | | PgDn | | Del | | |
- * `--------------------' `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC,
- KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, ALT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_HOME,
- KC_LCTRL, LCTL(KC_C), LCTL(KC_V), KC_LEFT,KC_RGHT,
- TT(UNIC), KC_F5,
- KC_PGUP,
- KC_ENT,KC_BSPC,KC_PGDN,
- // right hand
- KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
- KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,
- KC_END, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,
- KC_DOWN,KC_UP, ALL_T(KC_NO),KC_GRV, KC_RCTRL,
- KC_F2, TT(MDIA),
- KC_INS,
- KC_DEL,TT(SYMB), KC_SPC
- ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |PrintScr|
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | £ | | | | | | . | 0 | = |Alt+F4|
- * `----------------------------------' `----------------------------------'
- * ↑ ,-------------. ,-------------.
- * THERE! | | | | | |
- * ,------|------|------| |------+------+------.
- * CAD = Ctrl + Alt + Delete | | | | | | | |
- * | | |------| |------| | |
- * | | | | | CAD | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
- // left hand
- KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
- KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
- KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
- KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
- KC_TRNS,M(3),KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,
- KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_TRNS,
- KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
- KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
- KC_TRNS,KC_DOT, KC_0, KC_EQL, LALT(KC_F4),
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- LCTL(LALT(KC_DEL)), KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | TEENSY | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | Prev | Next | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | Lclk | Rclk | |VolDn |VolUp | Mute | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | |Brwser|
- * | | |------| |------| |Back |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK
-),
-/* Keymap 3: Unicode Entry
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | Alt | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | + | + | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Alt | | | E | | | | | | | 7 | 8 | 9 | + | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | Alt | A | | D | F | |------| |------| | 4 | 5 | 6 | + | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | Alt | | | C | | B | | | | | 1 | 2 | 3 | + | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | Alt | Alt | Alt | | | | 0 | 0 | 0 | + | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * WINDOWS ONLY SETUP!! | ~L3 | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | Alt | Alt |------| |------| Alt | Alt |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[UNIC] = LAYOUT_ergodox( // layer 3 : Unicode Entry
- // left hand
- KC_LALT, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6,
- KC_LALT, KC_TRNS, KC_TRNS, KC_E, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_LALT, KC_A, KC_TRNS, KC_D, KC_F, KC_TRNS,
- KC_LALT, KC_TRNS, KC_TRNS, KC_C, KC_TRNS, KC_B, KC_TRNS,
- KC_LALT, KC_LALT, KC_LALT, KC_TRNS,KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_LALT,KC_LALT, KC_TRNS,
- // right hand
- KC_P7, KC_P8, KC_P9, KC_P0, KC_PPLS,KC_PPLS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TRNS,
- KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PPLS, KC_TRNS,
- KC_P0, KC_P0, KC_P0, KC_PPLS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_LALT, KC_LALT
- ),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- register_code(KC_RSFT);
- } else {
- unregister_code(KC_RSFT);
- }
- case 3: // this would trigger when you hit a key mapped as M(3)
- if (record->event.pressed) {
- return MACRO( I(255), D(LALT), T(P1), T(P5), T(P6), U(LALT), END );
- }
- break;
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- // TODO: Make this relevant to the ErgoDox EZ.
- case 1:
- ergodox_right_led_1_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- case 3:
- ergodox_right_led_3_on();
- break;
- default:
- // none
- break;
- }
-
-};
diff --git a/layouts/community/ergodox/alexjj/readme.md b/layouts/community/ergodox/alexjj/readme.md
deleted file mode 100644
index 4845cbbd91..0000000000
--- a/layouts/community/ergodox/alexjj/readme.md
+++ /dev/null
@@ -1,179 +0,0 @@
-Englishman in New York
-===========================
-
-:microphone: :tea:
-
-About
-------
-
-After using the massdrop configurator to get the basics, I wanted to add a
-little extra to my ergodox. Notably the Hyper hotkey, the press and hold,
-and a way to have my beloved £ :pound: symbol available<sup>[1](#unicode)</sup>. Why not switch to a GB
-layout? Well the computers I use are US keymap'd and I can't always change
-that. Plus I've got used to 2/@ and 3/# and moving to the ergodox was hard
-enough. :sweat_smile:
-
-I started from the default and edited from there as I needed. It's somewhat
-similar to a regular layout, particularly R1 and shift/controls. I ended up
-with a few keys that were blank, so I'm testing out some shortcuts. Alt+F4 for
-quitting things in Windows, is one example, but I felt it was better placed on
-the 1st layer - in case of fat fingers.
-
-Layout
--------
-
-![Layout](https://i.imgur.com/4bDwHLS.jpg "Isn't it lovely")
-
-### Base Layer
-
-```
-,--------------------------------------------------. ,--------------------------------------------------.
-| ESC | 1! | 2@ | 3# | 4$ | 5% | 6^ | | 7& | 8* | 9( | 0) | -_ | += | BkSp |
-|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| Tab | Q | W | E | R | T | { | | } | Y | U | I | O | P | |\ |
-|--------+------+------+------+------+------| [ | | ] |------+------+------+------+------+--------|
-| Win | A | S | D | F | G |------| |------| H | J | K | L | :; | '" |
-|--------+------+------+------+------+------| Home | | End |------+------+------+------+------+--------|
-| LShift |Z/Alt | X | C | V | B | | | | N | M | , | . | Alt | RShift |
-`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- |LCtrl | COPY | PASTE| Left | Right| | Down | Up |Hyper | `~ | RCtrl |
- `----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- Hyper = Ctrl+Super+Alt+Shift | ~L3 | F5 | | F2 | ~L2 |
- ,------|------|------| |------+------+------.
- | | | PgUp | | Ins | | |
- | Enter| BkSp |------| |------| ~L1 |Space |
- | | | PgDn | | Del | | |
- `--------------------' `--------------------'
-```
-
-### Symbol Layer
-
-```
-,--------------------------------------------------. ,--------------------------------------------------.
-| | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |PrintScr|
-|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | |
-|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | |
-|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | |
-`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- | | £ | | | | | | . | 0 | = |Alt+F4|
- `----------------------------------' `----------------------------------'
- ↑ ,-------------. ,-------------.
- THERE! | | | | | |
- ,------|------|------| |------+------+------.
- CAD = Ctrl + Alt + Delete | | | | | | | |
- | | |------| |------| | |
- | | | | | CAD | | |
- `--------------------' `--------------------'
-```
-### Media Layer
-
-Not touched this, not used either.
-
-```
-,--------------------------------------------------. ,--------------------------------------------------.
-| TEENSY | | | | | | | | | | | | | | |
-|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| | | | MsUp | | | | | | | | | | | |
-|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play |
-|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| | | | | | | | | | | | Prev | Next | | |
-`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- | | | | Lclk | Rclk | |VolDn |VolUp | Mute | | |
- `----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | | | | | |
- ,------|------|------| |------+------+------.
- | | | | | | |Brwser|
- | | |------| |------| |Back |
- | | | | | | | |
- `--------------------' `--------------------'
-```
-### Unicode Layer
-
-Used to enter/test unicode input on Windows. All numbers are numpad keys.
-
-```
-,--------------------------------------------------. ,--------------------------------------------------.
-| Alt | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | + | + | |
-|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| Alt | | | E | | | | | | | 7 | 8 | 9 | + | |
-|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| Alt | A | | D | F | |------| |------| | 4 | 5 | 6 | + | |
-|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| Alt | | | C | | B | | | | | 1 | 2 | 3 | + | |
-`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- | Alt | Alt | Alt | | | | 0 | 0 | 0 | + | |
- `----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- WINDOWS ONLY SETUP!! | ~L3 | | | | |
- ,------|------|------| |------+------+------.
- | | | | | | | |
- | Alt | Alt |------| |------| Alt | Alt |
- | | | | | | | |
- `--------------------' `--------------------'
-```
-
-
-Usage
-------
-
-~L1 / L2 / L3 will momentarily switch to a layer if held and another key is pressed.
-If pressed and released will remain on layer until pressed again.
-
-### Unicode
-
-This layout is for Windows only. To enter a character Press and Hold Alt, type + and hex code then release Alt.
-
-Changelog
------------
-
-### [0.2.1] - 2016-04-05
-
-* Changed £ to alt code in Windows. Windows sucks at unicode.
-
-### [0.2.0] - 2016-03-27
-
-* Added unicode layer
-* Moved Copy/Paste to left hand side
-* Switched Enter and Space (again)
-* Added L3 (unicode layer) toggle
-* Removed Press and Hold for Alt on right hand size (/)
-* Swapped Volume Up/Down to match arrows
-* Tried fixing £ macro
-* Removed * in the matrix function things (upstream change)
-
-### [0.1.1] - 2016-03-23
-
-* Changed £ input to a macro
-
-
-### [0.1.0] - 2016-03-22
-
-After actually using the keyboard, I've made some changes:
-
-* Swapped Enter and Space
-* Moved backspace to thumb keys (top right still remains)
-* Added Ctrl+Alt+Delete
-* Added Teensy Reset on 2nd layer
-* Switched Up and Down
-* Changed copy/paste to be Ctrl+c and Ctrl+v as KC_COPY/PASTE didn't work (in Windows)
-* Moved ~L2 to replace +L1 after learning how the function works (notes above)
-* Hopefully fixed GBP symbol (unicode enabled in MakeFile)
-
-### [0.0.1] - 2016-03-21
-
-First version
-
-
-Issues
--------
-
-Space for feedback and notes for future improvements
-
-----
-<sup><a name="unicode">1</a></sup>: For Windows only, and you have to edit the [registry](https://en.wikipedia.org/wiki/Unicode_input#Hexadecimal_code_input).
diff --git a/layouts/community/ergodox/belak/keymap.c b/layouts/community/ergodox/belak/keymap.c
index de0fe1b1ae..95255be683 100644
--- a/layouts/community/ergodox/belak/keymap.c
+++ b/layouts/community/ergodox/belak/keymap.c
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC,
CTL_T(KC_BSLS), KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LGUI,
- LTOGGLE, KC_LCTRL, KC_LEFT,KC_RGHT,KC_LALT,
+ LTOGGLE, KC_LCTL, KC_LEFT,KC_RGHT,KC_LALT,
MO(NUMP),KC_INS,
KC_HOME,
CTL_T(KC_BSPC),GUI_T(KC_DEL),KC_END,
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_RGUI, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,
- KC_RALT,KC_UP, KC_DOWN,KC_RCTRL, LTOGGLE,
+ KC_RALT,KC_UP, KC_DOWN,KC_RCTL, LTOGGLE,
KC_GRV, MO(SYMB),
KC_PGUP,
KC_PGDN, GUI_T(KC_ENT), CTL_T(KC_SPC)
diff --git a/layouts/community/ergodox/bepo/keymap.c b/layouts/community/ergodox/bepo/keymap.c
deleted file mode 100644
index 4090721d09..0000000000
--- a/layouts/community/ergodox/bepo/keymap.c
+++ /dev/null
@@ -1,368 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_bepo.h"
-#include "keymap_french.h"
-
-// keymaps
-#define BEPO 0 // default layer, for bepo compatible systems
-#define QW_B 1 // bepo to qwerty base compat layer, for qwerty systems
-#define QW_A 2 // bepo with altgr key to qwerty compat layer
-#define QW_S 3 // bepo with shift key to qwerty compat layer
-#define AZ_B 4 // bepo to azerty base compat layer, for azerty systems
-#define AZ_A 5 // bepo with altgr key to azerty compat layer
-#define AZ_S 6 // bepo with shift key to azerty compat layer
-#define FNAV 7 // function / navigation / mouse layer
-#define NUMK 8 // numeric keypad layer
-
-// macros
-#define KP_00 0 // keypad "double 0"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: default layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | $ | " | < | > | ( | ) |Delete| |ScroLo| @ | + | - | / | * | = |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | % | B |E_ACUT| P | O |E_GRAV|Backsp| |CapsLo| ^ | V | D | L | J | Z |
- * |--------+------+------+------+------+------| ace | | |------+------+------+------+------+--------|
- * | W | A | U | I | E | , |------| |------| C | T | S | R | N | M |
- * |--------+------+------+------+------+------| Tab | | NumLo|------+------+------+------+------+--------|
- * | E_CIRC |A_GRAV| Y | X | . | K | | | | ' | Q | G | H | F | C_CEDIL|
- * `--------+------+------+------+------+-------------,-------------. ,-------------`-------------+------+------+------+------+--------'
- * |Escape|Insert|LSuper| LCtrl| LAlt| | BEPO |QWERTY| |AZERTY| BEPO | | AltGr| RCtrl|RSuper|PrntSc| Pause|
- * `----------------------------------' ,------|------|------| |------+------+------. `----------------------------------'
- * | | |L_NumK| |L_NumK| | |
- * | Space|LShift|------| |------|RShift|Enter |
- * | | |L_FNav| |L_FNav| | |
- * `--------------------' `--------------------'
- */
-[BEPO] = LAYOUT_ergodox(
-// Left hand
-BP_DLR, BP_DQUO, BP_LDAQ, BP_RDAQ, BP_LPRN, BP_RPRN, KC_DEL,
-BP_PERC, BP_B, BP_EACU, BP_P, BP_O, BP_EGRV, KC_BSPC,
-BP_W, BP_A, BP_U, BP_I, BP_E, BP_COMM,
-BP_ECIR, BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K, KC_TAB,
-KC_ESC, KC_INS, KC_LGUI, KC_LCTL, KC_LALT,
- DF(BEPO), DF(QW_B),
- MO(NUMK),
- KC_SPC, KC_LSHIFT, MO(FNAV),
-// Right hand
- KC_SLCK, BP_AT, BP_PLUS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL,
- KC_CAPSLOCK, BP_DCIR, BP_V, BP_D, BP_L, BP_J, BP_Z,
- BP_C, BP_T, BP_S, BP_R, BP_N, BP_M,
- KC_NUMLOCK, BP_QUOT, BP_Q, BP_G, BP_H, BP_F, BP_CCED,
- KC_ALGR, KC_RCTL, KC_RGUI, KC_PSCREEN, KC_PAUSE,
-DF(AZ_B), DF(BEPO),
-MO(NUMK),
-MO(FNAV), KC_RSHIFT, KC_ENTER),
-/* Keymap 1: bepo to qwerty base compat layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | $ | " | < | > | ( | ) |Delete| |ScroLo| @ | + | - | / | * | = |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | % | b | e | p | o | e |Backsp| |CapsLo| ^ | v | d | l | j | z |
- * |--------+------+------+------+------+------| ace | | |------+------+------+------+------+--------|
- * | w | a | u | i | e | , |------| |------| c | t | s | r | n | m |
- * |--------+------+------+------+------+------| Tab | | NumLo|------+------+------+------+------+--------|
- * | e | a | y | x | . | k | | | | ' | q | g | h | f | c |
- * `--------+------+------+------+------+-------------,-------------. ,-------------`-------------+------+------+------+------+--------'
- * |Escape|Insert|LSuper| LCtrl| LAlt| | BEPO |QWERTY| |AZERTY| BEPO | | AltGr| RCtrl|RSuper|PrntSc| Pause|
- * `----------------------------------' ,------|------|------| |------+------+------. `----------------------------------'
- * | | |L_NumK| |L_NumK| | |
- * | Space|LShift|------| |------|RShift|Enter |
- * | | |L_FNav| |L_FNav| | |
- * `--------------------' `--------------------'
- */
-[QW_B] = LAYOUT_ergodox(
-// Left hand
-KC_DOLLAR, S(KC_DQUO), S(KC_COMM), S(KC_DOT), KC_LPRN, KC_RPRN, KC_DEL,
-KC_PERCENT, KC_B, KC_E, KC_P, KC_O, KC_E, KC_BSPC,
-KC_W, KC_A, KC_U, KC_I, KC_E, KC_COMMA,
-KC_E, KC_A, KC_Y, KC_X, KC_DOT, KC_K, KC_TAB,
-KC_ESC, KC_INS, KC_LGUI, KC_LCTL, KC_LALT,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_SPC, MO(QW_S), KC_TRNS,
-// Right hand
- KC_SLCK, KC_AT, KC_PLUS, KC_MINUS, KC_SLASH, KC_ASTR, KC_EQUAL,
- KC_CAPSLOCK, KC_CIRC, KC_V, KC_D, KC_L, KC_J, KC_Z,
- KC_C, KC_T, KC_S, KC_R, KC_N, KC_M,
- KC_NUMLOCK, KC_DQUO, KC_Q, KC_G, KC_H, KC_F, KC_C,
- MO(QW_A), KC_RCTL, KC_RGUI, KC_PSCREEN, KC_PAUSE,
-KC_TRNS, KC_TRNS,
-KC_TRNS,
-KC_TRNS, MO(QW_S), KC_ENTER),
-/* Keymap 2: bepo with altgr key to qwerty compat layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | $ | " | < | > | [ | ] |Delete| |ScroLo| @ | + | - | / | * | = |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | % | | | e | & | o | e |Backsp| |CapsLo| ^ | v | d | l | j | z |
- * |--------+------+------+------+------+------| ace | | |------+------+------+------+------+--------|
- * | w | a | u | i | € | , |------| |------| c | t | s | r | n | m |
- * |--------+------+------+------+------+------| Tab | | NumLo|------+------+------+------+------+--------|
- * | e | \ | { | } | . | ~ | | | | ' | q | g | h | f | c |
- * `--------+------+------+------+------+-------------,-------------. ,-------------`-------------+------+------+------+------+--------'
- * |Escape|Insert|LSuper| LCtrl| LAlt| | BEPO |QWERTY| |AZERTY| BEPO | | AltGr| RCtrl|RSuper|PrntSc| Pause|
- * `----------------------------------' ,------|------|------| |------+------+------. `----------------------------------'
- * | | |L_NumK| |L_NumK| | |
- * | _ |LShift|------| |------|RShift|Enter |
- * | | |L_FNav| |L_FNav| | |
- * `--------------------' `--------------------'
- */
-[QW_A] = LAYOUT_ergodox(
-// Left hand
-KC_DOLLAR, S(KC_DQUO), S(KC_COMM), S(KC_DOT), KC_LBRC, KC_RBRC, KC_DEL,
-KC_PERCENT, KC_PIPE, KC_E, KC_AMPR, KC_O, KC_E, KC_BSPC,
-KC_W, KC_A, KC_U, KC_I, RALT(KC_5), KC_COMMA,
-KC_E, KC_BSLASH, KC_LCBR, KC_RCBR, KC_DOT, KC_TILDE, KC_TAB,
-KC_ESC, KC_INS, KC_LGUI, KC_LCTL, KC_LALT,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_UNDS, MO(QW_S), KC_TRNS,
-// Right hand
- KC_SLCK, KC_AT, KC_PLUS, KC_MINUS, KC_SLASH, KC_ASTR, KC_EQUAL,
- KC_CAPSLOCK, KC_CIRC, KC_V, KC_D, KC_L, KC_J, KC_Z,
- KC_C, KC_T, KC_S, KC_R, KC_N, KC_M,
- KC_NUMLOCK, KC_DQUO, KC_Q, KC_G, KC_H, KC_F, KC_C,
- KC_TRNS, KC_RCTL, KC_RGUI, KC_PSCREEN, KC_PAUSE,
-KC_TRNS, KC_TRNS,
-KC_TRNS,
-KC_TRNS, MO(QW_S), KC_ENTER),
-/* Keymap 3: bepo with shift key to qwerty compat layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | # | 1 | 2 | 3 | 4 | 5 |Delete| |ScroLo| 6 | 7 | 8 | 9 | 0 | = |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | ` | B | E | P | O | E |Backsp| |CapsLo| ! | V | D | L | J | Z |
- * |--------+------+------+------+------+------| ace | | |------+------+------+------+------+--------|
- * | W | A | U | I | E | ; |------| |------| C | T | S | R | N | M |
- * |--------+------+------+------+------+------| Tab | | NumLo|------+------+------+------+------+--------|
- * | E | A | Y | X | : | K | | | | ? | Q | G | H | F | C |
- * `--------+------+------+------+------+-------------,-------------. ,-------------`-------------+------+------+------+------+--------'
- * |Escape|Insert|LSuper| LCtrl| LAlt| | BEPO |QWERTY| |AZERTY| BEPO | | AltGr| RCtrl|RSuper|PrntSc| Pause|
- * `----------------------------------' ,------|------|------| |------+------+------. `----------------------------------'
- * | | |L_NumK| |L_NumK| | |
- * | Space|LShift|------| |------|RShift|Enter |
- * | | |L_FNav| |L_FNav| | |
- * `--------------------' `--------------------'
- */
-[QW_S] = LAYOUT_ergodox(
-// Left hand
-KC_HASH, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS,
-KC_GRV, S(KC_B), S(KC_E), S(KC_P), S(KC_O), S(KC_E), KC_TRNS,
-S(KC_W), S(KC_A), S(KC_U), S(KC_I), S(KC_E), KC_SCOLON,
-S(KC_E), S(KC_A), S(KC_Y), S(KC_X), KC_COLON, S(KC_K), S(KC_TAB),
-S(KC_ESC), S(KC_INS), S(KC_LGUI), S(KC_LCTL), S(KC_LALT),
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
-// Right hand
- KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
- KC_TRNS, KC_EXLM, S(KC_V), S(KC_D), S(KC_L), S(KC_J), S(KC_Z),
- S(KC_C), S(KC_T), S(KC_S), S(KC_R), S(KC_N), S(KC_M),
- KC_TRNS, S(KC_SLASH), S(KC_Q), S(KC_G), S(KC_H), S(KC_F), S(KC_C),
- S(KC_RALT), S(KC_RCTL), S(KC_RGUI), KC_TRNS, KC_TRNS,
-KC_TRNS, KC_TRNS,
-KC_TRNS,
-KC_TRNS, KC_TRNS, KC_TRNS),
-/* Keymap 4: bepo to azerty base compat layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | $ | " | < | > | ( | ) |Delete| |ScroLo| @ | + | - | / | * | = |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | % | b |e_acut| p | o |e_grav|Backsp| |CapsLo| ^ | v | d | l | j | z |
- * |--------+------+------+------+------+------| ace | | |------+------+------+------+------+--------|
- * | w | a | u | i | e | , |------| |------| c | t | s | r | n | m |
- * |--------+------+------+------+------+------| Tab | | NumLo|------+------+------+------+------+--------|
- * | e |a_grav| y | x | . | k | | | | ' | q | g | h | f | c_cedil|
- * `--------+------+------+------+------+-------------,-------------. ,-------------`-------------+------+------+------+------+--------'
- * |Escape|Insert|LSuper| LCtrl| LAlt| | BEPO |QWERTY| |AZERTY| BEPO | | AltGr| RCtrl|RSuper|PrntSc| Pause|
- * `----------------------------------' ,------|------|------| |------+------+------. `----------------------------------'
- * | | |L_NumK| |L_NumK| | |
- * | Space|LShift|------| |------|RShift|Enter |
- * | | |L_FNav| |L_FNav| | |
- * `--------------------' `--------------------'
- */
-[AZ_B] = LAYOUT_ergodox(
-// Left hand
-FR_DLR, FR_DQUO, FR_LABK, FR_RABK, FR_LPRN, FR_RPRN, KC_DEL,
-FR_PERC, KC_B, FR_EACU, KC_P, KC_O, FR_EGRV, KC_BSPC,
-FR_W, FR_A, KC_U, KC_I, KC_E, FR_COMM,
-KC_E, FR_AGRV, KC_Y, KC_X, FR_DOT, KC_K, KC_TAB,
-KC_ESC, KC_INS, KC_LGUI, KC_LCTL, KC_LALT,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_SPC, MO(AZ_S), KC_TRNS,
-// Right hand
- KC_SLCK, FR_AT, FR_PLUS, FR_MINS, FR_SLSH, FR_ASTR, FR_EQL,
- KC_CAPSLOCK, KC_LBRC, KC_V, KC_D, KC_L, KC_J, FR_Z,
- KC_C, KC_T, KC_S, KC_R, KC_N, FR_M,
- KC_NUMLOCK, FR_QUOT, FR_Q, KC_G, KC_H, KC_F, FR_CCED,
- MO(AZ_A), KC_RCTL, KC_RGUI, KC_PSCREEN, KC_PAUSE,
-KC_TRNS, KC_TRNS,
-KC_TRNS,
-KC_TRNS, MO(AZ_S), KC_ENTER),
-/* Keymap 5: bepo with altgr key to azerty compat layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | $ | " | < | > | [ | ] |Delete| |ScroLo| @ | + | - | / | * | = |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | % | | | e | & | o | e |Backsp| |CapsLo| ^ | v | d | l | j | z |
- * |--------+------+------+------+------+------| ace | | |------+------+------+------+------+--------|
- * | w | a |u_grav| trem | € | , |------| |------| c | t | s | r | n | m |
- * |--------+------+------+------+------+------| Tab | | NumLo|------+------+------+------+------+--------|
- * | / | \ | { | } | . | ~ | | | | ' | q | g | h | f | c |
- * `--------+------+------+------+------+-------------,-------------. ,-------------`-------------+------+------+------+------+--------'
- * |Escape|Insert|LSuper| LCtrl| LAlt| | BEPO |QWERTY| |AZERTY| BEPO | | AltGr| RCtrl|RSuper|PrntSc| Pause|
- * `----------------------------------' ,------|------|------| |------+------+------. `----------------------------------'
- * | | |L_NumK| |L_NumK| | |
- * | _ |LShift|------| |------|RShift|Enter |
- * | | |L_FNav| |L_FNav| | |
- * `--------------------' `--------------------'
- */
-[AZ_A] = LAYOUT_ergodox(
-// Left hand
-FR_DLR, FR_DQUO, FR_LABK, FR_RABK, FR_LBRC, FR_RBRC, KC_DEL,
-FR_PERC, FR_PIPE, FR_EACU, FR_AMPR, KC_O, FR_EGRV, KC_BSPC,
-FR_W, FR_A, FR_UGRV, S(KC_LBRC), FR_EURO, FR_COMM,
-FR_SLSH, FR_BSLS, FR_LCBR, FR_RCBR, FR_DOT, FR_TILD, KC_TAB,
-KC_ESC, KC_INS, KC_LGUI, KC_LCTL, KC_LALT,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- FR_UNDS, MO(AZ_S), KC_TRNS,
-// Right hand
- KC_SLCK, FR_AT, FR_PLUS, FR_MINS, FR_SLSH, FR_ASTR, FR_EQL,
- KC_CAPSLOCK, KC_LBRC, KC_V, KC_D, KC_L, KC_J, FR_Z,
- KC_C, KC_T, KC_S, KC_R, KC_N, FR_M,
- KC_NUMLOCK, FR_QUOT, FR_Q, KC_G, KC_H, KC_F, FR_CCED,
- KC_TRNS, KC_RCTL, KC_RGUI, KC_PSCREEN, KC_PAUSE,
-KC_TRNS, KC_TRNS,
-KC_TRNS,
-KC_TRNS, MO(AZ_S), KC_ENTER),
-/* Keymap 6: bepo with shift key to azerty compat layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | # | 1 | 2 | 3 | 4 | 5 |Delete| |ScroLo| 6 | 7 | 8 | 9 | 0 | ° |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | ` | B | E | P | O | E |Backsp| |CapsLo| ! | V | D | L | J | Z |
- * |--------+------+------+------+------+------| ace | | |------+------+------+------+------+--------|
- * | W | A | U | I | E | ; |------| |------| C | T | S | R | N | M |
- * |--------+------+------+------+------+------| Tab | | NumLo|------+------+------+------+------+--------|
- * | E | A | Y | X | : | K | | | | ? | Q | G | H | F | C |
- * `--------+------+------+------+------+-------------,-------------. ,-------------`-------------+------+------+------+------+--------'
- * |Escape|Insert|LSuper| LCtrl| LAlt| | BEPO |QWERTY| |AZERTY| BEPO | | AltGr| RCtrl|RSuper|PrntSc| Pause|
- * `----------------------------------' ,------|------|------| |------+------+------. `----------------------------------'
- * | | |L_NumK| |L_NumK| | |
- * | Space|LShift|------| |------|RShift|Enter |
- * | | |L_FNav| |L_FNav| | |
- * `--------------------' `--------------------'
- */
-[AZ_S] = LAYOUT_ergodox(
-// Left hand
-FR_HASH, FR_1, FR_2, FR_3, FR_4, FR_5, KC_TRNS,
-FR_GRV, S(KC_B), S(KC_E), S(KC_P), S(KC_O), S(KC_E), KC_TRNS,
-S(FR_W), S(FR_A), S(KC_U), S(KC_I), S(KC_E), FR_SCLN,
-S(KC_E), S(FR_A), S(KC_Y), S(KC_X), FR_COLN, S(KC_K), S(KC_TAB),
-S(KC_ESC), S(KC_INS), S(KC_LGUI), S(KC_LCTL), S(KC_LALT),
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
-// Right hand
- KC_TRNS, FR_6, FR_7, FR_8, FR_9, FR_0, FR_DEG,
- KC_TRNS, FR_EXLM, S(KC_V), S(KC_D), S(KC_L), S(KC_J), S(FR_Z),
- S(KC_C), S(KC_T), S(KC_S), S(KC_R), S(KC_N), S(FR_M),
- KC_TRNS, FR_QUES, S(FR_Q), S(KC_G), S(KC_H), S(KC_F), S(KC_C),
- S(KC_RALT), S(KC_RCTL), S(KC_RGUI), KC_TRNS, KC_TRNS,
-KC_TRNS, KC_TRNS,
-KC_TRNS,
-KC_TRNS, KC_TRNS, KC_TRNS),
-/* Keymap 7: function / navigation / mouse layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 |VolMut| | | F6 | F7 | F8 | F9 | F10 | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | Next |LClick| Up |RClick| WhUp |VolDwn| | | PgUp | Home | Up | End | F11 | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | Prev | Left | Down | Right|WhDown|------| |------| PgDn | Left | Down | Right| F12 | |
- * |--------+------+------+------+------+------| VolUp| | |------+------+------+------+------+--------|
- * | | Undo | Cut | Copy | Paste| | | | | | | | | | |
- * `--------+------+------+------+------+-------------,-------------. ,-------------`-------------+------+------+------+------+--------'
- * | | | | | | | | | | | | | | | | | |
- * `----------------------------------' ,------|------|------| |------+------+------. `----------------------------------'
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-[FNAV] = LAYOUT_ergodox(
-// Left hand
-KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_MUTE,
-KC_NO, KC_MS_BTN5, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, KC_MS_WH_UP, KC_VOLU,
-KC_NO, KC_MS_BTN4, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_DOWN,
-KC_NO, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_NO, KC_VOLD,
-KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_NO, KC_TRNS, KC_TRNS,
-// Right hand
- KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO,
- KC_NO, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_F11, KC_NO,
- KC_PGDOWN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_F12, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO,
-KC_TRNS, KC_TRNS,
-KC_TRNS,
-KC_TRNS, KC_TRNS, KC_NO),
-/* Keymap 8: numeric keypad layer, sends keypad codes
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | NumLo| / | * | - | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | | | | | | | | 7 | 8 | 9 | + | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | |------| |------| | 4 | 5 | 6 | + | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | 1 | 2 | 3 | Enter| |
- * `--------+------+------+------+------+-------------,-------------. ,-------------`-------------+------+------+------+------+--------'
- * | | | | | | | | | | | | | 0 | 00 | . | Enter| |
- * `----------------------------------' ,------|------|------| |------+------+------. `----------------------------------'
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-[NUMK] = LAYOUT_ergodox(
-// Left hand
-KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_NO, KC_TRNS, KC_TRNS,
-// Right hand
- KC_NO, KC_NO, KC_NUMLOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_NO,
- KC_NO, KC_NO, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_NO,
- KC_NO, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, KC_NO,
- KC_NO, KC_NO, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, KC_NO,
- KC_KP_0, M(KP_00), KC_KP_COMMA, KC_KP_ENTER, KC_NO,
-KC_TRNS, KC_TRNS,
-KC_TRNS,
-KC_TRNS, KC_TRNS, KC_NO)
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- switch(id) {
- // keypad "double 0"
- case KP_00:
- if (record->event.pressed) {
- return MACRO( T(KP_0), D(KP_0), END );
- } else {
- return MACRO( U(KP_0), END );
- }
- break;
- }
- return MACRO_NONE;
-};
diff --git a/layouts/community/ergodox/bepo/readme.md b/layouts/community/ergodox/bepo/readme.md
deleted file mode 100644
index 14a1d22196..0000000000
--- a/layouts/community/ergodox/bepo/readme.md
+++ /dev/null
@@ -1,36 +0,0 @@
-![bepo.png](https://i.imgur.com/TnO8ApW.png)
-
-# BEPO keymap for the ErgoDox
-
-This keymap has been made for the BEPO layout (http://bepo.fr), which is an ergonomic french keyboard layout based on Dvorak rules. As it's made for french people, the following of this readme will be in french.
-
-# Disposition BÉPO pour l'ErgoDox
-
-Cette keymap a été pensée pour la disposition BÉPO (http://bepo.fr), qui est une disposition de clavier francophone, ergonomique et libre, élaborée selon la méthode Dvorak. L'adaptation de cette disposition à l'ErgoDox a été réalisée en conservant les points forts du clavier TypeMatrix 2030 (très répandu dans la communauté bépo, avec un excellent rapport ergonomie / prix) voir en réglant certains de ses défauts (3 colonnes pour l'auriculaire droit et touche "Ê") et en apportant son lot de nouveautés (compatibilité avec les systèmes azerty et qwerty).
-
-Particularités
---------------
-
-Touches de repos des pouces : "espace" à gauche et "entrée" à droite.
-
-Placement des touches de combinaison ("Shift", "Alt", "Ctrl"...) adapté aux pouces, et permettant de conserver chaque doigt pour les rangées de lettres auxquelles ils sont assignés sans avoir à changer la touche de combinaison de côté (exemple : "A" majuscule puis "M" majuscule avec les auriculaires et un seul appui d'une touche "Shift").
-
-Les touches "Alt" et "Alt Gr" sont accessibles avec les pouces sur la rangée du bas comme sur la TypeMatrix 2030, avec une symétrie gauche / droite.
-
-Les touches "Ctrl" sont placées sur la même ligne que les touche "Alt" et "Alt Gr" comme sur un clavier clasique, elles sont accessibles aux pouces sur la rangée du bas (moins éloigné que le groupe de touches de pouces pour des petites mains).
-
-Les touches "Backspace" et "Delete" sont placées comme sur la TypeMatrix 2030, du côté gauche uniquement (pour laisser celles de la main droite servir de {caps,num,scroll}lock puisqu'elles ont des LED).
-
-La touche "Tab" est placée comme sur la TypeMatrix 2020.
-
-Meilleure symétrie et accessibilité que la TypeMatrix 2030 : les touches "W" et "%" ont dû être déplacées du côté gauche en raison du nombre de touches de l'ErgoDox, mais l'auriculaire droit ne gère maintenant que deux colonnes de touches au lieu de trois. La touche "Ê" redevient accessible sur la même rangée que les autres lettres, comme sur un clavier classique en disposition bépo. Les lettres, chiffres et symboles sont tous regroupés sur 4 lignes et 6 colonnes pour chaque main, et la première rangée de lettres à la main gauche conserve une identité visuelle "BÉPO".
-
-Touche de fonction permettant de saisir les touches F1 à F12, les touches F1 à F10 sont placées de façon logique par rapport aux chiffres 1 à 0. Cette même touche permet l'accès aux touches directionnelles sans déplacer la main droite et d'effectuer des actions souris avec uniquement la main gauche. Les touches "Home" et "End" sont placées de la même façon que sur une TypeMatrix 2030 par rapport aux touches directionnelles. Les touches "Page Up" et "Page Down" sont également accessibles facilement sans déplacer la main droite. Les fonctions "VolUp" et "VolDown" sont placées comme sur la TypeMatrix 2030, avec la fonction "Mute" juste au dessus. Les fonctions "Undo", "Cut", "Copy" et "Paste" sont placées côte à côte comme elles le seraient sur un clavier QWERTY en combinaison avec la touche "Ctrl" (à l'emplacement des lettres "Z", "X", "C" et "V"). Par rapport au layout "SpaceFN", l'utilisation d'une touche de fonction dédiée au pouce permet de ne pas ajouter de latence, et la touche espace reste compatible avec les jeux (action au moment de l'appui et possibilité d'appui long).
-
-Touche de fonction permettant l'accès au pavé numérique comme sur la TypeMatrix 2030, mais sans avoir à déplacer la main droite : avec les doigts sur la rangée de repos, possibilité de saisir les chiffres "4", "5" et "6" comme sur un pavé numérique classique. Le double "0" de la TypeMatrix a été conservé, et gagne une possibilité de répétition en simples "0".
-
-Touche permettant de basculer en mode BEPO sur un système configuré pour un clavier QWERTY. Cette compatibilité n'est pas parfaite (pas encore de gestion des accents mais ça devrait être faisable avec une disposition en qwerty international, et les combinaisons de touches ne sont pas toutes supportées puisque le clavier traduit déjà certaines touches en combinaisons) mais reste pratique pour une saisie de texte occasionnelle et pour des accès BIOS ou console en QWERTY.
-
-Touche permettant de basculer en mode BEPO sur un système configuré pour un clavier AZERTY. Cette compatibilité n'est pas parfaite (pas de gestion des caractères non présents sur le clavier AZERTY, et les combinaisons de touches ne sont pas toutes supportées puisque le clavier traduit déjà certaines touches en combinaisons) mais reste pratique pour une saisie de texte occasionnelle et pour faire du bureau à distance vers un système Windows sans BEPO.
-
-> Olivier Smedts <olivier@gid0.org>
diff --git a/layouts/community/ergodox/bepo/rules.mk b/layouts/community/ergodox/bepo/rules.mk
deleted file mode 100644
index 839dd82e1e..0000000000
--- a/layouts/community/ergodox/bepo/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Having a file like this allows you to override Makefile definitions
-# for your own particular keymap
-
-SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-COMMAND_ENABLE = no # Commands for debug and configuration
-
-
diff --git a/layouts/community/ergodox/bepo_alt/keymap.c b/layouts/community/ergodox/bepo_alt/keymap.c
index a3bb955abf..e379df030f 100644
--- a/layouts/community/ergodox/bepo_alt/keymap.c
+++ b/layouts/community/ergodox/bepo_alt/keymap.c
@@ -33,21 +33,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
BP_DLR, BP_DQUO, BP_LDAQ, BP_RDAQ, BP_LPRN, BP_RPRN, BP_AT,
KC_TAB, BP_B, BP_EACU, BP_P, BP_O, BP_EGRV, KC_BSPC,
BP_W, BP_A, BP_U, BP_I, BP_E, BP_COMM,
-KC_LSHIFT, BP_ECIR, BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K,
+KC_LSFT, BP_ECIR, BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K,
KC_LCTL, KC_LGUI, KC_LGUI, KC_LGUI, KC_LALT,
- KC_PGUP, KC_PGDOWN,
+ KC_PGUP, KC_PGDN,
KC_INS,
- KC_SPC, KC_LSHIFT, DF(FNAV),
+ KC_SPC, KC_LSFT, DF(FNAV),
/* Right hand */
BP_PLUS, BP_MINS, BP_MINS, BP_SLSH, BP_ASTR, BP_EQL, BP_PERC,
- KC_CAPSLOCK, BP_DCIR, BP_V, BP_D, BP_L, BP_J, BP_Z,
+ KC_CAPS, BP_DCIR, BP_V, BP_D, BP_L, BP_J, BP_Z,
BP_C, BP_T, BP_S, BP_R, BP_N, BP_M,
KC_ESC, BP_QUOT, BP_Q, BP_G, BP_H, BP_F, BP_CCED,
KC_ALGR, KC_RGUI, KC_RGUI, KC_RCTL, KC_ENTER,
DF(BEPO), KC_DEL,
DF(FNAV),
-MO(FNAV), KC_RSHIFT, KC_ENTER),
+MO(FNAV), KC_RSFT, KC_ENTER),
/* Keymap 1: function / navigation / mouse layer
*
@@ -73,7 +73,7 @@ MO(FNAV), KC_RSHIFT, KC_ENTER),
KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
KC_NO, KC_MS_BTN5, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, KC_MS_WH_UP, KC_BSPC,
KC_NO, KC_MS_BTN4, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_DOWN,
-KC_LSHIFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_NO, KC_VOLD,
+KC_LSFT, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_NO, KC_VOLD,
KC_LCTL, KC_INS, KC_LGUI, KC_LGUI, KC_LALT,
KC_HOME, KC_END,
KC_TRNS,
diff --git a/layouts/community/ergodox/bepo_csa/keymap.c b/layouts/community/ergodox/bepo_csa/keymap.c
deleted file mode 100644
index 8345d820c1..0000000000
--- a/layouts/community/ergodox/bepo_csa/keymap.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/* TypeMatrix-2030-like keymap */
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "action_util.h"
-#include "led.h"
-#include "keymap_extras/keymap_bepo.h"
-#include "keymap_extras/keymap_canadian_multilingual.h"
-
-enum layers {
- LR_BASE, // default layer
- LR_CSA, // BÉPO over Canadian Multilingual (CSA)
- LR_CSA_SFT, // shifted BÉPO over CSA
- LR_CSA_AGR, // altgr-ed BÉPO over CSA
- LR_CSA_AGR_SFT, // altgr-shifted BÉPO over CSA
- LR_NUMR, // numeric layer
- LR_FN, // fn layer
-};
-
-#define IS_CA_MULT_ENABLED() (layer_state & (1 << LR_CSA))
-
-enum macros {
- // Characters that do not exist in CSA and must be implemented based on unicode support
- // Note: these are intentionally declared first to be used as indexes in spec_chars below
- UC_NDSH, // –
- UC_MDSH, // —
- UC_ELPS, // …
- END_UC, // indicates the last unicode character macro
- // other macros
- M_CSA_SFT, // toggle shift on CSA
- M_CSA_AGR_SFT, // toggle shift on LR_CSA_AGR (goes to LR_CSA_AGR_SFT)
- M_CSA_SFT_AGR, // toggle AltGr on LR_CSA_SFT (goes to LR_CSA_AGR_SFT)
- // macros for characters that need to be un-shifted in LR_CA_MULT_SHIFT
- M_1,
- M_2,
- M_3,
- M_4,
- M_5,
- M_6,
- M_7,
- M_8,
- M_9,
- M_0,
- M_DEGR,
- M_SCLN,
- M_GRV,
- M_NBSP,
- // macros for characters that don't have a simple key combination in LR_CA_MULT_ALTGR
- M_CRC,
- // other layer macros
- M_DBL0, // double 0
- M_FNLR, // fn layer
- M_NMAL, // num+alt
-};
-
-#define CSA(name) M(M_CSA_##name) // calls a CSA macro
-
-const uint16_t unicode_chars[] = {
- [UC_NDSH] = L'–',
- [UC_MDSH] = L'—',
- [UC_ELPS] = L'…',
-};
-
-/* shortcut for unicode character macros */
-#define MUC(name) M(UC_##name) // calls a unicode macro
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Basic layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | $ | " | « | » | ( | ) | Del | | Del | @ | + | - | / | * | W |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Tab | B | É | P | O | È |Backsp| |Backsp| ^ | V | D | L | J | Z |
- * |--------+------+------+------+------+------|ace | |ace |------+------+------+------+------+--------|
- * | = | A | U | I | E | , |------| |------| C | T | S | R | N | M |
- * |--------+------+------+------+------+------|Enter | |Enter |------+------+------+------+------+--------|
- * | LShift | À | Y | X | . | K | | | | ' | Q | G | H | F | RShift |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |LCtrl | fn | LGui |numAlt| LAlt | |Alt Gr| % | App | Ç | RCtrl|
- * `----------------------------------' `----------------------------------'
- * ,--------------. ,-------------.
- * | Esc | num | | Left |Right |
- * ,------+-------+------| |------+------+------.
- * | | | PgUp | | Up | | |
- * |Space | Home |------| |------| End |Space |
- * | | | PgDn | | Down | | |
- * `---------------------' `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[LR_BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- BP_DLR, KC_1, KC_2, KC_3, KC_4, KC_5, KC_DEL,
- KC_TAB, BP_B, BP_EACU, BP_P, BP_O, BP_EGRV, KC_BSPC,
- BP_EQL, BP_A, BP_U, BP_I, BP_E, BP_COMM,
- KC_LSFT, BP_AGRV, BP_Y, BP_X, BP_DOT, BP_K, KC_ENT,
- KC_LCTL, M(M_FNLR), KC_LGUI, M(M_NMAL), KC_LALT,
-
- KC_ESC, TG(LR_NUMR),
- KC_PGUP,
- KC_SPC, KC_HOME, KC_PGDN,
-
- // right hand
- KC_DEL, KC_6, KC_7, KC_8, KC_9, KC_0, BP_W,
- KC_BSPC, BP_DCIR, BP_V, BP_D, BP_L, BP_J, BP_Z,
- BP_C, BP_T, BP_S, BP_R, BP_N, BP_M,
- KC_ENT, BP_QUOT, BP_Q, BP_G, BP_H, BP_F, KC_RSFT,
- KC_ALGR, BP_PERC, KC_APP, BP_CCED, KC_RCTL,
-
- KC_LEFT, KC_RGHT,
- KC_UP,
- KC_DOWN, KC_END, KC_SPC
- ),
-/**
- * Same as default but for use with Canadian Multilingual on OS side
- */
-[LR_CSA] = LAYOUT_ergodox(
- // left hand
- KC_DLR, CA_DQUO, CA_LDAQ, CA_RDAQ, KC_LPRN, KC_RPRN, KC_TRNS,
- KC_TRNS, KC_B, CA_EACU, KC_P, KC_O, CA_EGRV, KC_TRNS,
- KC_EQL, KC_A, KC_U, KC_I, KC_E, KC_COMM,
- CSA(SFT), CA_AGRV, KC_Y, KC_X, KC_DOT, KC_K, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
-
- // right hand
- KC_TRNS, KC_AT, KC_PLUS, KC_MINS, CA_SLSH, KC_ASTR, KC_W,
- KC_TRNS, CA_CIRC, KC_V, KC_D, KC_L, KC_J, KC_Z,
- KC_C, KC_T, KC_S, KC_R, KC_N, KC_M,
- KC_TRNS, CA_QUOT, KC_Q, KC_G, KC_H, KC_F, CSA(SFT),
- MO(LR_CSA_AGR), KC_PERC, KC_TRNS, CA_CCED, KC_LCTL, // RCTL has a special behaviour in CSA so use LCTL
-
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
- ),
-/* Shifted BÉPO over Canadian Multilingual
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | # | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | | | | | | | ! | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | ° | | | | | ; |------| |------| | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | : | | | | | ? | | | | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | ` | | | |
- * `----------------------------------' `-----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-[LR_CSA_SFT] = LAYOUT_ergodox(
- // left hand
- KC_HASH, M(M_1), M(M_2), M(M_3), M(M_4), M(M_5), KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- M(M_DEGR),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(M_SCLN),
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_COLN, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- M(M_NBSP), KC_TRNS, KC_TRNS,
-
- // right hand
- KC_TRNS, M(M_6), M(M_7), M(M_8), M(M_9), M(M_0), KC_TRNS,
- KC_TRNS, KC_EXLM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, CA_QUES, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- CSA(SFT_AGR), M(M_GRV), KC_TRNS, KC_TRNS, KC_TRNS,
-
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, M(M_NBSP)
- ),
-/* AltGr-ed BÉPO over Canadian Multilingual
- * "////" indicates that the key is disabled (unsupported bépo character)
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | – | — | < | > | [ | ] | | | | ^ | ± | //// | ÷ | × | dead ˘ |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | |dead '| & | œ |dead `| | | | ¡ |dead ˇ| ð | //// | ij | ////// |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | ////// | æ | ù |dead "| € | ̛’ |------| |------| © | þ | ß | ® |dead ~| dead ¯ |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | \ | { | } | … | ~ | | | | ¿ |dead °| μ | //// |dead ˛| |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | //// | |dead ¸| |
- * `----------------------------------' `-----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | _ | |------| |------| | _ |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-[LR_CSA_AGR] = LAYOUT_ergodox(
- // left hand
- MUC(NDSH), MUC(MDSH), CA_LABK, CA_RABK, CA_LBRC, CA_RBRC, KC_TRNS,
- KC_TRNS, CA_PIPE, CA_ACUT, KC_AMPR, CA_OE, CA_GRV, KC_TRNS,
- KC_NO, CA_AE, CA_UGRV, CA_DIAE, CA_EURO, CA_RQSU,
- CSA(AGR_SFT), CA_BSLS, CA_LCBR, CA_RCBR, MUC(ELPS), CA_TILD, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_UNDS, CSA(AGR_SFT), KC_TRNS,
-
- // right hand
- KC_TRNS, M(M_CRC), CA_PLMN, KC_NO, CA_DIV, CA_MUL, CA_BREV,
- KC_TRNS, CA_IEXL, CA_CARN, CA_ETH, KC_NO, CA_IJ, KC_NO,
- CA_COPY, CA_THRN, CA_SS, CA_REGD, CA_DTIL, CA_MACR,
- KC_TRNS, CA_IQUE, CA_RNGA, CA_MICR, KC_NO, CA_OGON, CSA(AGR_SFT),
- KC_TRNS, KC_NO, KC_TRNS, CA_CEDL, KC_TRNS,
-
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, CSA(AGR_SFT), KC_UNDS
- ),
-/* AltGr-shifted BÉPO over Canadian Multilingual
- * "////" indicates that the key is disabled (unsupported bépo character or unused in bépo)
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ¶ | //// | “ | ” | //// | //// | | | | //// | ¬ | ¼ | ½ | ¾ | ////// |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ¦ | ˝ | § | Œ | ` | | | | //// | //// | Ð | //// | IJ | ////// |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | ////// | Æ | Ù |dead-˙| //// | //// |------| |------| //// | Þ | ẞ | ™ | //// | º |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | //// | ‘ | ’ | //// | //// | | | | //// | //// | //// | //// | ª | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-[LR_CSA_AGR_SFT] = LAYOUT_ergodox(
- // left hand
- CA_PARA, KC_NO, CA_LDQU, CA_RDQU, KC_NO, KC_NO, KC_TRNS,
- KC_TRNS, CA_BRKP, CA_DACU, CA_SECT, S(CA_OE), M(M_GRV), KC_TRNS,
- KC_NO, S(CA_AE), S(CA_UGRV), CA_DOTA, KC_NO, KC_NO,
- CSA(AGR_SFT), KC_NO, CA_LSQU, CA_RSQU, KC_NO, KC_NO, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, CSA(AGR_SFT), KC_TRNS,
-
- // right hand
- KC_TRNS, KC_NO, CA_NOT, CA_QRTR, CA_HALF, CA_TQTR, KC_NO,
- KC_TRNS, KC_NO, KC_NO, S(CA_ETH), KC_NO, S(CA_IJ), KC_NO,
- KC_NO, S(CA_THRN), S(CA_SS), CA_TM, KC_NO, CA_MORD,
- KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, CA_FORD, CSA(AGR_SFT),
- CSA(SFT_AGR), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, CSA(AGR_SFT), KC_TRNS
- ),
-/* Numeric Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | | | | | | Tab | / | * | - |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | F6 | F7 | F8 | F9 | F10 | | | | | Home | 7 | 8 | 9 | + |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | F11 | F12 | | | |------| |------| Up | End | 4 | 5 | 6 | + |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | Left | Down | Right| 1 | 2 | 3 |KpEnter |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | 0 | 00 | . |Etr/Ctl|
- * `----------------------------------' `-----------------------------------'
- * ,-------------. ,-------------.
- * | | | |n.lock|c.lock|
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[LR_NUMR] = LAYOUT_ergodox(
- // left hand
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
- KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS,KC_TRNS,
-
- // right hand
- KC_TRNS, KC_F6, KC_F7, KC_TAB, KC_PSLS, KC_PAST, KC_PMNS,
- KC_TRNS, KC_TRNS, KC_HOME, KC_P7, KC_P8, KC_P9, KC_PPLS,
- KC_UP, KC_END, KC_P4, KC_P5, KC_P6, KC_PPLS,
- KC_LEFT, KC_DOWN, KC_RGHT, KC_P1, KC_P2, KC_P3, KC_PENT,
- KC_TRNS, KC_P0, M(M_DBL0),KC_PDOT, CTL_T(KC_PENT),
-
- KC_NLCK, KC_CAPS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* fn layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * |~CA-mult| | | | | |Insert| |Insert|Eject |Power |Sleep | Wake |PrtScr|ScrollLk|
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | | | |VolUp | | | | | | | | Pause |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | QK_BOOT | | | Calc | Mail |Browsr|------| |------| | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | App | cut | copy |paste | Mute |VolDn | | | | | | | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | Next | | | | |
- * | Mute | play |------| |------| | |
- * | | | Prev | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[LR_FN] = LAYOUT_ergodox(
- TG(LR_CSA), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
- QK_BOOT, KC_TRNS, KC_TRNS, KC_CALC, KC_MAIL, KC_WHOM,
- KC_TRNS, KC_APP, S(KC_DEL), LCTL(KC_INS),S(KC_INS), KC_MUTE, KC_VOLD,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
- KC_TRNS, KC_TRNS,
- KC_MPRV,
- KC_MUTE, KC_MPLY, KC_MNXT,
-
- // right hand
- KC_INS, KC_EJCT, KC_PWR, KC_SLEP, KC_WAKE, KC_PSCR, KC_SLCK,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-};
-
-void hold_shift(void) {
- register_code(KC_LSHIFT);
-}
-
-void release_shift(void) {
- unregister_code(KC_LSHIFT);
-}
-
-uint16_t hextokeycode(int hex) {
- if (hex == 0x0) {
- return KC_P0;
- } else if (hex < 0xA) {
- return KC_P1 + (hex - 0x1);
- } else {
- return KC_A + (hex - 0xA);
- }
-}
-
-void send_unicode(uint16_t unicode)
-{
- // For more info on how this works per OS, see here: https://en.wikipedia.org/wiki/Unicode_input#Hexadecimal_code_input
- // Implemented for Windows:
- // Pressing ALT followed by + followed by the unicode code point in hex.
- // Requires registry key HKEY_CURRENT_USER\Control Panel\Input Method\EnableHexNumpad set to String 1
- register_code(KC_LALT);
- register_code(KC_PPLS);
- unregister_code(KC_PPLS);
-
- for (int i = 12; i >= 0; i -= 4) {
- register_code(hextokeycode((unicode >> i) & 0xF));
- unregister_code(hextokeycode((unicode >> i) & 0xF));
- }
-
- unregister_code(KC_LALT);
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0 ... END_UC:
- if (record->event.pressed) {
- send_unicode(unicode_chars[id]);
- }
- break;
- case M_CSA_SFT:
- // BÉPO over CSA: toggle shift layer
- layer_invert(LR_CSA_SFT);
- if (record->event.pressed) {
- hold_shift();
- } else {
- release_shift();
- }
- break;
- case M_CSA_SFT_AGR:
- // BÉPO over CSA: from shift layer, momentary altgr+shift layer
- layer_invert(LR_CSA_AGR);
- layer_invert(LR_CSA_AGR_SFT);
- if (record->event.pressed) {
- // shift not needed for LR_CSA_AGR_SFT
- release_shift();
- } else {
- // back to shift layer
- hold_shift();
- }
- break;
- case M_CSA_AGR_SFT:
- // BÉPO over CSA: from altgr layer, momentary altgr+shift layer
- layer_invert(LR_CSA_SFT);
- layer_invert(LR_CSA_AGR_SFT);
- break;
- case M_1 ... M_0:
- case M_DEGR:
- case M_SCLN:
- case M_GRV:
- case M_NBSP:
- // macros of the shift layer that require to release shift
- if (record->event.pressed) {
- release_shift();
- switch (id) {
- case M_1 ... M_0:
- register_code(KC_1 + (id - M_1));
- break;
- case M_DEGR:
- return MACRO(DOWN(KC_ALGR), D(SCLN), END);
- case M_SCLN:
- return MACRO(D(SCLN), END);
- case M_GRV:
- return MACRO(I(75), DOWN(KC_ALGR), TYPE(CA_CIRC), UP(KC_ALGR), T(SPACE), END);
- case M_NBSP:
- // use weak mod such that pressing another key will not be affected
- add_weak_mods(MOD_BIT(KC_ALGR));
- return MACRO(D(SPACE), END);
- }
- } else {
- hold_shift();
- switch (id) {
- case M_1 ... M_0:
- unregister_code(KC_1 + (id - M_1));
- break;
- case M_DEGR:
- return MACRO(UP(KC_ALGR), U(SCLN), END);
- case M_SCLN:
- return MACRO(U(SCLN), END);
- case M_NBSP:
- del_weak_mods(MOD_BIT(KC_ALGR));
- return MACRO(U(SPACE), END);
- }
- }
- break;
- case M_CRC:
- if (record->event.pressed) {
- return MACRO(I(75), TYPE(CA_CIRC), T(SPACE), END);
- }
- break;
- case M_DBL0:
- if (record->event.pressed) {
- return MACRO( I(25), T(P0), T(P0), END );
- }
- break;
- case M_FNLR:
- layer_invert(LR_NUMR);
- layer_invert(LR_FN);
- break;
- case M_NMAL:
- layer_invert(LR_NUMR);
- if (record->event.pressed) {
- register_code(KC_LALT);
- } else {
- unregister_code(KC_LALT);
- }
- break;
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- // led 1: numeric layer
- if (layer_state & (1 << LR_NUMR)) {
- ergodox_right_led_1_on();
- }
- // led 2: BÉPO over Canadian Multilingual
- if (IS_CA_MULT_ENABLED()) {
- ergodox_right_led_2_on();
- }
- // led 3: caps lock
- if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
- ergodox_right_led_3_on();
- }
-};
diff --git a/layouts/community/ergodox/bepo_csa/readme.md b/layouts/community/ergodox/bepo_csa/readme.md
deleted file mode 100644
index d4975b2265..0000000000
--- a/layouts/community/ergodox/bepo_csa/readme.md
+++ /dev/null
@@ -1,162 +0,0 @@
-# BÉPO Keymap with firmware-remapping for software CSA layout
-
-This is a keymap intended to be used with the [BÉPO layout](http://bepo.fr), a French ergonomic layout designed by following Dvorak's principles.
-
-The particularity of this keymap is that it supports using the [Canadian Multilingual Standard layout](https://en.wikipedia.org/wiki/QWERTY#Canadian_Multilingual_Standard) (also known as _ACNOR keyboard_ or _CSA keyboard_, see also the [French page](https://fr.wikipedia.org/wiki/QWERTY#Clavier_canadien_multilingue_standard) which contains more details) on the OS side, by enabling the _CSA_ layer. This is especially useful for operating systems that natively provide CSA, but not BÉPO, like Windows. The CSA layout was chosen because it is probably the standard layout that provides the best character set coverage.
-
-This keymap is based on the [tm2030](../tm2030/) keymap, whose goal was to have a [TypeMatrix™ 2030](http://typematrix.com/2030/features.php) inspired layout for the ErgoDox EZ.
-
-As this keyboard is intended for French people, the rest of this page will be in French.
-
-# Keymap BÉPO avec support en firmware pour utilisation avec la disposition CSA en software
-
-Cette keymap a été conçue pour être utilisée avec la [disposition BÉPO](http://bepo.fr), la disposition francophone, ergonomique et libre basée sure les principes de Dvorak.
-
-La particularité de cette keymap est qu'elle supporte l'utilisation du [clavier canadien multilingue standard](https://fr.wikipedia.org/wiki/QWERTY#Clavier_canadien_multilingue_standard) (aussi appelé _clavier ACNOR_ ou _clavier CSA_) du côté du système d'exploitation, en activant la couche _CSA_. Ceci s'avère particulièrement utile pour les systèmes d'exploitations qui fournissent nativement le CSA, mais pas le BÉPO, comme Windows. Le clavier CSA a été choisi comme base car c'est probablement la disposition standard qui fournit la meilleure couverture en termes de caractères disponibles.
-
-Cette keymap est basée sur la keymap [tm2030](../tm2030/), dont le but est de fournir une disposition inspirée du [TypeMatrix™ 2030](http://typematrix.com/2030/features.php) pour l'ErgoDox EZ.
-
-## Couche de base
-C'est la couche par défaut, proche du TypeMatrix, avec les différences suivantes:
-- La ligne du haut (les touches `F`) et la colonne de droite sont retirées, les touches correspondantes étant déplacées ailleurs.
-- Les touches situés en bas à gauche sont redisposées dans cet ordre: `Ctrl`, `fn`, `Gui`, `num+Alt`, `Alt`
-- Les touches `shuffle` (`Alt+Tab`) et `desktop` ne sont pas supportés
-- `W` est déplacé à la place de `=`
-- `=` est déplacé sous `Tab` (au lieu d'avoir un grand `Shift`)
-- `%` et `Ç` sont déplacés à la place de `Home` et `End` respectivement
-- Les flèches ainsi que `PgUp`/`PgDown`/`Home`/`End` sont déplacées sur les pouces
-
-À noter que pour `W` et `Ç`, le but a été de ne pas les déplacer trop par rapport à la disposition BÉPO _standard_, afin de pouvoir repasser facilement sur un TypeMatrix ou un clavier traditionnel.
-
-
-```
-,--------------------------------------------------. ,--------------------------------------------------.
-| $ | " | « | » | ( | ) | Del | | Del | @ | + | - | / | * | W |
-|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| Tab | B | É | P | O | È |Backsp| |Backsp| ^ | V | D | L | J | Z |
-|--------+------+------+------+------+------|ace | |ace |------+------+------+------+------+--------|
-| = | A | U | I | E | , |------| |------| C | T | S | R | N | M |
-|--------+------+------+------+------+------|Enter | |Enter |------+------+------+------+------+--------|
-| LShift | À | Y | X | . | K | | | | ' | Q | G | H | F | RShift |
-`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- |LCtrl | fn | LGui |numAlt| LAlt | |Alt Gr| % | App | Ç | RCtrl|
- `----------------------------------' `----------------------------------'
- ,--------------. ,-------------.
- | Esc | num | | Left |Right |
- ,------+-------+------| |------+------+------.
- | | | PgUp | | Up | | |
- |Space | Home |------| |------| End |Space |
- | | | PgDn | | Down | | |
- `---------------------' `--------------------'
-```
-
-### Changer de couche
-
-- Utilisez `num` pour activer/désactiver [la couche numérique](#couche-numérique)
-- Maintenez `fn` pour activer temporairement [les couches numériques et Fn](#couche-fn)
-- Maintenez `numAlt` pour activer temporairement la couche numérique combinée avec `Alt` (facilite l'utilisation des raccourcis tels que `Alt`+`F4`)
-
-### Diodes
-Les diodes de l'ErgoDox EZ (côté droit) sont utilisées de la façon suivante :
-
-- diode de gauche (rouge) : indique l'activation de [la couche numérique](#couche-numérique)
-- diode du milieu (verte) : indique l'activation du [mode CSA](#couche-csa)
-- diode de droite (bleue) : indique le verrouillage majuscules
-
-## Couche CSA
-La couche _CSA_ est la même que la couche de base, pour une utilisation avec un clavier Canadien Multilingue configuré dans le système d'exploitation.
-
-Pour l'activer, appuyez sur `fn`+`$`. La [diode](#diodes) verte indique que la couche CSA est activée.
-
-### Limitations
-Seuls les caractères présents dans le clavier CSA sont parfaitement supportés. De manière générale, il s'agit des caractères suivants :
-
-- toute la couche de base
-- tous les caractères accessibles en `Shift`
-- tous les caractères de la main gauche accessibles en `AltGr` à l'exception du `≠`
-- environ la moitié des caractères de la main droite accessibles en `AltGr` et la moitié des caractères accessibles en `AltGr`+`Shift` (consultez [le fichier source](keymap.c) pour voir les caractères supportés)
-
-En particulier, les caractères suivants sont émulés via le support Unicode (Windows seulement):
-
-- le tiret cadratin (tiret long) : —
-- le tiret demi-cadratin (demi tiret) : –
-- les points de suspension : …
-
-L'implémentation actuelle ne fonctionne pas dans toutes les applications, en particulier les applications MS Office.
-
-Il est probable que l'utilisation de la couche CSA ne fonctionne pas correctement dans certains jeux vidéos.
-
-Cette fonctionnalité a été conçue et testée essentiellment pour Windows (7).
-
-### Détails techniques
-Techniquement, la couche CSA est en réalité composée de 4 couches servant à émuler la couche de base, les appuis sur `Shift` ou `Alt` et la combinaison des deux.
-
-Le changement de couches se fait par des macros afin d'activer ou désactiver plusieurs couches et la touche `Shift` en même temps.
-
-Certains caractères sont également implémentés par des macros, notamment ceux de la couche `Shift` qui n'ont pas besoin de cette touche en CSA, comme les chiffres.
-
-Les caractères Unicode se basent sur une implémentation spécifique et non celle fournie dans QMK — il faudrait sans doute migrer le code. Notez la façon dont ces caractères sont déclarés tels quels dans [le code source](keymap.c) (tableau `unicode_char`).
-
-## Couche numérique
-Couche numérique proche du TM lorsqu'on active `num`, avec les différences suivantes :
-
-- Le clavier numérique est déplacés de 1 vers le haut et vers la droite.
-- Les flèches sont décalées de 1 vers la gauche.
-- Fournit l'accès aux touches `F1` à `F12`, `caps-lock` et `num-lock`.
-
-La couche numérique est indiquée par la [diode](#diodes) de gauche (rouge). Caps-lock est indiqué par la diode de droite (bleue).
-
-La touche `numAlt` de [la couche de base](#couche-de-base) permet d'activer la couche numérique et la touche `Alt` simultanément, afin de faciliter les raccourcis claviers comme `Alt`+`F4`.
-
-```
-,--------------------------------------------------. ,--------------------------------------------------.
-| | F1 | F2 | F3 | F4 | F5 | | | | | | Tab | / | * | - |
-|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| | F6 | F7 | F8 | F9 | F10 | | | | | Home | 7 | 8 | 9 | + |
-|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| | F11 | F12 | | | |------| |------| Up | End | 4 | 5 | 6 | + |
-|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| | | | | | | | | Left | Down | Right| 1 | 2 | 3 |KpEnter |
-`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- | | | | | | | | 0 | 00 | . |Etr/Ctl|
- `----------------------------------' `-----------------------------------'
- ,-------------. ,-------------.
- | | | |n.lock|c.lock|
- ,------|------|------| |------+------+------.
- | | | | | | | |
- | | |------| |------| | |
- | | | | | | | |
- `--------------------' `--------------------'
-```
-
-## Couche Fn
-Activée simultanément avec la couche numérique lorsque l'on maintient la touche `fn`. Comme sur le TM, elle fournit l'accès aux fonctionnalités suivantes :
-
-- `couper`, `copier` et `coller` — attention: ne pas utiliser dans l'explorateur de fichiers.
-- monter/baisser/couper le volume — seulement accessible en main gauche, contrairement au TM.
-- piste précédente/suivante
-- calculatrice, e-mail et page d'accueil du navigateur web
-- `insert`, `power`, `sleep`, `wake`, `print screen`, `scroll-lock` et `pause`
-- ~CSA: (dés)activation de [la couche CSA](#couche-csa) sur `$`
-- RESET: rechargement du firmware avec Teensy-Loader (pour les développeurs)
-
-```
-,--------------------------------------------------. ,--------------------------------------------------.
-| ~CSA | | | | | |Insert| |Insert|Eject |Power |Sleep | Wake |PrtScr|ScrollLk|
-|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| | | | | | |VolUp | | | | | | | | Pause |
-|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| RESET | | | Calc | Mail |Browsr|------| |------| | | | | | |
-|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| | App | cut | copy |paste | Mute |VolDn | | | | | | | | |
-`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- | | | | | | | | | | | |
- `----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | | | | | |
- ,------|------|------| |------+------+------.
- | | | Next | | | | |
- | Mute | play |------| |------| | |
- | | | Prev | | | | |
- `--------------------' `--------------------'
-``` \ No newline at end of file
diff --git a/layouts/community/ergodox/berfarah/keymap.c b/layouts/community/ergodox/berfarah/keymap.c
index 7dc09e7543..3ef58b6025 100644
--- a/layouts/community/ergodox/berfarah/keymap.c
+++ b/layouts/community/ergodox/berfarah/keymap.c
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// left hand
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,VIM_W, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_PGDOWN,KC_END,
+ KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_PGDN,KC_END,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,VIM_B, KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,
@@ -233,7 +233,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case BF_AFK:
if (record->event.pressed) {
layer_on(AFK);
- SEND_STRING(SS_DOWN(X_LCTRL)SS_DOWN(X_LSHIFT)SS_TAP(X_POWER)SS_UP(X_LSHIFT)SS_UP(X_LCTRL));
+ SEND_STRING(SS_DOWN(X_LCTL)SS_DOWN(X_LSFT)SS_TAP(X_PWR)SS_UP(X_LSFT)SS_UP(X_LCTL));
}
return false; break;
case BF_WAKE:
diff --git a/layouts/community/ergodox/bryan/keymap.c b/layouts/community/ergodox/bryan/keymap.c
deleted file mode 100644
index ab301e8922..0000000000
--- a/layouts/community/ergodox/bryan/keymap.c
+++ /dev/null
@@ -1,222 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-enum custom_keycodes {
- PLACEHOLDER = SAFE_RANGE, // can always be here
- EPRM,
- VRSN,
- RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------------. ,--------------------------------------------------------.
- * | = | 1 | 2 | 3 | 4 | 5 | Cmd,Shft,[ | | Cmd,Shft,] | 6 | 7 | 8 | 9 | 0 | - |
- * |--------+------+------+------+------+-------------------| |------------+------+------+------+------+------+--------|
- * | Del | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * |BkSp/Cmd| A | S | D | F | G |------------| |------------| H | J | K | L |; / L2|' / Cmd |
- * |--------+------+------+------+------+------| Hyper | | Meh |------+------+------+------+------+--------|
- * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift |
- * `--------+------+------+------+------+-------------------' `-------------+------+------+------+------+--------'
- * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * |Ctrl/Esc|PgUp| | App | LGui |
- * ,------|------|------| |------+--------+------.
- * | | | PgDn | | Home | | |
- * | Space|Backsp|------| |------| Tab |Enter |
- * | |ace | Esc | | Alt | | |
- * `--------------------' `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, M(2),
- KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
- GUI_T(KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO),
- LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT,
- CTL_T(KC_ESC),KC_PGUP,
- KC_PGDN,
- KC_SPC,KC_BSPC, KC_ESC,
- // right hand
- M(3), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
- MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT,
- KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, TT(SYMB),
-
- ALT_T(KC_APP), KC_LGUI,
- KC_HOME,
- KC_LALT,KC_TAB, KC_ENT
- ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | % | ^ | [ | ] | ~ | | | | <- | 1 | 2 | 3 | \ | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | . | 0 | = | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
- // left hand
- KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
- KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
- KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
- KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
- KC_TRNS, M(1), KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
- KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-// KC_COMM, KC_MINS
-
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | Prev | Next | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | |Brwser|
- * | | |------| |------| |Back |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- break;
- case 1:
- if (record->event.pressed) { // For resetting EEPROM
- eeconfig_init();
- }
- break;
- }
- return MACRO_NONE;
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- // dynamically generate these.
- case EPRM:
- if (record->event.pressed) {
- eeconfig_init();
- }
- return false;
- break;
- case VRSN:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- return false;
- break;
- case RGB_SLD:
- if (record->event.pressed) {
- #ifdef RGBLIGHT_ENABLE
- rgblight_mode(1);
- #endif
- }
- return false;
- break;
- }
- return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- // TODO: Make this relevant to the ErgoDox EZ.
- case 1:
- ergodox_right_led_1_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- default:
- // none
- break;
- }
-
-};
diff --git a/layouts/community/ergodox/choromanski/keymap.c b/layouts/community/ergodox/choromanski/keymap.c
index 01786aab3c..a84935d392 100644
--- a/layouts/community/ergodox/choromanski/keymap.c
+++ b/layouts/community/ergodox/choromanski/keymap.c
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_MUTE,
KC_TRNS, KC_TRNS, KC_MYCM,
- QK_BOOT, KC_SLCK, KC_NLCK, KC_SLSH, KC_ASTR, KC_MINS, KC_TRNS,
+ QK_BOOT, KC_SCRL, KC_NUM, KC_SLSH, KC_ASTR, KC_MINS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, KC_PLUS, KC_ACL2,
KC_TRNS, KC_4, KC_5, KC_6, KC_PLUS, KC_ACL1,
KC_TRNS, KC_TRNS, KC_1, KC_2, KC_3, KC_ENT, KC_ACL0,
@@ -243,7 +243,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LEFT, KC_DOWN, KC_RGHT, KC_COMM, TO(0),
KC_LALT, KC_LCTL,
KC_PGUP,
- KC_PGDOWN, KC_BSPC, KC_DEL
+ KC_PGDN, KC_BSPC, KC_DEL
),
};
diff --git a/layouts/community/ergodox/colemak_code_friendly/keymap.c b/layouts/community/ergodox/colemak_code_friendly/keymap.c
index 6350bd9ee2..1d537b331f 100644
--- a/layouts/community/ergodox/colemak_code_friendly/keymap.c
+++ b/layouts/community/ergodox/colemak_code_friendly/keymap.c
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
KC_RCBR, RALT_T(KC_K), KC_M, KC_COMM, LGUI_T(KC_DOT), RCTL_T(KC_SLSH), KC_RSFT,
KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DEL,
- KC_INS, KC_SLCK,
+ KC_INS, KC_SCRL,
KC_PGUP,
KC_PGDN, KC_SPC, MO(LAYER_RNUM)
),
@@ -153,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
S(KC_H), S(KC_N), S(KC_E), S(KC_I), S(KC_O), S(KC_QUOT),
KC_RCBR, S(KC_K), S(KC_M), S(KC_COMM), S(KC_DOT), S(KC_SLSH), KC_RSFT,
S(KC_LEFT), S(KC_DOWN), S(KC_UP), S(KC_RGHT), S(KC_DEL),
- S(KC_INS), S(KC_SLCK),
+ S(KC_INS), S(KC_SCRL),
S(KC_PGUP),
S(KC_PGDN), S(KC_SPC), KC_CAPS
),
diff --git a/layouts/community/ergodox/colemak_programmer/keymap.c b/layouts/community/ergodox/colemak_programmer/keymap.c
index aa60d8d11b..2f053f9b7a 100644
--- a/layouts/community/ergodox/colemak_programmer/keymap.c
+++ b/layouts/community/ergodox/colemak_programmer/keymap.c
@@ -202,7 +202,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `--------------------' `--------------------'
*/
[4] = LAYOUT_ergodox(
- QK_BOOT, KC_LSFT, KC_LSFT, KC_SYSREQ, KC_PSCR, KC_SLCK, KC_PAUSE,
+ QK_BOOT, KC_LSFT, KC_LSFT, KC_SYRQ, KC_PSCR, KC_SCRL, KC_PAUSE,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HYPR,
@@ -213,7 +213,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS,
// right hand
- KC_NLCK, KC_CALC, KC_PEQL, KC_PSLS, KC_PAST, KC_LSFT, KC_TRNS,
+ KC_NUM, KC_CALC, KC_PEQL, KC_PSLS, KC_PAST, KC_LSFT, KC_TRNS,
KC_TRNS, KC_VOLU, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS,
KC_VOLD, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS,
KC_HYPR, KC_MUTE, KC_P1, KC_P2, KC_P3, KC_PENT, KC_TRNS,
diff --git a/layouts/community/ergodox/common_nighthawk/keymap.c b/layouts/community/ergodox/common_nighthawk/keymap.c
deleted file mode 100644
index 976fb68982..0000000000
--- a/layouts/community/ergodox/common_nighthawk/keymap.c
+++ /dev/null
@@ -1,212 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-//Tap Dance Declarations
-enum {
- TD_U_LBRC = 0,
- TD_I_RBRC,
-};
-
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
- [TD_U_LBRC] = ACTION_TAP_DANCE_DOUBLE(KC_U, KC_LBRC),
- [TD_I_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_RBRC)
-};
-
-//Macro Declarations
-static uint16_t sunds_timer;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | _ | x | x | _ | Esc | Hypr | Home | | End | Hypr | [ | ] | `~ | `~ | Bks |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * |Ctrl/Tab| Q | W | E | R | T | Up | | PgUp | Y | U | I | O | P | Ctrl |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | Cmd/"' | A | S | D | F | G |------| |------| H | J | K | L | ;: |Cmd/Entr|
- * |--------+------+------+------+------+------| Down | | PgDn |------+------+------+------+------+--------|
- * | Shft | Z | X | C | V | B | | | | N | M | ,< | .> | /? | Shft |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | Alt | x | x | x | Left | |Right | Bks | x | x | Alt |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * |Teensy| VolUp| | Play | Del |
- * ,------|------|------| |------+--------+------.
- * | | | VolDn| | Next | | |
- * |Sp/~L1| L2 |------| |------| L2 |'"/~L1|
- * | | | Mute | | Prev | | |
- * `--------------------' `----------------------'
- */
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_UNDS, KC_1, KC_1, KC_UNDS, KC_ESC, ALL_T(KC_NO), KC_HOME,
- CTL_T(KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_UP,
- M(1), KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DOWN,
- KC_LALT, KC_1, KC_1, KC_1, KC_LEFT,
- QK_BOOT, KC_VOLU,
- KC_VOLD,
- LT(SYMB, KC_SPC), TG(MDIA), KC_MUTE,
- // right hand
- KC_END, ALL_T(KC_NO), KC_LBRC, KC_RBRC, KC_GRV, KC_GRV, KC_BSPC,
- KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LCTRL,
- KC_H, KC_J, KC_K, KC_L, KC_SCOLON, GUI_T(KC_ENT),
- KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_RGHT, KC_BSPC, KC_1, KC_1, KC_RALT,
- KC_MPLY, KC_DEL,
- KC_MNXT,
- KC_MPRV, TG(MDIA), LT(SYMB, KC_QUOT)
- ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ! | ^ | [ | ( | { | | | | = | 7 | 8 | 9 | 0 | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | & | $ | ] | ) | } |------| |------| + | 4 | 5 | 6 | * | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | \ | @ | # | % | | | | | | - | 1 | 2 | 3 | / | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | 0 | 0 | . | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
- // left hand
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS, KC_EXLM, KC_CIRC, KC_LBRC, KC_LPRN, KC_LCBR, KC_TRNS,
- KC_TRNS, KC_AMPR, KC_DLR, KC_RBRC, KC_RPRN, KC_RCBR,
- KC_TRNS, KC_BSLS, KC_AT, KC_HASH, KC_PERC, KC_PIPE, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
- KC_TRNS, KC_EQL, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
- KC_PLUS, KC_4, KC_5, KC_6, KC_ASTR, KC_TRNS,
- KC_TRNS, KC_MINS, KC_1, KC_2, KC_3, KC_TRNS, KC_TRNS,
- KC_0, KC_0, KC_DOT, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * |Version | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | | | | | | | | WhDn | WhUp | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | R-Ck | L-Ck | |------| |------| MsLt | MsDn | MsUp | MsRt | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | | | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | |Brwser|
- * | | |------| |------| |Back |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- M(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN1, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WH_U, KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- break;
-
- case 1:
- if (record->event.pressed) {
- sunds_timer = timer_read();
- register_code (KC_LGUI);
- } else {
- if (timer_elapsed (sunds_timer) < TAPPING_TERM) {
- unregister_code (KC_LGUI);
- register_code (KC_LSFT);
- register_code (KC_QUOT);
- unregister_code (KC_QUOT);
- unregister_code (KC_LSFT);
- register_code (KC_LGUI);
- }
- unregister_code (KC_LGUI);
- }
- break;
-
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- // TODO: Make this relevant to the ErgoDox EZ.
- case 1:
- ergodox_right_led_3_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- default:
- // none
- break;
- }
- if (keyboard_report->mods & MOD_BIT(KC_LSFT)) {
- ergodox_right_led_1_on ();
- }
-};
diff --git a/layouts/community/ergodox/common_nighthawk/rules.mk b/layouts/community/ergodox/common_nighthawk/rules.mk
deleted file mode 100644
index 180880c165..0000000000
--- a/layouts/community/ergodox/common_nighthawk/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBPROJECT_DEFAULT = ez
-TAP_DANCE_ENABLE = yes
-
-
diff --git a/layouts/community/ergodox/csharp_dev/keymap.c b/layouts/community/ergodox/csharp_dev/keymap.c
deleted file mode 100644
index f22938429d..0000000000
--- a/layouts/community/ergodox/csharp_dev/keymap.c
+++ /dev/null
@@ -1,235 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-
-#define BASE 0 // default layer
-#define FKEYS 1 // F keys + macros
-
-#define MACRO_PUBLIC 10
-#define MACRO_PRIVATE 11
-
-#define MACRO_STATIC 12
-#define MACRO_CONST 13
-
-#define MACRO_VOID 14
-#define MACRO_VAR 15
-#define MACRO_STRING 16
-
-#define MACRO_INT 17
-#define MACRO_FLOAT 18
-#define MACRO_BOOL 19
-
-#define MACRO_RETURN 20
-#define MACRO_NULL 21
-#define MACRO_BREAK 22
-
-#define MACRO_TODO 23
-#define MACRO_NEW 24
-#define MACRO_PARENTHESE 25
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ( | 1 | 2 | 3 | 4 | 5 | " | | Save | 6 | 7 | 8 | 9 | 0 | [ |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | ) | Q | W | E | R | T |Bkspa | | Del | Y | U | I | O | P | ] |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | { | A | S | D | F | G |------| |------| H | J | K | L | _ | Redo |
- * |--------+------+------+------+------+------| / | | ; |------+------+------+------+------+--------|
- * | } |Z~Alt | X | C | V | B | | | | N | M | ' | ! | ? | Undo |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |Tab~CL| < | > | | | & | | = | + | - | * | L1 |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * |. ~L1 | , | |Home |End~L1|
- * ,------|------|------| |------+------+------.
- * | | | Copy | | UP | | |
- * | Enter| Space|------| |------| Space|Enter |
- * | ~WIN | ~LSFT| Past | | DOWN | ~LSFT| ~WIN |
- * `--------------------' `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_LPRN, KC_1, KC_2, KC_3, KC_4, KC_5, LSFT(KC_QUOTE),
- KC_RPRN, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_BSPACE,
- KC_LCBR, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_RCBR, ALT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_SLASH,
- CTL_T(KC_TAB), LSFT(KC_COMMA),LSFT(KC_DOT),KC_PIPE,KC_AMPR,
- LT(1,KC_DOT), KC_COMM,
- LCTL(KC_C),
- GUI_T(KC_ENTER),SFT_T(KC_SPACE),LCTL(KC_V),
- // right hand
- LCTL(KC_S) , KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRACKET,
- KC_DELETE, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRACKET,
- KC_H, KC_J, KC_K, KC_L, KC_UNDS,LCTL(KC_Y),
- KC_SCOLON,KC_N, KC_M, KC_QUOTE ,KC_EXLM , LSFT(KC_SLASH), LCTL(KC_Z),
- KC_EQUAL,KC_PLUS , KC_MINUS,KC_ASTR , TG(1),
- KC_HOME, LT(1,KC_END),
- KC_UP,
- KC_DOWN,SFT_T(KC_SPACE), GUI_T(KC_ENTER)
- ),
-
-/* Keymap 1: F keys + macros
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ESC | F1 | F2 | F3 | F4 | F5 | ` | | Calc | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Tab |Public|Static|string|int |return| | | |//TODO| | | | | F12 |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | |Privat|Const |var |float |null |------| |------|new | | | | | |
- * |--------+------+------+------+------+------| \ | | ~ |------+------+------+------+------+--------|
- * | | | |void |bool |break;| | | |(); | | | | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | WIN | Alt | | | | PgUp | PgDw | Ins | PtSc | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | Cut | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| Left | Right|
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// FKEYS + MACROS
-[FKEYS] = LAYOUT_ergodox(
- // left hand
- KC_ESCAPE,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_GRAVE,
- KC_TAB,M(MACRO_PUBLIC),M(MACRO_STATIC), M(MACRO_STRING),M(MACRO_INT),M(MACRO_RETURN),KC_TRNS,
- KC_TRNS,M(MACRO_PRIVATE),M(MACRO_CONST), M(MACRO_VAR),M(MACRO_FLOAT),M(MACRO_NULL),
- KC_TRNS,KC_TRNS,KC_TRNS,M(MACRO_VOID),M(MACRO_BOOL),M(MACRO_BREAK),KC_BSLASH,
- KC_TRNS,KC_LGUI,KC_LALT,KC_TRNS,KC_TRNS,
- KC_TRNS,LCTL(KC_X),
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_CALCULATOR, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, M(MACRO_TODO), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12,
- M(MACRO_NEW), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TILD, M(MACRO_PARENTHESE), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_PGUP,KC_PGDOWN, KC_INSERT, KC_PSCREEN, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_LEFT, KC_RIGHT
-),
-
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case MACRO_PUBLIC:
- if (record->event.pressed) {
- return MACRO( T(P), T(U), T(B), T(L), T(I), T(C), T(SPACE),END);
- }
- break;
- case MACRO_PRIVATE:
- if (record->event.pressed) {
- return MACRO( T(P), T(R), T(I), T(V), T(A), T(T), T(E), T(SPACE),END);
- }
- break;
- case MACRO_STATIC:
- if (record->event.pressed) {
- return MACRO( T(S), T(T), T(A), T(T), T(I), T(C), T(SPACE), END);
- }
- break;
- case MACRO_CONST:
- if (record->event.pressed) {
- return MACRO( T(C), T(O), T(N), T(S), T(T), T(SPACE), END);
- }
- break;
- case MACRO_VOID:
- if (record->event.pressed) {
- return MACRO( T(V), T(O), T(I), T(D), T(SPACE), END);
- }
- break;
- case MACRO_VAR:
- if (record->event.pressed) {
- return MACRO( T(V), T(A), T(R), T(SPACE), END);
- }
- break;
- case MACRO_STRING:
- if (record->event.pressed) {
- return MACRO( T(S), T(T), T(R), T(I), T(N), T(G), T(SPACE), END);
- }
- break;
- case MACRO_BOOL:
- if (record->event.pressed) {
- return MACRO( T(B), T(O), T(O), T(L), T(SPACE), END);
- }
- break;
- case MACRO_INT:
- if (record->event.pressed) {
- return MACRO( T(I), T(N), T(T), T(SPACE), END);
- }
- break;
- case MACRO_FLOAT:
- if (record->event.pressed) {
- return MACRO( T(F), T(L), T(O), T(A),T(T),T(SPACE), END);
- }
- break;
- case MACRO_RETURN:
- if (record->event.pressed) {
- return MACRO( T(R), T(E), T(T), T(U),T(R),T(N), END);
- }
- break;
- case MACRO_NULL:
- if (record->event.pressed) {
- return MACRO( T(N), T(U), T(L), T(L), END);
- }
- case MACRO_BREAK:
- if (record->event.pressed) {
- return MACRO( T(B), T(R), T(E), T(A), T(K), T(SCOLON), END);
- }
- break;
- case MACRO_TODO:
- if (record->event.pressed) {
- return MACRO( T(SLASH), T(SLASH), D(LSHIFT) ,T(T), T(O), T(D), T(O),U(LSHIFT), T(SPACE),END);
- }
- break;
- case MACRO_NEW:
- if (record->event.pressed) {
- return MACRO( T(N), T(E), T(W), T(SPACE), END);
- }
- break;
- case MACRO_PARENTHESE:
- if (record->event.pressed) {
- return MACRO( D(LSHIFT),T(9), T(0),U(LSHIFT), T(SCOLON), END);
- }
- break;
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- // TODO: Make this relevant to the ErgoDox EZ.
- case 1:
- ergodox_right_led_1_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- default:
- // none
- break;
- }
-
-};
diff --git a/layouts/community/ergodox/csharp_dev/readme.md b/layouts/community/ergodox/csharp_dev/readme.md
deleted file mode 100644
index 980480d626..0000000000
--- a/layouts/community/ergodox/csharp_dev/readme.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# ErgoDox EZ C# Developer configuration
-
-## Changelog
-
-* Feb 12, 2016 (V1):
- * First version commit
-* Mar 20, 2016 (V2):
- * Removed "Classic QWERTY" layer, inverted GUI and SHIFT on Hold for Space and Enter
-
-## About
-This layout was conceived in an attempt to optimise keyboard layout for developers (C# more specifically, but it can work with most of other languages), and limit the keys required to perform the most frequent actions.
-
-I came to the realization that my main tool as a developer, the qwerty keyboard was something that did not evolved at its core in almost 150 years.
-There are a lot of reasons to this, and it would be a massive entreprise to change a standard so strongly anchored, but I wanted to give it a try and see how would look an input device dedicated to developers, more specifically a C# developer in my case.
-The biggest flaw in standard QWERTY keyboards was that I always needed to perform key combination to access commonly used characters or actions. Think about it a minute, how many times a day do you press a modifier key such as Ctrl or Shift, it's insane and could be so easily optimized to require only one key press.
-
-Then I came across the ErgoDox EZ project, that allowed a full customization of its firmware, and a unique 2 parts design.
-
-![CSharpDev](https://i.imgur.com/PkNqi7V.png)
-![CSharpDev](https://i.imgur.com/0IcMgMf.png)
-
-## Layout design principles
-* No key combination required for the most common input characters ( (),[],{},<> ... )
-* No key combination required for the most common actions (copy/paste/undo/save)
-* Regroup characters by usage ( + - * = ...)
-* Easy access to the most commonly used characters: ; / " . ,
-* Preregistered macro for the most common C# langage instructions: public / private / string / int / float ...
-
-## Why is it specific to C Sharp
-I defined the characters priority based on their usage in C# language, most of this characters are also used in other coding languages but it may require some tweaking.
-For example there is no direct access to ~ or $ keys which can be very common in some languages.
-Note it is also specific to Windows environement as the shortcut used in action keys would not work on Mac Os
-
-## In usage
-It was relatively easy to get used to the layout, but it's hard for me to define how easy it was as I was getting used to a blank Ergodox keyboard at the same time.
-Still it's extremely satisfying to Save your file with just one easily accessible key or to have one big key to end your code line ( ; )
-
-## Improvements
-This layout was shared after a bunch of iterations and only once I was happy with it.
-Still there are many way to improve or iterate on this:
-* Make it language agnostic
-* Check and compile language's keyboard's heatmaps to statistically define keys priority (e.g. https://dzone.com/articles/most-pressed-keys-various )
-* QWERTY is still not the most efficient typing layout, I would like to create a Dvorak based similar layout in a near futur
-
-## Issues
-One of the issues encountered while creating this layout was that I did not find a way to have a key to send a modifier on hold, and a key combination while pressed (e.g. I can't set a Key to do Save (Ctrl + S) when pressed and Shift modifier when hold )
-
-
diff --git a/layouts/community/ergodox/dave/keymap.c b/layouts/community/ergodox/dave/keymap.c
index c54e50ba98..19ab66545c 100644
--- a/layouts/community/ergodox/dave/keymap.c
+++ b/layouts/community/ergodox/dave/keymap.c
@@ -34,10 +34,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// left hand
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y,
- KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_H,
CTL_T(KC_GRV),KC_NUBS,KC_NO, KC_NO, KC_LALT,
- KC_PSCREEN, KC_PSCREEN,
+ KC_PSCR, KC_PSCR,
TO(PROG),
KC_SPC, MO(NAVI), KC_LGUI,
// right hand
diff --git a/layouts/community/ergodox/deadcyclo/keymap.c b/layouts/community/ergodox/deadcyclo/keymap.c
index 76f5279257..6edf8b00f6 100644
--- a/layouts/community/ergodox/deadcyclo/keymap.c
+++ b/layouts/community/ergodox/deadcyclo/keymap.c
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TG(MDIA), KC_Y, KC_U, KC_I, KC_O, KC_P, LT(SYMB, KC_BSLS),
KC_H, KC_J, KC_K, KC_L, KC_SCLN,CTL_T(KC_QUOT),
MEH_T(KC_NO),KC_N, KC_M, KC_COMM,LT(MDIA, KC_DOT), LT(UNI2, KC_SLSH), KC_RSFT,
- KC_LALT, KC_RALT,KC_LEAD,LCTL(LSFT(KC_U)), LT(SYMB,KC_TILD),
+ KC_LALT, KC_RALT,QK_LEAD,LCTL(LSFT(KC_U)), LT(SYMB,KC_TILD),
KC_PGUP, KC_INS,
KC_PGDN,
KC_RBRC,KC_BSPC, KC_ENT
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS,
RGB_HUD, RGB_HUI,
KC_TRNS,
- EEP_RST, KC_DEL, KC_TRNS
+ EE_CLR, KC_DEL, KC_TRNS
),
/* Keymap 2: Media, mouse and navigation
*
diff --git a/layouts/community/ergodox/drashna/config.h b/layouts/community/ergodox/drashna/config.h
index d669f27298..aa1d05779b 100644
--- a/layouts/community/ergodox/drashna/config.h
+++ b/layouts/community/ergodox/drashna/config.h
@@ -28,7 +28,7 @@
#endif // RGBLIGHT_ENABLE
#undef PRODUCT
-#define PRODUCT DrashnaDox - Hacked ErgoDox EZ Hybrid Monstrosity
+#define PRODUCT "DrashnaDox - Hacked ErgoDox EZ Hybrid Monstrosity"
#undef DEBOUNCE
#define DEBOUNCE 20
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 1f07d1b6c7..c9c63168f6 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, _________________RAISE_L1__________________, _______, _______, _________________RAISE_R1__________________, KC_BSLS,
_______, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_QUOT,
_______, _________________RAISE_L3__________________, _______, _______, _________________RAISE_R3__________________, KC_PSCR,
- _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_SLCK,
+ _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_SCRL,
_______, _______, _______, _______,
_______, _______,
_______, _______, _______, _______, _______, _______
diff --git a/layouts/community/ergodox/dvorak_emacs/keymap.c b/layouts/community/ergodox/dvorak_emacs/keymap.c
index 14c592f27f..5c310593be 100644
--- a/layouts/community/ergodox/dvorak_emacs/keymap.c
+++ b/layouts/community/ergodox/dvorak_emacs/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT_ergodox(
// left hand
KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
- KC_TILD, KC_QUOTE, KC_COMM,KC_DOT, KC_P, KC_Y, KC_LBRACKET,
+ KC_TILD, KC_QUOTE, KC_COMM,KC_DOT, KC_P, KC_Y, KC_LBRC,
KC_TAB, KC_A, KC_O, KC_E, SFT_T(KC_U), LT(AUX, KC_I),
SFT_T(KC_LBRC), KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_LGUI,
KC_NO, KC_NO, KC_NO, KC_NO, MO(AUX),
@@ -66,10 +66,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
CTL_T(KC_BSPC), ALT_T(KC_DEL), KC_PGDN,
// right hand
KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL,
- KC_RBRACKET, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLASH,
+ KC_RBRC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLASH,
LT(AUX, KC_D), SFT_T(KC_H), KC_T, KC_N, KC_S, KC_MINUS,
KC_LGUI, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_T(KC_RBRC),
- MO(AUX), KC_NO, KC_NO, KC_BSLASH, KC_NO,
+ MO(AUX), KC_NO, KC_NO, KC_BSLS, KC_NO,
KC_LEFT, KC_RIGHT,
KC_UP,
KC_DOWN, ALT_T(KC_ENT), CTL_T(KC_SPC)
diff --git a/layouts/community/ergodox/dvorak_intl_squisher/keymap.c b/layouts/community/ergodox/dvorak_intl_squisher/keymap.c
index 2d3ec3806b..5d998a110b 100644
--- a/layouts/community/ergodox/dvorak_intl_squisher/keymap.c
+++ b/layouts/community/ergodox/dvorak_intl_squisher/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
MEH_T(KC_NO),KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_RSFT,
KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, TT(SYMB),
- TG(2), KC_PSCREEN,
+ TG(2), KC_PSCR,
KC_PGUP,
KC_PGDN,RALT(KC_RSFT), KC_ENT
),
diff --git a/layouts/community/ergodox/dvorak_programmer/README.md b/layouts/community/ergodox/dvorak_programmer/README.md
deleted file mode 100644
index 36722469fe..0000000000
--- a/layouts/community/ergodox/dvorak_programmer/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-Dvorak Programmer Layout
-========================
-
-This is a dvorak-only layout. The overall philosophy is that the left hand contains a number of layer-switching shortcuts, and the right hand key codes vary based on the layer selected.
-
-Layers
-------
-
-* BASE: this is where you type.
-* SHELL_NAV: hold down the Tab key to access shell/terminal navigation shorcuts such as forward/backward word, history, Ctrl+C, screen tab movement.
-* KEY_NAV: arrow key movement with backward/forward word support, and copy/paste.
-* KEY_SEL: same as above, but every movement shift-selects.
-* NUMBER: keypad layer.
-* SYMBOL: all the symbols.
-* BRACKET: special brackets-only layer for programming. Activated by pressing left capslock (OSL)
-* SHORTCUTS: sends Hyper keys for Autohotkey to interpret. I use this to switch between specific apps.
-* MOUSE: use mouse keys
-
-Updates
--------
-
-2017/02/10:
-* Made left shift an MO for SHELL_NAV, and symbol+right shift CAPSLOCK. Made all modifiers OSM.
-
-2017/01/28:
-* Made the capslock key a dual momentary layer activation for BRACKETS and SHELL_NAV. One keypress held down for BRACKETS, one keypress, released and then held down for SHELL_NAV
-
-2017/01/22:
-* Made brackets toggle an OSL on the left capslock
-* Added SHELL_LAYER
-
-2016/12/10:
-* toggle for brackets layer is now on left thumb cluster.
-
-2016/11/05:
-* removed brackets anywhere but in brackets layer
-* added mouse layer back in
-* put semicolon-newline and end-newline on symbol layer
-* replaced all HYPR with MEH, added more shortcut keys \ No newline at end of file
diff --git a/layouts/community/ergodox/dvorak_programmer/keymap.c b/layouts/community/ergodox/dvorak_programmer/keymap.c
deleted file mode 100644
index a8acee119a..0000000000
--- a/layouts/community/ergodox/dvorak_programmer/keymap.c
+++ /dev/null
@@ -1,406 +0,0 @@
-
-#include QMK_KEYBOARD_H
-#include "led.h"
-#include "debug.h"
-#include "action_layer.h"
-#include "action_code.h"
-
-#define BASE 0 // default layer
-#define SHELL_NAV 2
-#define KEY_NAV 3 // key navigation layer
-#define KEY_SEL 4 // key selection layer
-#define NUMBER 5 // number layer
-#define SYMBOL 6
-#define BRACKETS 7
-#define SHORTCUTS 8
-#define MOUSE 9
-
-// macros
-#define MC_COPY_LINE 0
-#define MC_CUT_LINE 1
-#define MC_PASTE_LINE 2
-#define MC_NEW_SEARCH_TAB 3
-#define SCREEN_TAB_LEFT 4
-#define SCREEN_TAB_RIGHT 5
-#define SCREEN_NEW_TAB 6
-#define SWITCH_NDS 7
-#define SCREEN_COPY_MODE 8
-#define SCREEN_PASTE 9
-#define OPEN_CLOSE_PAREN 10
-#define OPEN_CLOSE_BRACKET 11
-#define OPEN_CLOSE_CURLY 12
-#define OPEN_CLOSE_SINGLE_QUOTE 13
-#define OPEN_CLOSE_DOUBLE_QUOTE 14
-#define SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND 15
-#define SEMICOLON_NEWLINE 16
-#define END_NEWLINE 17
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-// base layer
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
- KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, MO(KEY_SEL),
- MO(BRACKETS), KC_A, KC_O, KC_E, KC_U, KC_I,
- MO(SHELL_NAV), KC_SCLN, KC_Q, KC_J, KC_K, KC_X, MO(KEY_NAV),
- OSL(SHORTCUTS),OSM(MOD_LCTL), OSM(MOD_LALT),OSL(SYMBOL),MO(NUMBER),
- // thumb cluster
- OSM(MOD_LSFT), RCTL(KC_S),
- RCTL(KC_DEL),
- KC_BSPC,RCTL(KC_BSPC),KC_DEL,
- // right hand
- KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSLS,
- KC_PGUP, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
- KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
- KC_PGDN, KC_B, KC_M, KC_W, KC_V, KC_Z, OSM(MOD_LSFT),
- // lower keys - browser tab control
- RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), RCTL(KC_T), LALT(KC_LEFT), RCTL(KC_W),
- // thumb cluster
- KC_HOME,KC_END,
- KC_UP,
- KC_DOWN,KC_ENT, KC_SPC
- ),
-
-
-
-
-// shell navigation layer
-[SHELL_NAV] = LAYOUT_ergodox(
- // left hand
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- // bottom row
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- // thumb cluster
- KC_TRNS,KC_TRNS,
- LALT(KC_D),
- KC_TRNS,RCTL(KC_W),KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- RCTL(KC_L), RCTL(KC_W), KC_HOME, KC_UP, KC_END, LALT(KC_D), RCTL(KC_R),
- LALT(KC_B), KC_LEFT, KC_DOWN, KC_RIGHT, LALT(KC_F), LALT(KC_DOT),
- RCTL(KC_C), RCTL(KC_U), M(SCREEN_COPY_MODE), M(SCREEN_PASTE), MEH(KC_V), RCTL(KC_K), M(SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND),
- // bottom row
- M(SCREEN_TAB_LEFT), M(SCREEN_TAB_RIGHT), M(SCREEN_NEW_TAB), KC_TRNS, KC_TRNS,
- // thumb cluster
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-
-// key navigation layer
-[KEY_NAV] = LAYOUT_ergodox(
- // left hand
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- // bottom row
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- // thumb cluster
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_PGDN, KC_HOME, KC_UP, KC_END, KC_PGUP, M(MC_COPY_LINE),
- RCTL(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, RCTL(KC_RIGHT), M(MC_CUT_LINE),
- KC_TRNS, KC_TRNS, RCTL(KC_C), RCTL(KC_X), RCTL(KC_V), KC_TRNS, M(MC_PASTE_LINE),
- // bottom row
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- // thumb cluster
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-// key selection layer
-[KEY_SEL] = LAYOUT_ergodox(
- // left hand
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- // bottom row
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- // thumb cluster
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- RSFT(KC_PGUP), RSFT(KC_PGDN), RSFT(KC_HOME), RSFT(KC_UP), RSFT(KC_END), RSFT(KC_PGUP), M(MC_COPY_LINE),
- RSFT(RCTL(KC_LEFT)), RSFT(KC_LEFT), RSFT(KC_DOWN), RSFT(KC_RIGHT), RSFT(RCTL(KC_RIGHT)), M(MC_CUT_LINE),
- RSFT(KC_PGDN), KC_TRNS, RCTL(KC_C), RCTL(KC_X), RCTL(KC_V), KC_TRNS, M(MC_PASTE_LINE),
- // bottom row
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- // thumb cluster
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-// number layer
-[NUMBER] = LAYOUT_ergodox(
- // left hand
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- // bottom row
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- // thumb cluster
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_PLUS, KC_7, KC_8, KC_9, KC_ASTR, KC_TRNS,
- KC_MINS, KC_4, KC_5, KC_6, KC_SLSH, KC_TRNS,
- KC_TRNS, KC_EQUAL, KC_1, KC_2, KC_3, KC_COLN, KC_TRNS,
- // bottom row
- KC_0, KC_DOT, KC_COMMA, KC_TRNS, KC_TRNS,
- // thumb cluster
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-
-[SYMBOL] = LAYOUT_ergodox(
- // left hand
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_PLUS, KC_AMPR, KC_ASTR, KC_GRAVE,KC_TILD, KC_TRNS,
- KC_MINS, KC_DLR, KC_PERC, KC_CIRC, KC_PIPE, KC_TRNS,
- KC_TRNS, KC_EQUAL,KC_EXLM, KC_AT, KC_HASH, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- M(SEMICOLON_NEWLINE), M(END_NEWLINE),
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-[BRACKETS] = LAYOUT_ergodox(
- // left hand
- KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,M(OPEN_CLOSE_CURLY), M(OPEN_CLOSE_PAREN),M(OPEN_CLOSE_BRACKET), KC_TRNS,KC_TRNS,
- KC_TRNS,KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS, KC_LCBR, KC_RCBR, KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS, KC_TRNS, M(OPEN_CLOSE_BRACKET),M(OPEN_CLOSE_PAREN),M(OPEN_CLOSE_CURLY),KC_TRNS,KC_TRNS,
- KC_TRNS, KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-[SHORTCUTS] = LAYOUT_ergodox(
- // left hand
- KC_NO, MEH(KC_F1), MEH(KC_F2), MEH(KC_F3), MEH(KC_F4), MEH(KC_F5), MEH(KC_F6),
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- MEH(KC_0),MEH(KC_1),
- MEH(KC_2),
- MEH(KC_3),MEH(KC_4),MEH(KC_5),
- // right hand
- MEH(KC_F7), MEH(KC_F8), MEH(KC_F9), MEH(KC_F10), MEH(KC_F11), MEH(KC_F12), M(SWITCH_NDS),
- KC_TRNS, MEH(KC_A), MEH(KC_B), MEH(KC_C), MEH(KC_D), MEH(KC_E), MEH(KC_F),
- MEH(KC_G), MEH(KC_H), MEH(KC_I), MEH(KC_J), MEH(KC_K), MEH(KC_L),
- KC_TRNS, MEH(KC_M), MEH(KC_N), MEH(KC_O), MEH(KC_P), MEH(KC_Q), KC_CAPSLOCK,
- MEH(KC_S), MEH(KC_T), MEH(KC_U), MEH(KC_V), MEH(KC_X),
- MEH(KC_6), MEH(KC_7),
- MEH(KC_8),
- MEH(KC_9), MEH(KC_Y), MEH(KC_Z)
-),
-
-
-[MOUSE] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_BTN1, KC_BTN2
-),
-
-};
-
-
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case MC_COPY_LINE:
- if (record->event.pressed) {
- return MACRO( T(HOME), D(LSFT), T(END), U(LSFT), D(LCTL), T(C), U(LCTL), END);
- }
- break;
- case MC_CUT_LINE:
- if (record->event.pressed) {
- return MACRO( T(HOME), D(LSFT), T(END), U(LSFT), D(LCTL), T(X), U(LCTL), END);
- }
- break;
- case MC_PASTE_LINE:
- if (record->event.pressed) {
- return MACRO( T(END), T(ENTER), D(LCTL), T(V), U(LCTL), END);
- }
- break;
- case MC_NEW_SEARCH_TAB:
- if (record->event.pressed) {
- return MACRO( D(LCTL), T(T), T(K), U(LCTL), END);
- }
- break;
- case SCREEN_TAB_LEFT:
- if (record->event.pressed) {
- return MACRO( D(LCTL), T(A), U(LCTL), T(P), END);
- }
- break;
- case SCREEN_TAB_RIGHT:
- if (record->event.pressed) {
- return MACRO( D(LCTL), T(A), U(LCTL), T(N), END);
- }
- break;
- case SCREEN_NEW_TAB:
- if (record->event.pressed) {
- return MACRO( D(LCTL), T(A), U(LCTL), T(C), END);
- }
- break;
- case SCREEN_COPY_MODE:
- if (record->event.pressed) {
- return MACRO( D(LCTL), T(A), U(LCTL), T(ESC), END);
- }
- break;
- case SCREEN_PASTE:
- if (record->event.pressed) {
- return MACRO( D(LCTL), T(A), U(LCTL), T(RBRC), END);
- }
- break;
- case SWITCH_NDS:
- if (record->event.pressed) {
- return MACRO( D(LSFT), T(F11), U(LSFT), W(255), D(LALT), T(TAB), U(LALT), END);
- }
- break;
- case OPEN_CLOSE_PAREN:
- if (record->event.pressed) {
- return MACRO( D(LSFT), T(9), T(0), U(LSFT), T(LEFT), END);
- }
- break;
- case OPEN_CLOSE_BRACKET:
- if (record->event.pressed) {
- return MACRO( T(LBRC), T(RBRC), T(LEFT), END);
- }
- break;
- case OPEN_CLOSE_CURLY:
- if (record->event.pressed) {
- return MACRO( D(LSFT), T(LBRC), T(RBRC), U(LSFT), T(LEFT), END);
- }
- break;
- case OPEN_CLOSE_SINGLE_QUOTE:
- if (record->event.pressed) {
- return MACRO( T(QUOT), T(QUOT), T(LEFT), END);
- }
- break;
- case OPEN_CLOSE_DOUBLE_QUOTE:
- if (record->event.pressed) {
- return MACRO( D(LSFT), T(QUOT), T(QUOT), U(LSFT), T(LEFT), END);
- }
- break;
- case SHELL_RECALL_LAST_ARG_REMOVE_FIRST_COMMAND:
- if (record->event.pressed) {
- return MACRO( T(UP), T(HOME), D(LALT), T(D), U(LALT), END);
- }
- break;
- case SEMICOLON_NEWLINE:
- if (record->event.pressed) {
- return MACRO( T(END), T(SCLN), T(ENTER), END);
- }
- break;
- case END_NEWLINE:
- if (record->event.pressed) {
- return MACRO( T(END), T(ENTER), END);
- }
- break;
-
-
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
- return;
-};
-
-void led_set_user(uint8_t usb_led) {
- if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
- ergodox_right_led_1_on();
- } else {
- ergodox_right_led_1_off();
- }
-}
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- case NUMBER:
- case SYMBOL:
- case BRACKETS:
- //case SHELL_LAYER:
- ergodox_right_led_2_on();
- break;
- case KEY_NAV:
- case KEY_SEL:
- ergodox_right_led_3_on();
- break;
- case SHORTCUTS:
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
- break;
- default:
- // none
- break;
- }
- return;
-};
diff --git a/layouts/community/ergodox/dvorak_programmer/rules.mk b/layouts/community/ergodox/dvorak_programmer/rules.mk
deleted file mode 100644
index a3ac8ed6ff..0000000000
--- a/layouts/community/ergodox/dvorak_programmer/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-COMMAND_ENABLE=no
-SLEEP_LED_ENABLE=no
-FORCE_NKRO = yes
-DEBUG_ENABLE = no
-CONSOLE_ENABLE = no
-TAP_DANCE_ENABLE = no
-MOUSEKEY_ENABLE = yes
diff --git a/layouts/community/ergodox/dvorak_programmer_swe/keymap.c b/layouts/community/ergodox/dvorak_programmer_swe/keymap.c
deleted file mode 100644
index 2578547f17..0000000000
--- a/layouts/community/ergodox/dvorak_programmer_swe/keymap.c
+++ /dev/null
@@ -1,328 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "keymap_swedish.h"
-//#include "keymap_nordic.h"
-//#include "keymap_norwegian.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // mouse keys
-#define DEVL 3 // dev keys
-
-#define MACRO_PUBLIC 10
-#define MACRO_PRIVATE 11
-#define MACRO_PROT 12
-
-#define MACRO_SHARED 13
-#define MACRO_CONST 14
-#define MACRO_DIM 15
-#define MACRO_STRING 16
-#define MACRO_INT 17
-#define MACRO_DEC 18
-#define MACRO_BOOL 19
-
-#define MACRO_RETURN 20
-#define MACRO_NOTHING 21
-#define MACRO_TODO 22
-
-#define MACRO_SAVE 24
-#define MACRO_BUILD 25
-#define MACRO_DEBUG 26
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | L3 | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | \ |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Del | - | , | . | P | Y | LT1 | | LT1 | F | G | C | R | L | Å |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | WIN | A | O | E | U | I |------| |------| D | H | T | N | S | Ä |
- * |--------+------+------+------+------+------| LT2 | | LT2 |------+------+------+------+------+--------|
- * | LShift | Ö | Q | J | K | X | | | | B | M | W | V |Z/Ctrl| RShift |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | CTRL | L1 |Alt | Left | Right| | Up | Down | [ | ] | ~L1 |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | App | LGui | | AltShf|Ctrl/Esc|
- * ,------|------|------| |------+--------+------.
- * | | | Home | | PgUp | | |
- * | Space|Backsp|------| |------| Tab |Enter |
- * | |ace | End | | PgDn | | |
- * `--------------------' `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- MO(DEVL), KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
- KC_DEL, SE_MINS, KC_COMM, KC_DOT, KC_P, KC_Y, TG(SYMB),
- KC_LGUI, KC_A, KC_O, KC_E, KC_U, KC_I,
- KC_LSFT, CTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, TG(MDIA),
- CTL_T(KC_NO), MO(SYMB), KC_LALT, KC_LEFT,KC_RGHT,
- ALT_T(KC_APP), KC_LGUI,
- KC_HOME,
- KC_SPC,KC_BSPC,KC_END,
- // right hand
- KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLASH,
- TG(1), KC_F, KC_G, KC_C, KC_R, KC_L, SE_ARNG,
- KC_D, KC_H, KC_T, KC_N, KC_S, SE_ADIA,
- TG(MDIA),KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_RSFT,
- KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, TT(SYMB),
- LALT(KC_LSFT), CTL_T(KC_ESC),
- KC_PGUP,
- KC_PGDN,KC_TAB, KC_ENT
- ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | @ | { | } | [ | ] | | | | < | 7 | 8 | 9 | * | F12 |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | # | ( | ) | \ | / |------| |------| > | 4 | 5 | 6 | + | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | ~ | UND | CUT | COP | PAS | | | | ? | 1 | 2 | 3 | % | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | . | 0 | = | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
- // left hand
- M(0), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS, SE_AT, ALGR(KC_7), ALGR(KC_0), SE_LBRC, SE_RBRC, KC_TRNS,
- KC_TRNS, KC_HASH, SE_LPRN, SE_RPRN, ALGR(KC_MINS), SE_SLSH,
- KC_TRNS, SE_TILD, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, SE_LABK, KC_7, KC_8, KC_9, KC_KP_ASTERISK, KC_F12,
- SE_RABK, KC_4, KC_5, KC_6, KC_KP_PLUS, KC_TRNS,
- KC_TRNS, SE_QUES, KC_1, KC_2, KC_3, LSFT(KC_5), KC_TRNS,
- KC_DOT,KC_0, LSFT(KC_0), KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | | | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | Lclk | Rclk | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 3: Developer keys in vb.net
- * shortened in layout beneth, for example int-> integer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | Save |Build |Debug |PrtScr| $ | | | | bool | int |string| dec | Todo | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | ´ | ' | | | | £ |------| |------| priv | publ |shared| prot | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | £ | | | | const| dim |return|nothin| | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[DEVL] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, M(MACRO_SAVE), M(MACRO_BUILD), M(MACRO_DEBUG), KC_PSCR, ALGR(KC_4), KC_TRNS,
- KC_TRNS, SE_ACUT, SE_QUOT, SE_PIPE, KC_TRNS, ALGR(KC_3),
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ALGR(KC_5), KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, M(MACRO_BOOL), M(MACRO_INT), M(MACRO_STRING), M(MACRO_DEC), M(MACRO_TODO), KC_TRNS,
- M(MACRO_PRIVATE), M(MACRO_PUBLIC), M(MACRO_SHARED), M(MACRO_PROT), KC_TRNS, KC_TRNS,
- KC_TRNS, M(MACRO_CONST), M(MACRO_DIM), M(MACRO_RETURN), M(MACRO_NOTHING), KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- register_code(KC_RSFT);
- } else {
- unregister_code(KC_RSFT);
- }
- break;
- case MACRO_PUBLIC:
- if (record->event.pressed) {
- return MACRO( T(P), T(U), T(B), T(L), T(I), T(C), T(SPACE),END);
- }
- break;
- case MACRO_PRIVATE:
- if (record->event.pressed) {
- return MACRO( T(P), T(R), T(I), T(V), T(A), T(T), T(E), T(SPACE),END);
- }
- break;
- case MACRO_PROT:
- if (record->event.pressed) {
- return MACRO( T(P), T(R), T(O), T(T), T(E), T(C), T(T), T(E), T(D), T(SPACE),END);
- }
- break;
- case MACRO_SHARED:
- if (record->event.pressed) {
- return MACRO( T(S), T(H), T(A), T(R), T(E), T(D), T(SPACE), END);
- }
- break;
- case MACRO_CONST:
- if (record->event.pressed) {
- return MACRO( T(C), T(O), T(N), T(S), T(T), T(SPACE), END);
- }
- break;
- case MACRO_DIM:
- if (record->event.pressed) {
- return MACRO( T(D), T(I), T(M), T(SPACE), END);
- }
- break;
- case MACRO_STRING:
- if (record->event.pressed) {
- return MACRO( T(S), T(T), T(R), T(I), T(N), T(G), T(SPACE), END);
- }
- break;
- case MACRO_BOOL:
- if (record->event.pressed) {
- return MACRO( T(B), T(O), T(O), T(L), T(E), T(A), T(N), T(SPACE), END);
- }
- break;
- case MACRO_INT:
- if (record->event.pressed) {
- return MACRO( T(I), T(N), T(T), T(SPACE), END);
- }
- break;
- case MACRO_DEC:
- if (record->event.pressed) {
- return MACRO( T(D), T(E), T(C), T(I), T(M), T(A), T(L), T(SPACE), END);
- }
- break;
- case MACRO_RETURN:
- if (record->event.pressed) {
- return MACRO( T(R), T(E), T(T), T(U),T(R),T(N), T(SPACE), END);
- }
- break;
- case MACRO_NOTHING:
- if (record->event.pressed) {
- return MACRO( T(N), T(O), T(T), T(H), T(I), T(N), T(G), T(SPACE), END);
- }
- case MACRO_TODO:
- if (record->event.pressed) {
- return MACRO( KC_BSLASH, D(LSHIFT) ,T(T), T(O), T(D), T(O), KC_DOT, U(LSHIFT), T(SPACE),END);
- }
- break;
- case MACRO_SAVE:
- if (record->event.pressed) {
- return MACRO( D(LCTL) ,T(S), U(LCTL),END);
- }
- break;
- case MACRO_BUILD:
- if (record->event.pressed) {
- return MACRO( D(LCTL), D(LSHIFT) ,T(B), U(LSHIFT), U(LCTL),END);
- }
- break;
- case MACRO_DEBUG:
- if (record->event.pressed) {
- return MACRO( KC_F5 ,END);
- }
- break;
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- // TODO: Make this relevant to the ErgoDox EZ.
- case 1:
- ergodox_right_led_1_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- default:
- // none
- break;
- }
-
-};
diff --git a/layouts/community/ergodox/dvorak_programmer_swe/readme.md b/layouts/community/ergodox/dvorak_programmer_swe/readme.md
deleted file mode 100644
index 78d872ab5b..0000000000
--- a/layouts/community/ergodox/dvorak_programmer_swe/readme.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# ErgoDox EZ Dvorak Programmer SWEDISH
-
-Dvorak layout adjusted for a suitable programmer layout and swedish special characters added:
-
-* åäö characters added
-* Layout for common vb.net keywords
-* Common Visual Studio commands like Save, Build, Debug
-
-TODO:
-
-* (Layer 4 is qwerty (for easier gaming & less fortunate keyboard users)) Like this idea, will add it later on
-
-Known issues:
-
-* Keymap 2 modifier has not gotten its place yet..
-
-
-## Changelog
-* 2019-03-11
- * Added currency $, £, € to keymap 3
- * Added pipe character to keymap 3
- * Added the acute accent character to keymap 3
-
-* 2019-03-08
- * Switched position on Alt and Alt-shift
- * Added tilde character to symbol layer
- * Added Print Screen to keymap 3
- * Added ' (NO_QUOT) to keymap 3
- * Added how to install help in this readme
-
-* 2017-05-16
- * Initial release
-
-
-# How to install - reminder
-0. Docs: https://docs.qmk.fm/#/newbs
-1. Download flashing tool - teensy (from ergodox-ez visual designer)
-2. Setup build environment: https://docs.qmk.fm/#/newbs_getting_started
-
-QUICK HOWTO WSL: (this is not supported anymore it seems, why?)
-The Toolchain setup is done through the Windows Subsystem for Linux, and the process is fully automated. If you want to do everything manually, there are no other instructions than the scripts themselves, but you can always open issues and ask for more information.
-Open "Bash On Ubuntu On Windows" from the start menu.
-Go to the directory where you cloned qmk_firmware. Note that the paths start with /mnt/ in the WSL, so you have to write for example cd /mnt/c/path/to/qmk_firmware.
-Run util/wsl_install.sh and follow the on-screen instructions.
-Close the Bash command window, and re-open it.
-You are ready to compile and flash the firmware!
-
-3. Build the firmware with:
-Run the following in the root qmk folder:
-make KEYBOARD=ergodox_ez KEYMAP=dvorak_programmer_swe
-
-
-# Author
-Christian Westerlund
-cwesterlund @ github
-
-Thanks to the author of keymap csharp_dev for inspiration! \ No newline at end of file
diff --git a/layouts/community/ergodox/dvorak_spanish/keymap.c b/layouts/community/ergodox/dvorak_spanish/keymap.c
deleted file mode 100644
index 805abb0b77..0000000000
--- a/layouts/community/ergodox/dvorak_spanish/keymap.c
+++ /dev/null
@@ -1,279 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-
-/******************************************************************************************
- * SPANISH DVORAK LAYOUT (see http://djelibeibi.unex.es/dvorak/)
- * Layer 1: auxiliary keys
- * Layer 2: full qwerty layout
- ******************************************************************************************
- * IMPORTANT: Software layout must be set to SPANISH QWERTY to work properly
- *****************************************************************************************/
-
-// LAYERS
-#define BASE 0 // dvorak layout (default)
-#define AUX 1 // auxiliary keys
-#define QWERTY 2 // qwerty layout
-
-// MACROS
-#define OBRACE 0 // key { or shift
-#define CBRACE 1 // key } or shift
-#define OBRACK 2 // key [ or left alt
-#define CBRACK 3 // key ] or left alt
-#define CAPS 4 // caps lock
-
-// LEDS
-#define USB_LED_NUM_LOCK 0
-#define USB_LED_CAPS_LOCK 1
-#define USB_LED_SCROLL_LOCK 2
-#define USB_LED_COMPOSE 3
-#define USB_LED_KANA 4
-
-// TIMERS
-#define KEY_TAP_FAST 85
-#define KEY_TAP_SLOW 95
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Base layer
- * Keys with double values (like Esc/Ctrl) correspond to the 'tapped' key and the 'held' key, respectively
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | \ | 1 | 2 | 3 | 4 | 5 | <> | | ¡ | 6 | 7 | 8 | 9 | 0 | ' |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | F1/~L1 | . | , | Ñ | P | Y |MEH_T | | L1 | F | G | C | H | L |ALL_T/+ |
- * |--------+------+------+------+------+------| DEL | | ~L1 |------+------+------+------+------+--------|
- * |Esc/Ctrl| A | O | E | U | I |------| |------| D | R | T | N | S |'/RCtrl |
- * |--------+------+------+------+------+------| LGUI | | RALT |------+------+------+------+------+--------|
- * | {/LSft | - | Q | J | K | X | | | | B | M | W | V | Z | }/RSft |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |[/LALT| HOME |PGDOWN| PGUP | END | | LEFT | DOWN | UP |RIGHT |]/LALT|
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * |F5/CAG|F6/~L1| |F7/~L1|F8/CAG|
- * ,------|------|------| |------+--------+------.
- * | | |F4/CA | |F11/CA| | |
- * | ENTER| TAB |------| |------| BSPC | SPACE|
- * | | |F3/SA | |F12/SA| | |
- * `--------------------' `----------------------'
- * CAG = CTRL-ALT-GUI
- * CA = CTRL-ALT
- * SA = SHIFT-ALT
- *
- */
-[BASE] = LAYOUT_ergodox(
- // left hand
- KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NONUS_BSLASH,
- LT(AUX, KC_F1), KC_DOT, KC_COMM,KC_SCLN,KC_P, KC_Y, MEH_T(KC_DEL),
- CTL_T(KC_ESC), KC_A, KC_O, KC_E, KC_U, KC_I,
- M(OBRACE), KC_SLSH,KC_Q, KC_J, KC_K, KC_X, KC_LGUI,
- M(OBRACK), KC_HOME,KC_PGDN,KC_PGUP,KC_END,
- LCAG_T(KC_F5), LT(AUX, KC_F6),
- MT((MOD_LALT | MOD_LCTL), KC_F4),
- KC_ENT,KC_TAB,MT((MOD_LALT | MOD_LSFT), KC_F3),
- // right hand
- KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS,
- TT(AUX), KC_F, KC_G, KC_C, KC_H, KC_L, ALL_T(KC_RBRACKET),
- KC_D, KC_R, KC_T, KC_N, KC_S, CTL_T(KC_QUOTE),
- KC_RALT, KC_B, KC_M, KC_W, KC_V, KC_Z, M(CBRACE),
- KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,M(CBRACK),
- LT(AUX, KC_F7), LCAG_T(KC_F8),
- MT((MOD_LALT | MOD_LCTL), KC_F11),
- MT((MOD_LALT | MOD_LSFT), KC_F12),KC_BSPC, KC_SPC
- ),
-/* Keymap 1: Aux layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | SLEEP | PWR | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | < | > | MsUp | | | | | ~L0 | | 7 | 8 | 9 | * | `^ |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | 4 | 5 | 6 | + | Ç |
- * |--------+------+------+------+------+------| | |PSCR |------+------+------+------+------+--------|
- * |CAPSLOCK| | | | | | | | | | 1 | 2 | 3 | / | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |CTRL-S|CTRL-Z|CTRL-X|CTRL-C|CTRL-V| | | . | 0 | = | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | Play |
- * ,------|------|------| |------+------+------.
- * | | | | | VolUp| | |
- * | Lclk | Rclk |------| |------| Prev | Next |
- * | | | L2 | | VolDn| | |
- * `--------------------' `--------------------'
- */
-[AUX] = LAYOUT_ergodox(
- // left hand
- KC_NO , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_SLEP,
- KC_TRNS, KC_NONUS_BSLASH, LSFT(KC_NONUS_BSLASH), KC_MS_U, KC_NO, KC_NO, KC_NO,
- KC_NO , KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO ,
- M(CAPS), KC_NO, KC_NO , KC_NO , KC_NO , KC_NO , KC_NO,
- LCTL(KC_S), LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V),
- KC_NO , KC_TRNS,
- KC_NO,
- KC_BTN1, KC_BTN2, TG(QWERTY),
- // right hand
- KC_PWR, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, KC_NO, KC_7, KC_8, KC_9, KC_PAST, KC_LBRACKET,
- KC_NO, KC_4, KC_5, KC_6, KC_PPLS, KC_BSLASH,
- KC_PSCR, KC_NO, KC_1, KC_2, KC_3, KC_PSLS, KC_NO,
- KC_NO ,KC_DOT, KC_0, KC_PEQL, KC_NO,
- KC_TRNS, KC_MPLY,
- KC_VOLU,
- KC_VOLD, KC_MPRV, KC_MNXT
-),
-/* Keymap 2: QWERTY layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | \ | 1 | 2 | 3 | 4 | 5 | <> | | ¡ | 6 | 7 | 8 | 9 | 0 | ' |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | TRANS | Q | W | E | R | T |MEH_T | | TRANS| Y | U | I | O | P |ALL_T/+ |
- * |--------+------+------+------+------+------| DEL | | |------+------+------+------+------+--------|
- * |Esc/Ctrl| A | S | D | F | G |------| |------| H | J | K | L | Ñ |'/RCtrl |
- * |--------+------+------+------+------+------| LGUI | | RALT |------+------+------+------+------+--------|
- * | {/LSft | Z | X | C | V | B | | | | N | M | , | . | - | }/RSft |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |[/LALT| HOME |PGDOWN| PGUP | END | | LEFT | DOWN | UP |RIGHT |]/LALT|
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * |F5/CAG| TRANS| | TRANS|F8/CAG|
- * ,------|------|------| |------+--------+------.
- * | | |F4/CA | |F11/CA| | |
- * | ENTER| TAB |------| |------| BSPC | SPACE|
- * | | | TRANS| |F12/SA| | |
- * `--------------------' `----------------------'
- * CAG = CTRL-ALT-GUI
- * CA = CTRL-ALT
- * SA = SHIFT-ALT
- *
- */
-[QWERTY] = LAYOUT_ergodox(
- // left hand
- KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NONUS_BSLASH,
- KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, MEH_T(KC_DEL),
- CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G,
- M(OBRACE), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LGUI,
- M(OBRACK), KC_HOME,KC_PGDN,KC_PGUP,KC_END,
- LCAG_T(KC_F5), KC_TRNS,
- MT((MOD_LALT | MOD_LCTL), KC_F4),
- KC_ENT,KC_TAB,KC_TRNS,
- // right hand
- KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS,
- KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P, ALL_T(KC_RBRACKET),
- KC_H, KC_J, KC_K, KC_L, KC_SCLN,CTL_T(KC_QUOTE),
- KC_RALT, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,M(CBRACE),
- KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,M(CBRACK),
- KC_TRNS, LCAG_T(KC_F8),
- MT((MOD_LALT | MOD_LCTL), KC_F11),
- MT((MOD_LALT | MOD_LSFT), KC_F12),KC_BSPC, KC_SPC
-),
-};
-
-static uint16_t key_timer;
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- switch(id) {
- case OBRACE: {
- if (record->event.pressed) {
- key_timer = timer_read();
- register_code(KC_RSFT);
- } else {
- unregister_code(KC_RSFT);
- if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
- register_code(KC_RALT);
- register_code(KC_QUOTE);
- unregister_code(KC_QUOTE);
- unregister_code(KC_RALT);
- }
- }
- break;
- }
- case CBRACE: {
- if (record->event.pressed) {
- key_timer = timer_read();
- register_code(KC_RSFT);
- } else {
- unregister_code(KC_RSFT);
- if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
- register_code(KC_RALT);
- register_code(KC_BSLS);
- unregister_code(KC_BSLS);
- unregister_code(KC_RALT);
- }
- }
- break;
- }
- case OBRACK: {
- if (record->event.pressed) {
- key_timer = timer_read();
- register_code(KC_LALT);
- } else {
- unregister_code(KC_LALT);
- if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
- register_code(KC_RALT);
- register_code(KC_LBRACKET);
- unregister_code(KC_LBRACKET);
- unregister_code(KC_RALT);
- }
- }
- break;
- }
- case CBRACK: {
- if (record->event.pressed) {
- key_timer = timer_read();
- register_code(KC_LALT);
- } else {
- unregister_code(KC_LALT);
- if (timer_elapsed(key_timer) < KEY_TAP_SLOW) {
- register_code(KC_RALT);
- register_code(KC_RBRACKET);
- unregister_code(KC_RBRACKET);
- unregister_code(KC_RALT);
- }
- }
- break;
- }
- case CAPS: {
- if (record->event.pressed) {
- register_code(KC_CAPSLOCK);
- } else {
- unregister_code(KC_CAPSLOCK);
- }
- break;
- }
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- case 1:
- ergodox_right_led_3_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- default:
- // none
- break;
- }
-
- // Turn the caps lock led on
- if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
- ergodox_right_led_1_on();
- }
-
-}
diff --git a/layouts/community/ergodox/dvorak_spanish/readme.md b/layouts/community/ergodox/dvorak_spanish/readme.md
deleted file mode 100644
index 1256c6887d..0000000000
--- a/layouts/community/ergodox/dvorak_spanish/readme.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# Ergodox Spanish Dvorak Layout
- * Software layout must be set to SPANISH QWERTY to work properly
-
-## Keymap Layers
- - L0: spanish dvorak with some customizations (see layout below)
- - L1: auxiliary keys (includes qwerty shortcuts, numpad...)
- - L2: qwerty layout with customizations
-
-
-### Keymap 0: Base layer
-Keys with double values (like Esc/Ctrl) correspond to the 'tapped' key and the 'held' key, respectively
-
-<pre><code>
-
-,--------------------------------------------------. ,--------------------------------------------------.
-| \ | 1 | 2 | 3 | 4 | 5 | <> | | ¡ | 6 | 7 | 8 | 9 | 0 | ' |
-|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| F1/~L1 | . | , | Ñ | P | Y |MEH_T | | L1 | F | G | C | H | L |ALL_T/+ |
-|--------+------+------+------+------+------| DEL | | ~L1 |------+------+------+------+------+--------|
-|Esc/Ctrl| A | O | E | U | I |------| |------| D | R | T | N | S |'/RCtrl |
-|--------+------+------+------+------+------| LGUI | | RALT |------+------+------+------+------+--------|
-| {/LSft | - | Q | J | K | X | | | | B | M | W | V | Z | }/RSft |
-'--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------'
- |[/LALT| HOME |PGDOWN| PGUP | END | | LEFT | DOWN | UP |RIGHT |]/LALT|
- '----------------------------------' '----------------------------------'
- ,-------------. ,-------------.
- |F5/CAG|F6/~L1| |F7/~L1|F8/CAG|
- ,------|------|------| |------+--------+------.
- | | |F4/CA | |F11/CA| | |
- | ENTER| TAB |------| |------| BSPC | SPACE|
- | | |F3/SA | |F12/SA| | |
- '--------------------' '----------------------'
- CAG = CTRL-ALT-GUI
- CA = CTRL-ALT
- SA = SHIFT-ALT
-
-</pre></code>
-
-### Keymap 1: Aux layer
-
-<pre><code>
-
-,--------------------------------------------------. ,--------------------------------------------------.
-| | F1 | F2 | F3 | F4 | F5 | SLEEP| | PWR | F6 | F7 | F8 | F9 | F10 | F11 |
-|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| | < | > | MsUp | | | | | ~L0 | | 7 | 8 | 9 | * | '^ |
-|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| | |MsLeft|MsDown|MsRght| |------| |------| | 4 | 5 | 6 | + | Ç |
-|--------+------+------+------+------+------| | |PSCR |------+------+------+------+------+--------|
-|CAPSLOCK| | | | | | | | | | 1 | 2 | 3 | / | |
-'--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------'
- |CTRL-S|CTRL-Z|CTRL-X|CTRL-C|CTRL-V| | | . | 0 | = | |
- '----------------------------------' '----------------------------------'
- ,-------------. ,-------------.
- | | | | | Play |
- ,------|------|------| |------+------+------.
- | | | | | VolUp| | |
- | Lclk | Rclk |------| |------| Prev | Next |
- | | | L2 | | VolDn| | |
- '--------------------' '--------------------'
-
-</pre></code>
-
-### Keymap 2: QWERTY layer
-
-<pre><code>
-
-,--------------------------------------------------. ,--------------------------------------------------.
-| \ | 1 | 2 | 3 | 4 | 5 | <> | | ¡ | 6 | 7 | 8 | 9 | 0 | ' |
-|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| TRANS | Q | W | E | R | T |MEH_T | | TRANS| Y | U | I | O | P |ALL_T/+ |
-|--------+------+------+------+------+------| DEL | | |------+------+------+------+------+--------|
-|Esc/Ctrl| A | S | D | F | G |------| |------| H | J | K | L | Ñ |'/RCtrl |
-|--------+------+------+------+------+------| LGUI | | RALT |------+------+------+------+------+--------|
-| {/LSft | Z | X | C | V | B | | | | N | M | , | . | - | }/RSft |
-'--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------'
- |[/LALT| HOME |PGDOWN| PGUP | END | | LEFT | DOWN | UP |RIGHT |]/LALT|
- '----------------------------------' '----------------------------------'
- ,-------------. ,-------------.
- |F5/CAG| TRANS| | TRANS|F8/CAG|
- ,------|------|------| |------+--------+------.
- | | |F4/CA | |F11/CA| | |
- | ENTER| TAB |------| |------| BSPC | SPACE|
- | | | TRANS| |F12/SA| | |
- '--------------------' '----------------------'
- CAG = CTRL-ALT-GUI
- CA = CTRL-ALT
- SA = SHIFT-ALT
-
-</pre></code>
-
-
-## Generation of .hex file
-> [Download scripts from here](https://github.com/johgh/keyboard/tree/master/ergodox)
-
-> Execute install.sh and generate.sh scripts.
-
-> Flash with `teensy_loader` binary (should be installed from previous step)
diff --git a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
index 6729dbeeb6..e35739c07e 100644
--- a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
+++ b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, SE_ARNG,SE_ADIA, SE_ODIA, KC_P, KC_Y, KC_NO,
KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I,
KC_LSFT, KC_DOT, KC_Q, KC_J, KC_K, KC_X, KC_NO,
- KC_LCTRL, KC_NO, KC_NO, KC_LALT, KC_LCMD,
+ KC_LCTL, KC_NO, KC_NO, KC_LALT, KC_LCMD,
KC_INSERT, KC_DEL,
KC_NO,
KC_BSPC, KC_TAB, KC_NO,
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TG(QWRT), KC_6, KC_7, KC_8, KC_9, KC_0, SE_PLUS,
KC_DEL, KC_F, KC_G, KC_C, KC_R, KC_L, KC_COMM,
KC_D, KC_H, KC_T, KC_N, KC_S, SE_MINS,
- KC_RCTRL, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
+ KC_RCTL, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
MO(SYMB), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
KC_HOME, KC_END,
KC_PGUP,
@@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, SE_ACUT,
CTL_T(SE_QUOT), SE_CIRC, SE_ASTR, KC_LALT, KC_LGUI,
- KC_LCTRL, KC_LALT,
+ KC_LCTL, KC_LALT,
SE_TILD,
KC_BSPC, KC_TAB, KC_ESC,
// right hand
diff --git a/layouts/community/ergodox/emacs_osx_dk/keymap.c b/layouts/community/ergodox/emacs_osx_dk/keymap.c
index 2c3430c236..ccffc74d30 100644
--- a/layouts/community/ergodox/emacs_osx_dk/keymap.c
+++ b/layouts/community/ergodox/emacs_osx_dk/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC,
CTL_T(KC_BSLS), KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_RALT,
- MO(SYMB), KC_LCTRL, KC_LEFT,KC_RGHT,KC_LALT,
+ MO(SYMB), KC_LCTL, KC_LEFT,KC_RGHT,KC_LALT,
KC_DEL, KC_INS,
KC_HOME,
KC_SPC,KC_BSPC,KC_END,
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
KC_H, KC_J, KC_K, KC_L, KC_SCLN, CTL_T(KC_QUOT),
KC_RALT, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,
- KC_LALT,KC_UP, KC_DOWN,KC_RCTRL, MO(MDIA),
+ KC_LALT,KC_UP, KC_DOWN,KC_RCTL, MO(MDIA),
KC_ESC, KC_APP,
KC_PGUP,
KC_PGDN, KC_LGUI, KC_ENT
diff --git a/layouts/community/ergodox/french_hacker/keymap.c b/layouts/community/ergodox/french_hacker/keymap.c
deleted file mode 100644
index 73e3076475..0000000000
--- a/layouts/community/ergodox/french_hacker/keymap.c
+++ /dev/null
@@ -1,168 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "keymap_french.h"
-
-#define BASE 0 // default Colemak Mod-DH layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Base Colemak Mod-DH layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | Esc | & _1 | é _2 | " _3 | ' _4 | ( _5 | | | | - _6 | è _7 | _ _8 | ç _9 | à _0 | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | Q | W | F | P | B | TO(0)| |TO(2) | J | L | U | Y | ; | Ins |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | Tab | A | R | S | T | G |------| |------| M | N | E | I | O | Bcksp |
- * |--------+------+------+------+------+------| TO(1)| | MEH |------+------+------+------+------+--------|
- * | LShift | Z | X | C | D | V | | | | K | H | , | . | : | Rshift |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | ù | | Left | Right| MO(2)| | MO(2)| Down | Up | PgDn | PgUp |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | Ralt | | Ralt | |
- * ,-------|------|------| |------+------+------.
- * | | | Home | | End | | |
- * | Space | Ctrl |------| |------| Ctrl | Enter |
- * | | | LAlt | | LAlt | | |
- * `---------------------' `---------------------'
- */
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO,
- KC_NO, FR_Q, FR_W, KC_F, KC_P, KC_B, TO(BASE),
- KC_TAB, FR_A, KC_R, KC_S, KC_T, KC_G,
- KC_LSFT, FR_Z, KC_X, KC_C, KC_D, KC_V, TO(SYMB),
- FR_UGRV, KC_NO, KC_LEFT, KC_RIGHT, MO(SYMB),
- KC_NO, KC_RALT,
- KC_HOME,
- KC_SPC,KC_LCTRL, KC_LALT,
- // right hand
- KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO,
- TO(MDIA), KC_J, KC_L, KC_U, KC_Y, FR_SCLN, KC_INS,
- FR_M, KC_N, KC_E, KC_I, KC_O, KC_BSPC,
- OSM(MOD_MEH), KC_K, KC_H, FR_COMM, FR_DOT, FR_COLN, KC_RSFT,
- MO(SYMB), KC_DOWN, KC_UP, KC_PGDN, KC_PGUP,
-
- KC_RALT, KC_NO,
- KC_END,
- KC_LALT,KC_RCTL, KC_ENT
- ),
-
-
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | § | < | { | \ | ~ | | | | % | @ | } | > | ¨ | F12 |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | ' | = | - | ( | + |------| |------| * | ) | _ | / | " | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | ` | ? | # | [ | | | | | | & | ] | $ | ! | ^ | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | € | £ | ¤ | ² | | | | ° | µ | ß | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
- // left hand
- M(0), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS, FR_SECT, FR_LABK, FR_LCBR, FR_BSLS, FR_TILD, KC_TRNS,
- KC_TRNS, FR_QUOT, FR_EQL, FR_MINS, FR_LPRN, FR_PLUS,
- KC_TRNS, FR_GRV, FR_QUES, FR_HASH, FR_LBRC, FR_PIPE, KC_TRNS,
- FR_EURO, FR_PND, FR_CURR, FR_SUP2, KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, FR_PERC, FR_AT, FR_RCBR, FR_RABK, FR_DIAE, KC_F12,
- FR_ASTR, FR_RPRN, FR_UNDS, FR_SLSH, FR_DQUO, KC_TRNS,
- KC_TRNS, FR_AMPR, FR_RBRC, FR_DLR, FR_EXLM, FR_CIRC, KC_TRNS,
- KC_TRNS, FR_DEG, FR_MICR, ALGR(KC_S), KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | Lclk | Rclk | | | Play |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | Prev | Next | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | |Brwser|
- * | | |------| |------| |Back |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_MPLY,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- case SYMB:
- ergodox_right_led_1_on();
- break;
- case MDIA:
- ergodox_right_led_2_on();
- break;
- default:
- // none
- break;
- }
-
-};
diff --git a/layouts/community/ergodox/french_hacker/readme.md b/layouts/community/ergodox/french_hacker/readme.md
deleted file mode 100644
index 829013597a..0000000000
--- a/layouts/community/ergodox/french_hacker/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# French hacker layout
-
-[Colemak Mod-DH](https://colemakmods.github.io/mod-dh/) layout for
-users keeping an `azerty` layout configuration on their OS.
-
-## Introduction
-
-This keymap is for users keeping their operating systems configured with
-`azerty` - for typing passwords in their native languages, or for their laptop
-keyboard - but who wants a Colemak Mod-DH layout on their mechanical keyboard.
-
-The symbols layers was done after analysing various programming
-languages sources codes and should be close to optimal for typing
-confort, see the link at the end of the README.
-
-The design is done to minimize the usage of the pinky fingers and reduces stress
-on the hands, thus Alt and Ctrl keys are accessible for both hands.
-
-## Flashing the firmware
-
-```
-qmk flash -kb ergodox_ez -km french_hacker
-```
-
-## Design explanations
-
-See my [blog post](http://www.dialectical-computing.de/blog/blog/2017/01/29/a-better-coder-layout-for-the-ergodox-ez-keyboard/).
diff --git a/layouts/community/ergodox/galson/keymap.c b/layouts/community/ergodox/galson/keymap.c
deleted file mode 100644
index 83c6638d57..0000000000
--- a/layouts/community/ergodox/galson/keymap.c
+++ /dev/null
@@ -1,179 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | + | 1 | 2 | 3 | 4 | 5 | rclk | | lclk | 6 | 7 | 8 | 9 | 0 | - |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | = | Q | W | E | R |cmd/T |shift | |shift |cmd/Y | U | I | O | P | \ |
- * |--------+------+------+------+------+------| ( | | ) |------+------+------+------+------+--------|
- * | " | A | S | D | F | G |------| |------| H | J | K | L |; / L2| ' |
- * |--------+------+------+------+------+------| ctrl | | ctrl |------+------+------+------+------+--------|
- * | { | Z | X | C | V | B | [ | | ] | N | M | , | . | / | } |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | _ | ` | $ | Left | Right| | Up | Down | : | * | ! |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | < | | | | & | > |
- * ,------|------|------| |------+--------+------.
- * | | | # | | @ | | |
- * | Space|Backsp|------| |------| Tab |Enter |
- * | |ace | % | | ESC | | |
- * `--------------------' `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_PLUS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_BTN2,
- KC_EQL, KC_Q, KC_W, KC_E, KC_R, GUI_T(KC_T), KC_LSPO,
- KC_DQUO, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LCBR, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, CTL_T(KC_LBRC),
- KC_UNDS, KC_GRV, KC_DLR, KC_LEFT,KC_RGHT,
- KC_LABK, KC_PIPE,
- KC_HASH,
- KC_SPC, KC_BSPC,KC_PERC,
- // right hand
- KC_BTN1, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- KC_RSPC, GUI_T(KC_Y), KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), KC_QUOT,
- CTL_T(KC_RBRC), KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RCBR,
- KC_UP, KC_DOWN,KC_COLN,KC_ASTR, KC_EXLM,
- KC_AMPR, KC_RABK,
- KC_AT,
- KC_ESC, KC_TAB, KC_ENT
- ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.
- * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | . | 0 | = | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
- // left hand
- M(0), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
- KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
- KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
- KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
- KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
- KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | Prev | Next | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | |Brwser|
- * | | |------| |------| |Back |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- break;
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- // TODO: Make this relevant to the ErgoDox EZ.
- case 1:
- ergodox_right_led_1_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- default:
- // none
- break;
- }
-
-};
diff --git a/layouts/community/ergodox/galson/readme.md b/layouts/community/ergodox/galson/readme.md
deleted file mode 100644
index ebc916725b..0000000000
--- a/layouts/community/ergodox/galson/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Galson keymap
-
-
-Sep 26, 2016.
-
-This is an ergonomic layout for programming for those with typing-related injuries. Key features:
-
-- As many symbol keys as possible are accessible without shifting. These should be accessed by moving the entire hand and pressing with a strong finger.
-- Arrow keys and left and right mouse clicks for mouse-free navigation when combined with head mouse or eyetracker.
-- Modifier keys are dual role and relocated to positions convenient for the index finger.
-- Positions are more convenient when the keyboard is vertically mounted (as it should be!) \ No newline at end of file
diff --git a/layouts/community/ergodox/galson/rules.mk b/layouts/community/ergodox/galson/rules.mk
deleted file mode 100644
index f008f50793..0000000000
--- a/layouts/community/ergodox/galson/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMMAND_ENABLE = no # Commands for debug and configuration
-
diff --git a/layouts/community/ergodox/german-kinergo/keymap.c b/layouts/community/ergodox/german-kinergo/keymap.c
index eae02d8925..e48452274a 100644
--- a/layouts/community/ergodox/german-kinergo/keymap.c
+++ b/layouts/community/ergodox/german-kinergo/keymap.c
@@ -44,16 +44,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, DE_Y, KC_X, KC_C, KC_V, KC_B, MO(2),
KC_LGUI, DE_CIRC, DE_LABK, KC_LEFT, KC_RIGHT,
- KC_LCTRL, KC_LALT,
+ KC_LCTL, KC_LALT,
KC_HOME,
KC_BSPC,KC_DEL,KC_END,
// right hand
- KC_PSCREEN, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_PSCR, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
MO(1), DE_Z, KC_U, KC_I, KC_O, KC_P, DE_UDIA,
KC_H, KC_J, KC_K, KC_L, DE_ODIA, LT(MDIA,DE_ADIA),
MO(2), KC_N, KC_M, KC_COMM, KC_DOT, DE_MINS, KC_RSFT,
KC_DOWN, KC_UP, DE_HASH, DE_PLUS, KC_RGUI,
- KC_RALT, KC_RCTRL,
+ KC_RALT, KC_RCTL,
KC_PGUP,
KC_PGDN, KC_ENT, KC_SPC
),
diff --git a/layouts/community/ergodox/german-lukas/keymap.c b/layouts/community/ergodox/german-lukas/keymap.c
index a63a13c12d..891bf0474b 100644
--- a/layouts/community/ergodox/german-lukas/keymap.c
+++ b/layouts/community/ergodox/german-lukas/keymap.c
@@ -41,16 +41,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, DE_Y, KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO),
KC_LGUI, DE_CIRC, DE_LABK, KC_LEFT, KC_RIGHT,
- KC_LCTRL, KC_LALT,
+ KC_LCTL, KC_LALT,
KC_HOME,
KC_SPC ,KC_DEL,KC_END,
// right hand
- KC_PSCREEN, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_PSCR, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
TG(MDIA), DE_Z, KC_U, KC_I, KC_O, KC_P, LT(SHRT,DE_UDIA),
KC_H, KC_J, KC_K, KC_L, DE_ODIA, LT(MDIA,DE_ADIA),
MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, DE_MINS, KC_RSFT,
KC_UP, KC_DOWN, DE_HASH, DE_PLUS, LCA_T(KC_NO),
- KC_RALT, KC_RCTRL,
+ KC_RALT, KC_RCTL,
KC_PGUP,
KC_PGDN, KC_BSPC, KC_ENT
),
diff --git a/layouts/community/ergodox/german-manuneo/compile_keymap.py b/layouts/community/ergodox/german-manuneo/compile_keymap.py
deleted file mode 100644
index ae7ff50397..0000000000
--- a/layouts/community/ergodox/german-manuneo/compile_keymap.py
+++ /dev/null
@@ -1,684 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""Compiler for keymap.c files
-
-This scrip will generate a keymap.c file from a simple
-markdown file with a specific layout.
-
-Usage:
- python compile_keymap.py INPUT_PATH [OUTPUT_PATH]
-"""
-from __future__ import division
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-import os
-import io
-import re
-import sys
-import json
-import unicodedata
-import collections
-import itertools as it
-
-PY2 = sys.version_info.major == 2
-
-if PY2:
- chr = unichr
-
-KEYBOARD_LAYOUTS = {
- # These map positions in the parsed layout to
- # positions in the LAYOUT_ergodox MATRIX
- 'ergodox_ez': [
- [0, 1, 2, 3, 4, 5, 6],
- [38, 39, 40, 41, 42, 43, 44],
- [7, 8, 9, 10, 11, 12, 13],
- [45, 46, 47, 48, 49, 50, 51],
- [14, 15, 16, 17, 18, 19],
- [52, 53, 54, 55, 56, 57],
- [20, 21, 22, 23, 24, 25, 26],
- [58, 59, 60, 61, 62, 63, 64],
- [27, 28, 29, 30, 31],
- [65, 66, 67, 68, 69],
- [32, 33],
- [70, 71],
- [34],
- [72],
- [35, 36, 37],
- [73, 74, 75],
- ]
-}
-
-ROW_INDENTS = {'ergodox_ez': [0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 5, 0, 6, 0, 4, 0]}
-
-BLANK_LAYOUTS = [
- # Compact Layout
- """
-.------------------------------------.------------------------------------.
-| | | | | | | | | | | | | | |
-!-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
-| | | | | | | | | | | | | | |
-!-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
-| | | | | | |-----!-----! | | | | | |
-!-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
-| | | | | | | | | | | | | | |
-'-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- | | | | | | ! | | | | |
- '------------------------' '------------------------'
- .-----------. .-----------.
- | | | ! | |
- .-----+-----+-----! !-----+-----+-----.
- ! ! | | ! | ! !
- ! ! !-----! !-----! ! !
- | | | | ! | | |
- '-----------------' '-----------------'
-""",
-
- # Wide Layout
- """
-.---------------------------------------------. .---------------------------------------------.
-| | | | | | | | ! | | | | | | |
-!-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
-| | | | | | | | ! | | | | | | |
-!-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
-| | | | | | |-------! !-------! | | | | | |
-!-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
-| | | | | | | | ! | | | | | | |
-'-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
- | | | | | | ! | | | | |
- '------------------------------' '------------------------------'
- .---------------. .---------------.
- | | | ! | |
- .-------+-------+-------! !-------+-------+-------.
- ! ! | | ! | ! !
- ! ! !-------! !-------! ! !
- | | | | ! | | |
- '-----------------------' '-----------------------'
-""",
-]
-
-DEFAULT_CONFIG = {
- "keymaps_includes": ["keymap_common.h",],
- 'filler': "-+.'!:x",
- 'separator': "|",
- 'default_key_prefix': ["KC_"],
-}
-
-SECTIONS = [
- 'layout_config',
- 'layers',
-]
-
-# Markdown Parsing
-
-ONELINE_COMMENT_RE = re.compile(
- r"""
- ^ # comment must be at the start of the line
- \s* # arbitrary whitespace
- // # start of the comment
- (.*) # the comment
- $ # until the end of line
-""", re.MULTILINE | re.VERBOSE
-)
-
-INLINE_COMMENT_RE = re.compile(
- r"""
- ([\,\"\[\]\{\}\d]) # anythig that might end a expression
- \s+ # comment must be preceded by whitespace
- // # start of the comment
- \s # and succeded by whitespace
- (?:[^\"\]\}\{\[]*) # the comment (except things which might be json)
- $ # until the end of line
-""", re.MULTILINE | re.VERBOSE
-)
-
-TRAILING_COMMA_RE = re.compile(
- r"""
- , # the comma
- (?:\s*) # arbitrary whitespace
- $ # only works if the trailing comma is followed by newline
- (\s*) # arbitrary whitespace
- ([\]\}]) # end of an array or object
-""", re.MULTILINE | re.VERBOSE
-)
-
-
-def loads(raw_data):
- if isinstance(raw_data, bytes):
- raw_data = raw_data.decode('utf-8')
-
- raw_data = ONELINE_COMMENT_RE.sub(r"", raw_data)
- raw_data = INLINE_COMMENT_RE.sub(r"\1", raw_data)
- raw_data = TRAILING_COMMA_RE.sub(r"\1\2", raw_data)
- return json.loads(raw_data)
-
-
-def parse_config(path):
- def reset_section():
- section.update({
- 'name': section.get('name', ""),
- 'sub_name': "",
- 'start_line': -1,
- 'end_line': -1,
- 'code_lines': [],
- })
-
- def start_section(line_index, line):
- end_section()
- if line.startswith("# "):
- name = line[2:]
- elif line.startswith("## "):
- name = line[3:]
- else:
- name = ""
-
- name = name.strip().replace(" ", "_").lower()
- if name in SECTIONS:
- section['name'] = name
- else:
- section['sub_name'] = name
- section['start_line'] = line_index
-
- def end_section():
- if section['start_line'] >= 0:
- if section['name'] == 'layout_config':
- config.update(loads("\n".join(section['code_lines'])))
- elif section['sub_name'].startswith('layer'):
- layer_name = section['sub_name']
- config['layer_lines'][layer_name] = section['code_lines']
-
- reset_section()
-
- def amend_section(line_index, line):
- section['end_line'] = line_index
- section['code_lines'].append(line)
-
- config = DEFAULT_CONFIG.copy()
- config.update({
- 'layer_lines': collections.OrderedDict(),
- 'macro_ids': {'UM'},
- 'unicode_macros': {},
- })
-
- section = {}
- reset_section()
-
- with io.open(path, encoding="utf-8") as fh:
- for i, line in enumerate(fh):
- if line.startswith("#"):
- start_section(i, line)
- elif line.startswith(" "):
- amend_section(i, line[4:])
- else:
- # TODO: maybe parse description
- pass
-
- end_section()
- assert 'layout' in config
- return config
-
-
-# header file parsing
-
-IF0_RE = re.compile(r"""
- ^
- #if 0
- $.*?
- #endif
-""", re.MULTILINE | re.DOTALL | re.VERBOSE)
-
-COMMENT_RE = re.compile(r"""
- /\*
- .*?
- \*/"
-""", re.MULTILINE | re.DOTALL | re.VERBOSE)
-
-
-def read_header_file(path):
- with io.open(path, encoding="utf-8") as fh:
- data = fh.read()
- data, _ = COMMENT_RE.subn("", data)
- data, _ = IF0_RE.subn("", data)
- return data
-
-
-def regex_partial(re_str_fmt, flags):
- def partial(*args, **kwargs):
- re_str = re_str_fmt.format(*args, **kwargs)
- return re.compile(re_str, flags)
-
- return partial
-
-
-KEYDEF_REP = regex_partial(r"""
- #define
- \s
- (
- (?:{}) # the prefixes
- (?:\w+) # the key name
- ) # capture group end
-""", re.MULTILINE | re.DOTALL | re.VERBOSE)
-
-ENUM_RE = re.compile(r"""
- (
- enum
- \s\w+\s
- \{
- .*? # the enum content
- \}
- ;
- ) # capture group end
-""", re.MULTILINE | re.DOTALL | re.VERBOSE)
-
-ENUM_KEY_REP = regex_partial(r"""
- (
- {} # the prefixes
- \w+ # the key name
- ) # capture group end
-""", re.MULTILINE | re.DOTALL | re.VERBOSE)
-
-
-def parse_keydefs(config, data):
- prefix_options = "|".join(config['key_prefixes'])
- keydef_re = KEYDEF_REP(prefix_options)
- enum_key_re = ENUM_KEY_REP(prefix_options)
- for match in keydef_re.finditer(data):
- yield match.groups()[0]
-
- for enum_match in ENUM_RE.finditer(data):
- enum = enum_match.groups()[0]
- for key_match in enum_key_re.finditer(enum):
- yield key_match.groups()[0]
-
-
-def parse_valid_keys(config, out_path):
- basepath = os.path.abspath(os.path.join(os.path.dirname(out_path)))
- dirpaths = []
- subpaths = []
- while len(subpaths) < 6:
- path = os.path.join(basepath, *subpaths)
- dirpaths.append(path)
- dirpaths.append(os.path.join(path, "tmk_core", "common"))
- dirpaths.append(os.path.join(path, "quantum"))
- subpaths.append('..')
-
- includes = set(config['keymaps_includes'])
- includes.add("keycode.h")
-
- valid_keycodes = set()
- for dirpath, include in it.product(dirpaths, includes):
- include_path = os.path.join(dirpath, include)
- if os.path.exists(include_path):
- header_data = read_header_file(include_path)
- valid_keycodes.update(parse_keydefs(config, header_data))
- return valid_keycodes
-
-
-# Keymap Parsing
-
-
-def iter_raw_codes(layer_lines, filler, separator):
- filler_re = re.compile("[" + filler + " ]")
- for line in layer_lines:
- line, _ = filler_re.subn("", line.strip())
- if not line:
- continue
- codes = line.split(separator)
- for code in codes[1:-1]:
- yield code
-
-
-def iter_indexed_codes(raw_codes, key_indexes):
- key_rows = {}
- key_indexes_flat = []
-
- for row_index, key_indexes in enumerate(key_indexes):
- for key_index in key_indexes:
- key_rows[key_index] = row_index
- key_indexes_flat.extend(key_indexes)
- assert len(raw_codes) == len(key_indexes_flat)
- for raw_code, key_index in zip(raw_codes, key_indexes_flat):
- # we keep track of the row mostly for layout purposes
- yield raw_code, key_index, key_rows[key_index]
-
-
-LAYER_CHANGE_RE = re.compile(r"""
- (DF|TG|MO)\(\d+\)
-""", re.VERBOSE)
-
-MACRO_RE = re.compile(r"""
- M\(\w+\)
-""", re.VERBOSE)
-
-UNICODE_RE = re.compile(r"""
- U[0-9A-F]{4}
-""", re.VERBOSE)
-
-NON_CODE = re.compile(r"""
- ^[^A-Z0-9_]$
-""", re.VERBOSE)
-
-
-def parse_uni_code(raw_code):
- macro_id = "UC_" + (unicodedata.name(raw_code).replace(" ", "_").replace("-", "_"))
- code = "M({})".format(macro_id)
- uc_hex = "{:04X}".format(ord(raw_code))
- return code, macro_id, uc_hex
-
-
-def parse_key_code(raw_code, key_prefixes, valid_keycodes):
- if raw_code in valid_keycodes:
- return raw_code
-
- for prefix in key_prefixes:
- code = prefix + raw_code
- if code in valid_keycodes:
- return code
-
-
-def parse_code(raw_code, key_prefixes, valid_keycodes):
- if not raw_code:
- return 'KC_TRNS', None, None
-
- if LAYER_CHANGE_RE.match(raw_code):
- return raw_code, None, None
-
- if MACRO_RE.match(raw_code):
- macro_id = raw_code[2:-1]
- return raw_code, macro_id, None
-
- if UNICODE_RE.match(raw_code):
- hex_code = raw_code[1:]
- return parse_uni_code(chr(int(hex_code, 16)))
-
- if NON_CODE.match(raw_code):
- return parse_uni_code(raw_code)
-
- code = parse_key_code(raw_code, key_prefixes, valid_keycodes)
- return code, None, None
-
-
-def parse_keymap(config, key_indexes, layer_lines, valid_keycodes):
- keymap = {}
- raw_codes = list(iter_raw_codes(layer_lines, config['filler'], config['separator']))
- indexed_codes = iter_indexed_codes(raw_codes, key_indexes)
- key_prefixes = config['key_prefixes']
- for raw_code, key_index, row_index in indexed_codes:
- code, macro_id, uc_hex = parse_code(raw_code, key_prefixes, valid_keycodes)
- # TODO: line numbers for invalid codes
- err_msg = "Could not parse key '{}' on row {}".format(raw_code, row_index)
- assert code is not None, err_msg
- # print(repr(raw_code), repr(code), macro_id, uc_hex)
- if macro_id:
- config['macro_ids'].add(macro_id)
- if uc_hex:
- config['unicode_macros'][macro_id] = uc_hex
- keymap[key_index] = (code, row_index)
- return keymap
-
-
-def parse_keymaps(config, valid_keycodes):
- keymaps = collections.OrderedDict()
- key_indexes = config.get('key_indexes', KEYBOARD_LAYOUTS[config['layout']])
- # TODO: maybe validate key_indexes
-
- for layer_name, layer_lines, in config['layer_lines'].items():
- keymaps[layer_name] = parse_keymap(config, key_indexes, layer_lines, valid_keycodes)
- return keymaps
-
-
-# keymap.c output
-
-USERCODE = """
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- case L1:
- ergodox_right_led_1_on();
- break;
- case L2:
- ergodox_right_led_2_on();
- break;
- case L3:
- ergodox_right_led_3_on();
- break;
- case L4:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- break;
- case L5:
- ergodox_right_led_1_on();
- ergodox_right_led_3_on();
- break;
- // case L6:
- // ergodox_right_led_2_on();
- // ergodox_right_led_3_on();
- // break;
- // case L7:
- // ergodox_right_led_1_on();
- // ergodox_right_led_2_on();
- // ergodox_right_led_3_on();
- // break;
- default:
- ergodox_board_led_off();
- break;
- }
-};
-"""
-
-MACROCODE = """
-#define UC_MODE_WIN 0
-#define UC_MODE_LINUX 1
-#define UC_MODE_OSX 2
-
-// TODO: allow default mode to be configured
-static uint16_t unicode_mode = UC_MODE_WIN;
-
-uint16_t hextokeycode(uint8_t hex) {{
- if (hex == 0x0) {{
- return KC_P0;
- }}
- if (hex < 0xA) {{
- return KC_P1 + (hex - 0x1);
- }}
- return KC_A + (hex - 0xA);
-}}
-
-void unicode_action_function(uint16_t hi, uint16_t lo) {{
- switch (unicode_mode) {{
- case UC_MODE_WIN:
- register_code(KC_LALT);
-
- register_code(KC_PPLS);
- unregister_code(KC_PPLS);
-
- register_code(hextokeycode((hi & 0xF0) >> 4));
- unregister_code(hextokeycode((hi & 0xF0) >> 4));
- register_code(hextokeycode((hi & 0x0F)));
- unregister_code(hextokeycode((hi & 0x0F)));
- register_code(hextokeycode((lo & 0xF0) >> 4));
- unregister_code(hextokeycode((lo & 0xF0) >> 4));
- register_code(hextokeycode((lo & 0x0F)));
- unregister_code(hextokeycode((lo & 0x0F)));
-
- unregister_code(KC_LALT);
- break;
- case UC_MODE_LINUX:
- register_code(KC_LCTL);
- register_code(KC_LSFT);
-
- register_code(KC_U);
- unregister_code(KC_U);
-
- register_code(hextokeycode((hi & 0xF0) >> 4));
- unregister_code(hextokeycode((hi & 0xF0) >> 4));
- register_code(hextokeycode((hi & 0x0F)));
- unregister_code(hextokeycode((hi & 0x0F)));
- register_code(hextokeycode((lo & 0xF0) >> 4));
- unregister_code(hextokeycode((lo & 0xF0) >> 4));
- register_code(hextokeycode((lo & 0x0F)));
- unregister_code(hextokeycode((lo & 0x0F)));
-
- unregister_code(KC_LCTL);
- unregister_code(KC_LSFT);
- break;
- case UC_MODE_OSX:
- break;
- }}
-}}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {{
- if (!record->event.pressed) {{
- return MACRO_NONE;
- }}
- // MACRODOWN only works in this function
- switch(id) {{
- case UM:
- unicode_mode = (unicode_mode + 1) % 2;
- break;
-{macro_cases}
-{unicode_macro_cases}
- default:
- break;
- }}
- return MACRO_NONE;
-}};
-"""
-
-UNICODE_MACRO_TEMPLATE = """
-case {macro_id}:
- unicode_action_function(0x{hi:02x}, 0x{lo:02x});
- break;
-""".strip()
-
-
-def unicode_macro_cases(config):
- for macro_id, uc_hex in config['unicode_macros'].items():
- hi = int(uc_hex, 16) >> 8
- lo = int(uc_hex, 16) & 0xFF
- yield UNICODE_MACRO_TEMPLATE.format(macro_id=macro_id, hi=hi, lo=lo)
-
-
-def iter_keymap_lines(keymap, row_indents=None):
- col_widths = {}
- col = 0
- # first pass, figure out the column widths
- prev_row_index = None
- for code, row_index in keymap.values():
- if row_index != prev_row_index:
- col = 0
- if row_indents:
- col = row_indents[row_index]
- col_widths[col] = max(len(code), col_widths.get(col, 0))
- prev_row_index = row_index
- col += 1
-
- # second pass, yield the cell values
- col = 0
- prev_row_index = None
- for key_index in sorted(keymap):
- code, row_index = keymap[key_index]
- if row_index != prev_row_index:
- col = 0
- yield "\n"
- if row_indents:
- for indent_col in range(row_indents[row_index]):
- pad = " " * (col_widths[indent_col] - 4)
- yield (" /*-*/" + pad)
- col = row_indents[row_index]
- else:
- yield pad
- yield " {}".format(code)
- if key_index < len(keymap) - 1:
- yield ","
- # This will be yielded on the next iteration when
- # we know that we're not at the end of a line.
- pad = " " * (col_widths[col] - len(code))
- prev_row_index = row_index
- col += 1
-
-
-def iter_keymap_parts(config, keymaps):
- # includes
- for include_path in config['keymaps_includes']:
- yield '#include "{}"\n'.format(include_path)
-
- yield "\n"
-
- # definitions
- for i, macro_id in enumerate(sorted(config['macro_ids'])):
- yield "#define {} {}\n".format(macro_id, i)
-
- yield "\n"
-
- for i, layer_name in enumerate(config['layer_lines']):
- yield '#define L{0:<3} {0:<5} // {1}\n'.format(i, layer_name)
-
- yield "\n"
-
- # keymaps
- yield "const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {\n"
-
- for i, layer_name in enumerate(config['layer_lines']):
- # comment
- layer_lines = config['layer_lines'][layer_name]
- prefixed_lines = " * " + " * ".join(layer_lines)
- yield "/*\n{} */\n".format(prefixed_lines)
-
- # keymap codes
- keymap = keymaps[layer_name]
- row_indents = ROW_INDENTS.get(config['layout'])
- keymap_lines = "".join(iter_keymap_lines(keymap, row_indents))
- yield "[L{0}] = LAYOUT_ergodox({1}\n),\n".format(i, keymap_lines)
-
- yield "};\n\n"
-
- # macros
- yield MACROCODE.format(
- macro_cases="",
- unicode_macro_cases="\n".join(unicode_macro_cases(config)),
- )
-
- # TODO: dynamically create blinking lights
- yield USERCODE
-
-
-def main(argv=sys.argv[1:]):
- if not argv or '-h' in argv or '--help' in argv:
- print(__doc__)
- return 0
-
- in_path = os.path.abspath(argv[0])
- if not os.path.exists(in_path):
- print("No such file '{}'".format(in_path))
- return 1
-
- if len(argv) > 1:
- out_path = os.path.abspath(argv[1])
- else:
- dirname = os.path.dirname(in_path)
- out_path = os.path.join(dirname, "keymap.c")
-
- config = parse_config(in_path)
- valid_keys = parse_valid_keys(config, out_path)
- keymaps = parse_keymaps(config, valid_keys)
-
- with io.open(out_path, mode="w", encoding="utf-8") as fh:
- for part in iter_keymap_parts(config, keymaps):
- fh.write(part)
-
-
-if __name__ == '__main__':
- sys.exit(main())
diff --git a/layouts/community/ergodox/german-manuneo/keymap.c b/layouts/community/ergodox/german-manuneo/keymap.c
deleted file mode 100644
index b6217800c3..0000000000
--- a/layouts/community/ergodox/german-manuneo/keymap.c
+++ /dev/null
@@ -1,781 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "keymap.h"
-#include "keymap_german.h"
-
-#define UC_ASYMPTOTICALLY_EQUAL_TO 0
-#define UC_DIVISION_SIGN 1
-#define UC_DOWNWARDS_ARROW 2
-#define UC_ELEMENT_OF 3
-#define UC_EMPTY_SET 4
-#define UC_FOR_ALL 5
-#define UC_GREEK_CAPITAL_LETTER_ALPHA 6
-#define UC_GREEK_CAPITAL_LETTER_BETA 7
-#define UC_GREEK_CAPITAL_LETTER_CHI 8
-#define UC_GREEK_CAPITAL_LETTER_DELTA 9
-#define UC_GREEK_CAPITAL_LETTER_EPSILON 10
-#define UC_GREEK_CAPITAL_LETTER_ETA 11
-#define UC_GREEK_CAPITAL_LETTER_GAMMA 12
-#define UC_GREEK_CAPITAL_LETTER_IOTA 13
-#define UC_GREEK_CAPITAL_LETTER_KAPPA 14
-#define UC_GREEK_CAPITAL_LETTER_LAMDA 15
-#define UC_GREEK_CAPITAL_LETTER_MU 16
-#define UC_GREEK_CAPITAL_LETTER_NU 17
-#define UC_GREEK_CAPITAL_LETTER_OMEGA 18
-#define UC_GREEK_CAPITAL_LETTER_OMICRON 19
-#define UC_GREEK_CAPITAL_LETTER_PHI 20
-#define UC_GREEK_CAPITAL_LETTER_PI 21
-#define UC_GREEK_CAPITAL_LETTER_PSI 22
-#define UC_GREEK_CAPITAL_LETTER_RHO 23
-#define UC_GREEK_CAPITAL_LETTER_SIGMA 24
-#define UC_GREEK_CAPITAL_LETTER_TAU 25
-#define UC_GREEK_CAPITAL_LETTER_THETA 26
-#define UC_GREEK_CAPITAL_LETTER_UPSILON 27
-#define UC_GREEK_CAPITAL_LETTER_XI 28
-#define UC_GREEK_CAPITAL_LETTER_ZETA 29
-#define UC_GREEK_SMALL_LETTER_ALPHA 30
-#define UC_GREEK_SMALL_LETTER_BETA 31
-#define UC_GREEK_SMALL_LETTER_CHI 32
-#define UC_GREEK_SMALL_LETTER_DELTA 33
-#define UC_GREEK_SMALL_LETTER_EPSILON 34
-#define UC_GREEK_SMALL_LETTER_ETA 35
-#define UC_GREEK_SMALL_LETTER_FINAL_SIGMA 36
-#define UC_GREEK_SMALL_LETTER_GAMMA 37
-#define UC_GREEK_SMALL_LETTER_IOTA 38
-#define UC_GREEK_SMALL_LETTER_KAPPA 39
-#define UC_GREEK_SMALL_LETTER_LAMDA 40
-#define UC_GREEK_SMALL_LETTER_MU 41
-#define UC_GREEK_SMALL_LETTER_NU 42
-#define UC_GREEK_SMALL_LETTER_OMEGA 43
-#define UC_GREEK_SMALL_LETTER_OMICRON 44
-#define UC_GREEK_SMALL_LETTER_PHI 45
-#define UC_GREEK_SMALL_LETTER_PI 46
-#define UC_GREEK_SMALL_LETTER_PSI 47
-#define UC_GREEK_SMALL_LETTER_RHO 48
-#define UC_GREEK_SMALL_LETTER_SIGMA 49
-#define UC_GREEK_SMALL_LETTER_TAU 50
-#define UC_GREEK_SMALL_LETTER_THETA 51
-#define UC_GREEK_SMALL_LETTER_UPSILON 52
-#define UC_GREEK_SMALL_LETTER_XI 53
-#define UC_GREEK_SMALL_LETTER_ZETA 54
-#define UC_INFINITY 55
-#define UC_LEFTWARDS_ARROW 56
-#define UC_MULTIPLICATION_SIGN 57
-#define UC_NOT_AN_ELEMENT_OF 58
-#define UC_NOT_EQUAL_TO 59
-#define UC_PLUS_MINUS_SIGN 60
-#define UC_RIGHTWARDS_ARROW 61
-#define UC_SUBSCRIPT_EIGHT 62
-#define UC_SUBSCRIPT_FIVE 63
-#define UC_SUBSCRIPT_FOUR 64
-#define UC_SUBSCRIPT_NINE 65
-#define UC_SUBSCRIPT_ONE 66
-#define UC_SUBSCRIPT_SEVEN 67
-#define UC_SUBSCRIPT_SIX 68
-#define UC_SUBSCRIPT_THREE 69
-#define UC_SUBSCRIPT_TWO 70
-#define UC_SUBSCRIPT_ZERO 71
-#define UC_SUPERSCRIPT_EIGHT 72
-#define UC_SUPERSCRIPT_FIVE 73
-#define UC_SUPERSCRIPT_FOUR 74
-#define UC_SUPERSCRIPT_LATIN_SMALL_LETTER_N 75
-#define UC_SUPERSCRIPT_NINE 76
-#define UC_SUPERSCRIPT_ONE 77
-#define UC_SUPERSCRIPT_SEVEN 78
-#define UC_SUPERSCRIPT_SIX 79
-#define UC_SUPERSCRIPT_THREE 80
-#define UC_SUPERSCRIPT_TWO 81
-#define UC_SUPERSCRIPT_ZERO 82
-#define UC_THERE_DOES_NOT_EXIST 83
-#define UC_THERE_EXISTS 84
-#define UC_UPWARDS_ARROW 85
-#define UC_VULGAR_FRACTION_ONE_EIGHTH 86
-#define UC_VULGAR_FRACTION_ONE_FIFTH 87
-#define UC_VULGAR_FRACTION_ONE_HALF 88
-#define UC_VULGAR_FRACTION_ONE_QUARTER 89
-#define UC_VULGAR_FRACTION_ONE_SIXTH 90
-#define UC_VULGAR_FRACTION_ONE_THIRD 91
-#define UC_VULGAR_FRACTION_THREE_QUARTERS 92
-#define UC_VULGAR_FRACTION_TWO_THIRDS 93
-#define UM 94
-
-#define L0 0 // layer_0
-#define L1 1 // layer_1
-#define L2 2 // layer_2
-#define L3 3 // layer_3
-#define L4 4 // layer_4
-#define L5 5 // layer_5
-#define L6 6 // layer_6
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * .------------------------------------.------------------------------------.
- * |MO(5)| 1 | 2 | 3 | 4 | 5 |ACUT | GRV | 6 | 7 | 8 | 9 | 0 |CIRC |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * |MO(4)| X | P | F | W | G |HOME |TG(2)| H | J | K | L | Q | Z |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * |MO(1)| U | I | A | E | O |-----!-----! S | N | R | T | D | SS |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * |MO(3)| UE | OE | AE | C | V |END | TAB | B | M |COMM| DOT| UP | Y |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- * | | |LGUI|LALT|LCTL| !RCTL|RALT|LEFT|DOWN|RGHT|
- * '------------------------' '------------------------'
- * .-----------. .-----------.
- * |INS |TG(2)| !M(UM)|DEL |
- * .-----+-----+-----! !-----+-----+-----.
- * ! ! | APP | ! PGUP| ! !
- * ! ! !-----! !-----! ! !
- * |BSPC |LSFT | ESC | ! PGDN|ENTER|SPACE|
- * '-----------------' '-----------------'
- */
-[L0] = LAYOUT_ergodox(
- MO(5), DE_1, DE_2, DE_3, DE_4, DE_5, DE_ACUT,
- MO(4), DE_X, DE_P, DE_F, DE_W, DE_G, KC_HOME,
- MO(1), DE_U, DE_I, DE_A, DE_E, DE_O,
- MO(3), DE_UDIA, DE_ODIA, DE_ADIA, DE_C, DE_V, KC_END,
- KC_TRNS, KC_TRNS, KC_LGUI, KC_LALT, KC_LCTL,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_INS, TG(2),
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_APP,
- /*-*/ /*-*/ /*-*/ /*-*/ KC_BSPC, KC_LSFT, KC_ESC,
- DE_GRV, DE_6, DE_7, DE_8, DE_9, DE_0, DE_CIRC,
- TG(2), DE_H, DE_J, DE_K, DE_L, DE_Q, DE_Z,
- /*-*/ DE_S, DE_N, DE_R, DE_T, DE_D, DE_SS,
- KC_TAB, DE_B, DE_M, DE_COMM, DE_DOT, KC_UP, DE_Y,
- /*-*/ /*-*/ KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT,
- M(UM), KC_DEL,
- KC_PGUP,
- KC_PGDN, KC_ENTER, KC_SPACE
-),
-/*
- * .------------------------------------.------------------------------------.
- * | |EXLM|DQOT|PARA| | | | | | | | |RING| |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * | |ASTR|PIPE|SLSH|LCBR|RCBR| | |HASH|LESS|MORE| |DQOT| |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * | |UNDS|MINS|AMPR|LBRC|RBRC|-----!-----!DLR |LPRN|RPRN|TILD|QUOT| QST |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * | | |PLUS|EQL | | | | |BSLS|PERC|SCLN|COLN| ↑ | |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- * | | | | | | ! | | ← | ↓ | → |
- * '------------------------' '------------------------'
- * .-----------. .-----------.
- * | | | ! | |
- * .-----+-----+-----! !-----+-----+-----.
- * ! ! | | ! | ! !
- * ! ! !-----! !-----! ! !
- * | | | | ! | | |
- * '-----------------' '-----------------'
- */
-[L1] = LAYOUT_ergodox(
- KC_TRNS, DE_EXLM, DE_DQUO, DE_SECT, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, DE_ASTR, DE_PIPE, DE_SLSH, DE_LCBR, DE_RCBR, KC_TRNS,
- KC_TRNS, DE_UNDS, DE_MINS, DE_AMPR, DE_LBRC, DE_RBRC,
- KC_TRNS, KC_TRNS, DE_PLUS, DE_EQL, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_DEG, KC_TRNS,
- KC_TRNS, DE_HASH, DE_LABK, DE_RABK, KC_TRNS, DE_DQUO, KC_TRNS,
- /*-*/ DE_DLR, DE_LPRN, DE_RPRN, DE_TILD, DE_QUOT, DE_QUES,
- KC_TRNS, DE_BSLS, DE_PERC, DE_SCLN, DE_COLN, M(UC_UPWARDS_ARROW), KC_TRNS,
- /*-*/ /*-*/ KC_TRNS, KC_TRNS, M(UC_LEFTWARDS_ARROW), M(UC_DOWNWARDS_ARROW), M(UC_RIGHTWARDS_ARROW),
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/*
- * .------------------------------------.------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | F11 | F12 | F6 | F7 | F8 | F9 |F10 |PEQL |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * | | | | | | | | | | P7 | P8 | P9 |PAST|PSLS |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * | | | | | | |-----!-----! | P4 | P5 | P6 |PMNS|PMNS |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * | | | | | | | | NLCK| | P1 | P2 | P3 |PPLS|PPLS |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- * | | | | | | ! P0 |PCMM|PDOT|PENT|PENT|
- * '------------------------' '------------------------'
- * .-----------. .-----------.
- * | | | ! | |
- * .-----+-----+-----! !-----+-----+-----.
- * ! ! | | ! | ! !
- * ! ! !-----! !-----! ! !
- * | | | | ! | | |
- * '-----------------' '-----------------'
- */
-[L2] = LAYOUT_ergodox(
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS, KC_TRNS,
- KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PEQL,
- KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS,
- /*-*/ KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PMNS,
- KC_NLCK, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PPLS, KC_PPLS,
- /*-*/ /*-*/ KC_P0, KC_PCMM, KC_PDOT, KC_PENT, KC_PENT,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/*
- * .------------------------------------.------------------------------------.
- * | | ¹ | ² | ³ | ⁴ | ⁵ | ∀ | | ⁶ | ⁷ | ⁸ | ⁹ | ⁰ | |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * | | × | ½ | ÷ | ¼ | ⅕ | | | ⅙ | | ⅛ | | | |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * | | | ± | AT |EURO| ∅ |-----!-----! ∞ | ⁿ | ∃ | ∈ | | |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * | | ⅓ | ≠ | ⅔ | ¾ | ≃ | | |EXLM| | ∄ | ∉ | | |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- * | | | | | | ! | | | | |
- * '------------------------' '------------------------'
- * .-----------. .-----------.
- * | | | ! | |
- * .-----+-----+-----! !-----+-----+-----.
- * ! ! | | ! | ! !
- * ! ! !-----! !-----! ! !
- * | | | | ! | | |
- * '-----------------' '-----------------'
- */
-[L3] = LAYOUT_ergodox(
- KC_TRNS, M(UC_SUPERSCRIPT_ONE), M(UC_SUPERSCRIPT_TWO), M(UC_SUPERSCRIPT_THREE), M(UC_SUPERSCRIPT_FOUR), M(UC_SUPERSCRIPT_FIVE), M(UC_FOR_ALL),
- KC_TRNS, M(UC_MULTIPLICATION_SIGN), M(UC_VULGAR_FRACTION_ONE_HALF), M(UC_DIVISION_SIGN), M(UC_VULGAR_FRACTION_ONE_QUARTER), M(UC_VULGAR_FRACTION_ONE_FIFTH), KC_TRNS,
- KC_TRNS, KC_TRNS, M(UC_PLUS_MINUS_SIGN), DE_AT, DE_EURO, M(UC_EMPTY_SET),
- KC_TRNS, M(UC_VULGAR_FRACTION_ONE_THIRD), M(UC_NOT_EQUAL_TO), M(UC_VULGAR_FRACTION_TWO_THIRDS), M(UC_VULGAR_FRACTION_THREE_QUARTERS), M(UC_ASYMPTOTICALLY_EQUAL_TO), KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, M(UC_SUPERSCRIPT_SIX), M(UC_SUPERSCRIPT_SEVEN), M(UC_SUPERSCRIPT_EIGHT), M(UC_SUPERSCRIPT_NINE), M(UC_SUPERSCRIPT_ZERO), KC_TRNS,
- KC_TRNS, M(UC_VULGAR_FRACTION_ONE_SIXTH), KC_TRNS, M(UC_VULGAR_FRACTION_ONE_EIGHTH), KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/ M(UC_INFINITY), M(UC_SUPERSCRIPT_LATIN_SMALL_LETTER_N), M(UC_THERE_EXISTS), M(UC_ELEMENT_OF), KC_TRNS, KC_TRNS,
- KC_TRNS, DE_EXLM, KC_TRNS, M(UC_THERE_DOES_NOT_EXIST), M(UC_NOT_AN_ELEMENT_OF), KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/*
- * .------------------------------------.------------------------------------.
- * | | ₁ | ₂ | ₃ | ₄ | ₅ | | | ₆ | ₇ | ₈ | ₉ | ₀ | |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * | | χ | π | φ | ω | γ | | | η | ξ | κ | λ | | ζ |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * | | υ | ι | α | ε | ο |-----!-----! σ | ν | ρ | τ | δ | ς |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * | | | θ | | | | | | β | μ | | | | ψ |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- * | | | | | | ! | | | | |
- * '------------------------' '------------------------'
- * .-----------. .-----------.
- * | | | ! | |
- * .-----+-----+-----! !-----+-----+-----.
- * ! ! | | ! | ! !
- * ! ! !-----! !-----! ! !
- * | | | | ! | | |
- * '-----------------' '-----------------'
- */
-[L4] = LAYOUT_ergodox(
- KC_TRNS, M(UC_SUBSCRIPT_ONE), M(UC_SUBSCRIPT_TWO), M(UC_SUBSCRIPT_THREE), M(UC_SUBSCRIPT_FOUR), M(UC_SUBSCRIPT_FIVE), KC_TRNS,
- KC_TRNS, M(UC_GREEK_SMALL_LETTER_CHI), M(UC_GREEK_SMALL_LETTER_PI), M(UC_GREEK_SMALL_LETTER_PHI), M(UC_GREEK_SMALL_LETTER_OMEGA), M(UC_GREEK_SMALL_LETTER_GAMMA), KC_TRNS,
- KC_TRNS, M(UC_GREEK_SMALL_LETTER_UPSILON), M(UC_GREEK_SMALL_LETTER_IOTA), M(UC_GREEK_SMALL_LETTER_ALPHA), M(UC_GREEK_SMALL_LETTER_EPSILON), M(UC_GREEK_SMALL_LETTER_OMICRON),
- KC_TRNS, KC_TRNS, M(UC_GREEK_SMALL_LETTER_THETA), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, M(UC_SUBSCRIPT_SIX), M(UC_SUBSCRIPT_SEVEN), M(UC_SUBSCRIPT_EIGHT), M(UC_SUBSCRIPT_NINE), M(UC_SUBSCRIPT_ZERO), KC_TRNS,
- KC_TRNS, M(UC_GREEK_SMALL_LETTER_ETA), M(UC_GREEK_SMALL_LETTER_XI), M(UC_GREEK_SMALL_LETTER_KAPPA), M(UC_GREEK_SMALL_LETTER_LAMDA), KC_TRNS, M(UC_GREEK_SMALL_LETTER_ZETA),
- /*-*/ M(UC_GREEK_SMALL_LETTER_SIGMA), M(UC_GREEK_SMALL_LETTER_NU), M(UC_GREEK_SMALL_LETTER_RHO), M(UC_GREEK_SMALL_LETTER_TAU), M(UC_GREEK_SMALL_LETTER_DELTA), M(UC_GREEK_SMALL_LETTER_FINAL_SIGMA),
- KC_TRNS, M(UC_GREEK_SMALL_LETTER_BETA), M(UC_GREEK_SMALL_LETTER_MU), KC_TRNS, KC_TRNS, KC_TRNS, M(UC_GREEK_SMALL_LETTER_PSI),
- /*-*/ /*-*/ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/*
- * .------------------------------------.------------------------------------.
- * | | | | | | | | | | | | | | |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * | | Χ | Π | Φ | Ω | Γ | | | Η | Ξ | Κ | Λ | | Ζ |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * | | Υ | Ι | Α | Ε | Ο |-----!-----! Σ | Ν | Ρ | Τ | Δ | |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * | | | Θ | | | | | | Β | Μ | | | | Ψ |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- * | | | | | | ! | | | | |
- * '------------------------' '------------------------'
- * .-----------. .-----------.
- * | | | ! | |
- * .-----+-----+-----! !-----+-----+-----.
- * ! ! | | ! | ! !
- * ! ! !-----! !-----! ! !
- * | | | | ! | | |
- * '-----------------' '-----------------'
- */
-[L5] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_CHI), M(UC_GREEK_CAPITAL_LETTER_PI), M(UC_GREEK_CAPITAL_LETTER_PHI), M(UC_GREEK_CAPITAL_LETTER_OMEGA), M(UC_GREEK_CAPITAL_LETTER_GAMMA), KC_TRNS,
- KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_UPSILON), M(UC_GREEK_CAPITAL_LETTER_IOTA), M(UC_GREEK_CAPITAL_LETTER_ALPHA), M(UC_GREEK_CAPITAL_LETTER_EPSILON), M(UC_GREEK_CAPITAL_LETTER_OMICRON),
- KC_TRNS, KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_THETA), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_ETA), M(UC_GREEK_CAPITAL_LETTER_XI), M(UC_GREEK_CAPITAL_LETTER_KAPPA), M(UC_GREEK_CAPITAL_LETTER_LAMDA), KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_ZETA),
- /*-*/ M(UC_GREEK_CAPITAL_LETTER_SIGMA), M(UC_GREEK_CAPITAL_LETTER_NU), M(UC_GREEK_CAPITAL_LETTER_RHO), M(UC_GREEK_CAPITAL_LETTER_TAU), M(UC_GREEK_CAPITAL_LETTER_DELTA), KC_TRNS,
- KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_BETA), M(UC_GREEK_CAPITAL_LETTER_MU), KC_TRNS, KC_TRNS, KC_TRNS, M(UC_GREEK_CAPITAL_LETTER_PSI),
- /*-*/ /*-*/ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/*
- * .------------------------------------.------------------------------------.
- * | | | | | | | | | | | | | | |
- * !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- * | | | | | | | | | | | | | | |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * | | | | | | |-----!-----! | | | | | |
- * !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- * | | | | | | | | | | | | | | |
- * '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- * | | | | | | ! | | | | |
- * '------------------------' '------------------------'
- * .-----------. .-----------.
- * | | | ! | |
- * .-----+-----+-----! !-----+-----+-----.
- * ! ! | | ! | ! !
- * ! ! !-----! !-----! ! !
- * | | | | ! | | |
- * '-----------------' '-----------------'
- */
-[L6] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS,
- /*-*/ /*-*/ /*-*/ /*-*/ KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- /*-*/ /*-*/ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-};
-
-#define UC_MODE_WIN 0
-#define UC_MODE_LINUX 1
-#define UC_MODE_OSX 2
-
-// TODO: allow default mode to be configured
-static uint16_t unicode_mode = UC_MODE_WIN;
-
-uint16_t hextokeycode(uint8_t hex) {
- if (hex == 0x0) {
- return KC_P0;
- }
- if (hex < 0xA) {
- return KC_P1 + (hex - 0x1);
- }
- return KC_A + (hex - 0xA);
-}
-
-void unicode_action_function(uint16_t hi, uint16_t lo) {
- switch (unicode_mode) {
- case UC_MODE_WIN:
- register_code(KC_LALT);
-
- register_code(KC_PPLS);
- unregister_code(KC_PPLS);
-
- register_code(hextokeycode((hi & 0xF0) >> 4));
- unregister_code(hextokeycode((hi & 0xF0) >> 4));
- register_code(hextokeycode((hi & 0x0F)));
- unregister_code(hextokeycode((hi & 0x0F)));
- register_code(hextokeycode((lo & 0xF0) >> 4));
- unregister_code(hextokeycode((lo & 0xF0) >> 4));
- register_code(hextokeycode((lo & 0x0F)));
- unregister_code(hextokeycode((lo & 0x0F)));
-
- unregister_code(KC_LALT);
- break;
- case UC_MODE_LINUX:
- register_code(KC_LCTL);
- register_code(KC_LSFT);
-
- register_code(KC_U);
- unregister_code(KC_U);
-
- register_code(hextokeycode((hi & 0xF0) >> 4));
- unregister_code(hextokeycode((hi & 0xF0) >> 4));
- register_code(hextokeycode((hi & 0x0F)));
- unregister_code(hextokeycode((hi & 0x0F)));
- register_code(hextokeycode((lo & 0xF0) >> 4));
- unregister_code(hextokeycode((lo & 0xF0) >> 4));
- register_code(hextokeycode((lo & 0x0F)));
- unregister_code(hextokeycode((lo & 0x0F)));
-
- unregister_code(KC_LCTL);
- unregister_code(KC_LSFT);
- break;
- case UC_MODE_OSX:
- break;
- }
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
- if (!record->event.pressed) {
- return MACRO_NONE;
- }
- // MACRODOWN only works in this function
- switch(id) {
- case UM:
- unicode_mode = (unicode_mode + 1) % 2;
- break;
-
-case UC_GREEK_SMALL_LETTER_OMICRON:
- unicode_action_function(0x03, 0xbf);
- break;
-case UC_LEFTWARDS_ARROW:
- unicode_action_function(0x21, 0x90);
- break;
-case UC_GREEK_CAPITAL_LETTER_RHO:
- unicode_action_function(0x03, 0xa1);
- break;
-case UC_SUBSCRIPT_THREE:
- unicode_action_function(0x20, 0x83);
- break;
-case UC_VULGAR_FRACTION_ONE_EIGHTH:
- unicode_action_function(0x21, 0x5b);
- break;
-case UC_GREEK_SMALL_LETTER_LAMDA:
- unicode_action_function(0x03, 0xbb);
- break;
-case UC_VULGAR_FRACTION_ONE_THIRD:
- unicode_action_function(0x21, 0x53);
- break;
-case UC_GREEK_SMALL_LETTER_XI:
- unicode_action_function(0x03, 0xbe);
- break;
-case UC_THERE_DOES_NOT_EXIST:
- unicode_action_function(0x22, 0x04);
- break;
-case UC_SUPERSCRIPT_ONE:
- unicode_action_function(0x00, 0xb9);
- break;
-case UC_GREEK_SMALL_LETTER_BETA:
- unicode_action_function(0x03, 0xb2);
- break;
-case UC_SUBSCRIPT_FIVE:
- unicode_action_function(0x20, 0x85);
- break;
-case UC_GREEK_CAPITAL_LETTER_IOTA:
- unicode_action_function(0x03, 0x99);
- break;
-case UC_VULGAR_FRACTION_ONE_FIFTH:
- unicode_action_function(0x21, 0x55);
- break;
-case UC_GREEK_SMALL_LETTER_PSI:
- unicode_action_function(0x03, 0xc8);
- break;
-case UC_SUBSCRIPT_NINE:
- unicode_action_function(0x20, 0x89);
- break;
-case UC_SUPERSCRIPT_FOUR:
- unicode_action_function(0x20, 0x74);
- break;
-case UC_RIGHTWARDS_ARROW:
- unicode_action_function(0x21, 0x92);
- break;
-case UC_SUPERSCRIPT_SIX:
- unicode_action_function(0x20, 0x76);
- break;
-case UC_DOWNWARDS_ARROW:
- unicode_action_function(0x21, 0x93);
- break;
-case UC_GREEK_SMALL_LETTER_PI:
- unicode_action_function(0x03, 0xc0);
- break;
-case UC_SUPERSCRIPT_TWO:
- unicode_action_function(0x00, 0xb2);
- break;
-case UC_GREEK_CAPITAL_LETTER_OMEGA:
- unicode_action_function(0x03, 0xa9);
- break;
-case UC_GREEK_CAPITAL_LETTER_PSI:
- unicode_action_function(0x03, 0xa8);
- break;
-case UC_SUBSCRIPT_FOUR:
- unicode_action_function(0x20, 0x84);
- break;
-case UC_GREEK_CAPITAL_LETTER_NU:
- unicode_action_function(0x03, 0x9d);
- break;
-case UC_DIVISION_SIGN:
- unicode_action_function(0x00, 0xf7);
- break;
-case UC_GREEK_SMALL_LETTER_SIGMA:
- unicode_action_function(0x03, 0xc3);
- break;
-case UC_GREEK_SMALL_LETTER_RHO:
- unicode_action_function(0x03, 0xc1);
- break;
-case UC_VULGAR_FRACTION_ONE_SIXTH:
- unicode_action_function(0x21, 0x59);
- break;
-case UC_GREEK_SMALL_LETTER_GAMMA:
- unicode_action_function(0x03, 0xb3);
- break;
-case UC_VULGAR_FRACTION_TWO_THIRDS:
- unicode_action_function(0x21, 0x54);
- break;
-case UC_GREEK_SMALL_LETTER_NU:
- unicode_action_function(0x03, 0xbd);
- break;
-case UC_GREEK_SMALL_LETTER_ZETA:
- unicode_action_function(0x03, 0xb6);
- break;
-case UC_GREEK_SMALL_LETTER_EPSILON:
- unicode_action_function(0x03, 0xb5);
- break;
-case UC_GREEK_SMALL_LETTER_KAPPA:
- unicode_action_function(0x03, 0xba);
- break;
-case UC_SUPERSCRIPT_SEVEN:
- unicode_action_function(0x20, 0x77);
- break;
-case UC_GREEK_CAPITAL_LETTER_PI:
- unicode_action_function(0x03, 0xa0);
- break;
-case UC_GREEK_SMALL_LETTER_FINAL_SIGMA:
- unicode_action_function(0x03, 0xc2);
- break;
-case UC_GREEK_CAPITAL_LETTER_XI:
- unicode_action_function(0x03, 0x9e);
- break;
-case UC_GREEK_SMALL_LETTER_THETA:
- unicode_action_function(0x03, 0xb8);
- break;
-case UC_GREEK_SMALL_LETTER_ETA:
- unicode_action_function(0x03, 0xb7);
- break;
-case UC_SUBSCRIPT_TWO:
- unicode_action_function(0x20, 0x82);
- break;
-case UC_ASYMPTOTICALLY_EQUAL_TO:
- unicode_action_function(0x22, 0x43);
- break;
-case UC_GREEK_SMALL_LETTER_ALPHA:
- unicode_action_function(0x03, 0xb1);
- break;
-case UC_GREEK_CAPITAL_LETTER_PHI:
- unicode_action_function(0x03, 0xa6);
- break;
-case UC_GREEK_SMALL_LETTER_PHI:
- unicode_action_function(0x03, 0xc6);
- break;
-case UC_INFINITY:
- unicode_action_function(0x22, 0x1e);
- break;
-case UC_GREEK_CAPITAL_LETTER_OMICRON:
- unicode_action_function(0x03, 0x9f);
- break;
-case UC_ELEMENT_OF:
- unicode_action_function(0x22, 0x08);
- break;
-case UC_MULTIPLICATION_SIGN:
- unicode_action_function(0x00, 0xd7);
- break;
-case UC_SUBSCRIPT_ZERO:
- unicode_action_function(0x20, 0x80);
- break;
-case UC_GREEK_CAPITAL_LETTER_SIGMA:
- unicode_action_function(0x03, 0xa3);
- break;
-case UC_GREEK_SMALL_LETTER_OMEGA:
- unicode_action_function(0x03, 0xc9);
- break;
-case UC_SUBSCRIPT_ONE:
- unicode_action_function(0x20, 0x81);
- break;
-case UC_GREEK_CAPITAL_LETTER_ZETA:
- unicode_action_function(0x03, 0x96);
- break;
-case UC_GREEK_SMALL_LETTER_TAU:
- unicode_action_function(0x03, 0xc4);
- break;
-case UC_SUPERSCRIPT_FIVE:
- unicode_action_function(0x20, 0x75);
- break;
-case UC_THERE_EXISTS:
- unicode_action_function(0x22, 0x03);
- break;
-case UC_PLUS_MINUS_SIGN:
- unicode_action_function(0x00, 0xb1);
- break;
-case UC_VULGAR_FRACTION_THREE_QUARTERS:
- unicode_action_function(0x00, 0xbe);
- break;
-case UC_SUPERSCRIPT_THREE:
- unicode_action_function(0x00, 0xb3);
- break;
-case UC_EMPTY_SET:
- unicode_action_function(0x22, 0x05);
- break;
-case UC_UPWARDS_ARROW:
- unicode_action_function(0x21, 0x91);
- break;
-case UC_SUPERSCRIPT_NINE:
- unicode_action_function(0x20, 0x79);
- break;
-case UC_GREEK_SMALL_LETTER_DELTA:
- unicode_action_function(0x03, 0xb4);
- break;
-case UC_GREEK_SMALL_LETTER_MU:
- unicode_action_function(0x03, 0xbc);
- break;
-case UC_GREEK_CAPITAL_LETTER_KAPPA:
- unicode_action_function(0x03, 0x9a);
- break;
-case UC_SUBSCRIPT_EIGHT:
- unicode_action_function(0x20, 0x88);
- break;
-case UC_GREEK_CAPITAL_LETTER_ALPHA:
- unicode_action_function(0x03, 0x91);
- break;
-case UC_SUBSCRIPT_SEVEN:
- unicode_action_function(0x20, 0x87);
- break;
-case UC_GREEK_CAPITAL_LETTER_BETA:
- unicode_action_function(0x03, 0x92);
- break;
-case UC_GREEK_CAPITAL_LETTER_ETA:
- unicode_action_function(0x03, 0x97);
- break;
-case UC_SUPERSCRIPT_EIGHT:
- unicode_action_function(0x20, 0x78);
- break;
-case UC_SUPERSCRIPT_ZERO:
- unicode_action_function(0x20, 0x70);
- break;
-case UC_NOT_AN_ELEMENT_OF:
- unicode_action_function(0x22, 0x09);
- break;
-case UC_GREEK_SMALL_LETTER_UPSILON:
- unicode_action_function(0x03, 0xc5);
- break;
-case UC_NOT_EQUAL_TO:
- unicode_action_function(0x22, 0x60);
- break;
-case UC_GREEK_CAPITAL_LETTER_CHI:
- unicode_action_function(0x03, 0xa7);
- break;
-case UC_FOR_ALL:
- unicode_action_function(0x22, 0x00);
- break;
-case UC_GREEK_CAPITAL_LETTER_TAU:
- unicode_action_function(0x03, 0xa4);
- break;
-case UC_VULGAR_FRACTION_ONE_QUARTER:
- unicode_action_function(0x00, 0xbc);
- break;
-case UC_GREEK_SMALL_LETTER_CHI:
- unicode_action_function(0x03, 0xc7);
- break;
-case UC_GREEK_CAPITAL_LETTER_THETA:
- unicode_action_function(0x03, 0x98);
- break;
-case UC_GREEK_SMALL_LETTER_IOTA:
- unicode_action_function(0x03, 0xb9);
- break;
-case UC_GREEK_CAPITAL_LETTER_LAMDA:
- unicode_action_function(0x03, 0x9b);
- break;
-case UC_SUPERSCRIPT_LATIN_SMALL_LETTER_N:
- unicode_action_function(0x20, 0x7f);
- break;
-case UC_GREEK_CAPITAL_LETTER_UPSILON:
- unicode_action_function(0x03, 0xa5);
- break;
-case UC_GREEK_CAPITAL_LETTER_MU:
- unicode_action_function(0x03, 0x9c);
- break;
-case UC_GREEK_CAPITAL_LETTER_EPSILON:
- unicode_action_function(0x03, 0x95);
- break;
-case UC_GREEK_CAPITAL_LETTER_GAMMA:
- unicode_action_function(0x03, 0x93);
- break;
-case UC_SUBSCRIPT_SIX:
- unicode_action_function(0x20, 0x86);
- break;
-case UC_GREEK_CAPITAL_LETTER_DELTA:
- unicode_action_function(0x03, 0x94);
- break;
-case UC_VULGAR_FRACTION_ONE_HALF:
- unicode_action_function(0x00, 0xbd);
- break;
- default:
- break;
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- case L1:
- ergodox_right_led_1_on();
- break;
- case L2:
- ergodox_right_led_2_on();
- break;
- case L3:
- ergodox_right_led_3_on();
- break;
- case L4:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- break;
- case L5:
- ergodox_right_led_1_on();
- ergodox_right_led_3_on();
- break;
- // case L6:
- // ergodox_right_led_2_on();
- // ergodox_right_led_3_on();
- // break;
- // case L7:
- // ergodox_right_led_1_on();
- // ergodox_right_led_2_on();
- // ergodox_right_led_3_on();
- // break;
- default:
- ergodox_board_led_off();
- break;
- }
-};
diff --git a/layouts/community/ergodox/german-manuneo/keymap.md b/layouts/community/ergodox/german-manuneo/keymap.md
deleted file mode 100644
index 3f476ad2a0..0000000000
--- a/layouts/community/ergodox/german-manuneo/keymap.md
+++ /dev/null
@@ -1,188 +0,0 @@
-# ManuNeo Ergodox Keyboard Layout
-
-Compile this file to a `keymap.c` file using `compile_keymap.py`
-
- python compile_keymap.py keymaps/german-manuneo/keymap.md
-
-Tested with python 2.7 and python 3.4
-
-
-# Layout Config
-
- {
- "layout": "ergodox_ez",
- "keymaps_includes": [
- QMK_KEYBOARD_H,
- "action_layer.h",
- "keymap_common.h",
- "keymap_extras/keymap_german.h",
- ],
- "key_prefixes": ["DE_", "KC_"],
- "macros": {
- // TODO: implement macros
- // "MUC": "",
- },
- // TODO: implement default unicode mode
- }
-
-
-# Layers
-
-
-## Layer 0
-
- .------------------------------------.------------------------------------.
- |MO(5)| 1 | 2 | 3 | 4 | 5 |ACUT | GRV | 6 | 7 | 8 | 9 | 0 |CIRC |
- !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- |MO(4)| X | P | F | W | G |HOME |TG(2)| H | J | K | L | Q | Z |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- |MO(1)| U | I | A | E | O |-----!-----! S | N | R | T | D | SS |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- |MO(3)| UE | OE | AE | C | V |END | TAB | B | M |COMM| DOT| UP | Y |
- '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- | | |LGUI|LALT|LCTL| !RCTL|RALT|LEFT|DOWN|RGHT|
- '------------------------' '------------------------'
- .-----------. .-----------.
- |INS |TG(2)| !M(UM)|DEL |
- .-----+-----+-----! !-----+-----+-----.
- ! ! | APP | ! PGUP| ! !
- ! ! !-----! !-----! ! !
- |BSPC |LSFT | ESC | ! PGDN|ENTER|SPACE|
- '-----------------' '-----------------'
-
-
-## Layer 1
-
- .------------------------------------.------------------------------------.
- | |EXLM|DQOT|PARA| | | | | | | | |RING| |
- !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- | |ASTR|PIPE|SLSH|LCBR|RCBR| | |HASH|LESS|MORE| |DQOT| |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- | |UNDS|MINS|AMPR|LBRC|RBRC|-----!-----!DLR |LPRN|RPRN|TILD|QUOT| QST |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- | | |PLUS|EQL | | | | |BSLS|PERC|SCLN|COLN| ↑ | |
- '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- | | | | | | ! | | ← | ↓ | → |
- '------------------------' '------------------------'
- .-----------. .-----------.
- | | | ! | |
- .-----+-----+-----! !-----+-----+-----.
- ! ! | | ! | ! !
- ! ! !-----! !-----! ! !
- | | | | ! | | |
- '-----------------' '-----------------'
-
-
-## Layer 2
-
- .------------------------------------.------------------------------------.
- | | F1 | F2 | F3 | F4 | F5 | F11 | F12 | F6 | F7 | F8 | F9 |F10 |PEQL |
- !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- | | | | | | | | | | P7 | P8 | P9 |PAST|PSLS |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- | | | | | | |-----!-----! | P4 | P5 | P6 |PMNS|PMNS |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- | | | | | | | | NLCK| | P1 | P2 | P3 |PPLS|PPLS |
- '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- | | | | | | ! P0 |PCMM|PDOT|PENT|PENT|
- '------------------------' '------------------------'
- .-----------. .-----------.
- | | | ! | |
- .-----+-----+-----! !-----+-----+-----.
- ! ! | | ! | ! !
- ! ! !-----! !-----! ! !
- | | | | ! | | |
- '-----------------' '-----------------'
-
-
-
-## Layer 3
-
-http://symbolcodes.tlt.psu.edu/bylanguage/mathchart.html
-
- .------------------------------------.------------------------------------.
- | | ¹ | ² | ³ | ⁴ | ⁵ | ∀ | | ⁶ | ⁷ | ⁸ | ⁹ | ⁰ | |
- !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- | | × | ½ | ÷ | ¼ | ⅕ | | | ⅙ | | ⅛ | | | |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- | | | ± | AT |EURO| ∅ |-----!-----! ∞ | ⁿ | ∃ | ∈ | | |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- | | ⅓ | ≠ | ⅔ | ¾ | ≃ | | |EXLM| | ∄ | ∉ | | |
- '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- | | | | | | ! | | | | |
- '------------------------' '------------------------'
- .-----------. .-----------.
- | | | ! | |
- .-----+-----+-----! !-----+-----+-----.
- ! ! | | ! | ! !
- ! ! !-----! !-----! ! !
- | | | | ! | | |
- '-----------------' '-----------------'
-
-
-## Layer 4
-
-
- .------------------------------------.------------------------------------.
- | | ₁ | ₂ | ₃ | ₄ | ₅ | | | ₆ | ₇ | ₈ | ₉ | ₀ | |
- !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- | | χ | π | φ | ω | γ | | | η | ξ | κ | λ | | ζ |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- | | υ | ι | α | ε | ο |-----!-----! σ | ν | ρ | τ | δ | ς |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- | | | θ | | | | | | β | μ | | | | ψ |
- '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- | | | | | | ! | | | | |
- '------------------------' '------------------------'
- .-----------. .-----------.
- | | | ! | |
- .-----+-----+-----! !-----+-----+-----.
- ! ! | | ! | ! !
- ! ! !-----! !-----! ! !
- | | | | ! | | |
- '-----------------' '-----------------'
-
-
-## Layer 5
-
- .------------------------------------.------------------------------------.
- | | | | | | | | | | | | | | |
- !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- | | Χ | Π | Φ | Ω | Γ | | | Η | Ξ | Κ | Λ | | Ζ |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- | | Υ | Ι | Α | Ε | Ο |-----!-----! Σ | Ν | Ρ | Τ | Δ | |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- | | | Θ | | | | | | Β | Μ | | | | Ψ |
- '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- | | | | | | ! | | | | |
- '------------------------' '------------------------'
- .-----------. .-----------.
- | | | ! | |
- .-----+-----+-----! !-----+-----+-----.
- ! ! | | ! | ! !
- ! ! !-----! !-----! ! !
- | | | | ! | | |
- '-----------------' '-----------------'
-
-
-## Layer 6
-
- .------------------------------------.------------------------------------.
- | | | | | | | | | | | | | | |
- !-----+----+----+----+----+----------!-----+----+----+----+----+----+-----!
- | | | | | | | | | | | | | | |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- | | | | | | |-----!-----! | | | | | |
- !-----+----+----+----x----x----! ! !----x----x----+----+----+-----!
- | | | | | | | | | | | | | | |
- '-----+----+----+----+----+----------'----------+----+----+----+----+-----'
- | | | | | | ! | | | | |
- '------------------------' '------------------------'
- .-----------. .-----------.
- | | | ! | |
- .-----+-----+-----! !-----+-----+-----.
- ! ! | | ! | ! !
- ! ! !-----! !-----! ! !
- | | | | ! | | |
- '-----------------' '-----------------'
-
diff --git a/layouts/community/ergodox/guni/keymap.c b/layouts/community/ergodox/guni/keymap.c
index d39599a1b1..570a45b127 100644
--- a/layouts/community/ergodox/guni/keymap.c
+++ b/layouts/community/ergodox/guni/keymap.c
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,
// right hand
- KC_TRNS,KC_NLCK,KC_PSLS,KC_PAST,KC_PAST,KC_PMNS,KC_BSPC,
+ KC_TRNS,KC_NUM, KC_PSLS,KC_PAST,KC_PAST,KC_PMNS,KC_BSPC,
KC_TRNS,KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS,KC_BSPC,
KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS,KC_PENT,
KC_TRNS,KC_NO, KC_P1, KC_P2, KC_P3, KC_PPLS,KC_PENT,
diff --git a/layouts/community/ergodox/guni/readme.txt b/layouts/community/ergodox/guni/readme.txt
index 679a08e31d..b39018feb4 100644
--- a/layouts/community/ergodox/guni/readme.txt
+++ b/layouts/community/ergodox/guni/readme.txt
@@ -118,7 +118,7 @@ echo 'xkbcomp $HOME/.xkbmap $DISPLAY' >> ~/.xinitrc
KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,
// right hand
- KC_TRNS,KC_NLCK,KC_PSLS,KC_PAST,KC_PAST,KC_PMNS,KC_BSPC,
+ KC_TRNS,KC_NUM, KC_PSLS,KC_PAST,KC_PAST,KC_PMNS,KC_BSPC,
KC_TRNS,KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS,KC_BSPC,
KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS,KC_PENT,
KC_TRNS,KC_NO, KC_P1, KC_P2, KC_P3, KC_PPLS,KC_PENT,
diff --git a/layouts/community/ergodox/haegin/keymap.c b/layouts/community/ergodox/haegin/keymap.c
index cf5db6333b..7b0e1b6c0e 100644
--- a/layouts/community/ergodox/haegin/keymap.c
+++ b/layouts/community/ergodox/haegin/keymap.c
@@ -201,7 +201,7 @@ void dance_backspace_ended (qk_tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
if (state->pressed) {
fib_bspc.state = HOLD_CTRL;
- register_code(KC_LCTRL);
+ register_code(KC_LCTL);
} else {
register_code(KC_BSPC);
}
@@ -210,7 +210,7 @@ void dance_backspace_ended (qk_tap_dance_state_t *state, void *user_data) {
void dance_backspace_reset (qk_tap_dance_state_t *state, void *user_data) {
switch (fib_bspc.state) {
- case HOLD_CTRL: unregister_code(KC_LCTRL); break;
+ case HOLD_CTRL: unregister_code(KC_LCTL); break;
case BSPC_WORD: unregister_code(KC_BSPC); unregister_code(KC_LALT); break;
case BSPC_LETTER: unregister_code(KC_BSPC); break;
}
diff --git a/layouts/community/ergodox/ishigoya-jp/keymap.c b/layouts/community/ergodox/ishigoya-jp/keymap.c
deleted file mode 100644
index 8fe2b7e415..0000000000
--- a/layouts/community/ergodox/ishigoya-jp/keymap.c
+++ /dev/null
@@ -1,958 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "keymap_japanese.h"
-
-static uint16_t start;
-
-#define BASE 0 // EN layer
-#define JP 1 // Japanese
-#define JPXON 2 // JP + Fn
-#define JPKAZARI 3 // JP + KAZARI
-#define JPTOPROW 4 // JP + TOPROW
-#define JPTRKZ 5 // JP + TOPROW + KAZARI
-#define NUM 6 // Numbers
-
-#define CTLSHFT 1
-#define CUTCOPY 2
-
-//kana macro definitions start here
-
-#define JPVU 4
-#define JPNU 6
-#define JPKO 7
-#define JPSA 8
-#define JPKE 9
-#define JPHE 10
-#define JPSHI 11
-#define JPKA 12
-#define JPKI 13
-#define JPSU 14
-#define JPSO 15
-#define JPHI 16
-#define JPCHI 17
-#define JPFU 18
-#define JPSE 19
-#define JPTSU 20
-#define JPKU 21
-#define JPTE 22
-#define JPTA 23
-#define JPTO 24
-#define JPHA 25
-#define JPHO 26
-#define JPXKE 27
-#define JPXU 28
-#define JPXKA 29
-#define JPXA 30
-#define JPXO 31
-#define JPGO 32
-#define JPZA 33
-#define JPGE 34
-#define JPBE 35
-#define JPYU 36
-#define JPJI 37
-#define JPGA 38
-#define JPGI 39
-#define JPZU 40
-#define JPZO 41
-#define JPBI 42
-#define JPDI 43
-#define JPZE 44
-#define JPDU 45
-#define JPGU 46
-#define JPYA 47
-#define JPYO 48
-#define JPDE 49
-#define JPDA 50
-#define JPDO 51
-#define JPBA 52
-#define JPBO 53
-#define JPRI 54
-#define JPRE 55
-#define JPRA 56
-#define JPNA 57
-#define JPNO 58
-#define JPMI 59
-#define JPMU 60
-#define JPME 61
-#define JPNE 62
-#define JPMA 63
-#define JPXTU 64
-#define JPWA 65
-#define JPRU 66
-#define JPWO 67
-#define JPNI 68
-#define JPNN 69
-#define JPMO 70
-#define JPRO 71
-#define JPXE 72
-#define JPXI 73
-#define JPXYU 74
-#define JPXYA 75
-#define JPXYO 76
-#define JPPE 77
-#define JPPU 78
-#define JPPI 79
-#define JPPA 80
-#define JPPO 81
-#define JPBU 82
-
-// kana macro definitions end here
-
-#define SHIFT 86
-#define KAZARI 87
-#define JPFN 88 //shifts to JPXON layer
-#define TOJPLOUT 89
-#define TOENL 90
-#define TOJPL 91
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- *
- * ,----------------------------------------------------. ,--------------------------------------------------.
- * | En / 和 | | ^ | % | | |Selall| | Undo | | $ | @ | LT | UP | RT |
- * |----------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Tab | Q | D | R | W | B | Cut | | PgUP | J | F | U | P | DN | \ |
- * |----------+------+------+------+------+------| Copy | | |------+------+------+------+------+--------|
- * | / | A | S | H | T | G |------| |------| Y | N | E | O | I | , |
- * |----------+------+------+------+------+------|Paste | | PgDN |------+------+------+------+------+--------|
- * | Ctl+Shft | Z | X | M | C | V | | | | . | L | K | ' | ? | tmux |
- * `----------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | LCtrl | LGui | Alt| _ | Esc | |MouseL|MouseR| - | ~ | Ctrl |
- * `------------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * |MidMs | Del | | VolUp| Mute |
- * ,------|------|------| |------+--------+------.
- * | | | | | VolDn| | |
- * | Space| Shift|------| |------| Backsp |Enter |
- * | | | Num | | Esc | | |
- * `--------------------' `----------------------'
- *
- *
- * tmux prefix set to C-b
- *
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- M(TOJPLOUT), KC_NO, KC_EQL, LSFT(KC_5), KC_NO, KC_NO, LCTL(KC_A),
- KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, M(CUTCOPY),
- KC_SLSH, KC_A, KC_S, KC_H, KC_T, KC_G,
- M(CTLSHFT), KC_Z, KC_X, KC_M, KC_C, KC_V, LCTL(KC_V),
- KC_RCTL, KC_LGUI, KC_LALT,JP_UNDS,KC_LCTL,
- KC_BTN3, KC_DEL,
- KC_NO,
- KC_SPC,KC_LSFT,MO(NUM),
- // right hand
- LCTL(KC_Z), KC_NO, LSFT(KC_4), JP_AT, KC_LEFT, KC_UP, KC_RIGHT,
- KC_PGUP, KC_J, KC_F, KC_U, KC_P, KC_DOWN, LSFT(KC_3),
- KC_Y, KC_N, KC_E, KC_O, KC_I, KC_COMMA,
- KC_PGDN, KC_DOT, KC_L, KC_K, LSFT(KC_7), KC_QUES, LCTL(KC_B),
- KC_BTN1, KC_BTN2,KC_MINS,JP_TILD, KC_RCTL,
- KC_VOLU, KC_MUTE,
- KC_VOLD,
- KC_SPC,KC_BSLS, KC_ENT
- ),
-/* Keymap 1: Japanese
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | En / 和| | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | |   nu | ko | sa | he | ke | | | | fu | se | tsu | ku | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | to | shi | ka | ki | su |------| |------| a | ha | te | ta | u | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | mu | so | hi | chi | me | | | | | ma | ho | i | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | shift| fn |------| |------| |kazari|
- * | | | Num | | | | |
- * `--------------------' `--------------------'
- *
- *
- *
- */
-[JP] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, M(JPNU), M(JPKO), M(JPSA), M(JPHE), M(JPKE), KC_TRNS,
- KC_TRNS, M(JPTO), M(JPSHI), M(JPKA), M(JPKI), M(JPSU),
- KC_TRNS, M(JPMU), M(JPSO), M(JPHI), M(JPCHI), M(JPME), KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_NO,
- M(SHIFT), M(JPFN), MO(NUM),
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, M(JPFU), M(JPSE), M(JPTSU), M(JPKU), KC_TRNS, KC_TRNS,
- KC_A, M(JPHA), M(JPTE), M(JPTA), KC_U, KC_TRNS,
- KC_TRNS, KC_TRNS, M(JPMA), M(JPHO), KC_I, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,M(KAZARI)
-),
-/* Keymap 2: Japanese with Fn
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | |   | xe | | | xke | | | | xya | | xtsu | xo | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | xka | | |------| |------| xa | xyo | | | xu | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | | xi | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- *
- *
- *
- */
-[JPXON] = LAYOUT_ergodox(
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, M(JPXE), KC_NO, M(JPXKE), KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, M(JPXKA), KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_TRNS, KC_TRNS,
- // right hand
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, M(JPXYA), KC_NO, M(JPXTU), M(JPXO), KC_NO, KC_NO,
- M(JPXA), M(JPXYO), M(JPXYU), KC_NO, M(JPXU), KC_NO,
- KC_NO, KC_NO,KC_NO, KC_NO, M(JPXI), KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_NO
-),
-/* Keymap 3: Japanese with kazari
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | |   | go | za | be | ge | | | | bu | ze | du | gu | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | do | ji | ga | gi | zu |------| |------| | ba | de | da | vu | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | zo | bi | di | | | | | | | bo | | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- *
- *
- *
- */
-[JPKAZARI] = LAYOUT_ergodox(
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, M(JPGO), M(JPZA), M(JPBE), M(JPGE), KC_NO,
- KC_NO, M(JPDO), M(JPJI), M(JPGA), M(JPGI), M(JPZU),
- KC_NO, KC_NO, M(JPZO), M(JPBI), M(JPDI), KC_NO, KC_NO,
- KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- M(SHIFT), KC_NO, KC_TRNS,
- // right hand
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, M(JPBU), M(JPZE), M(JPDU), M(JPGU), KC_NO, KC_NO,
- KC_NO, M(JPBA), M(JPDE), M(JPDA), M(JPVU), KC_NO,
- KC_NO, KC_NO, KC_NO, M(JPBO), KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_TRNS
-),
-/* Keymap 4: Japanese with Toprow
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | |   | e | - | re | | | | | ya | ne | ru | o | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | ra | ri | na | no | mi |------| |------| wa | yo | yu | ni | nn | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | mo | ro | wo | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- *
- *
- *
- */
-[JPTOPROW] = LAYOUT_ergodox(
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_E, KC_MINS, M(JPRE), KC_NO, KC_NO,
- KC_NO, M(JPRA), M(JPRI), M(JPNA), M(JPNO), M(JPMI),
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_TRNS, KC_NO, KC_NO,
- // right hand
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, M(JPYA), M(JPNE), M(JPRU), KC_O, KC_NO, KC_NO,
- M(JPWA), M(JPYO), M(JPYU), M(JPNI), M(JPNN), KC_NO,
- KC_NO, KC_NO, M(JPMO), M(JPRO), M(JPWO), KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, M(KAZARI)
-),
-
-/* Keymap 5: Japanese with Toprow and Kazari
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | |   | | | pe | | | | | pu | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | |------| |------| | pa | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | pi | | | | | | | | po | | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- *
- *
- *
- */
-[JPTRKZ] = LAYOUT_ergodox(
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, M(JPPE),KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, M(JPPI), KC_NO, KC_NO, KC_NO,
- KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_TRNS, KC_NO, KC_NO,
- // right hand
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, M(JPPU), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, M(JPPA), KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, M(JPPO), KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_TRNS
-),
-/* Keymap 6: Number Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | " | [ | ] | | | | | % | 7 | 8 | 9 | | F12 |
- * |--------+------+------+------+------+------| ; | | |------+------+------+------+------+--------|
- * | | | / | + | { | } |------| |------| ! | 4 | 5 | 6 | 0 | , |
- * |--------+------+------+------+------+------| : | | & |------+------+------+------+------+--------|
- * | | | * | - | ( | ) | | | | . | 1 | 2 | 3 | ? | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | # | | < | = | > | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| Back | Ent |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// Numbers
-[NUM] = LAYOUT_ergodox(
- // left hand
- KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO,
- KC_NO, KC_NO, KC_NO, JP_DQUO, KC_RBRACKET, KC_BSPC, KC_SCLN,
- KC_NO, KC_NO, KC_SLSH, JP_PLUS, LSFT(KC_RBRACKET), JP_RCBR,
- KC_NO, KC_NO, JP_ASTR, KC_MINS, LSFT(KC_8), LSFT(KC_9), JP_COLN,
- KC_TRNS, KC_NO, KC_NO, KC_NO, KC_HASH,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_TRNS,
- // right hand
- KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- LSFT(KC_JYEN), KC_PERC, KC_7, KC_8, KC_9, KC_NO, KC_F12,
- KC_EXLM, KC_4, KC_5, KC_6, KC_0, KC_COMM,
- LSFT(KC_6), KC_DOT, KC_1, KC_2, KC_3, KC_QUES, KC_NO,
- KC_LT,JP_EQL, KC_GT, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_SPC, KC_BSLS, KC_DOT
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-
- // MACRO only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- register_code(KC_RSFT);
- } else {
- unregister_code(KC_RSFT);
- }
- break;
- case CTLSHFT:
- if (record->event.pressed) {
- return MACRO( D(LSFT), D(LCTL), END);
- } else {
- return MACRO( U(LSFT), U(LCTL), END);
- }
- break;
- case CUTCOPY:
- if (record->event.pressed) {
- start = timer_read();
- } else {
- if (timer_elapsed(start) > 150) {
- return MACRO( D(LCTL), T(X), U(LCTL), END);
- } else {
- return MACRO( D(LCTL), T(C), U(LCTL), END);
- }
- }
- break;
-
- // kana macros start here
-
- case JPVU:
- if (record->event.pressed) {
- return MACRO( I(1), T(V), T(U), END);
- }
- break;
- case JPNU:
- if (record->event.pressed) {
- return MACRO( I(1), T(N), T(U), END);
- }
- break;
- case JPKO:
- if (record->event.pressed) {
- return MACRO( I(1), T(K), T(O), END);
- }
- break;
- case JPSA:
- if (record->event.pressed) {
- return MACRO( I(1), T(S), T(A), END);
- }
- break;
- case JPKE:
- if (record->event.pressed) {
- return MACRO( I(1), T(K), T(E), END);
- }
- break;
- case JPHE:
- if (record->event.pressed) {
- return MACRO( I(1), T(H), T(E), END);
- }
- break;
- case JPSHI:
- if (record->event.pressed) {
- return MACRO( I(1), T(S), T(I), END);
- }
- break;
- case JPKA:
- if (record->event.pressed) {
- return MACRO( I(1), T(K), T(A), END);
- }
- break;
- case JPKI:
- if (record->event.pressed) {
- return MACRO( I(1), T(K), T(I), END);
- }
- break;
- case JPSU:
- if (record->event.pressed) {
- return MACRO( I(1), T(S), T(U), END);
- }
- break;
- case JPSO:
- if (record->event.pressed) {
- return MACRO( I(1), T(S), T(O), END);
- }
- break;
- case JPHI:
- if (record->event.pressed) {
- return MACRO( I(1), T(H), T(I), END);
- }
- break;
- case JPCHI:
- if (record->event.pressed) {
- return MACRO( I(1), T(T), T(I), END);
- }
- break;
- case JPFU:
- if (record->event.pressed) {
- return MACRO( I(1), T(F), T(U), END);
- }
- break;
- case JPSE:
- if (record->event.pressed) {
- return MACRO( I(1), T(S), T(E), END);
- }
- break;
- case JPTSU:
- if (record->event.pressed) {
- return MACRO( I(1), T(T), T(U), END);
- }
- break;
- case JPKU:
- if (record->event.pressed) {
- return MACRO( I(1), T(K), T(U), END);
- }
- break;
- case JPTE:
- if (record->event.pressed) {
- return MACRO( I(1), T(T), T(E), END);
- }
- break;
- case JPTA:
- if (record->event.pressed) {
- return MACRO( I(1), T(T), T(A), END);
- }
- break;
- case JPTO:
- if (record->event.pressed) {
- return MACRO( I(1), T(T), T(O), END);
- }
- break;
- case JPHA:
- if (record->event.pressed) {
- return MACRO( I(1), T(H), T(A), END);
- }
- break;
- case JPHO:
- if (record->event.pressed) {
- return MACRO( I(1), T(H), T(O), END);
- }
- break;
- case JPXKE:
- if (record->event.pressed) {
- return MACRO( I(1), T(X), T(K), T(E), END);
- }
- break;
- case JPXU:
- if (record->event.pressed) {
- return MACRO( I(1), T(X), T(U), END);
- }
- break;
- case JPXKA:
- if (record->event.pressed) {
- return MACRO( I(1), T(X), T(K), T(A), END);
- }
- break;
- case JPXA:
- if (record->event.pressed) {
- return MACRO( I(1), T(X), T(A), END);
- }
- break;
- case JPXO:
- if (record->event.pressed) {
- return MACRO( I(1), T(X), T(O), END);
- }
- break;
- case JPGO:
- if (record->event.pressed) {
- return MACRO( I(1), T(G), T(O), END);
- }
- break;
- case JPZA:
- if (record->event.pressed) {
- return MACRO( I(1), T(Z), T(A), END);
- }
- break;
- case JPGE:
- if (record->event.pressed) {
- return MACRO( I(1), T(G), T(E), END);
- }
- break;
- case JPBE:
- if (record->event.pressed) {
- return MACRO( I(1), T(B), T(E), END);
- }
- break;
- case JPYU:
- if (record->event.pressed) {
- return MACRO( I(1), T(Y), T(U), END);
- }
- break;
- case JPJI:
- if (record->event.pressed) {
- return MACRO( I(1), T(J), T(I), END);
- }
- break;
- case JPGA:
- if (record->event.pressed) {
- return MACRO( I(1), T(G), T(A), END);
- }
- break;
- case JPGI:
- if (record->event.pressed) {
- return MACRO( I(1), T(G), T(I), END);
- }
- break;
- case JPZU:
- if (record->event.pressed) {
- return MACRO( I(1), T(Z), T(U), END);
- }
- break;
- case JPZO:
- if (record->event.pressed) {
- return MACRO( I(1), T(Z), T(O), END);
- }
- break;
- case JPBI:
- if (record->event.pressed) {
- return MACRO( I(1), T(B), T(I), END);
- }
- break;
- case JPDI:
- if (record->event.pressed) {
- return MACRO( I(1), T(D), T(I), END);
- }
- break;
- case JPZE:
- if (record->event.pressed) {
- return MACRO( I(1), T(Z), T(E), END);
- }
- break;
- case JPDU:
- if (record->event.pressed) {
- return MACRO( I(1), T(D), T(U), END);
- }
- break;
- case JPGU:
- if (record->event.pressed) {
- return MACRO( I(1), T(G), T(U), END);
- }
- break;
- case JPYA:
- if (record->event.pressed) {
- return MACRO( I(1), T(Y), T(A), END);
- }
- break;
- case JPYO:
- if (record->event.pressed) {
- return MACRO( I(1), T(Y), T(O), END);
- }
- break;
- case JPDE:
- if (record->event.pressed) {
- return MACRO( I(1), T(D), T(E), END);
- }
- break;
- case JPDA:
- if (record->event.pressed) {
- return MACRO( I(1), T(D), T(A), END);
- }
- break;
- case JPDO:
- if (record->event.pressed) {
- return MACRO( I(1), T(D), T(O), END);
- }
- break;
- case JPBA:
- if (record->event.pressed) {
- return MACRO( I(1), T(B), T(A), END);
- }
- break;
- case JPBO:
- if (record->event.pressed) {
- return MACRO( I(1), T(B), T(O), END);
- }
- break;
- case JPRI:
- if (record->event.pressed) {
- return MACRO( I(1), T(R), T(I), END);
- }
- break;
- case JPRE:
- if (record->event.pressed) {
- return MACRO( I(1), T(R), T(E), END);
- }
- break;
- case JPRA:
- if (record->event.pressed) {
- return MACRO( I(1), T(R), T(A), END);
- }
- break;
- case JPNA:
- if (record->event.pressed) {
- return MACRO( I(1), T(N), T(A), END);
- }
- break;
- case JPNO:
- if (record->event.pressed) {
- return MACRO( I(1), T(N), T(O), END);
- }
- break;
- case JPMI:
- if (record->event.pressed) {
- return MACRO( I(1), T(M), T(I), END);
- }
- break;
- case JPMU:
- if (record->event.pressed) {
- return MACRO( I(1), T(M), T(U), END);
- }
- break;
- case JPME:
- if (record->event.pressed) {
- return MACRO( I(1), T(M), T(E), END);
- }
- break;
- case JPNE:
- if (record->event.pressed) {
- return MACRO( I(1), T(N), T(E), END);
- }
- break;
- case JPMA:
- if (record->event.pressed) {
- return MACRO( I(1), T(M), T(A), END);
- }
- break;
- case JPXTU:
- if (record->event.pressed) {
- return MACRO( I(1), T(X), T(T), T(U), END);
- }
- break;
- case JPWA:
- if (record->event.pressed) {
- return MACRO( I(1), T(W), T(A), END);
- }
- break;
- case JPRU:
- if (record->event.pressed) {
- return MACRO( I(1), T(R), T(U), END);
- }
- break;
- case JPWO:
- if (record->event.pressed) {
- return MACRO( I(1), T(W), T(O), END);
- }
- break;
- case JPNI:
- if (record->event.pressed) {
- return MACRO( I(1), T(N), T(I), END);
- }
- break;
- case JPNN:
- if (record->event.pressed) {
- return MACRO( I(1), T(N), T(N), END);
- }
- break;
- case JPMO:
- if (record->event.pressed) {
- return MACRO( I(1), T(M), T(O), END);
- }
- break;
- case JPRO:
- if (record->event.pressed) {
- return MACRO( I(1), T(R), T(O), END);
- }
- break;
- case JPXE:
- if (record->event.pressed) {
- return MACRO( I(1), T(X), T(E), END);
- }
- break;
- case JPXI:
- if (record->event.pressed) {
- return MACRO( I(1), T(X), T(I), END);
- }
- break;
- case JPXYU:
- if (record->event.pressed) {
- return MACRO( I(1), T(X), T(Y), T(U), END);
- }
- break;
- case JPXYA:
- if (record->event.pressed) {
- return MACRO( I(1), T(X), T(Y), T(A), END);
- }
- break;
- case JPXYO:
- if (record->event.pressed) {
- return MACRO( I(1), T(X), T(Y), T(O), END);
- }
- break;
- case JPPE:
- if (record->event.pressed) {
- return MACRO( I(1), T(P), T(E), END);
- }
- break;
- case JPPU:
- if (record->event.pressed) {
- return MACRO( I(1), T(P), T(U), END);
- }
- break;
- case JPPI:
- if (record->event.pressed) {
- return MACRO( I(1), T(P), T(I), END);
- }
- break;
- case JPPA:
- if (record->event.pressed) {
- return MACRO( I(1), T(P), T(A), END);
- }
- break;
- case JPPO:
- if (record->event.pressed) {
- return MACRO( I(1), T(P), T(O), END);
- }
- break;
- case JPBU:
- if (record->event.pressed) {
- return MACRO( I(1), T(B), T(U), END);
- }
- break;
-
- // kana macros end here
-
- break;
- case SHIFT:
- if (record->event.pressed) {
- start = timer_read();
- if (layer_state == (1<<JPKAZARI)) {
- layer_state = (1<<JPTOPROW)| (1<<JPTRKZ);
- } else {
- layer_state = (1<<JPTOPROW);
- }
- } else {
- layer_state = (0<<JPTOPROW);
- clear_keyboard_but_mods();
- if (timer_elapsed(start) < 100) {
- return MACRO( I(1), T(SPC), END);
- }
- }
- break;
- case KAZARI:
- if (record->event.pressed) {
- start = timer_read();
- if (layer_state == (1<<JPTOPROW)) {
- layer_state = (1<<JPKAZARI)| (1<<JPTRKZ);
- } else {
- layer_state = (1<<JPKAZARI);
- }
- break;
- } else {
- layer_state = (0<<JPKAZARI);
- layer_state = (0<<JPTRKZ);
- if (timer_elapsed(start) < 100) {
- return MACRO( T(ENTER), END);
- }
- }
- break;
- case JPFN:
- if (record->event.pressed) {
- start = timer_read();
- layer_state = (1<<JPXON);
- } else {
- layer_state = (0<<JPXON);
- if (timer_elapsed(start) < 100) {
- return MACRO( T(F7), END);
- }
- }
- break;
- case TOJPLOUT:
- if (record->event.pressed) {
- if (default_layer_state == (1<<JP)) {
- default_layer_state = (0<<JP);
- } else {
- default_layer_state = (1<<JP);
- }
- return MACRO( T(ZKHK), END);
- }
- break;
-/*
- // TOJPL and TOENL switch keyboard language.
- // The Ctrl+[] commands here load the appropriate ibus-anthy input engine via a WM shortcut
- // The first key pressed in the new engine is missed, thus the space key
- // TOJPLOUT works in the same way but is used for switching engines on external systems.
- case TOJPL:
- if (record->event.pressed) {
- default_layer_state = (1<<JP);
- return MACRO( D(LCTL), T(END), U(LCTL), END);
- //return MACRO( D(LCTL), T(END), U(LCTL), W(250), W(250), W(250), T(SPACE), END);
- }
- break;
- case TOENL:
- if (record->event.pressed) {
- default_layer_state = (1<<BASE);
- return MACRO( D(LCTL), T(HOME), U(LCTL), END);
- //return MACRO( D(LCTL), T(HOME), U(LCTL), W(250), W(250), W(250), T(SPACE), END);
- }
- break;
-*/
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
- uint8_t deflayer = get_highest_layer(default_layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
-
-
- switch (layer) {
- case 0:
- //none
- break;
-// case 1:
-// ergodox_right_led_2_on();
-// break;
- case 6:
- ergodox_right_led_3_on();
- break;
- }
- switch (deflayer) {
- case 0:
- ergodox_right_led_1_off();
- break;
- case 1:
- ergodox_right_led_1_on();
- break;
- }
-};
diff --git a/layouts/community/ergodox/ishigoya-jp/readme.md b/layouts/community/ergodox/ishigoya-jp/readme.md
deleted file mode 100644
index 839fe978d1..0000000000
--- a/layouts/community/ergodox/ishigoya-jp/readme.md
+++ /dev/null
@@ -1,54 +0,0 @@
-This is a dual English-Japanese keymap that utilises a thumb-shift system for Japanese input. You can read more about this layout on my blog [here](https://ishigoya.com).
-
-### Some Editing Necessary
-The system I created this on is a Chromebook, and uses a Japanese keymap, so some of the key mappings may not be the same as those on your system. In particular, the Escape key on layer 0 is mapped to KC_LCTL.
-
-### Layouts
-------
-#### English layer - layer 0
-The English layout is a modified Workman layout, and is pictured below:
-
-![English layout](https://i.imgur.com/X1j2Mya.png)
-
-Some of the punctuation keys have been moved to a separate number/symbol layer.
-
-#### Number / Symbol layer - layer 6
-
-The Number / Symbol layer is reachable through a ACTION_LAYER_MOMENTARY function. The blue LED is illuminated when this layer is active. It is accessible from the English or Japanese layers.
-
-![Number layout](https://i.imgur.com/oNSNXPU.png)
-
-#### Japanese layers - layers 1-5
-
-There are 5 layers involved in Japanese input. The TOJPLOUT macro is mapped to the En / 和 button, and switches default layer between layer 0 (English) and 1 (main Japanese layer). When layer 1 is the default layer, the red LED is on. It also outputs the ZKHK button to change the input method language.
-
-On keypress, strings of romaji characters are output by the keyboard using macros, and these simulate the input of individual keys on a latin keyboard.
-
-![Japanese layout](https://i.imgur.com/qMvt92j.png)
-
-Layer 1 is the JP layer. Keys on this layer correspond to singleton keys, or keys on the bottom row where a key is shared. For example, pressing the "ふ や" key outputs `ふ` (or "fu").
-
-Layer 2 is the JPXON layer, and is active while holding the Fn key. This prints keys that are prefaced by "x" when writing in romaji. For example, pressing the "ふ や" key while holding the Fn key outputs `ゃ` (or "xya").
-
-Layer 3 is the JPKAZARI layer, and is active while holding the 飾り key. This provides letters with dakuten. For example, pressing the "ふ や" key while holding the 飾り key outputs `ぶ` (or "bu").
-
-Layer 4 is the JPTOPROW layer, and is active while holding the シフト key. Keys on this line correspond to top row keys on shared keys in the image. For example, pressing the "ふ や" key while holding the シフト key outputs `や` (or "ya").
-
-Layer 5 is the JPTRKZ layer, and is active while holding both the シフト key and the 飾り key. This layer contains handakuten keys. For example, pressing the "ふ や" while holding both the シフト key and the 飾り key outputs `ぷ` (or "pu").
-
-I've also separated out the #define sections and the macros required for kana for easy copying, in case anyone else should wish to make a kana-based layout.
-
-When tapped, the シフト key acts as a space key, and the 飾り key acts as a return key. This allows them to function as 変換 and 無変換, respectively, in many IMEs.
-
-Furthermore the Fn key, when tapped, acts as an F7 key, providing easy switching to katakana in many IMEs.
-
-### Other features
-The cut/copy button gives copy functionality on a short press, and cut functionality on a long press.
-
-The tmux prefix button outputs Control-B.
-
-The Control & Shift key acts as holding the control and shift keys at the same time.
-
-SelAll outputs Control-A.
-
-Undo outputs Control-Z.
diff --git a/layouts/community/ergodox/issmirnov/README.md b/layouts/community/ergodox/issmirnov/README.md
index 564edfe31d..fc8de6f99f 100644
--- a/layouts/community/ergodox/issmirnov/README.md
+++ b/layouts/community/ergodox/issmirnov/README.md
@@ -5,7 +5,7 @@
- Shift and Cmd are One Shot Modifiers, so tapping them once will apply them to the next key. When tapped twice they will lock, until tapped again to clear.
- When switching to other layers, any stuck modifiers are cleared in order to avoid unintended key combos
-- There are a few leader key combinations. Right now, `KC_LEAD` + `s` will open my wiki homepage.
+- There are a few leader key combinations. Right now, `QK_LEAD` + `s` will open my wiki homepage.
- All transparent keys have been replaced with noops to avoid layer bleeding.
## Initial Setup
diff --git a/layouts/community/ergodox/issmirnov/keymap.c b/layouts/community/ergodox/issmirnov/keymap.c
index c5a7a29121..91c349a5d3 100644
--- a/layouts/community/ergodox/issmirnov/keymap.c
+++ b/layouts/community/ergodox/issmirnov/keymap.c
@@ -13,7 +13,7 @@ OSM(MOD_LSFT), _________________QWERTY_L3_________________, KC_SLASH,
KC_LCTL, LSFT(KC_LGUI), LSFT(KC_LALT), KC_LALT, KC_LGUI,
XXXXXXX, XXXXXXX,
XXXXXXX,
- KC_SPACE, KC_BSPACE, KC_DEL,
+ KC_SPACE, KC_BSPC, KC_DEL,
KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_ESCAPE ,
KC_PLUS , _________________QWERTY_R1_________________ , LGUI(KC_SPACE) ,
@@ -31,12 +31,12 @@ KC_DOWN, KC_TAB, KC_ENTER
KC_ESCAPE , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,
XXXXXXX , _________________SYMB_L1___________________ ,KC_ASTR ,
KC_TAB , _________________SYMB_L2___________________,
-KC_LSHIFT , _________________SYMB_L3___________________, KC_SLASH ,
+KC_LSFT , _________________SYMB_L3___________________, KC_SLASH ,
KC_LCTL , LSFT(KC_LGUI) , LSFT(KC_LALT) , KC_LALT , WKSP_LEFT ,
XXXXXXX, XXXXXXX,
XXXXXXX,
- WKSP_RIGHT, KC_BSPACE, KC_DEL,
+ WKSP_RIGHT, KC_BSPC, KC_DEL,
KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , XXXXXXX ,
KC_PLUS , _________________SYMB_R1___________________ , MO(_NAVI) ,
@@ -59,7 +59,7 @@ TO(0) , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX , XXXXXXX ,
XXXXXXX ,
- KC_SPACE , KC_BSPACE , KC_DEL ,
+ KC_SPACE , KC_BSPC , KC_DEL ,
KC_EQL , ___________________XXXXX___________________ , QK_BOOT ,
KC_PLUS , _________________NUMP_R1___________________ , XXXXXXX ,
diff --git a/layouts/community/ergodox/italian/keymap.c b/layouts/community/ergodox/italian/keymap.c
deleted file mode 100644
index 3a81cc213b..0000000000
--- a/layouts/community/ergodox/italian/keymap.c
+++ /dev/null
@@ -1,219 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-enum custom_keycodes {
- PLACEHOLDER = SAFE_RANGE, // can always be here
- EPRM,
- VRSN,
- RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | \ | 1 | 2 | 3 | 4 | 5 | ESC | | T2 | 6 | 7 | 8 | 9 | 0 | ' |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Tab | Q | W | E | R | T | TT1 | | TT1 | Y | U | I | O | P | è |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | Caps | A | S | D | F | G |------| |------| H | J | K | L | ò | à |
- * |--------+------+------+------+------+------| Alt | | Alt |------+------+------+------+------+--------|
- * | LShift | Z | X | C | V | B | | | | N | M | , | . | ù |-/RShift|
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |</Win | + | - | * |//Ctr | |ì/RAlt| Left | Down | Up | Right | ~L1 |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | Ins | LGui | | Win | Ctrl |
- * ,------|------|------| |------+--------+------.
- * | | | Home | | PgUp | | |
- * |Backsp| Del |------| |------| Enter |Space |
- * |ace | | End | | PgDn | | |
- * `--------------------' `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TT(SYMB),
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LALT,
- MT(MOD_LGUI,KC_NONUS_BSLASH),KC_PPLS, KC_PMNS,KC_PAST,MT(MOD_LCTL,KC_PSLS),
- KC_INS, KC_LGUI,
- KC_HOME,
- KC_BSPC,KC_DEL, KC_END,
- // right hand
- TG(MDIA), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- TT(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_LALT, KC_N, KC_M, KC_COMM,KC_DOT, KC_BSLASH, MT(MOD_RSFT,KC_SLSH),
- MT(MOD_RALT,KC_EQL), KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT,
- KC_LGUI, KC_RCTL,
- KC_PGUP,
- KC_PGDN, KC_ENT, KC_SPC
- ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ! | @ | { | } | | | | | | | 7 | 8 | 9 | | F12 |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | # | $ | [ | ] | & |------| |------| | 4 | 5 | 6 | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | % | ^ | ( | ) | | | | | | 1 | 2 | 3 | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | . | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | 0 |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
- // left hand
- M(0), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS, KC_EXLM, RALT(KC_SCLN), RALT(KC_LCBR), RALT(KC_RCBR), KC_TILD, KC_TRNS,
- KC_TRNS, RALT(KC_QUOT), KC_DLR, RALT(KC_LBRC), RALT(KC_RBRC), KC_CIRC,
- KC_TRNS, KC_PERC, LSFT(KC_EQL), LSFT(KC_8), LSFT(KC_9), KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
- KC_TRNS, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
- KC_DOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_0
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | Lclk | Rclk | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | Prev | Next | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | |VolUp |VolDn | Mute | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | |Brwser|
- * | | |------| |------| |Back |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- break;
- case 1:
- if (record->event.pressed) { // For resetting EEPROM
- eeconfig_init();
- }
- break;
- }
- return MACRO_NONE;
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- // dynamically generate these.
- case EPRM:
- if (record->event.pressed) {
- eeconfig_init();
- }
- return false;
- break;
- case VRSN:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- return false;
- break;
- case RGB_SLD:
- if (record->event.pressed) {
- #ifdef RGBLIGHT_ENABLE
- rgblight_mode(1);
- #endif
- }
- return false;
- break;
- }
- return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- // TODO: Make this relevant to the ErgoDox EZ.
- case 1:
- ergodox_right_led_1_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- default:
- // none
- break;
- }
-
-};
diff --git a/layouts/community/ergodox/italian/readme.md b/layouts/community/ergodox/italian/readme.md
deleted file mode 100644
index 215c24a5af..0000000000
--- a/layouts/community/ergodox/italian/readme.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# ErgoDox Italian layout
-
-## Layer 0
-```
-
- ,--------------------------------------------------. ,--------------------------------------------------.
- | \ | 1 | 2 | 3 | 4 | 5 | ESC | | T2 | 6 | 7 | 8 | 9 | 0 | ' |
- |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- | Tab | Q | W | E | R | T | TT1 | | TT1 | Y | U | I | O | P | è |
- |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- | Caps | A | S | D | F | G |------| |------| H | J | K | L | ò | à |
- |--------+------+------+------+------+------| Alt | | Alt |------+------+------+------+------+--------|
- | LShift | Z | X | C | V | B | | | | N | M | , | . | ù |-/RShift|
- `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- |</Win | + | - | * |//Ctr | |ì/RAlt| Left | Down | Up | Right | ~L1 |
- `----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | Ins | LGui | | Win | Ctrl |
- ,------|------|------| |------+--------+------.
- | | | Home | | PgUp | | |
- |Backsp| Del |------| |------| Enter |Space |
- |ace | | End | | PgDn | | |
- `--------------------' `----------------------'
-```
-
-## Layer 1
-```
-
- ,--------------------------------------------------. ,--------------------------------------------------.
- |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
- |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- | | ! | @ | { | } | | | | | | | 7 | 8 | 9 | | F12 |
- |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- | | # | $ | [ | ] | & |------| |------| | 4 | 5 | 6 | | |
- |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- | | % | ^ | ( | ) | | | | | | 1 | 2 | 3 | | |
- `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- | | | | | | | . | | | | |
- `----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | | | | | |
- ,------|------|------| |------+------+------.
- | | | | | | | |
- | | |------| |------| | 0 |
- | | | | | | | |
- `--------------------' `--------------------'
-```
-
-## Layer 2
-```
-
- ,--------------------------------------------------. ,--------------------------------------------------.
- | | | | | | | | | | | | | | | |
- |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- | | | | MsUp | | | | | | Lclk | Rclk | | | | |
- |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play |
- |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- | | | | | | | | | | | | Prev | Next | | |
- `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- | | | | | | |VolUp |VolDn | Mute | | |
- `----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | | | | | |
- ,------|------|------| |------+------+------.
- | | | | | | |Brwser|
- | | |------| |------| |Back |
- | | | | | | | |
- `--------------------' `--------------------'
-```
-
-
diff --git a/layouts/community/ergodox/jackhumbert/config.h b/layouts/community/ergodox/jackhumbert/config.h
index 0aca0d6917..5458a236ce 100644
--- a/layouts/community/ergodox/jackhumbert/config.h
+++ b/layouts/community/ergodox/jackhumbert/config.h
@@ -2,7 +2,16 @@
/* ws2812 RGB LED */
#define RGB_DI_PIN D7
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 15 // Number of LEDs
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 255
diff --git a/layouts/community/ergodox/jacobono/keymap.c b/layouts/community/ergodox/jacobono/keymap.c
index 7c5b914872..2e9d6f2006 100644
--- a/layouts/community/ergodox/jacobono/keymap.c
+++ b/layouts/community/ergodox/jacobono/keymap.c
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// left hand
KC_BSPC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_TRNS,
- KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_LALT,
KC_TRNS, KC_QUOT, LALT(KC_LSFT), KC_LEFT, MO(SYMB),
KC_TAB, KC_DEL,
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// right hand
KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), KC_RCTRL,
+ KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), KC_RCTL,
KC_RALT, KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT,
MO(SYMB), KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB),
KC_LALT, CTL_T(KC_ESC),
diff --git a/layouts/community/ergodox/jafo/jafo-layout.pdf b/layouts/community/ergodox/jafo/jafo-layout.pdf
deleted file mode 100644
index 760a0eccf6..0000000000
--- a/layouts/community/ergodox/jafo/jafo-layout.pdf
+++ /dev/null
Binary files differ
diff --git a/layouts/community/ergodox/jjerrell/config.h b/layouts/community/ergodox/jjerrell/config.h
index 8223108d15..6aeaef35ce 100644
--- a/layouts/community/ergodox/jjerrell/config.h
+++ b/layouts/community/ergodox/jjerrell/config.h
@@ -17,5 +17,5 @@
#ifdef KEYBOARD_ergodox_ez
#undef PRODUCT
-#define PRODUCT ErgoDox EZ - Modified by <@jjerrell>
+#define PRODUCT "ErgoDox EZ - Modified by <@jjerrell>"
#endif
diff --git a/layouts/community/ergodox/josh/keymap.c b/layouts/community/ergodox/josh/keymap.c
deleted file mode 100644
index d98b98b236..0000000000
--- a/layouts/community/ergodox/josh/keymap.c
+++ /dev/null
@@ -1,210 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-//macros
-#define CTL_SFT_T 100 // open type
-#define CTL_SFT_G 101 // find references
-#define CTL_ALT_H 102 // open call hierarchy
-#define CTL_SFT_R 103 // open resource
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | = | 1 | 2 | 3 | 4 | 5 | ESC | |M100/3| 6 | 7 | 8 | 9 | 0 | - |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * |TAB /Alt| Q | W | E | R | T | Meh | | Meh | Y | U | I | O | P |\ / ALT |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | LCTL | A | S | D | F | G |------| |------| H | J | K | L |; / L2|' / CTL |
- * |--------+------+------+------+------+------| ~L1 | | ~L1 |------+------+------+------+------+--------|
- * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | RShift |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | WIN | ` | M 102| M 101|AltShf| |AltShf| Left | Down | Up | Right |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | App | LALT | | Alt | CAPS |
- * ,------|------|------| |------+--------+------.
- * | | | Home | | PgUp | | |
- * | Space|Backsp|------| |------| Delete |Enter |
- * | |ace | End | | PgDn | | |
- * `--------------------' `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- LT(MDIA, KC_EQL),KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
- ALT_T(KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, ALL_T(KC_NO),
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(SYMB),
- KC_LGUI, KC_GRV, M(CTL_ALT_H),M(CTL_SFT_G),LALT(KC_LSFT),
- CTL_T(KC_APP), KC_LALT,
- KC_HOME,
- KC_SPC,KC_BSPC,KC_END,
- // right hand
- LT(M(CTL_SFT_T),
- M(CTL_SFT_R)),KC_6, KC_7, KC_8, KC_9, KC_0, LT(MDIA, KC_MINS),
- MEH_T(KC_NO), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), CTL_T(KC_QUOT),
- MO(SYMB), KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,
- LALT(KC_LSFT),KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT,
- KC_LALT, KC_CAPS,
- KC_PGUP,
- KC_PGDN,KC_DEL, KC_ENT
- ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * |Version | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | CALC |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ! | @ | { | } | | | | | | | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | # | $ | ( | ) | ` |------| |------| Left | Down | Up | Right| | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | % | ^ | [ | ] | ~ | | | | | | | | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
- // left hand
- M(0), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
- KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
- KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
- KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_CALC,
- KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_LEFT, KC_DOWN,KC_UP, KC_RIGHT,KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | |QK_BOOT | |QK_BOOT | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | Prev | Next | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | |Brwser|
- * | | |------| |------| |Back |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- break;
- case CTL_SFT_T:
- if (record->event.pressed) {
- return MACRO(D(LCTL), D(LSFT), T(T), END);
- }
- return MACRO(U(LCTL), U(LSFT), END);
- break;
- case CTL_SFT_G:
- if (record->event.pressed) {
- return MACRO(D(LCTL), D(LSFT), T(G), END);
- }
- return MACRO(U(LCTL), U(LSFT), END);
- break;
- case CTL_ALT_H:
- if (record->event.pressed) {
- return MACRO(D(LCTL), D(LALT), T(H), END);
- }
- return MACRO(U(LCTL), U(LALT), END);
- break;
- case CTL_SFT_R:
- if (record->event.pressed) {
- return MACRO(D(LCTL), D(LSFT), T(R), END);
- }
- return MACRO(U(LCTL), U(LSFT), END);
- break;
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- // TODO: Make this relevant to the ErgoDox EZ.
- case 1:
- ergodox_right_led_1_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- default:
- // none
- break;
- }
-
-};
diff --git a/layouts/community/ergodox/josh/readme.md b/layouts/community/ergodox/josh/readme.md
deleted file mode 100644
index cee19d47ea..0000000000
--- a/layouts/community/ergodox/josh/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Layout is based on the default layout that comes on the ergodox infinity. Focused mostly on making ctl and alt easy to reach. I spend most my day working in Eclipse which has just so many 3 key shortcuts.
-
-* Removed numpad keys from symbol layer (I don't use them)
-* Added arrow keys under h, j, k, l on symbol layer. vi movement keys!
-* Added a few macros for eclipse hotkeys that I used all the time
-* Added calc button on symbol layer
-* tap vs hold on tab and \. Gives alt, ctl and shift on both sides of the keyboard
-
diff --git a/layouts/community/ergodox/kastyle/keymap.c b/layouts/community/ergodox/kastyle/keymap.c
index 268080c7dc..20f08cb44c 100644
--- a/layouts/community/ergodox/kastyle/keymap.c
+++ b/layouts/community/ergodox/kastyle/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[SYMB] = LAYOUT_ergodox(
// left hand
KC_PSCR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_SLCK, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
+ KC_SCRL, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,
KC_PAUS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV,
KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/layouts/community/ergodox/kines-ish/keymap.c b/layouts/community/ergodox/kines-ish/keymap.c
index 718bf6cee1..132b65845e 100644
--- a/layouts/community/ergodox/kines-ish/keymap.c
+++ b/layouts/community/ergodox/kines-ish/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[SYMB] = LAYOUT_ergodox(
// left hand
KC_PSCR,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_SLCK,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
+ KC_SCRL,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
KC_PAUS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
diff --git a/layouts/community/ergodox/kristian/keymap.c b/layouts/community/ergodox/kristian/keymap.c
deleted file mode 100644
index 3f84823b99..0000000000
--- a/layouts/community/ergodox/kristian/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "keymap_swiss_fr.h"
-#include "keymap_french.h"
-#include "keymap_german.h"
-#include "keymap_swiss_de.h"
-#include "keymap_nordic.h"
-#include "keymap_norwegian.h"
-#include "keymap_spanish.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-[0] = LAYOUT_ergodox(NO_LABK,KC_1,KC_2,KC_3,KC_4,KC_5,KC_BSPACE,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,TG(1),KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,SFT_T(NO_QUOT),CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,SFT_T(KC_EQUAL),MO(1),CTL_T(KC_GRAVE),KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_CAPSLOCK,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_6,KC_7,KC_8,KC_9,KC_0,NO_PLUS,TG(1),KC_Y,KC_U,KC_I,KC_O,KC_P,NO_ARNG,KC_H,KC_J,KC_K,KC_L,LT(2,NO_OSTR),NO_AE,SFT_T(KC_RBRC),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SFT_T(NO_QUOT),KC_DOWN,KC_UP,NO_LPRN,NO_RPRN,MO(1),NO_QUOT,CTL_T(KC_ESCAPE),NO_QUOT,KC_LALT,KC_LGUI,KC_ENTER),
-
-[1] = LAYOUT_ergodox(M(0),KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LSHIFT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LCTL,KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_TRANSPARENT,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_7,KC_8,KC_9,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_4,KC_5,KC_6,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_0,KC_1,KC_2,KC_3,NO_LBRC,NO_RBRC,KC_LSHIFT,KC_COMMA,KC_DOT,LSFT(NO_LBRC),LSFT(NO_RBRC),KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LALT,KC_LGUI,KC_ENTER),
-
-[2] = LAYOUT_ergodox(KC_ESCAPE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_LSHIFT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LCTL,KC_LALT,KC_LGUI,KC_MS_BTN1,KC_MS_BTN2,KC_ESCAPE,KC_TRANSPARENT,KC_TRANSPARENT,KC_SPACE,KC_LGUI,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_ESCAPE,KC_MS_WH_UP,KC_MS_WH_DOWN,KC_MS_ACCEL0,KC_MS_ACCEL1),
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- switch(id) {
- case 0:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- break;
- }
- return MACRO_NONE;
-};
-
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- case 1:
- ergodox_right_led_1_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- case 3:
- ergodox_right_led_3_on();
- break;
- case 4:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- break;
- case 5:
- ergodox_right_led_1_on();
- ergodox_right_led_3_on();
- break;
- case 6:
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
- break;
- case 7:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
- break;
- default:
- break;
- }
-
-};
diff --git a/layouts/community/ergodox/maz/keymap.c b/layouts/community/ergodox/maz/keymap.c
index 4d313dee43..fc0509e8a2 100644
--- a/layouts/community/ergodox/maz/keymap.c
+++ b/layouts/community/ergodox/maz/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
CTL_T(KC_SPC),GUI_T(KC_BSPC),KC_LALT,
// right hand
KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- KC_CAPSLOCK, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ KC_CAPS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
MO(MDIA), MO(SYMB), KC_LBRC,KC_RBRC, KC_TRNS,
@@ -128,11 +128,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
// right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_PGDOWN, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_PGDN, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/layouts/community/ergodox/mclennon_osx/keymap.c b/layouts/community/ergodox/mclennon_osx/keymap.c
index ae67d8fb40..aba1e3e7dc 100644
--- a/layouts/community/ergodox/mclennon_osx/keymap.c
+++ b/layouts/community/ergodox/mclennon_osx/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(1),
MO(1), KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC,
KC_LCTL, KC_TRNS,KC_TRNS,KC_TRNS,KC_ESC,
KC_TRNS,KC_TRNS,
KC_TRNS,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// right hand
KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC,
- KC_DELETE, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,
+ KC_DELETE, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_ENT,
KC_RBRC, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_QUOT,
KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
@@ -77,8 +77,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// left hand
KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_LSHIFT,KC_LCTL, KC_TRNS, KC_TRNS,
- KC_LSHIFT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_LSFT, KC_LCTL, KC_TRNS, KC_TRNS,
+ KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS,
diff --git a/layouts/community/ergodox/meagerfindings/config.h b/layouts/community/ergodox/meagerfindings/config.h
index d69aaf79dd..28a92e2bf6 100644
--- a/layouts/community/ergodox/meagerfindings/config.h
+++ b/layouts/community/ergodox/meagerfindings/config.h
@@ -5,9 +5,9 @@
#undef DEVICE_VER
#define DEVICE_VER 0x0001
#undef MANUFACTURER
-#define MANUFACTURER meagerfindings
+#define MANUFACTURER "meagerfindings"
#undef PRODUCT
-#define PRODUCT ErgoDox
+#define PRODUCT "ErgoDox"
#define USB_MAX_POWER_CONSUMPTION 500
diff --git a/layouts/community/ergodox/meagerfindings/keymap.c b/layouts/community/ergodox/meagerfindings/keymap.c
index 9d4eba205d..3035572a77 100644
--- a/layouts/community/ergodox/meagerfindings/keymap.c
+++ b/layouts/community/ergodox/meagerfindings/keymap.c
@@ -97,12 +97,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRAVE, ZENDESK, RUBYMINE, LGUI(KC_S), TODO,
KC_ESCAPE, KC_HOME,
KC_END,
- OSM(MOD_LSFT), LT(NUM,KC_BSPACE), LT(MKDWN,KC_DELETE),
+ OSM(MOD_LSFT), LT(NUM,KC_BSPC), LT(MKDWN,KC_DELETE),
//right hand
KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MINUS,
- MD_LINK, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,
- KC_H, KC_J, ALT_T(KC_K), LGUI_T(KC_L), LT(MEDIA,KC_SCOLON), ALL_T(KC_QUOTE),
+ MD_LINK, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ KC_H, KC_J, ALT_T(KC_K), LGUI_T(KC_L), LT(MEDIA,KC_SCLN), ALL_T(KC_QUOTE),
TD(CT_RBP), KC_N, KC_M, KC_COMMA, ALT_T(KC_DOT), CTL_T(KC_SLASH), SCMD_T(_______),
LSFT(KC_MINUS), _______, DBLE_ZER0, DBLE_ZER0, TO(OLD_BASE),
L_ID_0, KC_ESCAPE,
@@ -144,12 +144,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRAVE, ZENDESK, RUBYMINE, LGUI(KC_S), TODO,
KC_ESCAPE, KC_HOME,
KC_END,
- OSM(MOD_LSFT), LT(NUM,KC_BSPACE), LT(MKDWN,KC_DELETE),
+ OSM(MOD_LSFT), LT(NUM,KC_BSPC), LT(MKDWN,KC_DELETE),
//right hand
TD(TD_SNAGIT), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS,
- MD_LINK, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,
- KC_H, KC_J, KC_K, LGUI_T(KC_L), LT(MEDIA,KC_SCOLON), ALL_T(KC_QUOTE),
+ MD_LINK, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ KC_H, KC_J, KC_K, LGUI_T(KC_L), LT(MEDIA,KC_SCLN), ALL_T(KC_QUOTE),
TD(CT_RBP), KC_N, KC_M, KC_COMMA, ALT_T(KC_DOT), CTL_T(KC_SLASH), SCMD_T(_______),
LSFT(KC_MINUS), _______, DBLE_ZER0, DBLE_ZER0, TO(BASE),
L_ID_0, KC_ESCAPE,
@@ -473,7 +473,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
SEND_STRING ("Todoist");
SEND_STRING (SS_TAP(X_ENTER));
} else {
- SEND_STRING (SS_LGUI(SS_LCTRL("a"))); //macro to open Todoist new task dialog
+ SEND_STRING (SS_LGUI(SS_LCTL("a"))); //macro to open Todoist new task dialog
}
}
break;
diff --git a/layouts/community/ergodox/mpiechotka/keymap.c b/layouts/community/ergodox/mpiechotka/keymap.c
index a83725519b..b13ff0796b 100644
--- a/layouts/community/ergodox/mpiechotka/keymap.c
+++ b/layouts/community/ergodox/mpiechotka/keymap.c
@@ -203,7 +203,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return false;
case KC_PC1:
if (record->event.pressed) {
- tap_code_delay(KC_SLCK, 50);
+ tap_code_delay(KC_SCRL, 50);
wait_ms(50);
tap_code_delay(KC_1, 50);
tap_code(KC_ENT);
@@ -211,7 +211,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return false;
case KC_PC2:
if (record->event.pressed) {
- tap_code_delay(KC_SLCK, 50);
+ tap_code_delay(KC_SCRL, 50);
wait_ms(50);
tap_code_delay(KC_2, 50);
tap_code(KC_ENT);
@@ -219,7 +219,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return false;
case KC_PC3:
if (record->event.pressed) {
- tap_code_delay(KC_SLCK, 50);
+ tap_code_delay(KC_SCRL, 50);
wait_ms(50);
tap_code_delay(KC_3, 50);
tap_code(KC_ENT);
@@ -227,7 +227,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return false;
case KC_PC4:
if (record->event.pressed) {
- tap_code_delay(KC_SLCK, 50);
+ tap_code_delay(KC_SCRL, 50);
wait_ms(50);
tap_code_delay(KC_4, 50);
tap_code(KC_ENT);
diff --git a/layouts/community/ergodox/ordinary/keymap.c b/layouts/community/ergodox/ordinary/keymap.c
index 8d0425e49b..6c7586034c 100644
--- a/layouts/community/ergodox/ordinary/keymap.c
+++ b/layouts/community/ergodox/ordinary/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MDIA] = LAYOUT_ergodox(
// left hand
KC_TRNS ,KC_F11 ,KC_F12 ,KC_F13 ,KC_F14 ,KC_F15 ,KC_ESC
-,KC_TRNS ,KC_POWER ,KC_NO ,KC_MS_U ,KC_NO ,KC_VOLU ,KC_WH_U
+,KC_TRNS ,KC_PWR ,KC_NO ,KC_MS_U ,KC_NO ,KC_VOLU ,KC_WH_U
,KC_TRNS ,KC_SLEP ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_VOLD
,KC_TRNS ,KC_NO ,KC_NO ,KC_MS_D ,KC_NO ,KC_MUTE ,KC_WH_D
,KC_NO ,KC_NO ,KC_BTN3 ,KC_BTN1 ,KC_BTN2
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// right hand
,KC_NO ,KC_F16 ,KC_F17 ,KC_F18 ,KC_F19 ,KC_F20 ,KC_TRNS
,KC_WH_U ,KC_PSCR ,KC_HOME ,KC_UP ,KC_PGUP ,KC_MAIL ,KC_TRNS
- ,KC_NLCK ,KC_LEFT ,KC_DOWN ,KC_RIGHT,KC_MYCM ,KC_TRNS
+ ,KC_NUM ,KC_LEFT ,KC_DOWN ,KC_RIGHT,KC_MYCM ,KC_TRNS
,KC_WH_D ,KC_NO ,KC_END ,KC_DOWN ,KC_PGDN ,KC_NO ,KC_TRNS
,KC_INS ,KC_DEL ,KC_NO ,KC_NO ,KC_NO
,KC_MPRV ,KC_MNXT
diff --git a/layouts/community/ergodox/ordinary_osx/keymap.c b/layouts/community/ergodox/ordinary_osx/keymap.c
index 5f794cbba1..f67a6d6da0 100644
--- a/layouts/community/ergodox/ordinary_osx/keymap.c
+++ b/layouts/community/ergodox/ordinary_osx/keymap.c
@@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MDIA] = LAYOUT_ergodox(
// left hand
KC_TRNS ,KC_F11 ,KC_F12 ,KC_F13 ,KC_F14 ,KC_F15 ,KC_ESC
-,KC_TRNS ,KC_POWER ,KC_NO ,KC_MS_U ,KC_NO ,KC_VOLU ,KC_WH_U
+,KC_TRNS ,KC_PWR ,KC_NO ,KC_MS_U ,KC_NO ,KC_VOLU ,KC_WH_U
,KC_TRNS ,KC_SLEP ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_VOLD
,KC_TRNS ,KC_NO ,KC_NO ,KC_MS_D ,KC_NO ,KC_MUTE ,KC_WH_D
,KC_NO ,KC_NO ,KC_BTN3 ,KC_BTN1 ,KC_BTN2
@@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// right hand
,KC_NO ,KC_F16 ,KC_F17 ,KC_F18 ,KC_F19 ,KC_F20 ,KC_TRNS
,KC_WH_U ,KC_PSCR ,KC_HOME ,KC_UP ,KC_PGUP ,KC_MAIL ,KC_TRNS
- ,KC_NLCK ,KC_LEFT ,KC_DOWN ,KC_RIGHT,KC_MYCM ,KC_TRNS
+ ,KC_NUM ,KC_LEFT ,KC_DOWN ,KC_RIGHT,KC_MYCM ,KC_TRNS
,KC_WH_D ,KC_NO ,KC_END ,KC_DOWN ,KC_PGDN ,KC_NO ,KC_TRNS
,KC_INS ,KC_DEL ,KC_NO ,KC_NO ,KC_NO
,KC_MPRV ,KC_MNXT
diff --git a/layouts/community/ergodox/osx_de/keymap.c b/layouts/community/ergodox/osx_de/keymap.c
deleted file mode 100644
index cbbfc42280..0000000000
--- a/layouts/community/ergodox/osx_de/keymap.c
+++ /dev/null
@@ -1,359 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "keymap_german_mac_iso.h"
-
-#define BASE 0
-#define SYMB 1
-#define MDIA 2
-#define SMLY 3
-#define NUMB 4
-#define EGOS 5
-
-#define M_CTRL_CMDV 0
-#define M_CTRL_CMDC 1
-#define M_MEH_SH_ACUT 2
-#define M_LGUI_SHFT 3
-#define M_CTL_SFT_HASH 4
-#define M_DE_CIRC_CTRLCMD 5
-#define M_DE_PLUS_CTRLALT 6
-#define SM_SMILE 7
-#define SM_SMIRK 8
-#define SM_CRY 9
-#define SM_SAD 10
-#define SM_HEART 11
-#define SM_LAUGH 12
-#define SM_KISS 13
-#define SM_FROWN 14
-#define M_TOGGLE_5 15
-
-//Layout keymap.c generated with ErgodoxLayoutGenerator V1.0BETA1
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[BASE]=LAYOUT_ergodox(
-//left half
- KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, M(M_CTL_SFT_HASH),
- KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI,
- KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G,
- KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT,
- LT(SYMB,DE_LABK), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), KC_UP, KC_DOWN,
- M(M_MEH_SH_ACUT), TG(MDIA),
- KC_HOME,
- KC_BSPC, KC_DEL, LT(SMLY,KC_END),
- //right half
- M(M_CTL_SFT_HASH), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS,
- KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UDIA,
- DE_H, DE_J, DE_K, DE_L, DE_ODIA, ALT_T(DE_ADIA),
- KC_RALT, DE_N, DE_M, DE_COMM, DE_DOT, CTL_T(DE_MINS), KC_RSFT,
- KC_LEFT, KC_RIGHT, LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_PLUS),
- TG(NUMB), ALL_T(DE_ACUT),
- KC_PGUP,
- KC_PGDN, KC_ENT, KC_SPC),
-[SYMB]=LAYOUT_ergodox(
-//left half
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS, DE_LABK, DE_RABK, DE_EXLM, DE_QUES, KC_TRNS, KC_TRNS,
- KC_TRNS, DE_HASH, DE_DLR, DE_BSLS, DE_SLSH, KC_DOT,
- KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, DE_PIPE, DE_TILD, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_DEL, KC_TRNS,
- //right half
- M(M_TOGGLE_5), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), DE_LABK, DE_RABK, DE_EXLM,
- DE_SLSH, DE_LPRN, DE_RPRN, LALT(KC_8), LALT(KC_9), DE_HASH,
- KC_TRNS, DE_PIPE, DE_TILD, DE_CIRC, KC_UP, DE_MINS, LSFT(KC_4),
- DE_QUOT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,
- KC_F13, KC_F12,
- KC_F14,
- KC_F15, KC_TRNS, KC_TRNS),
-[MDIA]=LAYOUT_ergodox(
-//left half
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
- KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- //right half
- KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_VOLD, KC_TRNS, KC_MPRV, KC_MNXT, KC_UP, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK),
-[SMLY]=LAYOUT_ergodox(
-//left half
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- //right half
- M(SM_SMILE), M(SM_SMIRK), M(SM_LAUGH), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, M(SM_FROWN), M(SM_SAD), M(SM_CRY), KC_TRNS, KC_TRNS, KC_TRNS,
- M(SM_HEART), M(SM_KISS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS),
-[NUMB]=LAYOUT_ergodox(
-//left half
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- //right half
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, KC_UP, KC_7, KC_8, KC_9, LSFT(KC_RBRC), KC_F12,
- KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, DE_MINS,
- KC_TRNS, LSFT(KC_6), KC_1, KC_2, KC_3, LSFT(KC_7), KC_TRNS,
- KC_0, KC_DOT, KC_COMM, DE_EQL, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS),
-[EGOS]=LAYOUT_ergodox(
-//left half
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_F1, KC_F2,
- KC_F3,
- KC_SPC, KC_LCTL, KC_F4,
- //right half
- M(M_TOGGLE_5), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-static uint16_t start;
-switch(id) {
-case M_TOGGLE_5:
-//Macro: M_TOGGLE_5//-----------------------
- if (record->event.pressed){
- layer_state ^= (1<<5);
- layer_state &= (1<<5);
- }
-
-break;
-case M_CTRL_CMDC:
-//Macro: M_CTRL_CMDC//-----------------------
-if (record->event.pressed) {
- start = timer_read();
- return MACRO(D(LCTRL),END);
- } else {
- if (timer_elapsed(start) >150) {
- return MACRO(U(LCTRL),END);
- } else {
- return MACRO(U(LCTRL),D(LGUI),T(C),U(LGUI),END);
- }
- }
-
-break;
-case M_DE_PLUS_CTRLALT:
-//Macro: M_DE_PLUS_CTRLALT//-----------------------
-if (record->event.pressed) {
- start = timer_read();
- return MACRO(D(LCTRL),D(LALT),END);
- } else {
- if (timer_elapsed(start) >150) {
- return MACRO(U(LCTRL),U(LALT),END);
- } else {
- return MACRO(U(LCTRL),U(LALT),T(RBRC),END);
- }
- }
-
-break;
-case SM_KISS:
-//Macro: SM_KISS//-----------------------
-if (record->event.pressed) {
- return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(RBRC),U(LSFT),END);
- }
-
-break;
-case SM_FROWN:
-//Macro: SM_FROWN//-----------------------
-if (record->event.pressed) {
- return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LALT),T(8),U(LALT),END);
- }
-
-break;
-case SM_CRY:
-//Macro: SM_CRY//-----------------------
-if (record->event.pressed) {
- return MACRO(D(LSFT),T(COMM),U(LSFT),T(SLSH),D(LSFT),T(8),U(LSFT),END);
- }
-
-break;
-case SM_SMILE:
-//Macro: SM_SMILE//-----------------------
-if (record->event.pressed) {
- return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END);
- }
-
-break;
-case SM_SMIRK:
-//Macro: SM_SMIRK//-----------------------
-if (record->event.pressed) {
- return MACRO(D(LSFT),T(COMM),U(LSFT),T(SLSH),D(LSFT),T(9),U(LSFT),END);
- }
-
-break;
-case M_LGUI_SHFT:
-//Macro: M_LGUI_SHFT//-----------------------
-if (record->event.pressed){
- return MACRO(D(LGUI),D(LSFT),END);
- }else{
- return MACRO(U(LGUI),U(LSFT),END);
- }
-
-break;
-case SM_HEART:
-//Macro: SM_HEART//-----------------------
-if (record->event.pressed) {
- return MACRO(T(GRV),T(3),END);
- }
-
-break;
-case SM_LAUGH:
-//Macro: SM_LAUGH//-----------------------
-if (record->event.pressed) {
- return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(D),U(LSFT),END);
- }
-
-break;
-case M_CTL_SFT_HASH:
-//Macro: M_CTL_SFT_HASH//-----------------------
-if (record->event.pressed) {
- start = timer_read();
- return MACRO(D(LCTRL),D(LSFT),END);
- } else {
- if (timer_elapsed(start) >150) {
- return MACRO(U(LCTRL),U(LSFT),END);
- } else {
- return MACRO(U(LCTRL),U(LSFT),T(BSLS),END);
- }
- }
-
-break;
-case SM_SAD:
-//Macro: SM_SAD//-----------------------
-if (record->event.pressed) {
- return MACRO(D(LSFT),T(DOT),U(LSFT),T(SLSH),D(LSFT),T(8),U(LSFT),END);
- }
-
-break;
-case M_DE_CIRC_CTRLCMD:
-//Macro: M_DE_CIRC_CTRLCMD//-----------------------
-if (record->event.pressed) {
- start = timer_read();
- return MACRO(D(LCTRL),D(LGUI),END);
- } else {
- if (timer_elapsed(start) >150) {
- return MACRO(U(LCTRL),U(LGUI),END);
- } else {
- return MACRO(U(LCTRL),U(LGUI),T(NUBS),END);
- }
- }
-
-break;
-case M_CTRL_CMDV:
-//Macro: M_CTRL_CMDV//-----------------------
-if (record->event.pressed) {
- start = timer_read();
- return MACRO(D(LCTRL),END);
- } else {
- if (timer_elapsed(start) >150) {
- return MACRO(U(LCTRL),END);
- } else {
- return MACRO(U(LCTRL),D(LGUI),T(V),U(LGUI),END);
- }
- }
-
-break;
-case M_MEH_SH_ACUT:
-//Macro: M_MEH_SH_ACUT//-----------------------
-if (record->event.pressed) {
- start = timer_read();
- return MACRO(D(LCTRL),D(LSFT),D(LALT),END);
- } else {
- if (timer_elapsed(start) >150) {
- return MACRO(U(LCTRL),U(LSFT),U(LALT),END);
- } else {
- return MACRO(U(LCTRL),U(LALT),T(EQL),U(LSFT),END);
- }
- }
-
-break;
-}
-return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-uint8_t layer = get_highest_layer(layer_state);
-
-ergodox_board_led_off();
-ergodox_right_led_1_off();
-ergodox_right_led_2_off();
-ergodox_right_led_3_off();
-switch (layer) {
-
- case SYMB:
- ergodox_right_led_1_on();
-
-
- break;
- case MDIA:
-
- ergodox_right_led_2_on();
-
- break;
- case SMLY:
-
-
- ergodox_right_led_3_on();
- break;
- case NUMB:
- ergodox_right_led_1_on();
-
- ergodox_right_led_3_on();
- break;
- case EGOS:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
- break;
-default:
-// none
-break;
-}
-
-};
diff --git a/layouts/community/ergodox/osx_de/osx_de_highres.png.md b/layouts/community/ergodox/osx_de/osx_de_highres.png.md
deleted file mode 100644
index ee3dc53505..0000000000
--- a/layouts/community/ergodox/osx_de/osx_de_highres.png.md
+++ /dev/null
@@ -1 +0,0 @@
-https://i.imgur.com/kvSzkXK.png
diff --git a/layouts/community/ergodox/osx_de/readme.md b/layouts/community/ergodox/osx_de/readme.md
deleted file mode 100644
index e4ccee3aa6..0000000000
--- a/layouts/community/ergodox/osx_de/readme.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Ergodox EZ für OSX
-
-Dies ist nur ein kleiner Tweak der bestehenden firmware für das ErgoDox-EZ-Keyboard. Leider passte das layout nicht wirklich für OSX, deswegen habe ich einige Anpassungen gemacht. Dabei wurden folgende features umgesetzt:
-
-- Die Umlaute sollten an einigermassen sinnvollen Plätzen liegen
-- der Umstieg sollte dadurch erleichtert werden, dass einige Tasten an ihren "normalen" Platz zurückgewandert sind. Z.B. ESC, Tab,...
-- die Leertaste ist jetzt auf der rechten seite, neben Enter. Dafür hat der linke Daumen nun Backspace und Delete.
-- die CMD- und Alt-Tasten sind in der Mitte einfach erreichbar.
-- es gibt eine neue Layer die für Spiele genutzt werden kann (egosooter wie Counter Strike). Dort liegen die wichtigsten Tasten auf der linken Seite, im Daumenblock z.B. space und ctrl sowie die F-Tasten 1-4. Diese Layer ist über die Symbollayer erreichbar.
-- Die Symbollayer wurde dahingehend angepasst, dass die klammern, etc nun auf beiden hälften der Tastatur zu finden sind
-- der Zehnerblock wurde in eine eigene Layer umgezogen
-- die Meh und Hyper-Tasten wurden in die Daumenblöcke umgezogen
-
-# Erstellt Mit Dem ErgodoxLayoutGenerator
-
-Der ErgodoxLayoutGenerator ist ein kleines Werkzeug, welches die Erstellung und Pflege der eigenen Keymaps erleichtern soll. Es ist in java geschrieben und kann [hier](https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases) heruntergeladen werden. Damit das Tool funktioniert sollte das offizielle Oracle JDK in aktueller Version installiert sein.
-
-
-
-------------------------------
-
-# ErgoDox EZ for OSX
-
-This is only a little tweak of the existing default layout for the ErgoDox keyboard. Unfortunately the default layout did not work well with german OSX, so I created som adjustments. These were the features added and changed:
-
-- the umlaut-keys should be at their useful place more or less
-- the switching should be made more easy so some other keys (like tab, esc) were moved to their default place
-- the space key can now be used with both hands
-- the CMD- and ALT-Keys moved to the middle, can be reached more easily.
-- there is a new layer for using the cursor-keys, placed like on the default keyboard. This makes them useable for games also
-- the symbollayer now has only symbols
-- the number block was moved to a special layer
-- meh and hyper went down to the thumb block
-
-# Created Using the ErgodoxLayoutGenerator
-
-The ErgodoxLayoutGenerator (ELG) is a little tool, which makes the creation and maintenance of keycaps a lot easier. It was written in Java and can be downloaded [here](https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases). To use the tool, you need to have a current version of Oracles JDK installed.
-
-The documentation of the ELG can be viewed [here](https://boesebeck.name/2016/04/16/ergodoxlayoutgenerator-documentation/).
-
diff --git a/layouts/community/ergodox/osx_de_experimental/keymap.c b/layouts/community/ergodox/osx_de_experimental/keymap.c
deleted file mode 100644
index faf238726f..0000000000
--- a/layouts/community/ergodox/osx_de_experimental/keymap.c
+++ /dev/null
@@ -1,592 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "keymap_neo2.h"
-#include "keymap_uk.h"
-#include "keymap_colemak.h"
-#include "keymap_nordic.h"
-#include "keymap_dvorak.h"
-#include "keymap_german.h"
-#include "keymap_norwegian.h"
-#include "keymap_swiss_fr.h"
-#include "keymap_german_mac_iso.h"
-#include "keymap_spanish.h"
-#include "keymap_bepo.h"
-
-
-/**
-* This layout was generated using the ErgodoxLayoutGenerator (ELG). You can download it from https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases
-* documentation about it can be found here https://boesebeck.name/2016/04/16/ergodoxlayoutgenerator-documentation/
-* Thanks to the team of Erez Zukerman for building the great Ergodox-EZ!
-*
-* use at own risk!
-**/
-
-#define BASE 0
-#define SYMB 1
-#define MDIA 2
-#define SMLY 3
-#define NUMB 4
-#define EGOS 5
-
-#define SMLY_TOG_QUOT 0
-
-#define M_TOGGLE_5 1
-
-#define TGH_NUM 2
-
-#define M_DE_PLUS_CTRLALT 3
-
-#define SM_KISS 4
-
-#define SM_FROWN 5
-
-#define SM_CRY 6
-
-#define SM_SMILE 7
-
-#define SM_SMIRK 8
-
-#define M_LGUI_SHFT 9
-
-#define SM_HEART 10
-
-#define TOG_HLD_MDIA 11
-
-#define SM_LAUGH 12
-
-#define SM_SAD 13
-
-#define M_DE_CIRC_CTRLCMD 14
-
-#define M_MEH_SH_ACUT 15
-
-
-//Layout keymap.c generated with ErgodoxLayoutGenerator V1.0BETA1
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/**
-* Layer: BASE
-* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/ /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/
-* | ESC | 1 | 2 | 3 | 4 | 5 | Hold or toggle | | Hold or toggle | 6 | 7 | 8 | 9 | 0 | ß |
-* | | | | | | | Layer NUMB | | Layer MDIA | | | | | | |
-* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/ /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/
-* | TAB | Q | W | E | R | T | Cmd | | Cmd | Z | U | I | O | P | Ü |
-* | | | | | | | | | | | | | | | |
-* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/\-------------------\ \-------------------\/-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/
-* | Alt | A | S | D | F | G | | H | J | K | L | Ö | Ä |
-* | | | | | | | | | | | | | ALT |
-* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/ /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/
-* | Shift | Y | X | C | V | B | Alt | | Alt | N | M | , | . | - | Shift |
-* | | Ctrl | | | | | | | | | | | | Ctrl | |
-* \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\ \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\
-*
-*
-* /-------------------//-------------------//-------------------//-------------------//-------------------/ /-------------------//-------------------//-------------------//-------------------//-------------------/
-* | < | LongPress / Type | LongPress / Type | Shift+Ctrl | Type | | # | ACUT | CMD+Shift | ALT+Shift | + |
-* | SYMB | DE_CIRC_CTRLCMD | DE_PLUS_CTRAlt | | Toggle SMLY | | Meh | Hyper | | | SYMB |
-* \-------------------\\-------------------\\-------------------\\-------------------\/-------------------//-------------------/ /-------------------//-------------------/ \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\
-* | HOME | END | | LEFT | RIGHT |
-* | | | | | |
-* \-------------------\/-------------------/ /-------------------/\-------------------\
-* | PGUP | | UP |
-* | | | |
-* /-------------------//-------------------//-------------------/ /-------------------//-------------------//-------------------/
-* | BSPC | DEL | PGDN | | DOWN | ENT | SPC |
-* | | | | | | | |
-* \-------------------\\-------------------\\-------------------\ \-------------------\\-------------------\\-------------------\
-*
-*
-**/
-[BASE]=LAYOUT_ergodox(
-//left half
- KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, M(TGH_NUM),
- KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI,
- KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G,
- KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT,
- LT(SYMB,DE_LABK), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), LSFT(KC_LCTRL), M(SMLY_TOG_QUOT),
- KC_HOME, KC_END,
- KC_PGUP,
- KC_BSPC, KC_DEL, KC_PGDN,
- //right half
- M(TOG_HLD_MDIA), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS,
- KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UDIA,
- DE_H, DE_J, DE_K, DE_L, DE_ODIA, ALT_T(DE_ADIA),
- KC_RALT, DE_N, DE_M, DE_COMM, DE_DOT, CTL_T(DE_MINS), KC_RSFT,
- MEH_T(DE_HASH), ALL_T(DE_ACUT), LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_PLUS),
- KC_LEFT, KC_RIGHT,
- KC_UP,
- KC_DOWN, KC_ENT, KC_SPC),
-/**
-* Layer: SYMB
-* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/ /-----------//-----------//-----------//-----------//-----------//-----------//-----------/
-* | APPLICATION| F1 | F2 | F3 | F4 | F5 | F5 | | F6 | F6 | F7 | F8 | F9 | F10 | F11 |
-* | | | | | | | | | | | | | | | |
-* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/ /-----------//-----------//-----------//-----------//-----------//-----------//-----------/
-* | | < | > | ! | ? | | | | | \ | [ | ] | < | > | ! |
-* | | | | | | | | | | | | | | | |
-* /-----------//-----------//-----------//-----------//-----------//-----------/\-----------\ \-----------\/-----------//-----------//-----------//-----------//-----------//-----------/
-* | | # | $ | \ | / | . | | / | ( | ) | { | } | # |
-* | | | | | | | | | | | | | |
-* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/ /-----------//-----------//-----------//-----------//-----------//-----------//-----------/
-* | | | < | % | | | ~ | | | | | | ~ | | | | |
-* | | | | | | | | | | | | | | | |
-* \-----------\\-----------\\-----------\\-----------\\-----------\\-----------\\-----------\ \-----------\\-----------\\-----------\\-----------\\-----------\\-----------\\-----------\
-*
-*
-* /-----------//-----------//-----------//-----------//-----------/ /-----------//-----------//-----------//-----------//-----------/
-* | | | | | | | ' | DQOT | | Toggle 5 | |
-* | | | | | | | | | | | |
-* \-----------\\-----------\\-----------\\-----------\/-----------//-----------/ /-----------//-----------/ \-----------\\-----------\\-----------\\-----------\\-----------\
-* | | | | F13 | F12 |
-* | | | | | |
-* \-----------\/-----------/ /-----------/\-----------\
-* | | | F14 |
-* | | | |
-* /-----------//-----------//-----------/ /-----------//-----------//-----------/
-* | | DEL | | | F15 | | |
-* | | | | | | | |
-* \-----------\\-----------\\-----------\ \-----------\\-----------\\-----------\
-*
-*
-**/
-[SYMB]=LAYOUT_ergodox(
-//left half
- KC_APPLICATION, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5,
- KC_TRNS, DE_LABK, DE_RABK, DE_EXLM, DE_QST, KC_TRNS, KC_TRNS,
- KC_TRNS, DE_HASH, DE_DLR, DE_BSLS, DE_SLSH, KC_DOT,
- KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, DE_PIPE, DE_TILD, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_DEL, KC_TRNS,
- //right half
- KC_F6, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, DE_BSLS, DE_LBRC, DE_RBRC, DE_LABK, DE_RABK, DE_EXLM,
- DE_SLSH, DE_LPRN, DE_RPRN, DE_LCBR, DE_RCBR, DE_HASH,
- KC_TRNS, DE_PIPE, DE_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- DE_QUOT, DE_DQUO, KC_TRNS, M(M_TOGGLE_5), KC_TRNS,
- KC_F13, KC_F12,
- KC_F14,
- KC_F15, KC_TRNS, KC_TRNS),
-/**
-* Layer: MDIA
-* /-----//-----//-----//-----//-----//-----//-----/ /-----//-----//-----//-----//-----//-----//-----/
-* | | | | | | | | | | | | | | | |
-* | | | | | | | | | | | | | | | |
-* /-----//-----//-----//-----//-----//-----//-----/ /-----//-----//-----//-----//-----//-----//-----/
-* | | | BTN1 | U | BTN2 | U | | | | | | | | | |
-* | | | | | | | | | | | | | | | |
-* /-----//-----//-----//-----//-----//-----/\-----\ \-----\/-----//-----//-----//-----//-----//-----/
-* | | | L | D | R | D | | | | | | | |
-* | | | | | | | | | | | | | |
-* /-----//-----//-----//-----//-----//-----//-----/ /-----//-----//-----//-----//-----//-----//-----/
-* | | | L | D | R | BTN3 | | | | | | | | UP | |
-* | | | | | | | | | | | | | | | |
-* \-----\\-----\\-----\\-----\\-----\\-----\\-----\ \-----\\-----\\-----\\-----\\-----\\-----\\-----\
-*
-*
-* /-----//-----//-----//-----//-----/ /-----//-----//-----//-----//-----/
-* | | | | | | | | | LEFT | DOWN | RIGHT|
-* | | | | | | | | | | | |
-* \-----\\-----\\-----\\-----\/-----//-----/ /-----//-----/ \-----\\-----\\-----\\-----\\-----\
-* | | | | MPRV | MNXT |
-* | | | | | |
-* \-----\/-----/ /-----/\-----\
-* | | | VOLU |
-* | | | |
-* /-----//-----//-----/ /-----//-----//-----/
-* | | | | | VOLD | MUTE | MPLY |
-* | | | | | | | |
-* \-----\\-----\\-----\ \-----\\-----\\-----\
-*
-*
-**/
-[MDIA]=LAYOUT_ergodox(
-//left half
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D,
- KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- //right half
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,
- KC_MPRV, KC_MNXT,
- KC_VOLU,
- KC_VOLD, KC_MUTE, KC_MPLY),
-/**
-* Layer: SMLY
-* /--------//--------//--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------//--------//--------/
-* | | | | | | | | | Typing | Typing | Typing | | | | |
-* | | | | | | | | | SM_SMILE| SM_SMIRK| SM_LAUGH| | | | |
-* /--------//--------//--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------//--------//--------/
-* | | | | | | | | | | Typing | Typing | Typing | | | |
-* | | | | | | | | | | SM_FROWN| SM_SAD | SM_CRY | | | |
-* /--------//--------//--------//--------//--------//--------/\--------\ \--------\/--------//--------//--------//--------//--------//--------/
-* | | | | | | | | Typing | Typing | | | | |
-* | | | | | | | | SM_HEART| SM_KISS | | | | |
-* /--------//--------//--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------//--------//--------/
-* | | | | | | | | | | | | | | | |
-* | | | | | | | | | | | | | | | |
-* \--------\\--------\\--------\\--------\\--------\\--------\\--------\ \--------\\--------\\--------\\--------\\--------\\--------\\--------\
-*
-*
-* /--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------/
-* | | | | | | | | | | | |
-* | | | | | | | | | | | |
-* \--------\\--------\\--------\\--------\/--------//--------/ /--------//--------/ \--------\\--------\\--------\\--------\\--------\
-* | | | | | |
-* | | | | | |
-* \--------\/--------/ /--------/\--------\
-* | | | |
-* | | | |
-* /--------//--------//--------/ /--------//--------//--------/
-* | | | | | | | |
-* | | | | | | | |
-* \--------\\--------\\--------\ \--------\\--------\\--------\
-*
-*
-**/
-[SMLY]=LAYOUT_ergodox(
-//left half
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- //right half
- M(SM_SMILE), M(SM_SMIRK), M(SM_LAUGH), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, M(SM_FROWN), M(SM_SAD), M(SM_CRY), KC_TRNS, KC_TRNS, KC_TRNS,
- M(SM_HEART), M(SM_KISS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS),
-/**
-* Layer: NUMB
-* /----//----//----//----//----//----//----/ /----//----//----//----//----//----//----/
-* | | | | | | | | | | F6 | F7 | F8 | F9 | F10 | F11 |
-* | | | | | | | | | | | | | | | |
-* /----//----//----//----//----//----//----/ /----//----//----//----//----//----//----/
-* | | | | UP | | | | | | / | 7 | 8 | 9 | * | F12 |
-* | | | | | | | | | | | | | | | |
-* /----//----//----//----//----//----/\----\ \----\/----//----//----//----//----//----/
-* | | | LEFT| DOWN| RGHT| | | / | 4 | 5 | 6 | + | - |
-* | | | | | | | | | | | | | |
-* /----//----//----//----//----//----//----/ /----//----//----//----//----//----//----/
-* | | | | | | | | | | % | 1 | 2 | 3 | | |
-* | | | | | | | | | | | | | | | |
-* \----\\----\\----\\----\\----\\----\\----\ \----\\----\\----\\----\\----\\----\\----\
-*
-*
-* /----//----//----//----//----/ /----//----//----//----//----/
-* | | | | | | | 0 | . | , | = | |
-* | | | | | | | | | | | |
-* \----\\----\\----\\----\/----//----/ /----//----/ \----\\----\\----\\----\\----\
-* | | | | | |
-* | | | | | |
-* \----\/----/ /----/\----\
-* | | | |
-* | | | |
-* /----//----//----/ /----//----//----/
-* | | | | | | | |
-* | | | | | | | |
-* \----\\----\\----\ \----\\----\\----\
-*
-*
-**/
-[NUMB]=LAYOUT_ergodox(
-//left half
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- //right half
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, DE_SLSH, KC_7, KC_8, KC_9, DE_ASTR, KC_F12,
- DE_SLSH, KC_4, KC_5, KC_6, DE_PLUS, DE_MINS,
- KC_TRNS, DE_PERC, KC_1, KC_2, KC_3, KC_TRNS, KC_TRNS,
- KC_0, KC_DOT, KC_COMM, DE_EQL, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS),
-/**
-* Layer: EGOS
-* /--------//--------//--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------//--------//--------/
-* | | | | | | | | | | | | | | | |
-* | | | | | | | | | | | | | | | |
-* /--------//--------//--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------//--------//--------/
-* | | | | | | | | | | | | | | | |
-* | | | | | | | | | | | | | | | |
-* /--------//--------//--------//--------//--------//--------/\--------\ \--------\/--------//--------//--------//--------//--------//--------/
-* | Shift | | | | | | | | | | | | |
-* | | | | | | | | | | | | | |
-* /--------//--------//--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------//--------//--------/
-* | | | | | | | | | | | | | | | |
-* | | | | | | | | | | | | | | | |
-* \--------\\--------\\--------\\--------\\--------\\--------\\--------\ \--------\\--------\\--------\\--------\\--------\\--------\\--------\
-*
-*
-* /--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------/
-* | Ctrl | | | | | | | | | Toggle 5| |
-* | | | | | | | | | | | |
-* \--------\\--------\\--------\\--------\/--------//--------/ /--------//--------/ \--------\\--------\\--------\\--------\\--------\
-* | F1 | F2 | | | |
-* | | | | | |
-* \--------\/--------/ /--------/\--------\
-* | F3 | | |
-* | | | |
-* /--------//--------//--------/ /--------//--------//--------/
-* | SPC | Ctrl | F4 | | | | |
-* | | | | | | | |
-* \--------\\--------\\--------\ \--------\\--------\\--------\
-*
-*
-**/
-[EGOS]=LAYOUT_ergodox(
-//left half
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_F1, KC_F2,
- KC_F3,
- KC_SPC, KC_LCTL, KC_F4,
- //right half
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, M(M_TOGGLE_5), KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-static uint16_t start;
-switch(id) {
-case SMLY_TOG_QUOT:
-//Macro: SMLY_TOG_QUOT//-----------------------
-if (record->event.pressed) {
- start = timer_read();
- layer_state ^= (1<<SMLY);
- layer_state &= (1<<SMLY);
- return MACRO_NONE; } else {
- layer_state ^= (1<<SMLY);
- layer_state &= (1<<SMLY);
- if (timer_elapsed(start) >150) {
- return MACRO_NONE;
- } else {
- return MACRO(DOWN(KC_LSFT),TYPE(DE_HASH),UP(KC_LSFT),END);
- }
- }
-
-break;
-case M_TOGGLE_5:
-//Macro: M_TOGGLE_5//-----------------------
- if (record->event.pressed){
- layer_state ^= (1<<5);
- layer_state &= (1<<5);
- }
-
-break;
-case TGH_NUM:
-//Macro: TGH_NUM//-----------------------
-if (record->event.pressed){
- start = timer_read();
- layer_state ^=(1<<NUMB);
- layer_state &=(1<<NUMB);
- } else {
- if (timer_elapsed(start) > 150) {
- layer_state^=(1<<NUMB);
- layer_state&=(1<<NUMB);
- }
- }
-return MACRO_NONE;
-
-break;
-case M_DE_PLUS_CTRLALT:
-//Macro: M_DE_PLUS_CTRLALT//-----------------------
-if (record->event.pressed) {
- start = timer_read();
- return MACRO(DOWN(KC_LCTRL),DOWN(KC_LALT),END);
- } else {
- if (timer_elapsed(start) >150) {
- return MACRO(U(LCTRL),U(LALT),END);
- } else {
- return MACRO(UP(KC_LCTRL),UP(KC_LALT),TYPE(KC_RBRC),END);
- }
- }
-
-break;
-case SM_KISS:
-//Macro: SM_KISS//-----------------------
-if (record->event.pressed) {
- return MACRO(DOWN(KC_LSFT),TYPE(KC_DOT),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LSFT),TYPE(KC_RBRC),UP(KC_LSFT),END);
- }
-
-break;
-case SM_FROWN:
-//Macro: SM_FROWN//-----------------------
-if (record->event.pressed) {
- return MACRO(DOWN(KC_LSFT),TYPE(KC_DOT),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LALT),TYPE(KC_8),UP(KC_LALT),END);
- }
-
-break;
-case SM_CRY:
-//Macro: SM_CRY//-----------------------
-if (record->event.pressed) {
- return MACRO(DOWN(KC_LSFT),TYPE(KC_COMM),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LSFT),TYPE(KC_8),UP(KC_LSFT),END);
- }
-
-break;
-case SM_SMILE:
-//Macro: SM_SMILE//-----------------------
-if (record->event.pressed) {
- return MACRO(DOWN(KC_LSFT),TYPE(KC_DOT),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LSFT),TYPE(KC_9),UP(KC_LSFT),END);
- }
-
-break;
-case SM_SMIRK:
-//Macro: SM_SMIRK//-----------------------
-if (record->event.pressed) {
- return MACRO(DOWN(KC_LSFT),TYPE(KC_COMM),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LSFT),TYPE(KC_9),UP(KC_LSFT),END);
- }
-
-break;
-case M_LGUI_SHFT:
-//Macro: M_LGUI_SHFT//-----------------------
-if (record->event.pressed){
- return MACRO(DOWN(KC_LGUI),DOWN(KC_LSFT),END);
- }else{
- return MACRO(UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),U(LGUI),U(LSFT),END);
- }
-
-break;
-case SM_HEART:
-//Macro: SM_HEART//-----------------------
-if (record->event.pressed) {
- return MACRO(TYPE(KC_GRV),TYPE(KC_3),END);
- }
-
-break;
-case TOG_HLD_MDIA:
-//Macro: TOG_HLD_MDIA//-----------------------
-if (record->event.pressed){
- start = timer_read();
- layer_state ^=(1<<MDIA);
- layer_state &=(1<<MDIA);
- } else {
- if (timer_elapsed(start) > 150) {
- layer_state^=(1<<MDIA);
- layer_state&=(1<<MDIA);
- }
- }
-return MACRO_NONE;
-
-break;
-case SM_LAUGH:
-//Macro: SM_LAUGH//-----------------------
-if (record->event.pressed) {
- return MACRO(DOWN(KC_LSFT),TYPE(KC_DOT),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LSFT),TYPE(KC_D),UP(KC_LSFT),END);
- }
-
-break;
-case SM_SAD:
-//Macro: SM_SAD//-----------------------
-if (record->event.pressed) {
- return MACRO(DOWN(KC_LSFT),TYPE(KC_DOT),UP(KC_LSFT),TYPE(KC_SLSH),DOWN(KC_LSFT),TYPE(KC_8),UP(KC_LSFT),END);
- }
-
-break;
-case M_DE_CIRC_CTRLCMD:
-//Macro: M_DE_CIRC_CTRLCMD//-----------------------
-if (record->event.pressed) {
- start = timer_read();
- return MACRO(DOWN(KC_LCTRL),DOWN(KC_LGUI),END);
- } else {
- if (timer_elapsed(start) >150) {
- return MACRO(U(LCTRL),U(LGUI),END);
- } else {
- return MACRO(UP(KC_LCTRL),UP(KC_LGUI),TYPE(KC_NUBS),END);
- }
- }
-
-break;
-case M_MEH_SH_ACUT:
-//Macro: M_MEH_SH_ACUT//-----------------------
-if (record->event.pressed) {
- start = timer_read();
- return MACRO(DOWN(KC_LCTRL),DOWN(KC_LSFT),DOWN(KC_LALT),END);
- } else {
- if (timer_elapsed(start) >150) {
- return MACRO(U(LCTRL),U(LSFT),U(LALT),END);
- } else {
- return MACRO(UP(KC_LCTRL),UP(KC_LALT),TYPE(DE_ACUT),UP(KC_LSFT),END);
- }
- }
-
-break;
-}
-return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-uint8_t layer = get_highest_layer(layer_state);
-
-ergodox_board_led_off();
-ergodox_right_led_1_off();
-ergodox_right_led_2_off();
-ergodox_right_led_3_off();
-switch (layer) {
-
- case SYMB:
- ergodox_right_led_1_on();
-
-
- break;
- case MDIA:
-
- ergodox_right_led_2_on();
-
- break;
- case NUMB:
-
-
- ergodox_right_led_3_on();
- break;
- case EGOS:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
- break;
-default:
-// none
-break;
-}
-
-};
diff --git a/layouts/community/ergodox/osx_de_experimental/osx_de_experimental_highres.png.md b/layouts/community/ergodox/osx_de_experimental/osx_de_experimental_highres.png.md
deleted file mode 100644
index 1fca8a5bb5..0000000000
--- a/layouts/community/ergodox/osx_de_experimental/osx_de_experimental_highres.png.md
+++ /dev/null
@@ -1 +0,0 @@
-https://i.imgur.com/GIkRdX3.png
diff --git a/layouts/community/ergodox/osx_de_experimental/readme.md b/layouts/community/ergodox/osx_de_experimental/readme.md
deleted file mode 100644
index dde28eee41..0000000000
--- a/layouts/community/ergodox/osx_de_experimental/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# Ergodox und Ergodox-EZ experimentelles Layout
-
-dieses layout ist experimentell und wird im Lufe der Zeit viele Änderungen und Verbesserungen durchlaufen. Falls diese sich als vorteilhaft erweisen, werden sie evtl. auch in das `osx_de` layout übernommen.
-
-
-
-# Erstellt Mit Dem ErgodoxLayoutGenerator
-
-Der ErgodoxLayoutGenerator (ELG) ist ein kleines Werkzeug, welches die Erstellung und Pflege der eigenen Keymaps erleichtern soll. Es ist in java geschrieben und kann [hier](https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases) heruntergeladen werden. Damit das Tool funktioniert sollte das offizielle Oracle JDK in aktueller Version installiert sein.
----------------------------------------------------------------------------------------------------------------------
-
-# Ergodox and Ergodox-EZ experimental layout
-
-This is an experimental layout which will undergo heavy changes over time. If changes prove to be good, they might also move into the `osx_de` layout.
-
-Created Using the ErgodoxLayoutGenerator
-
-The ErgodoxLayoutGenerator (ELG) is a little tool, which makes the creation and maintenance of keycaps a lot easier. It was written in Java and can be downloaded [here](https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases). To use the tool, you need to have a current version of Oracles JDK installed.
-
-The documentation of the ELG can be viewed [here](https://boesebeck.name/2016/04/16/ergodoxlayoutgenerator-documentation/). \ No newline at end of file
diff --git a/layouts/community/ergodox/osx_kinesis_pnut/keymap.c b/layouts/community/ergodox/osx_kinesis_pnut/keymap.c
index fb50a3407e..f0be6d9a7f 100644
--- a/layouts/community/ergodox/osx_kinesis_pnut/keymap.c
+++ b/layouts/community/ergodox/osx_kinesis_pnut/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Otherwise, it needs KC_*
[BASE] = LAYOUT_ergodox( // layer 0 : default
// left hand
- KC_CAPSLOCK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
+ KC_CAPS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1),
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO),
diff --git a/layouts/community/ergodox/osx_neo2/keymap.c b/layouts/community/ergodox/osx_neo2/keymap.c
index 125cc43a8f..5b279073cc 100644
--- a/layouts/community/ergodox/osx_neo2/keymap.c
+++ b/layouts/community/ergodox/osx_neo2/keymap.c
@@ -57,12 +57,12 @@ enum custom_keycodes {
#define US_OSX_CENT LALT(KC_4) // ¢
#define US_OSX_YEN LALT(KC_Y) // ¥
#define US_OSX_SBQUO LALT(LSFT(KC_0)) // ‚
-#define US_OSX_LEFT_SINGLE_QUOTE LALT(KC_RBRACKET) // ‘
-#define US_OSX_RIGHT_SINGLE_QUOTE LALT(LSFT(KC_RBRACKET)) // ’
-#define US_OSX_ELLIPSIS LALT(KC_SCOLON) // …
+#define US_OSX_LEFT_SINGLE_QUOTE LALT(KC_RBRC) // ‘
+#define US_OSX_RIGHT_SINGLE_QUOTE LALT(LSFT(KC_RBRC)) // ’
+#define US_OSX_ELLIPSIS LALT(KC_SCLN) // …
#define US_OSX_UNDERSCORE LSFT(KC_MINUS) // _
-#define US_OSX_LBRACKET KC_LBRACKET // [
-#define US_OSX_RBRACKET KC_RBRACKET // ]
+#define US_OSX_LBRACKET KC_LBRC // [
+#define US_OSX_RBRACKET KC_RBRC // ]
#define US_OSX_CIRCUMFLEX LSFT(KC_6) // ^
#define US_OSX_EXCLAMATION LSFT(KC_1) // !
#define US_OSX_LESSTHAN LSFT(KC_COMMA) // <
@@ -70,26 +70,26 @@ enum custom_keycodes {
#define US_OSX_EQUAL KC_EQUAL // =
#define US_OSX_AMPERSAND LSFT(KC_7) // &
#define US_OSX_SMALL_LONG_S KC_NO // ſ
-#define US_OSX_BSLASH KC_BSLASH
+#define US_OSX_BSLASH KC_BACKSLASH
#define US_OSX_SLASH KC_SLASH // /
-#define US_OSX_CLBRACKET LSFT(KC_LBRACKET) // {
-#define US_OSX_CRBRACKET LSFT(KC_RBRACKET) // }
+#define US_OSX_CLBRACKET LSFT(KC_LBRC) // {
+#define US_OSX_CRBRACKET LSFT(KC_RBRC) // }
#define US_OSX_ASTERISK LSFT(KC_8) // *
#define US_OSX_QUESTIONMARK LSFT(KC_SLASH) // ?
#define US_OSX_LPARENTHESES LSFT(KC_9) // (
#define US_OSX_RPARENTHESES LSFT(KC_0) // )
#define US_OSX_HYPHEN_MINUS KC_MINUS // -
-#define US_OSX_COLON LSFT(KC_SCOLON) // :
+#define US_OSX_COLON LSFT(KC_SCLN) // :
#define US_OSX_AT LSFT(KC_2) // @
#define US_OSX_HASH LSFT(KC_3) // #
-#define US_OSX_PIPE LSFT(KC_BSLASH) // |
+#define US_OSX_PIPE LSFT(KC_BACKSLASH) // |
#define US_OSX_TILDE LSFT(KC_GRAVE) // ~
#define US_OSX_BACKTICK KC_GRAVE // `
#define US_OSX_PLUS LSFT(KC_EQUAL) // +
#define US_OSX_PERCENT LSFT(KC_5) // %
#define US_OSX_DOUBLE_QUOTE LSFT(KC_QUOTE) // "
#define US_OSX_SINGLE_QUOTE KC_QUOTE // '
-#define US_OSX_SEMICOLON KC_SCOLON // ;
+#define US_OSX_SEMICOLON KC_SCLN // ;
// NEO_4 special characters
#define US_OSX_FEMININE_ORDINAL LALT(KC_9) // ª
@@ -128,26 +128,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[NEO_1] = LAYOUT_ergodox(
// left hand side - main
KC_NO /* NOOP */, NEO2_1, NEO2_2, NEO2_3, NEO2_4, NEO2_5, KC_ESCAPE,
- KC_TAB, KC_X, KC_V, KC_L, KC_C, KC_W, KC_LCTRL,
+ KC_TAB, KC_X, KC_V, KC_L, KC_C, KC_W, KC_LCTL,
NEO2_LMOD3, KC_U, KC_I, KC_A, KC_E, KC_O, /* --- */
- KC_LSHIFT, NEO2_UE, NEO2_OE, NEO2_AE, KC_P, KC_Z, KC_LALT,
- KC_NO /* NOOP */, KC_NO /* NOOP */, KC_LCTRL, KC_LALT, KC_LGUI, /* --- */ /* --- */
+ KC_LSFT, NEO2_UE, NEO2_OE, NEO2_AE, KC_P, KC_Z, KC_LALT,
+ KC_NO /* NOOP */, KC_NO /* NOOP */, KC_LCTL, KC_LALT, KC_LGUI, /* --- */ /* --- */
// left hand side - thumb cluster
/* --- */ MO(FKEYS), KC_HOME,
- /* KC_BSPACE */ /* KC_DELETE */ KC_END,
- KC_BSPACE, KC_DELETE, NEO2_LMOD4,
+ /* KC_BSPC */ /* KC_DELETE */ KC_END,
+ KC_BSPC, KC_DELETE, NEO2_LMOD4,
// right hand side - main
TO(US_1), NEO2_6, NEO2_7, NEO2_8, NEO2_9, NEO2_0, NEO2_MINUS,
- KC_RCTRL, KC_K, KC_H, KC_G, KC_F, KC_Q, NEO2_SHARP_S,
+ KC_RCTL, KC_K, KC_H, KC_G, KC_F, KC_Q, NEO2_SHARP_S,
/* --- */ KC_S, KC_N, KC_R, KC_T, KC_D, NEO2_RMOD3,
- KC_RALT, KC_B, KC_M, NEO2_COMMA, NEO2_DOT, KC_J, KC_RSHIFT,
+ KC_RALT, KC_B, KC_M, NEO2_COMMA, NEO2_DOT, KC_J, KC_RSFT,
/* --- */ /* --- */ KC_RGUI, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,
// right hand side - thumb cluster
KC_PGUP, MO(FKEYS), /* --- */
- KC_PGDOWN, /* --- */ /* --- */
+ KC_PGDN, /* --- */ /* --- */
NEO2_RMOD4, KC_ENTER, KC_SPACE
),
@@ -222,7 +222,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[NEO_4] = LAYOUT_ergodox(
// left hand side - main
KC_NO /* NOOP */, US_OSX_FEMININE_ORDINAL, US_OSX_MASCULINE_ORDINAL, KC_NO /* NOOP */, US_OSX_MIDDLE_DOT, US_OSX_BRITISH_POUND, _______,
- _______, KC_PGUP, KC_BSPACE, KC_UP, KC_DELETE, KC_PGDOWN, _______,
+ _______, KC_PGUP, KC_BSPC, KC_UP, KC_DELETE, KC_PGDN, _______,
_______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END, /* --- */
_______, KC_ESCAPE, KC_TAB, KC_INSERT, KC_ENTER, KC_NO /* NOOP */, _______,
_______, _______, _______, _______, _______, /* --- */ /* --- */
@@ -363,27 +363,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[US_1] = LAYOUT_ergodox(
// left hand side - main
KC_EQUAL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESCAPE,
- KC_BSLASH, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO /* NOOP */,
+ KC_BSLS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO /* NOOP */,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, /* --- */
- KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO /* NOOP */,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO /* NOOP */,
KC_LGUI, KC_GRAVE, KC_NO, KC_NO, MO(FKEYS), /* --- */ /* --- */
// left hand side - thumb cluster
- /* --- */ KC_LCTRL, KC_LALT,
+ /* --- */ KC_LCTL, KC_LALT,
/* --- */ /* --- */ KC_HOME,
- KC_BSPACE, KC_DELETE, KC_END,
+ KC_BSPC, KC_DELETE, KC_END,
// right hand side - main
TO(NEO_1), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS,
- KC_LBRACKET, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRACKET,
- /* --- */ KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE,
- KC_NO /* NOOP */, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSHIFT,
+ KC_LBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRC,
+ /* --- */ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE,
+ KC_NO /* NOOP */, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RSFT,
/* --- */ /* --- */ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_RGUI,
// right hand side - thumb cluster
- KC_RALT, KC_RCTRL, /* --- */
+ KC_RALT, KC_RCTL, /* --- */
KC_PGUP, /* --- */ /* --- */
- KC_PGDOWN, KC_ENTER, KC_SPACE
+ KC_PGDN, KC_ENTER, KC_SPACE
),
/* FKEYS: Function keys
@@ -439,7 +439,7 @@ void tap_with_modifiers(uint16_t keycode, uint8_t force_modifiers) {
uint8_t active_modifiers = get_mods();
if ((force_modifiers & MOD_MASK_SHIFT) && !(active_modifiers & MOD_MASK_SHIFT)) register_code(KC_LSFT);
- if ((force_modifiers & MOD_MASK_CTRL) && !(active_modifiers & MOD_MASK_CTRL)) register_code(KC_LCTRL);
+ if ((force_modifiers & MOD_MASK_CTRL) && !(active_modifiers & MOD_MASK_CTRL)) register_code(KC_LCTL);
if ((force_modifiers & MOD_MASK_ALT) && !(active_modifiers & MOD_MASK_ALT)) register_code(KC_LALT);
if ((force_modifiers & MOD_MASK_GUI) && !(active_modifiers & MOD_MASK_GUI)) register_code(KC_LGUI);
@@ -447,7 +447,7 @@ void tap_with_modifiers(uint16_t keycode, uint8_t force_modifiers) {
unregister_code(keycode);
if ((force_modifiers & MOD_MASK_SHIFT) && !(active_modifiers & MOD_MASK_SHIFT)) unregister_code(KC_LSFT);
- if ((force_modifiers & MOD_MASK_CTRL) && !(active_modifiers & MOD_MASK_CTRL)) unregister_code(KC_LCTRL);
+ if ((force_modifiers & MOD_MASK_CTRL) && !(active_modifiers & MOD_MASK_CTRL)) unregister_code(KC_LCTL);
if ((force_modifiers & MOD_MASK_ALT) && !(active_modifiers & MOD_MASK_ALT)) unregister_code(KC_LALT);
if ((force_modifiers & MOD_MASK_GUI) && !(active_modifiers & MOD_MASK_GUI)) unregister_code(KC_LGUI);
}
@@ -486,7 +486,7 @@ bool process_record_user_shifted(uint16_t keycode, keyrecord_t *record) {
if (command) {
tap_code16(S(G(KC_4)));
} else {
- tap_code16(S(A(KC_BSLASH)));
+ tap_code16(S(A(KC_BACKSLASH)));
}
break;
case NEO2_5:
@@ -494,7 +494,7 @@ bool process_record_user_shifted(uint16_t keycode, keyrecord_t *record) {
tap_code16(S(G(KC_5)));
} else {
// left angled quote
- tap_code16(A(KC_BSLASH));
+ tap_code16(A(KC_BACKSLASH));
}
break;
case NEO2_6:
@@ -511,11 +511,11 @@ bool process_record_user_shifted(uint16_t keycode, keyrecord_t *record) {
break;
case NEO2_9:
// left double quote
- tap_code16(A(KC_LBRACKET));
+ tap_code16(A(KC_LEFT_BRACKET));
break;
case NEO2_0:
// right double quote
- tap_code16(S(A(KC_LBRACKET)));
+ tap_code16(S(A(KC_LEFT_BRACKET)));
break;
case NEO2_MINUS:
// em dash
@@ -620,18 +620,18 @@ bool process_record_user_shifted(uint16_t keycode, keyrecord_t *record) {
// Runs for each key down or up event.
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case KC_LSHIFT:
+ case KC_LSFT:
if (record->event.pressed) {
- capslock_state |= (MOD_BIT(KC_LSHIFT));
+ capslock_state |= (MOD_BIT(KC_LSFT));
} else {
- capslock_state &= ~(MOD_BIT(KC_LSHIFT));
+ capslock_state &= ~(MOD_BIT(KC_LSFT));
}
break;
- case KC_RSHIFT:
+ case KC_RIGHT_SHIFT:
if (record->event.pressed) {
- capslock_state |= MOD_BIT(KC_RSHIFT);
+ capslock_state |= MOD_BIT(KC_RSFT);
} else {
- capslock_state &= ~(MOD_BIT(KC_RSHIFT));
+ capslock_state &= ~(MOD_BIT(KC_RSFT));
}
break;
case NEO2_LMOD3:
@@ -687,9 +687,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if ((capslock_state & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
// CAPSLOCK is currently active, disable it
if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) {
- unregister_code(KC_LOCKING_CAPS);
+ unregister_code(KC_LOCKING_CAPS_LOCK);
} else {
- register_code(KC_LOCKING_CAPS);
+ register_code(KC_LOCKING_CAPS_LOCK);
}
return false;
}
diff --git a/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c
index 2285aa4a94..592a70238a 100644
--- a/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c
+++ b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
// right hand
- KC_NO, KC_NO, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_NO,
+ KC_NO, KC_NO, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_NO,
KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_NO,
KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO,
KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO,
diff --git a/layouts/community/ergodox/qwerty_code_friendly/keymap.c b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
index ed06446907..19c00e1b03 100644
--- a/layouts/community/ergodox/qwerty_code_friendly/keymap.c
+++ b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
@@ -395,7 +395,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
K80(L1K0), K80(L1K1), DYN_MACRO_PLAY1,
DYN_REC_STOP, KC_TRNS, DYN_MACRO_PLAY2,
/* right hand */
- M_BRACKET_OUT_CBR, KC_TRNS, KC_NLCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS,
+ M_BRACKET_OUT_CBR, KC_TRNS, KC_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS,
M_BRACKET_OUT_PRN, M_ARROW_LEQL, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TRNS,
M_ARROW_LMINUS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, KC_TRNS,
M_BRACKET_OUT_BRC, M_BRACKET_OUT_ANG, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, KC_TRNS,
@@ -593,18 +593,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
break;
#ifdef CFQ_USE_SHIFT_QUOTES
- case KC_LSHIFT: /* '' */
+ case KC_LEFT_SHIFT: /* '' */
if (record->event.pressed && (keyboard_report->mods & (MOD_BIT(KC_RSFT)))) {
WITHOUT_MODS({
- SEND_STRING("''" SS_TAP(X_LEFT) SS_DOWN(X_RSHIFT) SS_DOWN(X_LSHIFT));
+ SEND_STRING("''" SS_TAP(X_LEFT) SS_DOWN(X_RSFT) SS_DOWN(X_LSFT));
});
return false;
}
break;
- case KC_RSHIFT: /* "" */
+ case KC_RIGHT_SHIFT: /* "" */
if (record->event.pressed && (keyboard_report->mods & (MOD_BIT(KC_LSFT)))) {
WITHOUT_MODS({
- SEND_STRING("\x22\x22" SS_TAP(X_LEFT) SS_DOWN(X_LSHIFT) SS_DOWN(X_RSHIFT));
+ SEND_STRING("\x22\x22" SS_TAP(X_LEFT) SS_DOWN(X_LSFT) SS_DOWN(X_RSFT));
});
return false;
}
diff --git a/layouts/community/ergodox/replicaJunction/keymap.c b/layouts/community/ergodox/replicaJunction/keymap.c
index 8bd24a1233..4e0559a3e2 100644
--- a/layouts/community/ergodox/replicaJunction/keymap.c
+++ b/layouts/community/ergodox/replicaJunction/keymap.c
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TG_GAME, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL,
CAPWORD, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
- KC_LOCK, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ QK_LOCK, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
TAB_SFT, MO_FN, KC_RALT, KC_RGUI, MO_SLED,
KC_LEFT, KC_RGHT,
KC_UP,
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_A, KC_R, KC_S, KC_T, _______,
KC_LSFT,_______,_______,KC_C, KC_D, _______,_______,
_______,_______,KC_TAB, KC_LALT,KC_LCTL,
- KC_LOCK,_______,
+ QK_LOCK,_______,
_______,
KC_SPC, KC_LSFT,_______,
@@ -91,8 +91,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,
_______,_______,_______,
- _______,KC_NLCK,_______,_______,_______,_______,_______,
- KC_NLCK,KC_HASH,KC_P7, KC_P8, KC_P9, KC_PSLS,SFT_TAB,
+ _______,KC_NUM, _______,_______,_______,_______,_______,
+ KC_NUM, KC_HASH,KC_P7, KC_P8, KC_P9, KC_PSLS,SFT_TAB,
KC_PPLS,KC_P4, KC_P5, KC_P6, KC_PAST,KC_TAB,
_______,KC_PMNS,KC_P1, KC_P2, KC_P3, KC_BSLS,KC_EQL,
KC_P0, KC_P0, KC_PDOT,KC_PENT,_______,
@@ -197,10 +197,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,
_______,_______,_______,
- KC_NLCK,_______,_______,_______,_______,_______,_______,
+ KC_NUM, _______,_______,_______,_______,_______,_______,
KC_CAPS,_______,_______,_______,_______,_______,_______,
_______,_______,_______,_______,_______,_______,
- KC_SLCK,_______,_______,_______,_______,_______,_______,
+ KC_SCRL,_______,_______,_______,_______,_______,_______,
_______,_______,_______,_______,ooooooo,
_______,_______,
_______,
diff --git a/layouts/community/ergodox/romanzolotarev-norman-osx/keymap.c b/layouts/community/ergodox/romanzolotarev-norman-osx/keymap.c
index c8ee21990b..971e764ee2 100644
--- a/layouts/community/ergodox/romanzolotarev-norman-osx/keymap.c
+++ b/layouts/community/ergodox/romanzolotarev-norman-osx/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT_ergodox(
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_F5,
KC_TAB, KC_Q, KC_W, KC_D, KC_F, KC_K, KC_BSLS,
- KC_LCTRL, KC_A, KC_S, KC_E, KC_T, KC_G,
+ KC_LCTL, KC_A, KC_S, KC_E, KC_T, KC_G,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC,
KC_F1, KC_F2, KC_F3, KC_F4, KC_LGUI,
/*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLD, KC_MUTE,
diff --git a/layouts/community/ergodox/sethbc/keymap.c b/layouts/community/ergodox/sethbc/keymap.c
index ea6fc465ef..1d21471688 100644
--- a/layouts/community/ergodox/sethbc/keymap.c
+++ b/layouts/community/ergodox/sethbc/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
// right hand
- KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PAST, KC_PMNS, KC_BSPC,
+ KC_TRNS, KC_NUM, KC_PSLS, KC_PAST, KC_PAST, KC_PMNS, KC_BSPC,
KC_TRNS, KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_BSPC,
KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PENT,
KC_TRNS, KC_NO, KC_P1, KC_P2, KC_P3, KC_PPLS, KC_PENT,
diff --git a/layouts/community/ergodox/siroken3/keymap.c b/layouts/community/ergodox/siroken3/keymap.c
index dd5125d20e..50695fd695 100644
--- a/layouts/community/ergodox/siroken3/keymap.c
+++ b/layouts/community/ergodox/siroken3/keymap.c
@@ -37,12 +37,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// left hand
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
- KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_BSPC,
LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT,
KC_BSPC, KC_LGUI,
KC_HOME,
- MT(MOD_LGUI, KC_SPC),KC_LANG1,KC_END,
+ MT(MOD_LGUI, KC_SPC),KC_LNG1,KC_END,
// right hand
KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, TT(SYMB),
KC_LALT, CTL_T(KC_ESC),
KC_PGUP,
- KC_PGDN,KC_LANG2, KC_ENT
+ KC_PGDN,KC_LNG2, KC_ENT
),
/* Keymap 1: Symbol Layer
*
diff --git a/layouts/community/ergodox/swedish-lindhe/keymap.c b/layouts/community/ergodox/swedish-lindhe/keymap.c
index 6b8ff9d9c8..1644512de7 100644
--- a/layouts/community/ergodox/swedish-lindhe/keymap.c
+++ b/layouts/community/ergodox/swedish-lindhe/keymap.c
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, SE_ACUT,
CTL_T(SE_QUOT), SE_CIRC, SE_ASTR, KC_LALT, KC_LGUI,
- KC_LCTRL, KC_LALT,
+ KC_LCTL, KC_LALT,
SE_TILD,
KC_SPC, KC_BSPC, KC_ESC,
// right hand
diff --git a/layouts/community/ergodox/swissgerman/keyboard-layout.json b/layouts/community/ergodox/swissgerman/keyboard-layout.json
deleted file mode 100644
index 6958952b48..0000000000
--- a/layouts/community/ergodox/swissgerman/keyboard-layout.json
+++ /dev/null
@@ -1,419 +0,0 @@
-[
- {
- "backcolor": "#ffffff",
- "name": "Ergodox Swiss German Layout - Base Layer",
- "author": "Andreas Schmidt (https://github.com/remigius42)"
- },
- [
- {
- "x": 3.5
- },
- "#\n3",
- {
- "x": 10.5
- },
- "*\n8"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5
- },
- "@\n2",
- {
- "x": 1
- },
- "$\n4",
- {
- "x": 8.5
- },
- "&\n7",
- {
- "x": 1
- },
- "(\n9"
- ],
- [
- {
- "y": -0.875,
- "x": 5.5
- },
- "%\n5",
- {
- "a": 7
- },
- "<i class='fa fa-arrow-left'></i>",
- {
- "x": 4.5
- },
- "<i class='fa fa-arrow-right'></i>",
- {
- "a": 4
- },
- "^\n6"
- ],
- [
- {
- "y": -0.875,
- "w": 1.5
- },
- "°\n§",
- "!\n1",
- {
- "x": 14.5
- },
- ")\n0",
- {
- "w": 1.5
- },
- "?\n'\n\n'"
- ],
- [
- {
- "y": -0.375,
- "x": 3.5
- },
- "E",
- {
- "x": 10.5
- },
- "I"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5
- },
- "W",
- {
- "x": 1
- },
- "R",
- {
- "x": 8.5
- },
- "U",
- {
- "x": 1
- },
- "O"
- ],
- [
- {
- "y": -0.875,
- "x": 5.5
- },
- "T",
- {
- "c": "#b56b6b",
- "a": 6,
- "h": 1.5
- },
- "Toggle Code Layer",
- {
- "x": 4.5,
- "h": 1.5
- },
- "Toggle Code Layer",
- {
- "c": "#cccccc",
- "a": 4
- },
- "Y"
- ],
- [
- {
- "y": -0.875,
- "a": 6,
- "w": 1.5
- },
- "Delete",
- {
- "a": 4
- },
- "Q",
- {
- "x": 14.5
- },
- "P",
- {
- "w": 1.5
- },
- "è\nü\n\n["
- ],
- [
- {
- "y": -0.375,
- "x": 3.5
- },
- "D",
- {
- "x": 10.5
- },
- "K"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5
- },
- "S",
- {
- "x": 1
- },
- "F",
- {
- "x": 8.5
- },
- "J",
- {
- "x": 1
- },
- "L"
- ],
- [
- {
- "y": -0.875,
- "x": 5.5
- },
- "G",
- {
- "x": 6.5
- },
- "H"
- ],
- [
- {
- "y": -0.875,
- "a": 6,
- "w": 1.5
- },
- "Backspace",
- {
- "c": "#79c777",
- "a": 4
- },
- "A\n\nLyr3",
- {
- "x": 14.5
- },
- "é\nö\nLyr3",
- {
- "c": "#748adb",
- "w": 1.5
- },
- "à\nä\nCmd\n{"
- ],
- [
- {
- "y": -0.625,
- "x": 6.5,
- "c": "#cccccc",
- "a": 6,
- "h": 1.5
- },
- "Hyper",
- {
- "x": 4.5,
- "h": 1.5
- },
- "Meh"
- ],
- [
- {
- "y": -0.75,
- "x": 3.5,
- "a": 4
- },
- "C",
- {
- "x": 10.5
- },
- ";\n,"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5,
- "c": "#748adb"
- },
- "X\n\nAlt",
- {
- "x": 1,
- "c": "#cccccc"
- },
- "V",
- {
- "x": 8.5
- },
- "M",
- {
- "x": 1,
- "c": "#748adb"
- },
- ":\n.\nAlt"
- ],
- [
- {
- "y": -0.875,
- "x": 5.5,
- "c": "#cccccc"
- },
- "B",
- {
- "x": 6.5
- },
- "N"
- ],
- [
- {
- "y": -0.875,
- "a": 6,
- "w": 1.5
- },
- "Shift",
- {
- "c": "#748adb",
- "a": 4
- },
- "Z\n\nCtrl",
- {
- "x": 14.5
- },
- "_\n-\nCtrl",
- {
- "c": "#cccccc",
- "a": 6,
- "w": 1.5
- },
- "Shift"
- ],
- [
- {
- "y": -0.375,
- "x": 3.5,
- "a": 7
- },
- "<i class='fa fa-arrow-left'></i>",
- {
- "x": 10.5
- },
- "<i class='fa fa-arrow-down'></i>"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5,
- "a": 4
- },
- "£\n$\n\n}",
- {
- "x": 1,
- "a": 7
- },
- "<i class='fa fa-arrow-right'></i>",
- {
- "x": 10.5,
- "a": 6
- },
- "AltGr"
- ],
- [
- {
- "y": -0.9950000000000001,
- "x": 14,
- "a": 7
- },
- "<i class='fa fa-arrow-up'></i>"
- ],
- [
- {
- "y": -0.7549999999999999,
- "x": 0.5,
- "c": "#b56b6b",
- "a": 4
- },
- ">\n<\nCode Layer\n\\",
- {
- "c": "#cccccc"
- },
- "`\n^\n\n~",
- {
- "x": 14.5
- },
- "!\n¨\n\n]",
- {
- "c": "#b56b6b"
- },
- "\n\nCode Layer"
- ],
- [
- {
- "r": 30,
- "rx": 6.5,
- "ry": 4.25,
- "y": -1,
- "x": 1,
- "c": "#748adb"
- },
- "Apps\nAlt",
- {
- "c": "#cccccc",
- "a": 6
- },
- "Win / Cmd"
- ],
- [
- {
- "h": 2
- },
- "Space",
- {
- "h": 2
- },
- "Back Space",
- "Home"
- ],
- [
- {
- "x": 2
- },
- "End"
- ],
- [
- {
- "r": -30,
- "rx": 13,
- "y": -1,
- "x": -3
- },
- "Alt",
- {
- "c": "#748adb",
- "a": 4
- },
- "Esc\nCtrl"
- ],
- [
- {
- "x": -3,
- "c": "#cccccc",
- "a": 6
- },
- "Pg Up",
- {
- "h": 2
- },
- "Tab",
- {
- "h": 2
- },
- "Enter"
- ],
- [
- {
- "x": -3
- },
- "Pg Dn"
- ]
-]
diff --git a/layouts/community/ergodox/swissgerman/keyboard-layout_1_2.json b/layouts/community/ergodox/swissgerman/keyboard-layout_1_2.json
deleted file mode 100644
index 38a728514f..0000000000
--- a/layouts/community/ergodox/swissgerman/keyboard-layout_1_2.json
+++ /dev/null
@@ -1,436 +0,0 @@
-[
- {
- "backcolor": "#ffffff",
- "name": "Ergodox Swiss German Layout - Symbol & Media Layer",
- "author": "Andreas Schmidt (https://github.com/remigius42)"
- },
- [
- {
- "x": 3.5,
- "t": "#b81c1c"
- },
- "F3",
- {
- "x": 10.5
- },
- "F8"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5
- },
- "F2",
- {
- "x": 1
- },
- "F4",
- {
- "x": 8.5
- },
- "F7",
- {
- "x": 1
- },
- "F9"
- ],
- [
- {
- "y": -0.875,
- "x": 5.5
- },
- "F5",
- {
- "t": "#000000",
- "a": 7
- },
- "",
- {
- "x": 4.5
- },
- "",
- {
- "t": "#b81c1c",
- "a": 4
- },
- "F6"
- ],
- [
- {
- "y": -0.875,
- "t": "#000000\n\n\n#529151",
- "w": 1.5
- },
- "\n\n\nFlash",
- {
- "t": "#b81c1c"
- },
- "F1",
- {
- "x": 14.5
- },
- "F10",
- {
- "t": "#b81c1c\n\n\n#529151",
- "w": 1.5
- },
- "F11\n\n\nFlash"
- ],
- [
- {
- "y": -0.375,
- "x": 3.5
- },
- "{\n\n\n<i class='fa fa-arrow-circle-up'></i>",
- {
- "x": 10.5,
- "t": "#b81c1c"
- },
- "8"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5
- },
- "@",
- {
- "x": 1
- },
- "}",
- {
- "x": 8.5,
- "t": "#b81c1c\n\n\n#529151"
- },
- "7\n\n\nHTML ul",
- {
- "x": 1
- },
- "9\n\n\nHTML ol"
- ],
- [
- {
- "y": -0.875,
- "x": 5.5,
- "t": "#b81c1c"
- },
- "|",
- {
- "t": "#000000",
- "a": 7,
- "h": 1.5
- },
- "",
- {
- "x": 4.5,
- "h": 1.5
- },
- "",
- {
- "t": "#b81c1c",
- "a": 4
- },
- "<i class='fa fa-arrow-up'></i>"
- ],
- [
- {
- "y": -0.875,
- "t": "#000000",
- "a": 7,
- "w": 1.5
- },
- "",
- {
- "t": "#b81c1c",
- "a": 4
- },
- "!",
- {
- "x": 14.5
- },
- "*",
- {
- "w": 1.5
- },
- "F12"
- ],
- [
- {
- "y": -0.375,
- "x": 3.5,
- "t": "#b81c1c\n\n\n#529151"
- },
- "(\n\n\n<i class='fa fa-arrow-circle-down'></i>",
- {
- "x": 10.5
- },
- "5\n\n\nHTML li"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5
- },
- "$\n\n\n<i class='fa fa-arrow-circle-left'></i>",
- {
- "x": 1
- },
- ")\n\n\n<i class='fa fa-arrow-circle-right'></i>",
- {
- "x": 8.5,
- "t": "#b81c1c"
- },
- "4",
- {
- "x": 1
- },
- "6"
- ],
- [
- {
- "y": -0.875,
- "x": 5.5
- },
- "`",
- {
- "x": 6.5
- },
- "<i class='fa fa-arrow-down'></i>"
- ],
- [
- {
- "y": -0.875,
- "t": "#000000",
- "a": 7,
- "w": 1.5
- },
- "",
- {
- "t": "#b81c1c",
- "a": 4
- },
- "#",
- {
- "x": 14.5
- },
- "+",
- {
- "t": "#000000\n\n\n#529151",
- "w": 1.5
- },
- "\n\n\n<i class='fa fa-play'></i><i class='fa fa-pause'></i>"
- ],
- [
- {
- "y": -0.625,
- "x": 6.5,
- "t": "#000000",
- "a": 7,
- "h": 1.5
- },
- "",
- {
- "x": 4.5,
- "h": 1.5
- },
- ""
- ],
- [
- {
- "y": -0.75,
- "x": 3.5,
- "t": "#b81c1c\n\n\n#529151",
- "a": 4
- },
- "[\n\n\nHTML code",
- {
- "x": 10.5
- },
- "2\n\n\n<i class='fa fa-fast-backward'></i>"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5,
- "t": "#b81c1c"
- },
- "^",
- {
- "x": 1,
- "t": "#b81c1c\n\n\n#529151"
- },
- "]\n\n\nHTML br",
- {
- "x": 8.5,
- "t": "#b81c1c"
- },
- "1",
- {
- "x": 1,
- "t": "#b81c1c\n\n\n#529151"
- },
- "3\n\n\n<i class='fa fa-fast-forward'></i>"
- ],
- [
- {
- "y": -0.875,
- "x": 5.5,
- "t": "#b81c1c"
- },
- "~",
- {
- "x": 6.5
- },
- "&"
- ],
- [
- {
- "y": -0.875,
- "t": "#000000",
- "a": 7,
- "w": 1.5
- },
- "",
- {
- "t": "#b81c1c",
- "a": 4
- },
- "%",
- {
- "x": 14.5
- },
- "\\",
- {
- "t": "#000000",
- "a": 7,
- "w": 1.5
- },
- ""
- ],
- [
- {
- "y": -0.375,
- "x": 3.5,
- "t": "#000000\n\n\n#529151",
- "a": 4
- },
- "\n\n\nleft click",
- {
- "x": 10.5,
- "t": "#b81c1c\n\n\n#529151"
- },
- ".\n\n\n<i class='fa fa-volume-down'></i>"
- ],
- [
- {
- "y": -0.875,
- "x": 2.5,
- "t": "#000000",
- "a": 7
- },
- "",
- {
- "x": 1,
- "t": "#000000\n\n\n#529151",
- "a": 4
- },
- "\n\n\nright click",
- {
- "x": 8.5,
- "t": "#b81c1c\n\n\n#529151"
- },
- "?\n\n\n<i class='fa fa-volume-up'></i>",
- {
- "x": 1,
- "t": "#b81c1c"
- },
- "0"
- ],
- [
- {
- "y": -0.75,
- "x": 0.5,
- "t": "#000000",
- "a": 7
- },
- "",
- {
- "t": "#b81c1c",
- "a": 4
- },
- "EPRM RST",
- {
- "x": 14.5,
- "t": "#000000",
- "a": 7
- },
- "",
- ""
- ],
- [
- {
- "r": 30,
- "rx": 6.5,
- "ry": 4.25,
- "y": -1,
- "x": 1
- },
- "",
- ""
- ],
- [
- {
- "t": "#000000\n\n\n#529151",
- "a": 4,
- "h": 2
- },
- "\n\n\nEnter",
- {
- "t": "#000000",
- "a": 7,
- "h": 2
- },
- "",
- ""
- ],
- [
- {
- "x": 2
- },
- ""
- ],
- [
- {
- "r": -30,
- "rx": 13,
- "y": -1,
- "x": -3
- },
- "",
- ""
- ],
- [
- {
- "x": -3
- },
- "",
- {
- "h": 2
- },
- "",
- {
- "t": "#000000\n\n\n#529151",
- "a": 4,
- "h": 2
- },
- "\n\n\nWeb back"
- ],
- [
- {
- "x": -3,
- "t": "#000000",
- "a": 7
- },
- ""
- ]
-]
diff --git a/layouts/community/ergodox/swissgerman/keymap.c b/layouts/community/ergodox/swissgerman/keymap.c
deleted file mode 100644
index 9677be43b9..0000000000
--- a/layouts/community/ergodox/swissgerman/keymap.c
+++ /dev/null
@@ -1,283 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "string.h"
-
-#ifdef SUBPROJECT_infinity
-#include "visualizer/lcd_backlight.h"
-#endif
-
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-#define EPRM M(1) // Macro 1: Reset EEPROM
-#define HTML_LI M(10)
-#define HTML_UL M(11)
-#define HTML_OL M(12)
-#define HTML_CODE M(13)
-#define HTML_BR M(14)
-
-#define SEND_TAG(TAG) do {\
- send_key(KC_NONUS_BSLASH); \
- SEND_STRING(TAG); \
- send_larger_than(); \
- send_key(KC_NONUS_BSLASH); \
- SEND_STRING("&"); \
- SEND_STRING(TAG); \
- send_larger_than(); \
- go_back_based_on_tag(TAG); \
- } while (0)
-
-#define SEND_SHORT_TAG(TAG) do {\
- send_key(KC_NONUS_BSLASH); \
- SEND_STRING(TAG); \
- SEND_STRING("&"); \
- send_larger_than(); \
- } while (0)
-
-void send_key(uint16_t keycode);
-void go_back_based_on_tag(char* tag);
-void send_larger_than(void);
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | § | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | ' |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Del | Q | W | E | R | T | L1 | | L1 | Z | U | I | O | P | ü |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | BkSp | A /L2| S | D | F | G |------| |------| H | J | K | L |ö / L2|ä / Cmd |
- * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------|
- * | LShift |Y/Ctrl|X/Alt | C | V | B | | | | N | M | , |./Alt |-/Ctrl| RShift |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |< / L1| ^ | $ | Left | Right| | Up | Down |AltGr | ¨ | ~L1 |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | App | LGui | | Alt |Ctrl/Esc|
- * ,------|------|------| |------+--------+------.
- * | | | Home | | PgUp | | |
- * | Space|Backsp|------| |------| Tab |Enter |
- * | |ace | End | | PgDn | | |
- * `--------------------' `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
- KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
- KC_BSPC, LT(MDIA, KC_A),KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, CTL_T(KC_Z), ALT_T(KC_X), KC_C, KC_V, KC_B, ALL_T(KC_NO),
- LT(SYMB,KC_NONUS_BSLASH), KC_EQL, KC_BSLS, KC_LEFT,KC_RGHT,
- ALT_T(KC_APP), KC_LGUI,
- KC_HOME,
- KC_SPC,KC_BSPC,KC_END,
- // right hand
- KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
- KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
- MEH_T(KC_NO),KC_N, KC_M, KC_COMM,ALT_T(KC_DOT), CTL_T(KC_SLSH), KC_RSFT,
- KC_UP, KC_DOWN,KC_RALT,KC_RBRC, TT(SYMB),
- KC_LALT,CTL_T(KC_ESC),
- KC_PGUP,
- KC_PGDN,KC_TAB, KC_ENT
- ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | EPRM | | | | | ? | . | 0 | = | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
- // left hand
- M(0), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS,ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), ACTION_MODS_KEY(MOD_RALT, KC_2), ACTION_MODS_KEY(MOD_RALT, KC_QUOT), ACTION_MODS_KEY(MOD_RALT, KC_BSLS),ACTION_MODS_KEY(MOD_RALT,KC_7),KC_TRNS,
- KC_TRNS,ACTION_MODS_KEY(MOD_RALT,KC_3),KC_BSLS, ACTION_MODS_KEY(MOD_LSFT, KC_8), ACTION_MODS_KEY(MOD_RSFT, KC_9),ACTION_MODS_KEY(MOD_LSFT,KC_EQL),
- KC_TRNS,ACTION_MODS_KEY(MOD_LSFT,KC_5),KC_EQL, ACTION_MODS_KEY(MOD_RALT, KC_LBRC), ACTION_MODS_KEY(MOD_RALT, KC_RBRC),ACTION_MODS_KEY(MOD_RALT,KC_EQL),KC_TRNS,
- KC_TRNS,EPRM,KC_TRNS,KC_NONUS_BSLASH, ACTION_MODS_KEY(MOD_LSFT, KC_NONUS_BSLASH)/*KC_TRNS,KC_TRNS*/,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, KC_UP, KC_7, KC_8, KC_9, ACTION_MODS_KEY(MOD_RSFT,KC_3), KC_F12,
- KC_DOWN, KC_4, KC_5, KC_6, ACTION_MODS_KEY(MOD_RSFT,KC_1), KC_TRNS,
- KC_TRNS, ACTION_MODS_KEY(MOD_RSFT,KC_6), KC_1, KC_2, KC_3, ACTION_MODS_KEY(MOD_RALT,KC_NONUS_BSLASH), KC_TRNS,
- ACTION_MODS_KEY(MOD_RSFT,KC_MINS),KC_DOT, KC_0, KC_EQL, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | QK_BOOT | | | | | | | | | | | | | | QK_BOOT |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | |H_UL | |H_OL | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | | |H_LI | | Play |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |H_CODE| |H_BR | | | | | | | Prev | Next | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * |Enter | | | | | |Brwser|
- * | | |------| |------| |Back |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, HTML_CODE, KC_TRNS, HTML_BR, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_ENT, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,
- KC_TRNS, KC_TRNS, HTML_UL, KC_TRNS, HTML_OL, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, HTML_LI, KC_TRNS, KC_MPLY,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- break;
- case 1:
- if (record->event.pressed) { // For resetting EEPROM
- eeconfig_init();
- }
- break;
- case 10:
- if (record->event.pressed) {
- SEND_TAG("li");
- }
- break;
- case 11:
- if (record->event.pressed) {
- SEND_TAG("ul");
- }
- break;
- case 12:
- if (record->event.pressed) {
- SEND_TAG("ol");
- }
- break;
- case 13:
- if (record->event.pressed) {
- SEND_TAG("code");
- }
- break;
- case 14:
- if (record->event.pressed) {
- SEND_SHORT_TAG("br");
- }
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- switch (layer) {
- // TODO: Make this relevant to the ErgoDox EZ.
- case 0:
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
-
- #ifdef SUBPROJECT_infinity
- lcd_backlight_hal_color(0, 0, 0);
- #endif
- break;
- case 1:
- ergodox_right_led_1_on();
-
- ergodox_board_led_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- #ifdef SUBPROJECT_infinity
- lcd_backlight_hal_color(5000, 0, 0);
- #endif
- break;
- case 2:
- ergodox_right_led_2_on();
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_3_off();
- #ifdef SUBPROJECT_infinity
- lcd_backlight_hal_color(0, 5000, 0);
- #endif
- break;
- default:
- // none
- break;
- }
-
-};
-
-void send_key(uint16_t keycode) {
- register_code(keycode);
- unregister_code(keycode);
-}
-
-void go_back_based_on_tag(char* tag) {
- const int BRACKETS_AND_SLASH_LENGTH = 3;
-
- for (int i=0; i < strlen(tag) + BRACKETS_AND_SLASH_LENGTH; i++) {
- send_key(KC_LEFT);
- }
-}
-
-void send_larger_than() {
- register_code(KC_LSFT);
- send_key(KC_NONUS_BSLASH);
- unregister_code(KC_LSFT);
-}
diff --git a/layouts/community/ergodox/swissgerman/readme.md b/layouts/community/ergodox/swissgerman/readme.md
deleted file mode 100644
index fa7fc1618f..0000000000
--- a/layouts/community/ergodox/swissgerman/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# ErgoDox Swiss German Configuration
-
-Swiss German keyboard layout based on the Ergodox EZ default layout.
-
-Keyboard diagrams created with the [keyboard layout editor](http://www.keyboard-layout-editor.com).
-
-Diagram sources: [default layer](keyboard-layout.json), [layer 1 & 2](keyboard-layout_1_2.json)
-
-![Layout Layer 0](https://i.imgur.com/yf4HNXV.png)
-![Layout Layer 1&2](https://i.imgur.com/Q814cKa.png)
-
-## Changelog
-* Jan 21, 2017:
- * Initial version based on default layout.
-
diff --git a/layouts/community/ergodox/teckinesis/keymap.c b/layouts/community/ergodox/teckinesis/keymap.c
index 509b91af90..adfc935c28 100644
--- a/layouts/community/ergodox/teckinesis/keymap.c
+++ b/layouts/community/ergodox/teckinesis/keymap.c
@@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// right hand
,KC_NO ,KC_F16 ,KC_F17 ,KC_F18 ,KC_F19 ,KC_F20 ,KC_TRNS
,KC_WH_U ,KC_PSCR ,KC_HOME ,KC_UP ,KC_PGUP ,KC_NO ,KC_TRNS
- ,KC_NLCK ,KC_LEFT ,KC_DOWN ,KC_RIGHT,KC_NO ,KC_TRNS
+ ,KC_NUM ,KC_LEFT ,KC_DOWN ,KC_RIGHT,KC_NO ,KC_TRNS
,KC_WH_D ,KC_NO ,KC_END ,KC_DOWN ,KC_PGDN ,KC_NO ,KC_TRNS
,GUI_T(KC_INS),ALT_T(KC_DEL),KC_HYPR ,KC_MEH ,KC_RCTL
,KC_MPRV ,KC_MNXT
diff --git a/layouts/community/ergodox/tm2030/keymap.c b/layouts/community/ergodox/tm2030/keymap.c
deleted file mode 100644
index 3f82800377..0000000000
--- a/layouts/community/ergodox/tm2030/keymap.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/* TypeMatrix-2030-like keymap */
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "led.h"
-
-#define BASE 0 // default layer
-#define DVRK 1 // Dvorak layer
-#define NUMR 8 // numeric layer
-#define FNLR 9 // fn layer
-
-#define MDBL0 1
-#define MFNLR 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Basic layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | Del | | Del | 6 | 7 | 8 | 9 | 0 | ] |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Tab | Q | W | E | R | T |Backsp| |Backsp| Y | U | I | O | P | [ |
- * |--------+------+------+------+------+------|ace | |ace |------+------+------+------+------+--------|
- * | LShift | A | S | D | F | G |------| |------| H | J | K | L | ; | '/Shift|
- * |--------+------+------+------+------+------|Enter | |Enter |------+------+------+------+------+--------|
- * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | \/Shift|
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |LCtrl | fn | LGui | Play |App/Alt| | RAlt | - | Home | = |End/Ctl|
- * `-----------------------------------' `-----------------------------------'
- * ,--------------. ,-------------.
- * |Esc/Alt| num | | Left |Right |
- * ,------+-------+------| |------+------+------.
- * | | | PgUp | | Up | | |
- * |Space |LShift |------| |------|RShift|Space |
- * | | | PgDn | | Down | | |
- * `---------------------' `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_DEL,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_BSPC,
- KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT,
- KC_LCTL, M(MFNLR), KC_LGUI,KC_MPLY,ALT_T(KC_APP),
-
- ALT_T(KC_ESC), TG(NUMR),
- KC_PGUP,
- KC_SPC, KC_LSFT, KC_PGDN,
-
- // right hand
- KC_DEL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RBRC,
- KC_BSPC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, SFT_T(KC_QUOT),
- KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_BSLS),
- KC_RALT, KC_MINS, KC_HOME, KC_EQL, CTL_T(KC_END),
-
- KC_LEFT, KC_RGHT,
- KC_UP,
- KC_DOWN, KC_RSFT, KC_SPC
- ),
-/* Dvorak layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | Del | | Del | 6 | 7 | 8 | 9 | 0 | = |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | Tab | ' | , | . | P | Y |Backsp| |Backsp| F | G | C | R | L | / |
- * |--------+------+------+------+------+------|ace | |ace |------+------+------+------+------+--------|
- * | LShift | A | O | E | U | I |------| |------| D | H | T | N | S | -/Shift|
- * |--------+------+------+------+------+------|Enter | |Enter |------+------+------+------+------+--------|
- * | LShift | ; | Q | J | K | X | | | | B | M | W | V | Z | \/Shift|
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |LCtrl | fn | LGui | Play |App/Alt| | RAlt | [ | Home | ] |End/Ctl|
- * `-----------------------------------' `-----------------------------------'
- * ,--------------. ,-------------.
- * |Esc/Alt| num | | Left |Right |
- * ,------+-------+------| |------+------+------.
- * | | | PgUp | | Up | | |
- * |Space |LShift |------| |------|RShift|Space |
- * | | | PgDn | | Down | | |
- * `---------------------' `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[DVRK] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_DEL,
- KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_BSPC,
- KC_LSFT, KC_A, KC_O, KC_E, KC_U, KC_I,
- KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_ENT,
- KC_LCTL, M(MFNLR), KC_LGUI, KC_MPLY, ALT_T(KC_APP),
-
- ALT_T(KC_ESC), TG(NUMR),
- KC_PGUP,
- KC_SPC, KC_LSFT, KC_PGDN,
-
- // right hand
- KC_DEL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL,
- KC_BSPC, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
- KC_D, KC_H, KC_T, KC_N, KC_S, SFT_T(KC_MINS),
- KC_ENT, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_T(KC_BSLS),
- KC_RALT, KC_LBRC, KC_HOME, KC_RBRC, CTL_T(KC_END),
-
- KC_LEFT, KC_RGHT,
- KC_UP,
- KC_DOWN, KC_RSFT, KC_SPC
- ),
-/* Numeric Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | | | | | | Tab | / | * | - |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | F6 | F7 | F8 | F9 | F10 | | | | | Home | 7 | 8 | 9 | + |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | F11 | F12 | | | |------| |------| Up | End | 4 | 5 | 6 | + |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | Left | Down | Right| 1 | 2 | 3 |KpEnter |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | 0 | 00 | . |Etr/Ctl|
- * `----------------------------------' `-----------------------------------'
- * ,-------------. ,-------------.
- * | | | |n.lock|c.lock|
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[NUMR] = LAYOUT_ergodox(
- // left hand
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
- KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS, KC_F6, KC_F7, KC_TAB, KC_PSLS, KC_PAST, KC_PMNS,
- KC_TRNS, KC_TRNS, KC_HOME, KC_P7, KC_P8, KC_P9, KC_PPLS,
- KC_UP, KC_END, KC_P4, KC_P5, KC_P6, KC_PPLS,
- KC_LEFT, KC_DOWN, KC_RGHT, KC_P1, KC_P2, KC_P3, KC_PENT,
- KC_TRNS, KC_P0, M(MDBL0),KC_PDOT, CTL_T(KC_PENT),
-
- KC_NLCK, KC_CAPS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* fn layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | |Insert| |Insert|Eject |Power |Sleep | Wake |PrtScr|ScrollLk|
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | | | |VolUp | | | | | | | | Pause |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | Calc | Mail |Browsr|------| |------| | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | cut | copy |paste | Mute |VolDn | | | | | | | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | Next | | |
- * | Mute | |------| |------| | |
- * | | | | | Prev | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[FNLR] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MAIL, KC_WHOM,
- KC_TRNS, KC_TRNS, LSFT(KC_DEL), LCTL(KC_INS),LSFT(KC_INS), KC_MUTE, KC_VOLD,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_MUTE, KC_TRNS, KC_TRNS,
- // right hand
- KC_INS, KC_EJCT, KC_PWR, KC_SLEP, KC_WAKE, KC_PSCR, KC_SLCK,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
- KC_TRNS, KC_TRNS,
- KC_MPRV,
- KC_MNXT, KC_TRNS, KC_TRNS
-),
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case MDBL0:
- if (record->event.pressed) {
- return MACRO( I(25), T(P0), T(P0), END );
- }
- break;
- case MFNLR:
- layer_invert(NUMR);
- layer_invert(FNLR);
- break;
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- // led 1: numeric layer
- if (layer_state & (1 << NUMR)) {
- ergodox_right_led_1_on();
- }
- // led 2: Dvorak layer
- if (default_layer_state == 1 << DVRK) {
- ergodox_right_led_2_on();
- }
- // led 3: caps lock
- if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
- ergodox_right_led_3_on();
- }
-
-};
diff --git a/layouts/community/ergodox/tm2030/readme.md b/layouts/community/ergodox/tm2030/readme.md
deleted file mode 100644
index fce0c46e7d..0000000000
--- a/layouts/community/ergodox/tm2030/readme.md
+++ /dev/null
@@ -1,136 +0,0 @@
-# TypeMatrix™ 2030 inspired layout
-
-This is a [TypeMatrix™ 2030](http://typematrix.com/2030/features.php) inspired layout for the ErgoDox EZ. The _TypeMatrix_ is a nice small ergonomic keyboard with a matrix layout, and it provides several nice features like `enter`, `backspace` and `delete` at the center, bigger `shift` keys and international `cut`, `copy` and `paste` keys.
-
-The idea in this ErgoDox layout is to make it is as close as possible to the TM2030, such that it would be easy to switch between the TM and the ErgoDox. No _fancy_ features have been implemented, as this is intended to be a base for further customization if desired. Some keys have been duplicated in order to accomodate for most people.
-
-Most of the TM2030 features are supported except
-* automatic window switching (alt-tab key, at the left of the space key)
-* show desktop key (at the right of the space key)
-* 102/106 modes
-
-Dvorak mode is even supported by pressing [`Magic`](/docs/feature_bootmagic.md)+`1` (`Magic` is by default `LShift`+`RShift`)
-
-Some keys had to be moved around to fit into the ErgoDox, especially the `F1`-`F12` keys and the arrow keys.
-
-## Base Layer
-This is the default layer, close to the TM with the following differences:
-
- - Top row (with the `F`-keys) and rightmost column (with application shortcuts) are removed, the corresponding keys are displaced elsewhere.
- - Bottom-left keys are reorganized on a single row as: `Ctrl`, `fn`, `Gui`, `Play`, `App`/`Alt`.
- - `shuffle` and `desktop` are not supported.
- - `right-shift` is moved on `'`, `\` and on the right thumb (the latter is actually the only _true_ `right-shift`, and must be used in the `Magic` key combination).
- - `right-ctrl` is moved on `End`.
- - `]` is moved in place of the dash (`-`).
- - Dash (`-`) and `=` are moved on bottom right row.
- - Arrows and `PgUp`/`PgDn` are moved on the thumbs.
-
-```
-,--------------------------------------------------. ,--------------------------------------------------.
-| ` | 1 | 2 | 3 | 4 | 5 | Del | | Del | 6 | 7 | 8 | 9 | 0 | ] |
-|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
-| Tab | Q | W | E | R | T |Backsp| |Backsp| Y | U | I | O | P | [ |
-|--------+------+------+------+------+------|ace | |ace |------+------+------+------+------+--------|
-| LShift | A | S | D | F | G |------| |------| H | J | K | L | ; | '/Shift|
-|--------+------+------+------+------+------|Enter | |Enter |------+------+------+------+------+--------|
-| LShift | Z | X | C | V | B | | | | N | M | , | . | / | \/Shift|
-`--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- |LCtrl | fn | LGui | Play |App/Alt| | RAlt | - | Home | = |End/Ctl|
- `-----------------------------------' `-----------------------------------'
- ,--------------. ,-------------.
- |Esc/Alt| num | | Left |Right |
- ,------+-------+------| |------+------+------.
- | | | PgUp | | Up | | |
- |Space |LShift |------| |------|RShift|Space |
- | | | PgDn | | Down | | |
- `---------------------' `--------------------'
-```
-
-### Layer Switching
-- Use `num` to toggle the Numeric Layer.
-- Hold `fn` to temporarily activate the Numeric & Fn Layers.
-
-As on the original TM 2030, when `num` layer is activated, holding `fn` disables it but enables the other `fn` keys.
-
-## Dvorak Layer
-Same as Layer 0 but with _Dvorak_ layout, to use with QWERTY OS layout.
-
-Enable Dvorak layout with [`Magic`](/docs/feature_bootmagic.md)+`1` (`LShift`+`RShift`+`1`), disable with `Magic`-`0`.
-
-The middle (green) led indicates when the Dvorak layer is activated.
-
- ,--------------------------------------------------. ,--------------------------------------------------.
- | ` | 1 | 2 | 3 | 4 | 5 | Del | | Del | 6 | 7 | 8 | 9 | 0 | = |
- |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- | Tab | ' | , | . | P | Y |Backsp| |Backsp| F | G | C | R | L | / |
- |--------+------+------+------+------+------|ace | |ace |------+------+------+------+------+--------|
- | LShift | A | O | E | U | I |------| |------| D | H | T | N | S | -/Shift|
- |--------+------+------+------+------+------|Enter | |Enter |------+------+------+------+------+--------|
- | LShift | ; | Q | J | K | X | | | | B | M | W | V | Z | \/Shift|
- `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- |LCtrl | fn | LGui | Play |App/Alt| | RAlt | [ | Home | ] |End/Ctl|
- `-----------------------------------' `-----------------------------------'
- ,--------------. ,-------------.
- |Esc/Alt| num | | Left |Right |
- ,------+-------+------| |------+------+------.
- | | | PgUp | | Up | | |
- |Space |LShift |------| |------|RShift|Space |
- | | | PgDn | | Down | | |
- `---------------------' `--------------------'
-
-## Numeric Layer
-Numeric layer close to the TM when toggling `num`, with the following differences:
-
-- Numpad is displaced by 1 to the top left.
-- Arrows are displaced by 1 to the left.
-- Provides access to `F1`-`F12`, `caps-lock` and `num-lock`.
-
-The numeric layer is indicated with the left (red) led. Caps-lock is indicated with the right (blue) led.
-
- ,--------------------------------------------------. ,--------------------------------------------------.
- | | F1 | F2 | F3 | F4 | F5 | | | | | | Tab | / | * | - |
- |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- | | F6 | F7 | F8 | F9 | F10 | | | | | Home | 7 | 8 | 9 | + |
- |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- | | F11 | F12 | | | |------| |------| Up | End | 4 | 5 | 6 | + |
- |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- | | | | | | | | | Left | Down | Right| 1 | 2 | 3 |KpEnter |
- `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- | | | | | | | | 0 | 00 | . |Etr/Ctl|
- `----------------------------------' `-----------------------------------'
- ,-------------. ,-------------.
- | | | |n.lock|c.lock|
- ,------|------|------| |------+------+------.
- | | | | | | | |
- | | |------| |------| | |
- | | | | | | | |
- `--------------------' `--------------------'
-
-## Fn Layer
-Activated simultaneously with the Numeric layer when holding the `fn` key. As on the TM, it provides access to the following features:
-- `cut`, `copy` and `paste`
-- `volume up`, `volume down` and `mute` — as opposed to the TM, these are only on left hand
-- `previous track` and `next track`
-- `calculator`, `mail` and `browser home`
-- `insert`, `power`, `sleep`, `wake`, `print screen`, `scroll-lock` and `pause`
-
-Note: the `eject` key does not work due to jackhumbert/qmk_firmware#82
-
- ,--------------------------------------------------. ,--------------------------------------------------.
- | | | | | | |Insert| |Insert|Eject |Power |Sleep | Wake |PrtScr|ScrollLk|
- |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- | | | | | | |VolUp | | | | | | | | Pause |
- |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- | | | | Calc | Mail |Browsr|------| |------| | | | | | |
- |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- | | | cut | copy |paste | Mute |VolDn | | | | | | | | |
- `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- | | | | | | | | | | | |
- `----------------------------------' `----------------------------------'
- ,-------------. ,-------------.
- | | | | | |
- ,------|------|------| |------+------+------.
- | | | | | Next | | |
- | Mute | |------| |------| | |
- | | | | | Prev | | |
- `--------------------' `--------------------'
diff --git a/layouts/community/ergodox/townk_osx/config.h b/layouts/community/ergodox/townk_osx/config.h
deleted file mode 100644
index c817dadf50..0000000000
--- a/layouts/community/ergodox/townk_osx/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-//#define DEBUG_MATRIX_SCAN_RATE
-#define ONESHOT_TAP_TOGGLE 2
-#define ONESHOT_TIMEOUT 3000
diff --git a/layouts/community/ergodox/townk_osx/keymap.c b/layouts/community/ergodox/townk_osx/keymap.c
deleted file mode 100644
index c79d74d6eb..0000000000
--- a/layouts/community/ergodox/townk_osx/keymap.c
+++ /dev/null
@@ -1,279 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "action_util.h"
-#include "led.h"
-#include "keymap.h"
-#include "timer.h"
-
-/*
-
-# Why this Layout
-
-This layout was based on Kinesis layout and other ErgoDox user layouts
-available. It's target to be used on a MacOS but I'm pretty sure it can be
-addapted to Windows and/or Linux easily.
-
-## Function Key
-
-The `fn` key work almost like it would in any other keyboard with the exception
-it has a semi-sticky behavior. What does that mean?
-
-Well, if you press the `fn` and release it, the keyboard will be put on the
-_function layout_ and the next key stroke will be processed as if the `fn` key
-was pressed. Aftwards, the leyout get back to _normal_. If you hold `fn` and
-press any other key, when you release them, the keyboard leyout is back to
-_normal_.
-
-While pressing the `fn` with the left hand and strikeing the other keys on the
-right hand is farly easy, the same cannot being said for the other keys on the
-left side. So, instead of trying to do contorcionism with my left hand, I
-decided to do a semi-sticky version of `fn`. This way, I can press the `fn`
-key with my pinky, release it and press the `1` key to issue an `F1` to the
-operating system.
-
-## Key-Pad Key
-
-The `key pad` key is a layout switch key. If pressed, it will put the keyboard
-on the _key pad layout_ and stay there until key is pressed again.
-
-This is used to make the keyboard behave mostly like a **num pad keyboard**.
-
-## Notes
-- Regardless in which layout you are, keys from other layouts are not
- accessible. This means that if you are on the _key pad layout_, the left hand
- will be pretty much unusable.
- Of course that like anything else, there are exceptions to this rule.
- Modifiers should remain accessible throughout the layers.
-- The _shift key_ is, like the _function key_, also configured to have a sticky
- behavior.
-- All sticky keys have a timeout of 3 seconds.
-
-*/
-#define BASE 0
-#define KEYPAD 1
-#define FN 2
-
-#define MACRO_TMUX_ESC 10
-#define MACRO_TMUX_PASTE 11
-#define MACRO_OSX_COPY 12
-#define MACRO_OSX_PASTE 13
-
-#define M_TESC M(MACRO_TMUX_ESC)
-#define M_TPASTE M(MACRO_TMUX_PASTE)
-#define M_OSXCPY M(MACRO_OSX_COPY)
-#define M_OSXPST M(MACRO_OSX_PASTE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Base Layer
- *
- * ,-----------------------------------------------------. ,-----------------------------------------------------.
- * | `~ | 1 | 2 | 3 | 4 | 5 | ESC | | Pwr | 6 | 7 | 8 | 9 | 0 | - _ |
- * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------|
- * | Tab | Q | W | E | R | T | F16 | | F17 | Y | U | I | O | P | = + |
- * |-----------+------+------+------+------+------| Meh | | Meh |------+------+------+------+------+-----------|
- * | \ (Ctrl) | A | S | D | F | G |------| |------| H | J | K | L | ; | ' " (Ctrl)|
- * |-----------+------+------+------+------+------| F18 | | F19 |------+------+------+------+------+-----------|
- * | LShift | Z | X | C | V | B | Hyper| | Hyper| N | M | , | . | / | RShift |
- * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------'
- * | FN | KPAD |LCtrl | LAlt | LGui | | RGui | RAlt | RCtrl| KPAD | FN |
- * `-----------------------------------' `-----------------------------------'
- * ,-------------. ,-------------.
- * | M(0) | M(1) | | M(2) | M(3) |
- * ,------|------|------| |------+------+------.
- * | | | Home | | PgUp | | |
- * |Backsp| Del |------| |------| Enter| Space|
- * | | | End | | PgDn | | |
- * `--------------------' `--------------------'
- *
- * M(0) = Ctrk+A Esc
- * (this is used to issue the Esc key to the Tmux application)
- * M(1) = Ctrk+A P
- * (this is used to issue the Paste key to the Tmux application)
- * M(2) = Cmd+C
- * M(3) = Cmd+V
- */
-[BASE]=LAYOUT_ergodox(//left half
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MEH_T(KC_F16),
- CTL_T(KC_BSLS), KC_A, KC_S, KC_D, KC_F, KC_G,
- OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, ALL_T(KC_F18),
- OSL(FN), TG(KEYPAD), KC_LCTRL, KC_LALT, KC_LGUI,
- M_TESC, M_TPASTE,
- KC_HOME,
- KC_BSPC, KC_DEL, KC_END,
- //right half
- KC_POWER, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- MEH_T(KC_F17), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, CTL_T(KC_QUOT),
- ALL_T(KC_F19), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM(MOD_LSFT),
- KC_RGUI, KC_RALT, CTL_T(KC_LBRC), LT(KEYPAD, KC_RBRC), OSL(FN),
- M_OSXCPY, M_OSXPST,
- KC_PGUP,
- KC_PGDN, KC_ENT, KC_SPC),
-
-/* Keymap 1: KeyPad Layer
- *
- * ,-----------------------------------------------------. ,-----------------------------------------------------.
- * | | | LClk | RClk | MClk | | | | BTab | Clear| / | * | ^ | ( | |
- * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------|
- * | M.Accel 2 | |ScrlUp| U |ScrlDn| | | | Tab | 7 | 8 | 9 | + | ) | |
- * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------|
- * | M.Accel 1 | | L | D | R | |------| |------| 4 | 5 | 6 | - | | |
- * |-----------+------+------+------+------+------| | |Return|------+------+------+------+------+-----------|
- * | M.Accel 0 | |ScrlL | |ScrlR | | | | | 1 | 2 | 3 | = | | |
- * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------'
- * | | XXXX | | | | | 0 | . | , | XXXX | |
- * `-----------------------------------' `-----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | XXXX | |
- * | | |------| |------| XXXX | |
- * | | | | | | XXXX | |
- * `--------------------' `--------------------'
- */
-[KEYPAD]=LAYOUT_ergodox(//left half
- KC_NO, KC_NO, KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, KC_NO, KC_NO,
- KC_MS_ACCEL2, KC_NO, KC_MS_WH_UP, KC_MS_U, KC_MS_WH_DOWN, KC_NO, KC_NO,
- KC_MS_ACCEL1, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,
- KC_MS_ACCEL0, KC_NO, KC_MS_WH_LEFT, KC_NO, KC_MS_WH_RIGHT, KC_NO, KC_NO,
- KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_NO,
- //right half
- LSFT(KC_TAB), KC_CLEAR, KC_KP_SLASH, KC_KP_ASTERISK, KC_CIRCUMFLEX, KC_LPRN, KC_NO,
- KC_TAB, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_RPRN, KC_NO,
- KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_MINUS, KC_NO, KC_NO,
- KC_KP_ENTER, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_EQUAL, KC_NO, KC_NO,
- KC_KP_0, KC_KP_DOT, KC_KP_COMMA, KC_TRNS, KC_NO,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_TRNS, KC_NO),
-
-/* Keymap 2: Functions Layer
- *
- * ,-----------------------------------------------------. ,-----------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | Vol. Up |
- * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------|
- * | | Stop | Rw | Rec | FF | | XXXX | | XXXX | | | | | | Vol. Down |
- * |-----------+------+------+------+------+------| XXXX | | XXXX |------+------+------+------+------+-----------|
- * | CapsLock | Eject| Prev | Play | Next | |------| |------| Left | Down | Up | Right| | Mute |
- * |-----------+------+------+------+------+------| XXXX | | XXXX |------+------+------+------+------+-----------|
- * | L Shift | | | | | | XXXX | | XXXX | | | | | | R Shift |
- * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------'
- * | XXXXX | | XXXX | XXXX | XXXX | | XXXX | XXXX | XXXX | | XXXXX |
- * `-----------------------------------' `-----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- *
- * XXX = These keys are transparent keys that, when pressed, they issue the key from the previous layer.
- */
-[FN]=LAYOUT_ergodox(//left half
- KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
- KC_NO, KC_MEDIA_STOP, KC_MEDIA_REWIND, KC_MEDIA_SELECT, KC_MEDIA_FAST_FORWARD, KC_NO, KC_TRNS,
- KC_CAPS, KC_MEDIA_EJECT, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_NO,
- KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
- KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_NO,
- //right half
- KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU,
- KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD,
- KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_NO, KC_MUTE,
- KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_RSFT,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS,
- KC_NO, KC_NO,
- KC_NO,
- KC_NO, KC_NO, KC_NO)};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
- // MACRODOWN only works in this function
- switch(id) {
- case MACRO_TMUX_ESC:
- if (record->event.pressed) {
- return MACRO(D(LCTRL), T(A), U(LCTRL), D(ESC), END);
- }
- return MACRO(U(ESC), END);
- case MACRO_TMUX_PASTE:
- if (record->event.pressed) {
- return MACRO(D(LCTRL), T(A), U(LCTRL), D(P), END);
- }
- return MACRO(U(P), END);
- case MACRO_OSX_COPY:
- if (record->event.pressed) {
- return MACRO(D(LGUI), D(C), END);
- }
- return MACRO(U(C), U(LGUI), END);
- case MACRO_OSX_PASTE:
- if (record->event.pressed) {
- return MACRO(D(LGUI), D(V), END);
- }
- return MACRO(U(V), U(LGUI), END);
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-
-uint8_t current_layer = BASE;
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_led_all_off();
- ergodox_led_all_set(LED_BRIGHTNESS_LO);
-
- switch (layer) {
- case BASE:
- current_layer = BASE;
- break;
- case KEYPAD:
- current_layer = KEYPAD;
- break;
- default:
- // none
- break;
- }
-
- // layer leds
- if (current_layer == KEYPAD) {
- ergodox_right_led_3_on();
- }
-
- // capslock
- if (host_keyboard_leds() & (3<<USB_LED_CAPS_LOCK)) {
- ergodox_right_led_1_on();
- }
-
- // Temporary leds
-
- // The function layer takes over other layers and we need to reflect that on the leds.
- // If the current layer is the BASE, we simply turn on the FN led, but if the current
- // layer is the KEYPAD, than we must turn it off before turning on the FN led.
- if (layer == FN && !has_oneshot_layer_timed_out()) {
- ergodox_right_led_3_off();
- ergodox_right_led_2_on();
- }
-
- // if the shifted is pressed I show the case led in a brighter color. This is nice to
- // differenciate the shift from the capslock.
- // Notice that I make sure that we're not using the shift on a chord shortcut (pressing
- // shift togather with other modifiers).
- if((keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) && // is shift pressed and there is no other
- !(keyboard_report->mods & (~MOD_BIT(KC_LSFT) & ~MOD_BIT(KC_RSFT)))) || // modifier being pressed as well
- (get_oneshot_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) && !has_oneshot_mods_timed_out())) { // or the one shot shift didn't timed out
- ergodox_right_led_1_set(LED_BRIGHTNESS_HI);
- ergodox_right_led_1_on();
- }
-};
diff --git a/layouts/community/ergodox/townk_osx/readme.md b/layouts/community/ergodox/townk_osx/readme.md
deleted file mode 100644
index e10e447829..0000000000
--- a/layouts/community/ergodox/townk_osx/readme.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Townk's Keymap
-
-Trying to take care of an enjury on my arm I borrow an ergonomic keyboard from
-a frient ([Kinesis Advantage](https://www.kinesis-ergo.com/shop/advantage2/)).
-
-I really enjoyed my time with it but there were some anoyancies:
-
-* The curvature on the keys bothered me since I'm a Vim user and using the
- motion keys on my editor was awkard.
-* I had to spend too much time remapping the keyboard to make some symbol keys
- more accessible to me.
-* The fact that my hands had to stay close to each other was a bit stressfull
- to my sholders.
-
-After a long research I find out that Ergodox EZ would be perfect for my needs
-and purchase one. Before the keyboard even got in my hands I started to think
-on the layout I would use on it and soon enough I planed couple adjustments
-from the Kinesis I was using so far.
-
-## The layout
-
-Here are the layout mapping in images so you can have a glimpse on it:
-
-![Base Layout](https://i.imgur.com/m1yyQvU.png)
-![fn Layout](https://i.imgur.com/AJIzrjq.png)
-![Keypad & Mouse Layout](https://i.imgur.com/9I6Qr0e.png)
-
-Notice that, differently from the default behavior, my layer keys are not transparent
-by default, which means that if you press any non-labeled white key, nothing will be
-handled to the OS.
-
-### One shot keys
-
-It all started with the access to the function keys (F1, F2, F3...), since
-those keys are located on a different layer I needed a way to press them with
-minimal effort without disrupting my flow.
-
-For me, togglihg a layer to press a button and than toggle it back is a waste
-of time (although I admit it's a single tap from what I have), so I decided to
-do it as a one shot key. I could press it and the next pressed key would be
-handled by the target layer which just after it delivers the key to the OS it
-would get back to the previous layer.
-
-After setting up my layout to do just that I realized that occasionally I
-would stop myseld on the middle of the process and the one shot layer would be
-still triggered until I press any other key. So to prevent me from tapping
-keys I don't want I added a timeout of 3 seconds for the one shot actions.
-
-Ultimately I tested the shift key as a one shot one and really like it, so
-here you have it, all the one shot keys on my layout.
-
-## Glossary
-
-If you're not familiar with the Mac symbols used on some keys, here is a
-reference to them:
-
-| Symbol | Description |
-| :----: | ------------------- |
-| ⌘ | Command |
-| ⇪ | Caps Lock |
-| ⇧ | Shift |
-| ⌥ | Option (alt) |
-| ⎋ | Esc |
-| ⇥ | Tab forward |
-| ⇤ | Tab backward |
-| ⌃ | Control |
-| ␣ | Space |
-| ⌫ | Backspace |
-| ⌦ | Delete |
-| ⏎ | Enter |
-| ⌤ | Return |
-| ⌽ | Power on/off button |
-| ↖ | Home |
-| ↘ | End |
-| ⇞ | Page up |
-| ⇟ | Page down |
-| ⌧ | Clear |
diff --git a/layouts/community/ergodox/townk_osx/rules.mk b/layouts/community/ergodox/townk_osx/rules.mk
deleted file mode 100644
index c06021b9fb..0000000000
--- a/layouts/community/ergodox/townk_osx/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# I don't want my keyboard blinking lights when is suppose to be asleep.
-SLEEP_LED_ENABLE = no \ No newline at end of file
diff --git a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
index 12548ae0ea..cc18259d40 100644
--- a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
+++ b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c
@@ -28,23 +28,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `--------------------' `----------------------'
*/
[0] = LAYOUT_ergodox(
- TG(1), KC_1, KC_2, KC_3, KC_4, KC_5, LALT(KC_LSHIFT),
+ TG(1), KC_1, KC_2, KC_3, KC_4, KC_5, LALT(KC_LSFT),
KC_TAB, KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, TG(3),
KC_ESCAPE, KC_A, KC_O, KC_E, KC_U, KC_I,
- KC_LSHIFT, KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, TG(2),
+ KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, TG(2),
MO(3), LCTL(KC_C), LCTL(KC_X), LCTL(KC_V), MO(2),
KC_DELETE, KC_TRNS,
KC_LGUI,
- KC_BSPACE,CTL_T(KC_NO),KC_LALT,
+ KC_BSPC,CTL_T(KC_NO),KC_LALT,
KC_TILD, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQUAL,
KC_TRNS, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLASH,
KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINUS,
- KC_TRNS, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_LSHIFT,
- KC_LBRACKET, KC_RBRACKET, KC_BSLASH, KC_UNDO, LCTL(KC_A),
+ KC_TRNS, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_LSFT,
+ KC_LBRC, KC_RBRC, KC_BSLS, KC_UNDO, LCTL(KC_A),
KC_END, KC_HOME,
KC_PGUP,
- KC_PGDOWN, KC_ENTER, KC_SPACE
+ KC_PGDN, KC_ENTER, KC_SPACE
),
/* Keymap 1: Hebrew layer
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_Y, KC_U, KC_E, KC_O, KC_P, KC_TRNS,
- KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_TRNS,
+ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_TRNS,
KC_TRNS, KC_N, KC_M, KC_COMMA, KC_DOT, KC_I, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
@@ -161,11 +161,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,
// Right Hand
- KC_TRNS, KC_TRNS, KC_LOCKING_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TRNS,
- KC_TRNS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_KP_1, KC_KP_2, KC_KP_3, KC_ENTER, KC_TRNS,
- KC_KP_0, KC_KP_0, KC_KP_DOT, KC_ENTER, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_LNUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TRNS,
+ KC_TRNS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_KP_1, KC_KP_2, KC_KP_3, KC_ENTER, KC_TRNS,
+ KC_KP_0, KC_KP_0, KC_KP_DOT, KC_ENTER, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/layouts/community/ergodox/twey/keymap.c b/layouts/community/ergodox/twey/keymap.c
deleted file mode 100644
index dac153f070..0000000000
--- a/layouts/community/ergodox/twey/keymap.c
+++ /dev/null
@@ -1,232 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "keymap_steno.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define STEN 2 // steno
-#define MDIA 3 // media keys
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,---------------------------------------------------. ,---------------------------------------------------.
- * | = | 1 | 2 | 3 | 4 | 5 | STEN | | NONE | 6 | 7 | 8 | 9 | 0 | \ |
- * |--------+------+------+------+-------+-------------| |-------+------+------+------+------+------+--------|
- * | Del | ' | , | . | P | Y | Esc | | Caps | F | G | C | R | L | / |
- * |--------+------+------+------+-------+------| | | |------+------+------+------+------+--------|
- * | BkSp | A | O | E | U | I |------| |-------| D | H | T | N | S | - |
- * |--------+------+------+------+-------+------| Tab | | Enter |------+------+------+------+------+--------|
- * | LShift | ; | Q | J | K | X | | | | B | M | W | V | Z | RShift |
- * `--------+------+------+------+-------+-------------' `--------------+------+------+------+------+--------'
- * | L1 | NONE | Grv | Left | Right | | Up | Down | [ | ] | L1 |
- * `-----------------------------------' `----------------------------------'
- * ,--------------. ,---------------.
- * | PgUp | PgDn | | Home | End |
- * ,------|-------|------| |-------+-------+------.
- * | | | NONE | | AltGr | | |
- * | Alt | Enter |------| |-------| Space | Ctrl |
- * | | | Supr | | ~MDIA | | |
- * `---------------------' `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(STEN),
- KC_DEL, KC_QUOT, KC_COMM,KC_DOT, KC_P, KC_Y, KC_ESC,
- KC_BSPC, KC_A, KC_O, KC_E, KC_U, KC_I,
- KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_TAB,
- MO(SYMB), KC_NO, KC_GRV, KC_LEFT,KC_RGHT,
- KC_PGUP,KC_PGDN,
- KC_NO,
- KC_LALT,KC_ENT ,M(0),
- // right hand
- KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
- KC_CAPS, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
- KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
- KC_ENT, KC_B, KC_M, KC_W, KC_V, KC_Z , KC_RSFT,
- KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, MO(SYMB),
- KC_HOME, KC_END,
- KC_RALT,
- MO(MDIA),KC_SPC,KC_RCTL
- ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | . | 0 | = | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
- // left hand
- KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
- KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
- KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
- KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
- KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
- KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-/* Keymap 2: Steno for Plover
- *
- * ,---------------------------------------------------. ,---------------------------------------------------.
- * | | | # | # | # | # | | | | # | # | # | # | # | |
- * |--------+------+------+------+-------+-------------| |-------+------+------+------+------+------+--------|
- * | | | S | T | P | H | * | | * | F | P | L | T | D | |
- * |--------+------+------+------+-------+------| | | |------+------+------+------+------+--------|
- * | | | S | K | W | R |------| |-------| R | B | G | S | Z | |
- * |--------+------+------+------+-------+------| * | | * |------+------+------+------+------+--------|
- * | | | | | | | | | | | | | | | |
- * `--------+------+------+------+-------+-------------' `--------------+------+------+------+------+--------'
- * | L1 | | | Left | Right | | Up | Down | | | L1 |
- * `-----------------------------------' `----------------------------------'
- * ,--------------. ,---------------.
- * | | | | | |
- * ,------|-------|------| |-------+-------+------.
- * | | | | | | | |
- * | A | O |------| |-------| E | U |
- * | | | | | | | |
- * `---------------------' `----------------------'
- */
-
-
-[STEN] = LAYOUT_ergodox( // layout: layer 2: Steno for Plover
- // left hand
- KC_NO, STN_N1, STN_N2, STN_N3, STN_N4, STN_N5, KC_TRNS,
- KC_NO, KC_NO, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1,
- KC_NO, KC_NO, STN_S2, STN_KL, STN_WL, STN_RL,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, STN_ST2,
- KC_TRNS,KC_NO, KC_NO, KC_TRNS, KC_TRNS,
- KC_NO, KC_NO,
- KC_NO,
- STN_A, STN_O, KC_TRNS,
- // right hand
- KC_NO, STN_N6, STN_N7, STN_N8, STN_N9, STN_NA, KC_NO,
- STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR, KC_NO,
- STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR, KC_NO,
- STN_ST4, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_TRNS,
- KC_NO, KC_NO,
- KC_NO,
- KC_TRNS, STN_E, STN_U
-),
-
-/* Keymap 3: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | STEN | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | | Back | | Frwd | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | Lclk | Mclk | Rclk | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | Prev | Play | Next | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK, KC_TRNS, KC_WFWD, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_BTN1, KC_BTN3, KC_BTN2, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-// press `key`, but deactivate `layer` whilst it's held
-void press_without(int pressed, int key, uint8_t layer)
-{
- static bool was_on;
- if (pressed) {
- was_on = layer_state_is(layer);
- layer_off(layer);
- register_code(key);
- } else {
- if (was_on) layer_on(layer);
- unregister_code(key);
- }
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- press_without(record->event.pressed, KC_LGUI, STEN);
- break;
- }
- return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
- steno_set_mode(STENO_MODE_BOLT);
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
- __attribute__ ((unused))
- uint32_t layer0 = layer_state & (1UL << 0),
- layer1 = layer_state & (1UL << 1),
- layer2 = layer_state & (1UL << 2),
- layer3 = layer_state & (1UL << 3);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
-
- if (layer1) ergodox_right_led_1_on();
- if (layer2) ergodox_right_led_2_on();
- if (layer3) ergodox_right_led_3_on();
-};
diff --git a/layouts/community/ergodox/twey/readme.md b/layouts/community/ergodox/twey/readme.md
deleted file mode 100644
index 52190cb1f8..0000000000
--- a/layouts/community/ergodox/twey/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Twey's Home Configuration
-## Layers
-- Layer 0: Non-ANSI Dvorak layout, with modified modifiers — all
- modifiers on thumb keys, as well as return and space.
-- Layer 1: Default symbol layout.
-- Layer 2: Plover-oriented stenography layer.
-- Layer 3: Extended media/mouse layout.
-
-## Hardware notes
-The default Ergodox EZ keycaps are delightfully staggered, which seems
-like it would make them terrible for steno, but in fact flipping the
-top row (`QWERTYUIOP`) and the middle thumb keys upside down brings
-them close enough together to give a rather pleasant steno experience,
-without interfering much with standard Dvorak typing.
diff --git a/layouts/community/ergodox/twey/rules.mk b/layouts/community/ergodox/twey/rules.mk
deleted file mode 100644
index 87af2f7606..0000000000
--- a/layouts/community/ergodox/twey/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-VIRTSER_ENABLE = yes
-STENO_ENABLE = yes
-MOUSEKEY_ENABLE = no
-FORCE_NKRO = yes
diff --git a/layouts/community/ergodox/videck/keymap.c b/layouts/community/ergodox/videck/keymap.c
index 7058d93447..1a17657da1 100644
--- a/layouts/community/ergodox/videck/keymap.c
+++ b/layouts/community/ergodox/videck/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LBRC, KC_RBRC, KC_EQL, KC_RALT, KC_RCTL,
KC_APP, KC_ESC,
KC_INS,
- KC_SLCK, KC_ENT, KC_SPC
+ KC_SCRL, KC_ENT, KC_SPC
),
[ARROWS] = LAYOUT_ergodox(
// left hand
diff --git a/layouts/community/ergodox/win10_writers-block/config.h b/layouts/community/ergodox/win10_writers-block/config.h
deleted file mode 100644
index ca75f83aab..0000000000
--- a/layouts/community/ergodox/win10_writers-block/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#undef MOUSEKEY_DELAY
-#undef MOUSEKEY_INTERVAL
-#undef MOUSEKEY_MAX_SPEED
-#undef MOUSEKEY_TIME_TO_MAX
-
-#define MOUSEKEY_DELAY 100
-#define MOUSEKEY_INTERVAL 20
-#define MOUSEKEY_MAX_SPEED 3
-#define MOUSEKEY_TIME_TO_MAX 10
-
-#define TAPPING_TOGGLE 1
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-#undef TAPPING_TERM
-#define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-#define IS_COMMAND() ( \
- get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
- get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
-)
diff --git a/layouts/community/ergodox/win10_writers-block/keymap.c b/layouts/community/ergodox/win10_writers-block/keymap.c
deleted file mode 100644
index 443e403b18..0000000000
--- a/layouts/community/ergodox/win10_writers-block/keymap.c
+++ /dev/null
@@ -1,324 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-#include "wait.h"
-
-#define BASE 0 // default layer - helpful for writing in Office-style word processors.
-#define SYMB 1 // symbol layer - NumPad, etc. - same as Ergodox EZ default but no EEPROM or Version key
-#define RIMW 2 // rimworld layer - made for the game RimWorld, by Tynan Sylvester | feel free to remap for your favorite game!
-#define MDIA 3 // media layer - mouse and music - close to Ergodox EZ default media layer
-
-#define CO_PA M(0) // hold copy, tap paste
-
-#define W_CUT LCTL(KC_X) // C-x Cut
-#define W_COPY LCTL(KC_C) // C-c Copy
-#define W_PASTE LCTL(KC_V) // C-v Paste
-#define W_UNDO LCTL(KC_Z) // C-z Undo
-#define W_FIND LCTL(KC_F) // C-v Find
-#define W_CAD LCTL(LALT(KC_DEL)) // one-tap ctrl-alt-del
-
-
-
-//Tap Dance Declarations
-enum {
- CAKEWARP,
- CTRLALTMDIA,
-};
-
-void cake_count (qk_tap_dance_state_t *state, void *user_data) {
- if (state->count == 2) {
- layer_on (SYMB); //define double tap here
- layer_off (MDIA);
- }
- else {
- layer_off (SYMB); //define single tap or hold here
- layer_off (MDIA);
- }
- if (state->count == 3) {
- layer_on (RIMW); //define triple tap here
- layer_off (MDIA);
- }
- else {
- layer_off (RIMW); //define single tap or hold here
- layer_off (MDIA);
- reset_tap_dance (state);
- }
-}
-
-void dance_cad_mdia_fin (qk_tap_dance_state_t *state, void *user_data) {
- if (state->count == 1) {
- register_code (KC_LCTL);
- register_code (KC_LALT);
- register_code (KC_DEL);
- } else {
- layer_on (MDIA);
- }
-}
-
-void dance_cad_mdia_reset (qk_tap_dance_state_t *state, void *user_data) {
- if (state->count == 1) {
- unregister_code (KC_DEL);
- unregister_code (KC_LALT);
- unregister_code (KC_LCTL);
- } else {
- ;
- }
-}
-
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
- // tap for Layer 0, tap twice to switch to symbol layer, and tap three times to switch to rimworld layer.
- [CAKEWARP] = ACTION_TAP_DANCE_FN(cake_count)
- // tap for ctrl-alt-del, tap twice for media layer
- ,[CTRLALTMDIA] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_cad_mdia_fin, dance_cad_mdia_reset)
- // Other declarations would go here, separated by commas, if you have them
-};
-
-//In Layer declaration, add tap dance item in place of a key code
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer - TD(one_tap, two_taps, three_taps...)
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 7 | 8 | 9 | 0 | - | = |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | F12/L1 | Q | W | E | R | T | {/[ | |TD(L0 | Y | U | I | O | P | \ |
- * |--------+------+------+------+------+------| | |L1 L2)|------+------+------+------+------+--------|
- * |Caps/Win| A | S | D | F | G |------| |------| H | J | K | L | ; | ' |
- * |--------+------+------+------+------+------| }/] | TD(ctrl|------+------+------+------+------+--------|
- * |LShift/(|Z/Ctrl| X | C | V | B | | |altdel| N | M | , | . | / |RShift/)|
- * `--------+------+------+------+------+-------------' |L3) |------+------+------+------+------+--------'
- * | Undo | Cut |CopyPa| Meh | LGui | '------| | Enter| Left | Up | Down | Right |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | Esc | VolUp| | F4 | Mute |
- * ,------|------|------| |------+--------+------.
- * | | | VolDn| | F5 | | |
- * |Backsp|Delete|------| |------| Tab / |Space |
- * |ace | | Find | | Alt | CTRL | |
- * `--------------------' `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
- // left hand
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
-LT(SYMB, KC_F12), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC,
- GUI_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSPO, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_RBRC,
- W_UNDO, W_CUT, CO_PA, MEH_T(KC_NO), KC_LGUI,
- KC_ESC, KC_VOLU,
- KC_VOLD,
- KC_BSPC, KC_DELETE, W_FIND,
- // right hand
- KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,
- TD(CAKEWARP), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- TD(CTRLALTMDIA), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
- KC_ENT, KC_LEFT, KC_UP, KC_DOWN, KC_RIGHT,
- KC_F4, KC_MUTE,
- KC_F5,
- KC_RALT, CTL_T(KC_TAB), KC_SPC
- ),
-
-/* Keymap 1: Symbol Layer | No EEPROM Or Version keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | xx | | xx | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ! | @ | { | } | | | | |TD(L0 | Up | 7 | 8 | 9 | * | F12 |
- * |--------+------+------+------+------+------| | |L1 L2)|------+------+------+------+------+--------|
- * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | - |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | . | 0 | = | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
- // left hand
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO,
- KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
- KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
- KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_TRNS,KC_TRNS,KC_TRNS,
- // right hand
- KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
- KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_MINS,
- KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
- KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_NO,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-),
-
-/* Keymap 2: RimWorld Layer
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 7 | 8 | 9 | 0 | - | = |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | TAB | C | ,< | W | >. | R | | |TD(L0 | U | B | N | J | M | PGUP |
- * |--------+------+------+------+------+------| F10 | |L1 L2)|------+------+------+------+------+--------|
- * | I | F | A | S | D | 8 |------| |------| X | L | P | Y | H | ENTER |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | K | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | PGDN |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | F | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * |SPACE | C |------| |------| E |SPACE |
- * | | | Q | | | | |
- * `--------------------' `--------------------'
- */
-// RIMWORLD
-[RIMW] = LAYOUT_ergodox(
- // left hand
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
- KC_TAB, KC_C, KC_COMM, KC_W, KC_DOT, KC_R, KC_F10,
- KC_I, KC_F, KC_A, KC_S, KC_D, KC_8,
- KC_K, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
- KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS,KC_TRNS,
- KC_TRNS,
- KC_C,KC_Q,KC_TRNS,
- // right hand
- KC_7, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,
- KC_TRNS, KC_U, KC_B, KC_N, KC_J, KC_M, KC_PGUP,
- KC_X, KC_L, SFT_T(KC_P), KC_Y, KC_H, KC_ENT,
- KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PGDN,
- KC_F, KC_LEFT, KC_UP, KC_DOWN,KC_RIGHT,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_E, KC_TRNS
-),
-/* Keymap 3: Media and mouse keys
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | | | | | | | | | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | Prev | Next | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | |Brwser|
- * | Lclk | Rclk |------| |------| |Back |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_BTN1, KC_BTN2, KC_TRNS,
- // right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-static uint16_t key_timer;
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- switch(id) {
- case 0: {
- if (record->event.pressed) {
- key_timer = timer_read(); // if the key is being pressed, we start the timer.
- }
- else { // this means the key was just released, so we can figure out how long it was pressed for (tap or "held down").
- if (timer_elapsed(key_timer) > 150) { // 150 being 150ms, the threshhold we pick for counting something as a tap.
- return MACRO( D(LCTL), T(C), U(LCTL), END );
- }
- else {
- return MACRO( D(LCTL), T(V), U(LCTL), END );
- }
- }
- break;
- }
- }
- return MACRO_NONE;
-};
-
-// Anything you want to do once when the keyboard initializes.
-// Tests LED function when the keyboard initializes.
-void matrix_init_user(void) {
-
- wait_ms(500);
- ergodox_board_led_on();
- wait_ms(200);
- ergodox_right_led_1_on();
- wait_ms(200);
- ergodox_right_led_2_on();
- wait_ms(200);
- ergodox_right_led_3_on();
- wait_ms(200);
- ergodox_board_led_off();
- wait_ms(200);
- ergodox_right_led_1_off();
- wait_ms(200);
- ergodox_right_led_2_off();
- wait_ms(200);
- ergodox_right_led_3_off();
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
- uint8_t layer = get_highest_layer(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- case 1:
- ergodox_right_led_1_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- case 3:
- ergodox_right_led_3_on();
- break;
- default:
- // none
- break;
- }
-
-};
diff --git a/layouts/community/ergodox/win10_writers-block/readme.md b/layouts/community/ergodox/win10_writers-block/readme.md
deleted file mode 100644
index cb135b4437..0000000000
--- a/layouts/community/ergodox/win10_writers-block/readme.md
+++ /dev/null
@@ -1,113 +0,0 @@
-<!-- -*- mode: markdown; fill-column: 8192 -*- -->
-
-Win10 Writer's Block ErgoDox - v1.0
-
-=======================
-
-This is a QWERTY layout for QMK. It's designed to work well in MS Office-like environments. It's tested on Windows 7 and 10.
-
-Professional writers may find this layout useful -- copywriters, technical writers, novelists, etc.
-
-I use my ErgoDox with this keymap as a daily driver at my office.
-
-A gaming layer is unobtrusively built into this layout. I use that layer to play RimWorld.
-
-Feel free to modify the gaming layer to your personal taste.
-
-## Table of Contents
-
-* [Layouts](#layouts)
- - [Base layer](#base-layer)
- - [Symbol layer](#symbol-layer)
- - [Gaming layer](#rimworld-layer)
- - [Media layer](#media-layer)
-* [Tools](#tools)
- - [Layer notification](#layer-notification)
-* [Building](#building)
- - [Using on Windows](#using-on-windows)
-* [License](#license)
-* [Special Thanks](#special-thanks)
-
-# Layouts
-
-* TapDance will teleport you to the layer you want:
-* One Tap for the Base layer
-* Two Taps for the Symbol layer
-* Three Taps for the Rimworld/Gaming layer
-
-* Where the "Meh" key is located on the Ergodox EZ default layout, I've changed it to another tap dance key:
-* One Tap for CTRL-ALT-DEL
-* Two Taps for the Media/Mouse layer
-
-## Base layer
-
-[![Base layer](https://i.imgur.com/1PTR0SG.png)](http://www.keyboard-layout-editor.com/#/gists/8fd9bbdd3a23bbb5a8779de3624a3be1)
-
-This is a QWERTY layout with some quirks.
-
-* Enter is located on a key that won't cause as much thumb fatigue.
-* Copy and Paste work from the same key. Just hold the key to copy and tap the key to paste!
-* Undo, Find and Cut are also one-touch keys.
-* F12 is where you would normally find TAB on standard layouts. Quickly save in Word, safely.
-* You'll find bracket keys below the "6" key.
-
-* The Meh Key is a single-button CTRL+ALT+SHIFT modifier.
-
-* Space Cadet Shift: Tap L Shift for "(" and R Shift for ")" -- holding either shift works like a normal shift.
-* Tap "Z" or Tab to use either normally. Hold them for CTRL.
-* Tap Caps Lock to use it normally. Hold it for Win key combinations (Win+D to minimize all programs, etc).
-
-## Symbol layer
-
-[![Symbol layer](https://i.imgur.com/8nEzpcp.png)](http://www.keyboard-layout-editor.com/#/gists/04eb6458b8b17882e472f64d482f12b4)
-
-Your standard Ergodox EZ symbol + numpad layout, minus the Version and EEPROM keys.
-
-* From the base layer, hold the F12 Key to temporarily access this layer (use for quick access to numpad)
-* Release F12 to return to the base layer.
-
-## Rimworld layer
-
-[![Rimworld / Gaming Layer](https://i.imgur.com/Yh3eBjJ.png)](http://www.keyboard-layout-editor.com/#/gists/d53af8391e6e443ed0a98ccfbdb4eace)
-
-This layer was made to play RimWorld, a Sci-Fi Colony Survival Game by Tynan Sylvester and Ludeon Studios, available on Steam.
-
-* Have fun!
-
-## Media layer
-
-[![Media layer](https://i.imgur.com/r5ysFy1.png)](http://www.keyboard-layout-editor.com/#/gists/3209d09ed4bd997e4f49f28c6ada2ab3)
-
-This is the standard Ergodox EZ media layout with more options for mouseclick buttons.
-
-* In this layer, your "space" key changes into a back button for your browser.
-
-## LED states
-
-Your LEDs will change to indicate your layer. You'll know you are in the base layer if all LEDs are off.
-
-# Building
-
-To build, you will need the [QMK][qmk] firmware checked out. from there, dive into `keyboards/ergodox/keymaps/win10_writers-block/`
-
-[qmk]: https://github.com/qmk/qmk_firmware
-
-```
-$ make keyboard=ergodox keymap=win10_writers-block
-```
-
-## Using on Windows
-
-This layout is tested in Windows 7 Pro and Windows 10 Home environments.
-
-# License
-
-GPL 3+
-
-# Special Thanks
-
-* To algernon for his coding help. I'm a novice but I still made this work (and figured out tap dance) with his help.
-
-* To /r/MechanicalKeyboards for being an all-around great community.
-
-* To /u/profet23 for his amazing custom Ergodox boards. \ No newline at end of file
diff --git a/layouts/community/ergodox/win10_writers-block/rules.mk b/layouts/community/ergodox/win10_writers-block/rules.mk
deleted file mode 100644
index 83c5090c5f..0000000000
--- a/layouts/community/ergodox/win10_writers-block/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Having a file like this allows you to override Makefile definitions
-# for your own particular keymap
-
-TAP_DANCE_ENABLE=yes
-
-
-
diff --git a/layouts/community/ergodox/xyverz/keymap.c b/layouts/community/ergodox/xyverz/keymap.c
index cb23782330..88a8ad2cc3 100644
--- a/layouts/community/ergodox/xyverz/keymap.c
+++ b/layouts/community/ergodox/xyverz/keymap.c
@@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______,
// right hand
_______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12,
- _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+ _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
_______, DVORAK, QWERTY, COLEMAK, _______, _______,
_______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______,
diff --git a/layouts/community/ergodox/zweihander-macos/keymap.c b/layouts/community/ergodox/zweihander-macos/keymap.c
index 0aecc24e67..d1c444f48d 100644
--- a/layouts/community/ergodox/zweihander-macos/keymap.c
+++ b/layouts/community/ergodox/zweihander-macos/keymap.c
@@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
// MEDIA AND MOUSE
[MDIA] = LAYOUT_ergodox(
- KC_TRNS, KC_F14 , KC_F15 , KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, /* F14 dims screen, F15 brightens */
+ KC_TRNS, KC_F14 , KC_F15 , KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, /* F14 dims screen, F15 brightens */
KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END , KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_HOME,
KC_TRNS, KC_TRNS, KC_TRNS,
// right hand
- KC_TRNS, LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), KC_TRNS, KC_TRNS, KC_POWER,
+ KC_TRNS, LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), KC_TRNS, KC_TRNS, KC_PWR,
KC_TRNS, LGUI(KC_RBRC), LGUI(LALT(KC_UP)), KC_UP , LGUI(LALT(KC_DOWN)), KC_TRNS, KC_TRNS,
LGUI(KC_LBRC), KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_F16 ,
KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
diff --git a/layouts/community/numpad_5x4/mrsendyyk/keymap.c b/layouts/community/numpad_5x4/mrsendyyk/keymap.c
index 2b013b6c74..874e4e8c97 100644
--- a/layouts/community/numpad_5x4/mrsendyyk/keymap.c
+++ b/layouts/community/numpad_5x4/mrsendyyk/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_numpad_5x4(
- KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_P1, KC_P2, KC_P3,
diff --git a/layouts/community/numpad_5x6/bjohnson/config.h b/layouts/community/numpad_5x6/bjohnson/config.h
index 6f1c539700..566365d7b6 100644
--- a/layouts/community/numpad_5x6/bjohnson/config.h
+++ b/layouts/community/numpad_5x6/bjohnson/config.h
@@ -3,7 +3,16 @@
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
#define RGB_DI_PIN B7
#define RGBLED_NUM 13 // Number of LEDs
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_HUE_STEP 12
#define RGBLIGHT_SAT_STEP 12
diff --git a/layouts/community/numpad_5x6/bjohnson/keymap.c b/layouts/community/numpad_5x6/bjohnson/keymap.c
index 45b339f7ff..dc6b939e5f 100644
--- a/layouts/community/numpad_5x6/bjohnson/keymap.c
+++ b/layouts/community/numpad_5x6/bjohnson/keymap.c
@@ -4,7 +4,7 @@ extern rgblight_config_t rgblight_config;
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_numpad_5x6(
- KC_F1, LT(1,KC_F2), KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_F1, LT(1,KC_F2), KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_F3, KC_F4, KC_P7, KC_P8, KC_P9,
KC_F5, KC_F6, KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_F7, KC_F8, KC_P1, KC_P2, KC_P3,
diff --git a/layouts/community/numpad_5x6/drashna/config.h b/layouts/community/numpad_5x6/drashna/config.h
index aa0c201232..83e8766b27 100644
--- a/layouts/community/numpad_5x6/drashna/config.h
+++ b/layouts/community/numpad_5x6/drashna/config.h
@@ -32,5 +32,5 @@
#if defined(KEYBOARD_primekb_prime_m)
# undef PRODUCT
-# define PRODUCT Drashna Hacked Prime_M Macro Pad
+# define PRODUCT "Drashna Hacked Prime_M Macro Pad"
#endif
diff --git a/layouts/community/numpad_5x6/drashna/keymap.c b/layouts/community/numpad_5x6/drashna/keymap.c
index e2d0b01eec..014da361f6 100644
--- a/layouts/community/numpad_5x6/drashna/keymap.c
+++ b/layouts/community/numpad_5x6/drashna/keymap.c
@@ -21,7 +21,7 @@
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NUMLOCK] = LAYOUT_numpad_5x6(
- KC_F1, F2_MCRO, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_F1, F2_MCRO, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_F3, KC_F4, KC_P7, KC_P8, KC_P9,
KC_F5, KC_F6, KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_F7, KC_F8, KC_P1, KC_P2, KC_P3,
diff --git a/layouts/community/ortho_3x10/bbaserdem/config.h b/layouts/community/ortho_3x10/bbaserdem/config.h
deleted file mode 100644
index d781d34478..0000000000
--- a/layouts/community/ortho_3x10/bbaserdem/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2019 Batuhan Başerdem <baserdem.batuhan@gmail.com> @bbaserdem
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-// Gherkin specific
-#ifdef KEYBOARD_40percentclub_gherkin
- #define MUSIC_MAP
- #define RGB_DI_PIN F6
- #define DRIVER_LED_TOTAL 10
-#endif
diff --git a/layouts/community/ortho_3x10/bbaserdem/keymap.c b/layouts/community/ortho_3x10/bbaserdem/keymap.c
deleted file mode 100644
index 4cc1a25caf..0000000000
--- a/layouts/community/ortho_3x10/bbaserdem/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-Copyright 2019 Batuhan Başerdem <baserdem.batuhan@gmail.com> @bbaserdem
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-#include "bbaserdem.h"
-
-#ifdef KEYBOARD_40percentclub_gherkin
- // Flip it
- #undef LAYOUT_ortho_3x10
- #define LAYOUT_ortho_3x10( \
- K00, K01, K02, K03, K04, K05, K10, K11, K12, K13 , \
- K14, K15, K20, K21, K22, K23, K24, K25, K30, K31 , \
- K32, K33, K34, K35, K40, K41, K42, K43, K44, K45 \
- ) { \
- { K45, K44, K43, K42, K41, K40 }, \
- { K35, K34, K33, K32, K31, K30 }, \
- { K25, K24, K23, K22, K21, K20 }, \
- { K15, K14, K13, K12, K11, K10 }, \
- { K05, K04, K03, K02, K01, K00 } \
- }
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Game pad
- * ,-----------------------------------------------------------.
- * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | F1 | F2 | F3 |
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |AdjsL| Q | W | E | R | Ent | Tab | Ctr | |^| | Alt |
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |Music| A | S | D | F | Spc |Shift| <-- | |v| | --> |
- * `-----------------------------------------------------------'
- */
- [_BASE] = LAYOUT_ortho_3x10(
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_F1, KC_F2, KC_F3,
- MO(_MEDI), KC_Q, KC_W, KC_E, KC_R, KC_ENT, KC_TAB, KC_LCTL,KC_UP, KC_LALT,
- MU_TOG, KC_A, KC_S, KC_D, KC_F, KC_SPC, KC_LSFT,KC_LEFT,KC_DOWN,KC_RGHT
- ),
-/* Adjust
- * ,-----------------------------------------------------------.
- * | Esc |RGBTg|HueUp|HueDn|SatUp|SatDn|ValUp|ValDn|ModNx|ModPr|
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * | |BltTg|Breth|BriUp|BriDn| | |Veloc|SpdUp|SpdDn|
- * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |Music| | | | | | | |EEprm|Reset|
- * `-----------------------------------------------------------'
- */
- [_MEDI] = LAYOUT_ortho_3x10(
- CK_TOGG,RGB_TOG,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,RGB_MOD,RGB_RMOD,
- _______,BL_TOGG,BL_BRTG,BL_INC, BL_DEC, XXXXXXX,XXXXXXX,VLK_TOG,RGB_SPI,RGB_SPD,
- AU_TOG, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,EEP_RST,QK_BOOT
- ),
- [_MUSI] = LAYOUT_ortho_3x10_wrapper(
- MU_FAST,_MU_08_,MU_REC,
- MU_SLOW,_MU_08_,MU_STOP,
- MU_TOG, _MU_08_,MU_PLAY
- ),
-};
-
-// Music map, guitar like.
-#ifdef AUDIO_ENABLE
-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_ortho_3x10(
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
-);
-#endif
-
-// RGB matrix code
-#ifdef RGB_MATRIX_ENABLE
-// Gherkin
-#if defined(KEYBOARD_40percentclub_gherkin)
-led_config_t g_led_config = {
- { // Key Matrix to LED Index
- { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
- { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
- { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
- { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
- { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED}
-}, { // LED Index to Physical Position
- {224, 0}, {168, 0}, {112, 0}, { 56, 0}, { 0, 0},
- { 0, 64}, { 56, 64}, {112, 64}, {168, 64}, {224, 64},
-}, { // LED Index to Flag
- 2,2,2,2,2,2,2,2,2,2
-}};
-// Disable layer switching
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {return true;}
-#endif // Gherkin
-#endif // RGB Matrix
diff --git a/layouts/community/ortho_3x10/bbaserdem/readme.md b/layouts/community/ortho_3x10/bbaserdem/readme.md
deleted file mode 100644
index 3681eb840a..0000000000
--- a/layouts/community/ortho_3x10/bbaserdem/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-This folder contains my [3x10\_ortho](../../../default/ortho_3x10) board layouts
-Check out the [user readme](../../../../users/bbaserdem/readme.md) for more info.
-
-# Gherkin
-
-I use [Gherkin](../../../../keyboards/40percentclub/gherkin/readme.md).
-
-It is used as a game pad, and key layout is inspired by spare keys I had lying around.
-The firmware is very simple, and only includes one layer keymap, and RGB effects.
-
-## Status
-
-* [x] Layout adapted
-* [x] Tested build
-* [x] Confirmed on board
-
-## Build
-
-Build command: `CFLAGS="-Wno-error=deprecated" <FILL-IN-LATER>`
diff --git a/layouts/community/ortho_3x10/bbaserdem/rules.mk b/layouts/community/ortho_3x10/bbaserdem/rules.mk
deleted file mode 100755
index 7232f6969d..0000000000
--- a/layouts/community/ortho_3x10/bbaserdem/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2019 Batuhan Başerdem <baserdem.batuhan@gmail.com> @bbaserdem
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# This small layout is a macro-pad; does not need userspace
-
-# Gherkin has both RGB strip and LED lights
-ifneq (,$(findstring 40percentclub/gherkin,$(KEYBOARD)))
- CONVERT_TO_PROTON_C = yes
- RGB_MATRIX_ENABLE = yes
- RGB_MATRIX_DRIVER = WS2812
- AUDIO_ENABLE = yes
- BACKLIGHT_ENABLE = yes
- VELOCIKEY_ENABLE = yes
-endif
diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c
index 6652d003c2..8267c66730 100644
--- a/layouts/community/ortho_4x12/ajp10304/keymap.c
+++ b/layouts/community/ortho_4x12/ajp10304/keymap.c
@@ -33,8 +33,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_ortho_4x12(
LT(_NUMPAD, KC_ESC), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC ,
MT(MOD_LSFT, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, MT(MOD_RSFT, KC_ENT) ,
- KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT ,
- MO(_FUNC), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_BSPC, KC_SPC, RAISE, KC_LSHIFT, KC_BTN2, KC_RCTL, MO(_FUNC2)
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT ,
+ MO(_FUNC), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_BSPC, KC_SPC, RAISE, KC_LSFT, KC_BTN2, KC_RCTL, MO(_FUNC2)
),
/* Colemak-DHm
@@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_COLEMAK] = LAYOUT_ortho_4x12(
LT(_NUMPAD, KC_ESC), KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC ,
MT(MOD_LSFT, KC_TAB), KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, MT(MOD_RSFT, KC_ENT) ,
- KC_LSHIFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT ,
- MO(_FUNC), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_BSPC, KC_SPC, RAISE, KC_LSHIFT, KC_BTN2, KC_RCTL, MO(_FUNC2)
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT ,
+ MO(_FUNC), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_BSPC, KC_SPC, RAISE, KC_LSFT, KC_BTN2, KC_RCTL, MO(_FUNC2)
),
/* Function
@@ -67,10 +67,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------'
*/
[_FUNC] = LAYOUT_ortho_4x12(
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 ,
- KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, UK_TILD, KC_INSERT ,
- KC_LSHIFT, KC_NONUS_BSLASH, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL, KC_BSLASH, KC_LBRC, KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,
- _______, _______, _______, _______, _______, _______, _______, MO(_MOUSE), _______, _______, _______, _______
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 ,
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, UK_TILD, KC_INSERT ,
+ KC_LSFT, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL, KC_BSLS, KC_LBRC, KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,
+ _______, _______, _______, _______, _______, _______, _______, MO(_MOUSE), _______, _______, _______, _______
),
/* Lower
@@ -85,10 +85,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------'
*/
[_LOWER] = LAYOUT_ortho_4x12(
- KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_BSPC ,
- LSFT(KC_1), LSFT(KC_2), LSFT(KC_3), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_9), LSFT(KC_0), LCTL(KC_DEL), LCTL(KC_BSPC) ,
- KC_LSPO, KC_NONUS_BSLASH, KC_GRAVE, KC_NONUS_HASH, KC_QUOT, KC_MINS, KC_EQL, KC_NONUS_HASH, KC_LBRC, KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,
- _______, _______, _______, _______, _______, KC_DEL, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_BSPC ,
+ LSFT(KC_1), LSFT(KC_2), LSFT(KC_3), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_9), LSFT(KC_0), LCTL(KC_DEL), LCTL(KC_BSPC) ,
+ KC_LSPO, KC_NUBS, KC_GRAVE, KC_NONUS_HASH, KC_QUOT, KC_MINS, KC_EQL, KC_NONUS_HASH, KC_LBRC, KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,
+ _______, _______, _______, _______, _______, KC_DEL, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
),
/* Raise
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------'
*/
[_RAISE] = LAYOUT_ortho_4x12(
- KC_GRV, XXXXXXX, M_WORD_SEL, KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_PGDOWN, XXXXXXX, KC_PSCREEN ,
+ KC_GRV, XXXXXXX, M_WORD_SEL, KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_PGDN, XXXXXXX, KC_PSCR ,
KC_GRV, XXXXXXX, XXXXXXX, LSFT(KC_9), LSFT(KC_0), XXXXXXX, XXXXXXX, KC_HOME, KC_UP, KC_END, XXXXXXX, LCTL(LSFT(KC_EQL)) ,
_______, XXXXXXX, XXXXXXX, LSFT(KC_LBRC), LSFT(KC_RBRC), XXXXXXX, LCTL(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, LCTL(KC_RIGHT), LCTL(KC_MINS) ,
MO(_MOUSE), _______, _______, _______, _______, KC_LALT, KC_ENT, _______, XXXXXXX, _______, _______, _______
@@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------'
*/
[_NUMPAD] = LAYOUT_ortho_4x12(
- _______, _______, _______, _______, _______, _______, KC_NLCK, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_SLASH, _______,
+ _______, _______, _______, _______, _______, _______, KC_NUM, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_SLASH, _______,
_______, _______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ASTERISK, _______,
_______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_PLUS, _______,
_______, _______, _______, _______, _______, _______, _______, KC_KP_0, KC_KP_DOT, KC_COMM, KC_KP_MINUS, _______
diff --git a/layouts/community/ortho_4x12/bakingpy/config.h b/layouts/community/ortho_4x12/bakingpy/config.h
index f7d2c24252..fcfa2ca49c 100644
--- a/layouts/community/ortho_4x12/bakingpy/config.h
+++ b/layouts/community/ortho_4x12/bakingpy/config.h
@@ -8,7 +8,16 @@
#define TAPPING_TERM 150
#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 12
#define RGBLED_SPLIT { 6, 6 }
#define RGBLIGHT_HUE_STEP 8
diff --git a/layouts/community/ortho_4x12/bbaserdem/config.h b/layouts/community/ortho_4x12/bbaserdem/config.h
deleted file mode 100755
index fb3ec1371b..0000000000
--- a/layouts/community/ortho_4x12/bbaserdem/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-// Code pertaining to planck rev6
-#ifdef KEYBOARD_planck_rev6
- // Encoder I use;
-# ifdef ENCODER_RESOLUTION
-# undef ENCODER_RESOLUTION
-# endif
-# define ENCODER_RESOLUTION 2
-#endif
diff --git a/layouts/community/ortho_4x12/bbaserdem/keymap.c b/layouts/community/ortho_4x12/bbaserdem/keymap.c
deleted file mode 100755
index 91ddc61764..0000000000
--- a/layouts/community/ortho_4x12/bbaserdem/keymap.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "bbaserdem.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- // Base layer
- [_BASE] = LAYOUT_ortho_4x12_wrapper(
- _BL1_5_,_BL1_1_,_BR1_1_,_BR1_5_,
- _BL2_5_,_BL2_1_,_BR2_1_,_BR2_5_,
- _BL3_5_,_BL3_1_,_BR3_1_,_BR3_5_,
- BB_ENC0,KC_DOWN,KC_UP, _BL4_3_,_BR4_3_,KC_LEFT,KC_RGHT,RGB_TOG
- ),
- // Extra characters overlay
- [_CHAR] = LAYOUT_ortho_4x12_wrapper(
- _CL1_5_,xxx2xxx,_CR1_5_,
- _CL2_5_,xxx2xxx,_CR2_5_,
- _CL3_5_,xxx2xxx,_CR3_5_,
- ___3___,_CL4_3_,_CR4_3_,___3___
- ),
- // Game layer: left_half
- [_GAME] = LAYOUT_ortho_4x12_wrapper(
- _GA1_5_,_GA1_1_,___6___,
- _GA2_5_,_GA2_1_,___6___,
- _GA3_5_,_GA3_1_,___6___,
- ___3___,_GA4_3_,___6___
- ),
- // Media layer: right_half
- [_MEDI] = LAYOUT_ortho_4x12_wrapper(
- ___6___,xxx1xxx,_ME1_5_,
- ___6___,xxx1xxx,_ME2_5_,
- ___6___,xxx1xxx,_ME3_5_,
- ___6___,_ME4_3_,___3___
- ),
- // Navigation layer: right_half
- [_NAVI] = LAYOUT_ortho_4x12_wrapper(
- ___6___,xxx1xxx,_NA1_5_,
- ___6___,xxx1xxx,_NA2_5_,
- ___6___,xxx1xxx,_NA3_5_,
- ___6___,_NA4_3_,___3___
- ),
- // Symbol layer: right_half
- [_SYMB] = LAYOUT_ortho_4x12_wrapper(
- ___6___,xxx1xxx,_SY1_5_,
- ___6___,xxx1xxx,_SY2_5_,
- ___6___,xxx1xxx,_SY3_5_,
- ___6___,_SY4_3_,___3___
- ),
- // Number layer: left_half
- [_NUMB] = LAYOUT_ortho_4x12_wrapper(
- xxx1xxx,_NU1_5_,___6___,
- xxx1xxx,_NU2_5_,___6___,
- xxx1xxx,_NU3_5_,___6___,
- ___3___,_NU4_3_,___6___
- ),
- // Function layer: left_half
- [_FUNC] = LAYOUT_ortho_4x12_wrapper(
- _FU1_5_,xxx1xxx,___6___,
- _FU2_5_,xxx1xxx,___6___,
- _FU3_5_,xxx1xxx,___6___,
- ___3___,_FU4_3_,___6___
- ),
- // Mouse layer: left_half
- [_MOUS] = LAYOUT_ortho_4x12_wrapper(
- _MO1_5_,xxx1xxx,___6___,
- _MO2_5_,xxx1xxx,___6___,
- _MO3_5_,xxx1xxx,___6___,
- ___3___,_MO4_3_,___6___
- ),
- // Music layer: everything
- [_MUSI] = LAYOUT_ortho_4x12_wrapper(
- _MU_12_,_MU_12_,_MU_12_,
- ___1___,_MU_02_,_MUL_3_,_MUR_3_,_MU_02_,___1___)
-};
diff --git a/layouts/community/ortho_4x12/bbaserdem/readme.md b/layouts/community/ortho_4x12/bbaserdem/readme.md
deleted file mode 100644
index 5eb6548574..0000000000
--- a/layouts/community/ortho_4x12/bbaserdem/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-This folder contains my [4x12\_ortho](../../../default/ortho_4x12) board layouts
-Check out the [user readme](../../../../users/bbaserdem/readme.md) for more info.
-
-# Planck Light
-
-I use a couple [planck](../../../../keyboards/planck/readme.md) keyboards.
-To sell soon; don't use them anymore, but will keep the light version.
-
-# JJ40
-
-A planck rev4 replacement; for my acrylic planck case which used to host a now
-defunct rev4.
diff --git a/layouts/community/ortho_4x12/bbaserdem/rules.mk b/layouts/community/ortho_4x12/bbaserdem/rules.mk
deleted file mode 100755
index b3ce684315..0000000000
--- a/layouts/community/ortho_4x12/bbaserdem/rules.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2021 Batuhan Başerdem
-# <baserdem.batuhan@gmail.com> @bbaserdem
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Planck rev6 has both RGBLIGHT and RGB_MATRIX enabled
-ifneq (,$(findstring planck/rev6,$(KEYBOARD)))
- RGB_MATRIX_ENABLE = yes
- RGBLIGHT_ENABLE = no
-endif
-# JJ40 here
-ifneq (,$(findstring jj40,$(KEYBOARD)))
- RGB_MATRIX_ENABLE = yes
-endif
diff --git a/layouts/community/ortho_4x12/bifbofii/keymap.c b/layouts/community/ortho_4x12/bifbofii/keymap.c
index 6d24fc14cf..d754741899 100644
--- a/layouts/community/ortho_4x12/bifbofii/keymap.c
+++ b/layouts/community/ortho_4x12/bifbofii/keymap.c
@@ -128,10 +128,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
*/
[FUNCTIONS] = LAYOUT_ortho_4x12(
- _______, _______, _______, _______, _______, KC__MUTE, KC_MPRV, KC__VOLDOWN, KC_VOLU, KC_MNXT, KC_MEDIA_PLAY_PAUSE, KC_DEL,
- KC_CAPS, _______, KC_WBAK, _______, _______, KC_WFWD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
- _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, KC_MUTE, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, KC_MEDIA_PLAY_PAUSE, KC_DEL,
+ KC_CAPS, _______, KC_WBAK, _______, _______, KC_WFWD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
+ _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Unicode Layer
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
*/
[SPECIALS] = LAYOUT_ortho_4x12(
- XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_OS, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_MA, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_LN, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c
index 07ba5e167c..33094f9ca5 100644
--- a/layouts/community/ortho_4x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c
@@ -76,13 +76,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Adjust (Lower + Raise) */
[_ADJUST] = LAYOUT_ortho_4x12( \
// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
- QM_MAKE, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MC_SLPD, \
+ QM_MAKE, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MC_SLPD, \
// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, RGB_RTHM,RGB_THM, _______, _______, _______, \
// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
- EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+ EE_CLR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
)
diff --git a/layouts/community/ortho_4x12/bredfield/keymap.c b/layouts/community/ortho_4x12/bredfield/keymap.c
index af704ca398..6621cc2483 100644
--- a/layouts/community/ortho_4x12/bredfield/keymap.c
+++ b/layouts/community/ortho_4x12/bredfield/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
GUI_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, SCL_NAV, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT,
- L_NUMPAD,KC_LCTL, KC_LALT, KC_LGUI, L_LOWER, KC_BSPC, KC_SPACE,L_RAISE, KC_RCTRL,KC_RALT, L_UI, L_KEYBD
+ L_NUMPAD,KC_LCTL, KC_LALT, KC_LGUI, L_LOWER, KC_BSPC, KC_SPACE,L_RAISE, KC_RCTL, KC_RALT, L_UI, L_KEYBD
),
/* Lower
@@ -157,9 +157,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keyboard
* ,--------------------------------------------------------------------------------+--------+-----------------.
- * | | | | | | | | | | | | QK_BOOT |
+ * | | | | | | | | | | | | Boot |
* |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
- * | | | | | | | | | | | | DEBUG |
+ * | | | | | | | | | | | | Debug |
* |--------+--------+--------+--------+--------+-----------------+--------+--------------------------+--------|
* | | | | | | | | | | | | |
* |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
@@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_KEYBOARD_LAYER] = LAYOUT_ortho_4x12(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______
),
diff --git a/layouts/community/ortho_4x12/bredfield/readme.md b/layouts/community/ortho_4x12/bredfield/readme.md
index e0f6e3f55e..f43b809167 100644
--- a/layouts/community/ortho_4x12/bredfield/readme.md
+++ b/layouts/community/ortho_4x12/bredfield/readme.md
@@ -95,7 +95,7 @@ This is the layout that I use for all 4x12 boards, for writing and programming.
* ,--------------------------------------------------------------------------------+--------+-----------------.
* | | | | | | | | | | | | RESET |
* |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
- * | | | | | | | | | | | | DEBUG |
+ * | | | | | | | | | | | | Debug |
* |--------+--------+--------+--------+--------+-----------------+--------+--------------------------+--------|
* | | | | | | | | | | | | |
* |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------|
diff --git a/layouts/community/ortho_4x12/buswerks/config.h b/layouts/community/ortho_4x12/buswerks/config.h
index 8d6e26287e..f96d099db5 100644
--- a/layouts/community/ortho_4x12/buswerks/config.h
+++ b/layouts/community/ortho_4x12/buswerks/config.h
@@ -1,24 +1,19 @@
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
// #define _MASTER_RIGHT
// #define EE_HANDS
-#ifdef AUDIO_ENABLE
- #define STARTUP_SONG SONG(PLANCK_SOUND)
- // #define STARTUP_SONG SONG(NO_SOUND)
+#ifdef AUDIO_ENABLE
+ #define STARTUP_SONG SONG(PLANCK_SOUND)
+ // #define STARTUP_SONG SONG(NO_SOUND)
#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
SONG(COLEMAK_SOUND), \
SONG(DVORAK_SOUND) \
- }
-#endif
+ }
+#endif
// MIDI notes can be sent when in Music mode
#define MIDI_BASIC
diff --git a/layouts/community/ortho_4x12/buswerks/keymap.c b/layouts/community/ortho_4x12/buswerks/keymap.c
index df0f2c6a0f..0f8d380a0d 100644
--- a/layouts/community/ortho_4x12/buswerks/keymap.c
+++ b/layouts/community/ortho_4x12/buswerks/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_ADJUST] = LAYOUT_ortho_4x12(
- _______, QK_BOOT, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
+ _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, GAME, _______,
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h b/layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h
index 33e9342039..2f0c23b7f1 100644
--- a/layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h
+++ b/layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/layouts/community/ortho_4x12/crs/config.h b/layouts/community/ortho_4x12/crs/config.h
deleted file mode 100644
index 33e9342039..0000000000
--- a/layouts/community/ortho_4x12/crs/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define _MASTER_RIGHT
-// #define EE_HANDS
diff --git a/layouts/community/ortho_4x12/crs/keymap.c b/layouts/community/ortho_4x12/crs/keymap.c
deleted file mode 100644
index e0d553362c..0000000000
--- a/layouts/community/ortho_4x12/crs/keymap.c
+++ /dev/null
@@ -1,253 +0,0 @@
-// Can't Remember Sh*t Keymap for 4x12 ortho
-// http://www.keyboard-layout-editor.com/#/gists/c6c0ac051b2b118a34ef84ebadab54c7
-
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#ifdef AUDIO_ENABLE
- #include "audio.h"
-#endif
-#include "eeconfig.h"
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _ARROW 1
-#define _GAME 2
-#define _LOWER 3
-#define _RAISE 4
-#define _PLOVER 5
-#define _ADJUST 16
-
-enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- ARROW,
- GAME,
- LOWER,
- RAISE,
- BACKLIT,
- PLOVER,
- EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab | A | S | D | F | G | H | J | K | L | ; | ' |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI | \ | Alt | Lower|SpcRse| Space|Raise | [ | - | = | ] |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_4x12( \
- KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
- KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT), \
- KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER, LT(4, KC_SPC), KC_SPC, RAISE, LT(3, KC_LBRC), KC_MINS, KC_EQL, CTL_T(KC_RBRC) \
-),
-
-/* Arrow
- * ,-----------------------------------------------------------------------------------.
- * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab | A | S | D | F | G | H | J | K | L | ; | ' |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI | \ | Alt | Lower| Space| Space|Raise | Left | Down | Up |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_ARROW] = LAYOUT_ortho_4x12( \
- KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
- KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT), \
- KC_LCTL, KC_LGUI, KC_BSLS, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT \
-),
-
-/* Game
- * ,-----------------------------------------------------------------------------------.
- * | 1 | Q | W | E | R | T | Y | U | I | O | P | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |Shift | A | S | D | F | G | H | J | K | L | ; | ' |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Ctrl | Z | X | C | V | B | N | M | , | . | / |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Alt | 4 | 3 | 2 | Lower| Space |Raise | Left | Down | Up | Right|
- * `-----------------------------------------------------------------------------------'
- */
-[_GAME] = LAYOUT_ortho_4x12( \
- KC_1, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
- KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
- KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______ , \
- KC_LALT, KC_4, KC_3, KC_2, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT \
-),
-
-
-/* Lower (switched to # because KP# were weird in terminal emulators)
- * ,-----------------------------------------------------------------------------------.
- * | Del | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab | F1 | F2 | F3 | F4 | F5 | F6 | 4 | 5 | 6 | . | * |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | F12 | 1 | 2 | 3 | / |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc | | | | | | 0 | | | | KP_+ | |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_4x12( \
- KC_DEL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_4, KC_5, KC_6, KC_DOT, KC_ASTR, \
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_1, KC_2, KC_3, KC_SLSH, _______, \
- KC_ESC, _______, _______, _______, _______, _______, KC_0, _______, _______, _______, KC_PLUS, _______ \
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del | Wh Up|RightC| M-Up | LeftC|QWERTY| Left | Down | Up | Right| | | ` |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | Wh Dn| M-L | M-Dn | M-R | | - | = | [ | ] | \ | |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | App | | | | | Ins | | Home | PGDN | PGUP | End |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_4x12( \
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \
- KC_DEL, KC_WH_U, KC_BTN2, KC_MS_U, KC_BTN1, QWERTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PIPE, KC_GRV, \
- _______, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLASH, _______, \
- _______, KC_APP, _______, _______, _______, _______, KC_INS, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END \
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * | # | # | # | # | # | # | # | # | # | # | # | # |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | | S | T | P | H | * | * | F | P | L | T | D |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | S | K | W | R | * | * | R | B | G | S | Z |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit | | | A | O | | E | U | | | |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_ortho_4x12 ( \
- KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , \
- XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, \
- XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
- EXT_PLV, XXXXXXX, XXXXXXX, KC_C, KC_V, XXXXXXX, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX \
-),
-
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | C-A-I|Qwerty| | |Reset |Macro0| | | | |PLOVER|C-A-D |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Caps | Arrow| |Aud on|Audoff| Game |AGswap|AGnorm| PrtSc|ScrLck| Break| |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | |Voice-|Voice+|Mus on|Musoff| Prev | Next | Mute | VolDn| VolUp| | |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| | | | | Play/Pause | | BL_T |BL_DEC|BL_INC|BL_ST |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_4x12( \
- LALT(LCTL(KC_INS)), QWERTY, _______, _______, QK_BOOT, M(0), _______, _______, _______, _______, PLOVER, LALT(LCTL(KC_DEL)), \
- KC_CAPS, ARROW, _______, AU_ON, AU_OFF, GAME, AG_SWAP, AG_NORM, KC_PSCR, KC_SLCK, KC_PAUS, _______, \
- _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, \
- BACKLIT, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, BL_TOGG, BL_DEC , BL_INC , BL_STEP \
-)
-
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is.
-{
- switch(id) {
- case 0: // this would trigger when you hit a key mapped as M(0)
- if (record->event.pressed) {
- return MACRO( D(LSFT), T(LEFT), U(LSFT), D(LCTL), T(X), U(LCTL), T(RIGHT), D(LCTL), T(V), U(LCTL), T(LEFT), END ); // this swaps the characters on either side of the cursor when the macro executes
- }
- break;
- }
- return MACRO_NONE;
-};
-
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2] = SONG(QWERTY_SOUND);
-float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
-#endif
-
-
-void persistant_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_qwerty);
- #endif
- persistant_default_layer_set(1UL<<_QWERTY);
- }
- return false;
- break;
- case GAME:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(music_scale);
- #endif
- persistant_default_layer_set(1UL<<_GAME);
- }
- return false;
- break;
-
-
- case LOWER:
- if (record->event.pressed) {
- layer_on(_LOWER);
- update_tri_layer(_LOWER, _RAISE, _ADJUST);
- } else {
- layer_off(_LOWER);
- update_tri_layer(_LOWER, _RAISE, _ADJUST);
- }
- return false;
- break;
- case RAISE:
- if (record->event.pressed) {
- layer_on(_RAISE);
- update_tri_layer(_LOWER, _RAISE, _ADJUST);
- } else {
- layer_off(_RAISE);
- update_tri_layer(_LOWER, _RAISE, _ADJUST);
- }
- return false;
- break;
- case BACKLIT:
- if (record->event.pressed) {
- register_code(KC_RSFT);
- #ifdef BACKLIGHT_ENABLE
- backlight_step();
- #endif
- } else {
- unregister_code(KC_RSFT);
- }
- return false;
- break;
- }
- return true;
-}
-
-void matrix_init_user(void) {
-
-}
diff --git a/layouts/community/ortho_4x12/crs/readme.md b/layouts/community/ortho_4x12/crs/readme.md
deleted file mode 100644
index 66b03cfd43..0000000000
--- a/layouts/community/ortho_4x12/crs/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# CRS 4x12 Ortholinear Layout
-
-Since I started with a Planck and a 2u space, it's not as optimal on a split or grid but it's what I'm used to using.
-
-Goals:
-
-* Maximum compatibility with standard keyboards
- * I have to work on other staggered Qwerty keyboards all the time so I wanted to keep essentially the same layout instead of optimizing too much.
-* Trying to fit as many characters as possible on the default layer
- * its easier for me to remember logical functions than characters
- * Using the extra punctuation caps in place of arrows frees up some Row 4 caps
- * however, I'm trying out an arrows layout with the other punctuation on the Raise layer and it is quite nice too
-* A number pad AND a number row
-
-[Here is the layout in easily readable KLE form.](http://www.keyboard-layout-editor.com/#/gists/c6c0ac051b2b118a34ef84ebadab54c7)
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h
index d6197ece29..e2154cbe2f 100644
--- a/layouts/community/ortho_4x12/drashna/config.h
+++ b/layouts/community/ortho_4x12/drashna/config.h
@@ -35,18 +35,16 @@
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
// #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
// #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# undef RGB_MATRIX_LED_PROCESS_LIMIT
# undef RGB_MATRIX_LED_FLUSH_LIMIT
# ifdef KEYBOARD_planck_rev6
-# define DRIVER_LED_TOTAL RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# endif
#endif
#if defined(KEYBOARD_lets_split_rev2)
-# define USE_SERIAL
# undef USE_I2C
# define EE_HANDS
#endif
@@ -70,11 +68,11 @@
#if defined(KEYBOARD_planck)
# undef PRODUCT
# if defined(KEYBOARD_planck_light)
-# define PRODUCT Drashna Hacked RGB Beacon(Planck Light)
+# define PRODUCT "Drashna Hacked RGB Beacon(Planck Light)"
# elif defined(KEYBOARD_planck_rev6)
-# define PRODUCT Drashna Hacked Planck Rev6
+# define PRODUCT "Drashna Hacked Planck Rev6"
# elif defined(KEYBOARD_planck_ez)
-# define PRODUCT Drashna Hacked Planck EZ
+# define PRODUCT "Drashna Hacked Planck EZ"
# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095
# endif
#endif
diff --git a/layouts/community/ortho_4x12/ergodoxish/config.h b/layouts/community/ortho_4x12/ergodoxish/config.h
index 33e9342039..2f0c23b7f1 100644
--- a/layouts/community/ortho_4x12/ergodoxish/config.h
+++ b/layouts/community/ortho_4x12/ergodoxish/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/layouts/community/ortho_4x12/grahampheath/config.h b/layouts/community/ortho_4x12/grahampheath/config.h
index 8bc3d7762d..342c55cdea 100644
--- a/layouts/community/ortho_4x12/grahampheath/config.h
+++ b/layouts/community/ortho_4x12/grahampheath/config.h
@@ -23,11 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keyboards/lets_split/config.h"
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
#define MASTER_LEFT
diff --git a/layouts/community/ortho_4x12/grahampheath/keymap.c b/layouts/community/ortho_4x12/grahampheath/keymap.c
index 7b35c52e71..a4fa168c5c 100644
--- a/layouts/community/ortho_4x12/grahampheath/keymap.c
+++ b/layouts/community/ortho_4x12/grahampheath/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
HYPR_0, _______, WINK, _______, ROFL, TOUNGE, THANKS, _______, CRY, FLIP, _______, _______ ,
HYPR_1, ABOVE, SHRUG, GRIN, FROWN, _______, HEART, JOY, _______, LLAP, _______, _______ ,
HYPR_2, SING, THINK, CLAP, CONFUSED, BUG, _______, _______, SHIT, ELIP, _______, _______ ,
- _______, _______, _______, _______, KC_SLCK, KC_SLEP, KC_SLEP, KC_PAUS, FNGLEFT, THMBDN, THMBUP, FNGRIGHT
+ _______, _______, _______, _______, KC_SCRL, KC_SLEP, KC_SLEP, KC_PAUS, FNGLEFT, THMBDN, THMBUP, FNGRIGHT
),
};
diff --git a/layouts/community/ortho_4x12/greatwizard/keymap.c b/layouts/community/ortho_4x12/greatwizard/keymap.c
index 1796254c16..b63afe4424 100644
--- a/layouts/community/ortho_4x12/greatwizard/keymap.c
+++ b/layouts/community/ortho_4x12/greatwizard/keymap.c
@@ -166,7 +166,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_ADJUST] = LAYOUT_ortho_4x12_wrapper(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
- KC_CAPS, QK_BOOT, EEP_RST, _______, _______, _______, GAME, QWERTY, WORKMAN, COLEMAK, DVORAK, _______,
+ KC_CAPS, QK_BOOT, EE_CLR, _______, _______, _______, GAME, QWERTY, WORKMAN, COLEMAK, DVORAK, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
diff --git a/layouts/community/ortho_4x12/jackhumbert/keymap.c b/layouts/community/ortho_4x12/jackhumbert/keymap.c
index ed637b7c30..8941342aa6 100644
--- a/layouts/community/ortho_4x12/jackhumbert/keymap.c
+++ b/layouts/community/ortho_4x12/jackhumbert/keymap.c
@@ -112,16 +112,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | |MUSmod|Aud on|Audoff|AGnorm|AGswap| | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
- * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf| | | |
+ * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT_ortho_4x12(
- _______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
- _______, XXXXXXX, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
- _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, XXXXXXX, XXXXXXX, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______,
+ _______, XXXXXXX, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+ _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/layouts/community/ortho_4x12/jarred/keymap.c b/layouts/community/ortho_4x12/jarred/keymap.c
index 4be5f9ed69..e419b3942c 100644
--- a/layouts/community/ortho_4x12/jarred/keymap.c
+++ b/layouts/community/ortho_4x12/jarred/keymap.c
@@ -13,10 +13,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_user(void) {
#ifdef KEYBOARD_planck_light
// Disable light in middle of 2U position of Planck Light
rgb_matrix_set_color(42, 0, 0, 0);
#endif
+ return false;
}
#endif
diff --git a/layouts/community/ortho_4x12/jjerrell/config.h b/layouts/community/ortho_4x12/jjerrell/config.h
index aee885b8d0..8d2080d868 100644
--- a/layouts/community/ortho_4x12/jjerrell/config.h
+++ b/layouts/community/ortho_4x12/jjerrell/config.h
@@ -32,7 +32,7 @@
#ifdef KEYBOARD_planck_ez_glow
#undef PRODUCT
-#define PRODUCT Planck EZ Glow - Modified by <@jjerrell>
+#define PRODUCT "Planck EZ Glow - Modified by <@jjerrell>"
#endif
/*
diff --git a/layouts/community/ortho_4x12/jjerrell/keymap.c b/layouts/community/ortho_4x12/jjerrell/keymap.c
index d873907e91..90b7714ec4 100644
--- a/layouts/community/ortho_4x12/jjerrell/keymap.c
+++ b/layouts/community/ortho_4x12/jjerrell/keymap.c
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
/* Adjust (Lower + Raise)
* ,-----------------------------------------------------------------------------------.
- * | Make | Debug|Reset |TermOn|TrmOff| | |MusMod|Mus On|MusOff|MidiOn|MidOff|
+ * | Make | Debug|Reset | | | | |MusMod|Mus On|MusOff|MidiOn|MidOff|
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Mute | Vol- | Vol+ | Play | Skip | | |Voice-| HUE+ | HUE- | SAT+ | SAT- |
* |------+------+------+------+------+------+------+------+------+------+------+------|
diff --git a/layouts/community/ortho_4x12/jotix/keymap.c b/layouts/community/ortho_4x12/jotix/keymap.c
index ffffbe75d2..92e697ded3 100644
--- a/layouts/community/ortho_4x12/jotix/keymap.c
+++ b/layouts/community/ortho_4x12/jotix/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- _______,KC_VOLD,KC_MUTE,KC_VOLU,DM_PLY1,DM_REC1,DM_RSTP,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,
+ _______,KC_VOLD,KC_MUTE,KC_VOLU,DM_PLY1,DM_REC1,DM_RSTP,KC_PSCR,KC_SCRL,KC_PAUS,_______,_______,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
_______,KC_MPRV,KC_MPLY,KC_MNXT,DM_PLY2,DM_REC2,KC_INS, KC_APP, _______,_______,_______,_______,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
_______,KC_MS_L,KC_MS_D,KC_MS_R,KC_WH_D,_______,_______,KC_P4, KC_P5, KC_P6, KC_PPLS,_______,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
- _______,_______,_______,_______,_______,_______,KC_NLCK,KC_P1, KC_P2, KC_P3, KC_PSLS,KC_PENT,
+ _______,_______,_______,_______,_______,_______,KC_NUM, KC_P1, KC_P2, KC_P3, KC_PSLS,KC_PENT,
// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
_______,_______,_______,_______,_______,_______,_______,_______,KC_P0, KC_PDOT,KC_PAST,_______
// └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
@@ -100,7 +100,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
bool led_update_user(led_t led_state) {
// NumLock allways on
if (!led_state.num_lock) {
- tap_code(KC_NUMLOCK);
+ tap_code(KC_NUM_LOCK);
}
#ifdef JOTANCK_LEDS
writePin(JOTANCK_LED1, led_state.caps_lock);
diff --git a/layouts/community/ortho_4x12/juno/keymap.c b/layouts/community/ortho_4x12/juno/keymap.c
index 1c9b4af891..91499cc298 100644
--- a/layouts/community/ortho_4x12/juno/keymap.c
+++ b/layouts/community/ortho_4x12/juno/keymap.c
@@ -155,9 +155,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT_ortho_4x12(
- _______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+ _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______,
- _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______,
+ _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
diff --git a/layouts/community/ortho_4x12/junonum/keymap.c b/layouts/community/ortho_4x12/junonum/keymap.c
index b5ed159f6a..416949aecc 100644
--- a/layouts/community/ortho_4x12/junonum/keymap.c
+++ b/layouts/community/ortho_4x12/junonum/keymap.c
@@ -89,10 +89,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_ADJUST] = LAYOUT_ortho_4x12(
- _______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
- _______, AG_NORM, MU_MOD, AU_ON, AU_OFF, CG_NORM, CG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______,
- _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+ _______, AG_NORM, MU_MOD, AU_ON, AU_OFF, CG_NORM, CG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______,
+ _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[_FN1] = LAYOUT_ortho_4x12(
diff --git a/layouts/community/ortho_4x12/mguterl/keymap.c b/layouts/community/ortho_4x12/mguterl/keymap.c
index e57fb0c47f..5b55fa3fa5 100644
--- a/layouts/community/ortho_4x12/mguterl/keymap.c
+++ b/layouts/community/ortho_4x12/mguterl/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
ESC_CTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT,
- KC_GESC, KC_LCTL, KC_LALT, KC_LGUI, LOWER, SPC_UTL, SPC_UTL, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ QK_GESC, KC_LCTL, KC_LALT, KC_LGUI, LOWER, SPC_UTL, SPC_UTL, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
/*
@@ -158,16 +158,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover| |
* |------+------+------+------+------+------+------+------+------+------+------+------|
- * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf| | | |
+ * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT_ortho_4x12(
- TG_GAME, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
- _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______,
- _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ TG_GAME, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+ _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______,
+ _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/layouts/community/ortho_4x12/symbolic/config.h b/layouts/community/ortho_4x12/symbolic/config.h
index 3f88b4cc17..db74d0fdfa 100644
--- a/layouts/community/ortho_4x12/symbolic/config.h
+++ b/layouts/community/ortho_4x12/symbolic/config.h
@@ -20,13 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
/* Select hand configuration */
//#define MASTER_LEFT
diff --git a/layouts/community/ortho_4x12/wanleg/config.h b/layouts/community/ortho_4x12/wanleg/config.h
index bcf2756f6b..7ec47302bc 100644
--- a/layouts/community/ortho_4x12/wanleg/config.h
+++ b/layouts/community/ortho_4x12/wanleg/config.h
@@ -15,7 +15,6 @@
#define QMK_LED B0
#define QMK_ESC_OUTPUT F6 // usually COL
#define QMK_ESC_INPUT D7 // usually ROW
-#define USE_SERIAL
#undef USE_I2C
#define EE_HANDS
#endif
@@ -36,7 +35,7 @@
// use alternate settings for 4x4 board using ProMicro instead of Micro
// usage: make 4x4:wanleg PM=yes
-#if defined(KEYBOARD_40percentclub_4x4) && defined(PRO_MICRO)
+#if defined(KEYBOARD_40percentclub_4x4) && defined(PRO_MICRO)
#define QMK_ESC_OUTPUT F4 // usually COL
#define QMK_ESC_INPUT D1 // usually ROW
#define QMK_LED B0
diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h
index 287f4cc2b7..44bac5bf18 100644
--- a/layouts/community/ortho_4x12/xyverz/config.h
+++ b/layouts/community/ortho_4x12/xyverz/config.h
@@ -3,8 +3,6 @@
#define MIDI_BASIC
-#define USE_SERIAL
-
#define EE_HANDS
#undef RGBLED_NUM
@@ -21,7 +19,16 @@
#define RGBLED_NUM 1
#endif
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/layouts/community/ortho_4x4/jotix/keymap.c b/layouts/community/ortho_4x4/jotix/keymap.c
index 9035860da7..ec975d6db2 100644
--- a/layouts/community/ortho_4x4/jotix/keymap.c
+++ b/layouts/community/ortho_4x4/jotix/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,
KC_EXLM,KC_AT, KC_HASH,KC_DLR,
KC_Z, KC_X, KC_C, _______,
- KC_NLCK,_______,_______,TGGAME
+ KC_NUM, _______,_______,TGGAME
)
};
@@ -47,7 +47,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
bool led_update_user(led_t led_state) {
// NumLock allways on
if (!led_state.num_lock) {
- tap_code(KC_NUMLOCK);
+ tap_code(KC_NUM_LOCK);
}
return true;
}
diff --git a/layouts/community/ortho_5x12/333fred/config.h b/layouts/community/ortho_5x12/333fred/config.h
index bdbeead547..4327d154c2 100644
--- a/layouts/community/ortho_5x12/333fred/config.h
+++ b/layouts/community/ortho_5x12/333fred/config.h
@@ -22,7 +22,6 @@
#pragma once
-#define USE_SERIAL
#define MASTER_LEFT
#undef TAPPING_TERM
diff --git a/layouts/community/ortho_5x12/333fred/keymap.c b/layouts/community/ortho_5x12/333fred/keymap.c
index e270b40893..15deea50d3 100644
--- a/layouts/community/ortho_5x12/333fred/keymap.c
+++ b/layouts/community/ortho_5x12/333fred/keymap.c
@@ -46,10 +46,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[BASE] = LAYOUT_ortho_5x12( \
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, \
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, \
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, \
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RCTL_T(KC_SLSH), OSM(MOD_RSFT), \
- KC_LCTL, KC_LALT, KC_F4, KC_LGUI, KC_BSPC, TD(TD_SYM_VIM), KC_SPC, KC_ENT, KC_LOCK, KC_EQL, KC_RALT, KC_DEL \
+ KC_LCTL, KC_LALT, KC_F4, KC_LGUI, KC_BSPC, TD(TD_SYM_VIM), KC_SPC, KC_ENT, QK_LOCK, KC_EQL, KC_RALT, KC_DEL \
),
/* Symbols
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
KC_LCTL, _______, _______, _______, KC_F, _______, _______, _______, _______, _______, _______, _______, \
KC_LSFT, KC_Z, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LGUI, \
- KC_ENT, _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC, OSL(SYMB), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TO(BASE) \
+ KC_ENT, _______, QK_LOCK, KC_BSPC, KC_LALT, KC_SPC, OSL(SYMB), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TO(BASE) \
)
};
diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c
index 1b66886e6b..0e415fe3bf 100644
--- a/layouts/community/ortho_5x12/brandonschlack/keymap.c
+++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c
@@ -86,13 +86,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, \
// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
- QM_MAKE, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, \
+ QM_MAKE, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, \
// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
QM_FLSH, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, RGB_RTHM,RGB_THM, _______, _______, _______, \
// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
- EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+ EE_CLR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
)
diff --git a/layouts/community/ortho_5x12/drashna/config.h b/layouts/community/ortho_5x12/drashna/config.h
index 619b460a7b..61c95fed8f 100644
--- a/layouts/community/ortho_5x12/drashna/config.h
+++ b/layouts/community/ortho_5x12/drashna/config.h
@@ -20,8 +20,17 @@
#if defined(KEYBOARD_fractal)
# define RGB_DI_PIN D2
# undef RGBLED_NUM
-# define RGBLIGHT_ANIMATIONS
-# define RGBLED_NUM 29 // Number of LEDs
+# define RGBLIGHT_EFFECT_BREATHING
+# define RGBLIGHT_EFFECT_RAINBOW_MOOD
+# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# define RGBLIGHT_EFFECT_SNAKE
+# define RGBLIGHT_EFFECT_KNIGHT
+# define RGBLIGHT_EFFECT_CHRISTMAS
+# define RGBLIGHT_EFFECT_STATIC_GRADIENT
+# define RGBLIGHT_EFFECT_RGB_TEST
+# define RGBLIGHT_EFFECT_ALTERNATING
+# define RGBLIGHT_EFFECT_TWINKLE
+# define RGBLED_NUM 29 // Number of LEDs
# undef RGBLIGHT_HUE_STEP
# define RGBLIGHT_HUE_STEP 8
# undef RGBLIGHT_SAT_STEP
diff --git a/layouts/community/ortho_5x12/greatwizard/keymap.c b/layouts/community/ortho_5x12/greatwizard/keymap.c
index 30e7ca6676..1125f5e316 100644
--- a/layouts/community/ortho_5x12/greatwizard/keymap.c
+++ b/layouts/community/ortho_5x12/greatwizard/keymap.c
@@ -292,7 +292,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_ADJUST] = LAYOUT_ortho_5x12_wrapper(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
- _______, QK_BOOT, EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, QK_BOOT, EE_CLR, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_CAPS, _______, _______, _______, _______, _______, GAME, QWERTY, WORKMAN, COLEMAK, DVORAK, _______,
_______, _______, _______, _______, _______, _______, _______, QWERTYP, WORKMNP, COLEMKP, DVORAKP, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/ortho_5x12/riblee/keymap.c b/layouts/community/ortho_5x12/riblee/keymap.c
index 8ccdf41da6..1ce3a8dd3e 100644
--- a/layouts/community/ortho_5x12/riblee/keymap.c
+++ b/layouts/community/ortho_5x12/riblee/keymap.c
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_ADJUST] = LAYOUT_ortho_5x12(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
- _______, QK_BOOT, DEBUG, _______, _______, _______, _______, _______, _______, KC_INS, KC_PSCR, KC_DEL,
+ _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, KC_INS, KC_PSCR, KC_DEL,
_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, HUNGARIAN, WORKMAN,
_______, _______, _______, _______, UC_MOD, UC_RMOD, NK_TOGG, CG_NORM, CG_SWAP, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/community/ortho_5x12/xyverz/config.h b/layouts/community/ortho_5x12/xyverz/config.h
index 5f9f6e5c11..780fce389d 100644
--- a/layouts/community/ortho_5x12/xyverz/config.h
+++ b/layouts/community/ortho_5x12/xyverz/config.h
@@ -12,7 +12,16 @@
#if defined(KEYBOARD_preonic_rev2)
#define RGB_DI_PIN B3
#undef RGBLED_NUM
- #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 11 // Number of LEDs
#undef RGBLIGHT_HUE_STEP
#define RGBLIGHT_HUE_STEP 8
@@ -23,7 +32,6 @@
#endif
// for the split boards //
-#define USE_SERIAL
#define EE_HANDS
#endif
diff --git a/layouts/community/ortho_5x12/xyverz/keymap.c b/layouts/community/ortho_5x12/xyverz/keymap.c
index fe2287918b..fe6055f1ad 100644
--- a/layouts/community/ortho_5x12/xyverz/keymap.c
+++ b/layouts/community/ortho_5x12/xyverz/keymap.c
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______, \
- _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \
+ _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, \
BL_STEP, _______, KC_HOME, KC_END, _______, KC_DEL, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ \
),
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_EQL, KC_LBRC, KC_RBRC, _______, \
- _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, \
+ _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, \
BL_STEP, _______, KC_HOME, KC_END, _______, KC_DEL, KC_INS, _______, KC_PGUP, KC_PGDN, _______, _______ \
),
diff --git a/layouts/community/ortho_5x14/peej/keymap.c b/layouts/community/ortho_5x14/peej/keymap.c
index ac0b4d9631..ea55361bd5 100644
--- a/layouts/community/ortho_5x14/peej/keymap.c
+++ b/layouts/community/ortho_5x14/peej/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------------------------------'
*/
[_BASE] = LAYOUT_PEEJ_hhkb(
- KC_GESC, BASE_ROW_1_L, BASE_ROW_1_M, BASE_ROW_1_R, KC_BSPC,
+ QK_GESC, BASE_ROW_1_L, BASE_ROW_1_M, BASE_ROW_1_R, KC_BSPC,
KC_TAB, BASE_ROW_2_L, BASE_ROW_2_M, BASE_ROW_2_R, KC_BSLS,
CTLESC, BASE_ROW_3_L, BASE_ROW_3_M, BASE_ROW_3_R, KC_QUOT,
KC_LSFT, BASE_ROW_4_L, BASE_ROW_4_M, BASE_ROW_4_R, KC_ENT,
diff --git a/layouts/community/ortho_5x14/yet-another-developer/config.h b/layouts/community/ortho_5x14/yet-another-developer/config.h
index 3f8dbd3c5e..66959a6d42 100644
--- a/layouts/community/ortho_5x14/yet-another-developer/config.h
+++ b/layouts/community/ortho_5x14/yet-another-developer/config.h
@@ -4,8 +4,17 @@
#if defined(KEYBOARD_fractal)
# define RGB_DI_PIN D2
# undef RGBLED_NUM
-# define RGBLIGHT_ANIMATIONS
-# define RGBLED_NUM 29 // Number of LEDs
+# define RGBLIGHT_EFFECT_BREATHING
+# define RGBLIGHT_EFFECT_RAINBOW_MOOD
+# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# define RGBLIGHT_EFFECT_SNAKE
+# define RGBLIGHT_EFFECT_KNIGHT
+# define RGBLIGHT_EFFECT_CHRISTMAS
+# define RGBLIGHT_EFFECT_STATIC_GRADIENT
+# define RGBLIGHT_EFFECT_RGB_TEST
+# define RGBLIGHT_EFFECT_ALTERNATING
+# define RGBLIGHT_EFFECT_TWINKLE
+# define RGBLED_NUM 29 // Number of LEDs
# undef RGBLIGHT_HUE_STEP
# define RGBLIGHT_HUE_STEP 8
# undef RGBLIGHT_SAT_STEP
diff --git a/layouts/community/ortho_5x14/yet-another-developer/keymap.c b/layouts/community/ortho_5x14/yet-another-developer/keymap.c
index aea50508d3..ea4252b6d7 100644
--- a/layouts/community/ortho_5x14/yet-another-developer/keymap.c
+++ b/layouts/community/ortho_5x14/yet-another-developer/keymap.c
@@ -188,14 +188,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, _________________RAISE_L1__________________, _______, _______, _________________RAISE_R1__________________, KC_BSLS,
_______, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_QUOT,
_______, _________________RAISE_L3__________________, _______, _______, _________________RAISE_R3__________________, KC_PSCR,
- _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_SLCK,
+ _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_SCRL,
_______, _______, _______, _______,
_______, _______, _______, _______, _______, _______
),
[_ADJUST] = LAYOUT_ergodash_pretty_wrapper(
KC_MAKE, _______, _______, _______, _______, _______, _______, KC_NUKE, _________________ADJUST_R1_________________, KC_RST,
- VRSN, _________________ADJUST_L1_________________, _______, _______, _______, _______, _______, _______, _______, EEP_RST,
+ VRSN, _________________ADJUST_L1_________________, _______, _______, _______, _______, _______, _______, _______, EE_CLR,
_______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, RGB_IDL,
_______, _________________ADJUST_L3_________________, _______, _______, _________________ADJUST_R3_________________, TG(_MODS),
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/layouts/community/ortho_5x15/wanleg/keymap.c b/layouts/community/ortho_5x15/wanleg/keymap.c
index ea4521d3d9..7f238010d0 100644
--- a/layouts/community/ortho_5x15/wanleg/keymap.c
+++ b/layouts/community/ortho_5x15/wanleg/keymap.c
@@ -11,7 +11,7 @@
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \
) \
LAYOUT_ortho_5x15_wrapper( \
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, QWERTY, GHERKIN, FUNCTION, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NLCK, \
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, QWERTY, GHERKIN, FUNCTION, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NUM, \
K00, K01, K02, K03, K04, K05, K0c, K0d, K0e, K06, K07, K08, K09, K0a, K0b, \
K10, K11, K12, K13, K14, K15, K1c, K1d, K1e, K16, K17, K18, K19, K1a, K1b, \
K20, K21, K22, K23, K24, K25, K2c, K2d, K2e, K26, K27, K28, K29, K2a, K2b, \
@@ -26,7 +26,7 @@
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \
) \
LAYOUT_ortho_5x15_wrapper( \
- QWERTY, GHERKIN, FUNCTION, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NLCK, \
+ QWERTY, GHERKIN, FUNCTION, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NUM, \
K0c, K0d, K0e, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
K1c, K1d, K1e, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
K2c, K2d, K2e, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
@@ -41,7 +41,7 @@
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e \
) \
LAYOUT_ortho_5x15_wrapper( \
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NLCK, QWERTY, GHERKIN, FUNCTION, \
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NUM, QWERTY, GHERKIN, FUNCTION, \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \
diff --git a/layouts/community/planck_mit/guidoism/guidoism.json b/layouts/community/planck_mit/guidoism/guidoism.json
index 123bd74182..9c2083bbe8 100644
--- a/layouts/community/planck_mit/guidoism/guidoism.json
+++ b/layouts/community/planck_mit/guidoism/guidoism.json
@@ -1 +1 @@
-{"keyboard":"planck/rev4","keymap":"guidoism","layout":"LAYOUT_planck_mit","layers":[["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_LCTL","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_COLN","KC_ENT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_NO","MO(3)","KC_ESC","KC_LALT","KC_LGUI","MO(1)","LSFT_T(KC_SPC)","MO(2)","KC_RGUI","KC_RALT","KC_SCLN","MO(5)"],["KC_TILD","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_CIRC","KC_AMPR","KC_ASTR","KC_NO","KC_NO","KC_UNDO","KC_TRNS","KC_NO","KC_CUT","KC_COPY","KC_PSTE","KC_NO","KC_NO","KC_UNDS","KC_PLUS","KC_DQUO","KC_QUOT","KC_PIPE","KC_CAPS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_MNXT","KC_VOLD","KC_VOLU","KC_MPLY"],["KC_GRV","KC_P1","KC_P2","KC_P3","KC_P4","KC_P5","KC_P6","KC_P7","KC_P8","KC_P9","KC_P0","KC_TRNS","KC_TRNS","KC_LBRC","KC_RBRC","KC_LPRN","KC_RPRN","KC_NO","KC_NO","KC_PMNS","KC_PEQL","KC_NO","KC_NO","KC_BSLS","KC_TRNS","KC_LT","KC_GT","KC_LCBR","KC_RCBR","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["QK_BOOT","DEBUG","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_UP","KC_PGDN","KC_NO","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_LEFT","KC_DOWN","KC_RGHT","KC_NO","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_HOME","KC_NO","KC_END","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PERC","KC_P7","KC_P8","KC_P9","KC_P0","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_DLR","KC_P4","KC_P5","KC_P6","KC_PDOT","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_P0","KC_P1","KC_P2","KC_P3","KC_PCMM","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_P0","KC_NO","KC_NO","KC_TRNS"],["KC_NO","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_TRNS"]]} \ No newline at end of file
+{"keyboard":"planck/rev4","keymap":"guidoism","layout":"LAYOUT_planck_mit","layers":[["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_LCTL","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_COLN","KC_ENT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_NO","MO(3)","KC_ESC","KC_LALT","KC_LGUI","MO(1)","LSFT_T(KC_SPC)","MO(2)","KC_RGUI","KC_RALT","KC_SCLN","MO(5)"],["KC_TILD","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_CIRC","KC_AMPR","KC_ASTR","KC_NO","KC_NO","KC_UNDO","KC_TRNS","KC_NO","KC_CUT","KC_COPY","KC_PSTE","KC_NO","KC_NO","KC_UNDS","KC_PLUS","KC_DQUO","KC_QUOT","KC_PIPE","KC_CAPS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_MNXT","KC_VOLD","KC_VOLU","KC_MPLY"],["KC_GRV","KC_P1","KC_P2","KC_P3","KC_P4","KC_P5","KC_P6","KC_P7","KC_P8","KC_P9","KC_P0","KC_TRNS","KC_TRNS","KC_LBRC","KC_RBRC","KC_LPRN","KC_RPRN","KC_NO","KC_NO","KC_PMNS","KC_PEQL","KC_NO","KC_NO","KC_BSLS","KC_TRNS","KC_LT","KC_GT","KC_LCBR","KC_RCBR","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["QK_BOOT","DB_TOGG","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PGUP","KC_UP","KC_PGDN","KC_NO","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_LEFT","KC_DOWN","KC_RGHT","KC_NO","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_HOME","KC_NO","KC_END","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PERC","KC_P7","KC_P8","KC_P9","KC_P0","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_DLR","KC_P4","KC_P5","KC_P6","KC_PDOT","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_P0","KC_P1","KC_P2","KC_P3","KC_PCMM","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_NO","KC_P0","KC_NO","KC_NO","KC_TRNS"],["KC_NO","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_TRNS"]]} \ No newline at end of file
diff --git a/layouts/community/planck_mit/guidoism/keymap.c b/layouts/community/planck_mit/guidoism/keymap.c
index 57c1042dbe..df8a64c203 100644
--- a/layouts/community/planck_mit/guidoism/keymap.c
+++ b/layouts/community/planck_mit/guidoism/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
*/
[_MOVEMENT] = LAYOUT_planck_mit(
- QK_BOOT, DEBUG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_PGDN, KC_NO, KC_TRNS,
+ QK_BOOT, DB_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_PGDN, KC_NO, KC_TRNS,
KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_TRNS,
KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_NO, KC_END, KC_NO, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/layouts/community/planck_mit/guidoism/keys.json b/layouts/community/planck_mit/guidoism/keys.json
index 791119b4f2..31cecd5638 100644
--- a/layouts/community/planck_mit/guidoism/keys.json
+++ b/layouts/community/planck_mit/guidoism/keys.json
@@ -75,7 +75,7 @@
"KC_ENT": "\u23ce",
"KC_ESCAPE": "\u238b",
"KC_ESC": "\u238b",
- "KC_BSPACE": "\u232b",
+ "KC_BACKSPACE": "\u232b",
"KC_BSPC": "\u232b",
"KC_TAB": "\u21e5",
"KC_SPACE": "",
@@ -84,13 +84,13 @@
"KC_MINS": "-",
"KC_EQUAL": "+",
"KC_EQL": "=",
- "KC_LBRACKET": "{",
+ "KC_LEFT_BRACKET": "{",
"KC_LBRC": "[",
- "KC_RBRACKET": "}",
+ "KC_RIGHT_BRACKET": "}",
"KC_RBRC": "]",
"KC_BSLS": "\\",
- "KC_BSLASH": "\\",
- "KC_SCOLON": ":",
+ "KC_BACKSLASH": "\\",
+ "KC_SEMICOLON": ":",
"KC_SCLN": ";",
"KC_QUOTE": "\"",
"KC_QUOT": "'",
@@ -102,36 +102,34 @@
"KC_SLASH": "/",
"KC_NUBS": "/",
"KC_NUHS": "#",
- "KC_CAPSLOCK": "Caps",
+ "KC_CAPS_LOCK": "Caps",
"KC_CAPS": "Caps",
- "KC_LCTRL": "Ctrl",
+ "KC_LEFT_CTRL": "Ctrl",
"KC_LCTL": "Ctrl",
- "KC_LSHIFT": "\u21e7",
+ "KC_LEFT_SHIFT": "\u21e7",
"KC_LSFT": "\u21e7",
"KC_LALT": "\u2325",
"KC_LGUI": "\u2318",
"KC_LCMD": "\u2318",
- "KC_RCTRL": "Right Control",
+ "KC_RIGHT_CTRL": "Right Control",
"KC_RCTL": "Right Control",
- "KC_RSHIFT": "\u21e7",
+ "KC_RIGHT_SHIFT": "\u21e7",
"KC_RSFT": "\u21e7",
"KC_RALT": "\u2325",
"KC_RGUI": "\u2318",
"KC_RCMD": "\u2318",
- "KC_LOCKING_CAPS": "Locking Caps Lock",
+ "KC_LOCKING_CAPS_LOCK": "Locking Caps Lock",
"KC_LCAP": "Locking Caps Lock",
- "KC_LOCKING_NUM": "Locking Num Lock",
+ "KC_LOCKING_NUM_LOCK": "Locking Num Lock",
"KC_LNUM": "Locking Num Lock",
- "KC_LOCKING_SCROLL": "Locking Scroll Lock",
+ "KC_LOCKING_SCROLL_LOCK": "Locking Scroll Lock",
"KC_LSCR": "Locking Scroll Lock",
"KC_INT4": "JIS Henkan",
- "KC_HENK": "JIS Henkan",
"KC_INT5": "JIS Muhenkan",
- "KC_MHEN": "JIS Muhenkan",
- "KC_PSCREEN": "Print Screen",
+ "KC_PRINT_SCREEN": "Print Screen",
"KC_PSCR": "Print Screen",
- "KC_SCROLLLOCK": "Scroll Lock",
- "KC_SLCK": "Scroll Lock",
+ "KC_SCROLL_LOCK": "Scroll Lock",
+ "KC_SCRL": "Scroll Lock",
"KC_PAUSE": "Pause",
"KC_PAUS": "Pause",
"KC_INSERT": "Insert",
@@ -141,7 +139,7 @@
"KC_DELETE": "\u2326",
"KC_DEL": "\u2326",
"KC_END": "End",
- "KC_PGDOWN": "PgDn",
+ "KC_PAGE_DOWN": "PgDn",
"KC_PGDN": "PgDn",
"KC_RIGHT": "→",
"KC_RGHT": "→",
@@ -150,7 +148,7 @@
"KC_UP": "↑",
"KC_APPLICATION": "Application (Windows Menu Key)",
"KC_APP": "Application (Windows Menu Key)",
- "KC_POWER": "Deprecated by MS in favor of KC_SYSTEM_POWER.",
+ "KC_KB_POWER": "Deprecated by MS in favor of KC_SYSTEM_POWER.",
"KC_EXECUTE": "Execute",
"KC_HELP": "Help",
"KC_MENU": "Menu",
@@ -161,8 +159,8 @@
"KC_COPY": "Copy",
"KC_PASTE": "Paste",
"KC_FIND": "Find",
- "KC_ALT_ERASE": "Alternate Erase",
- "KC_SYSREQ": "SysReq/Attention",
+ "KC_ERAS": "Alternate Erase",
+ "KC_SYRQ": "SysReq/Attention",
"KC_CANCEL": "Cancel",
"KC_CLEAR": "Clear",
"KC_PRIOR": "Prior",
@@ -180,9 +178,9 @@
"KC_SYSTEM_WAKE": "System Wake",
"KC_WAKE": "System Wake",
"KC_STOP": "Stop",
- "KC__MUTE": "Mute (macOS)",
- "KC__VOLUP": "vol+",
- "KC__VOLDOWN": "vol-",
+ "KC_KB_MUTE": "Mute (macOS)",
+ "KC_KB_VOLUME_UP": "vol+",
+ "KC_KB_VOLUME_DOWN": "vol-",
"KC_AUDIO_MUTE": "Mute",
"KC_MUTE": "Mute",
"KC_AUDIO_VOL_UP": "vol+",
@@ -201,8 +199,8 @@
"KC_MSTP": "Stop Track",
"KC_MEDIA_PLAY_PAUSE": "play",
"KC_MPLY": "play",
- "KC_NUMLOCK": "Keypad Num Lock and Clear",
- "KC_NLCK": "Keypad Num Lock and Clear",
+ "KC_NUM_LOCK": "Keypad Num Lock and Clear",
+ "KC_NUM": "Keypad Num Lock and Clear",
"KC_SLSH": "/",
"KC_KP_SLASH": "/",
"KC_PSLS": "/",
diff --git a/layouts/community/split_3x5_3/bbaserdem/config.h b/layouts/community/split_3x5_3/bbaserdem/config.h
deleted file mode 100644
index 6bb3515b9e..0000000000
--- a/layouts/community/split_3x5_3/bbaserdem/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-// Split definition; use the following to flash;
-// pro-micro: avrdude-split-left/right
-// elite-c: dfu-split-left/right
-#define EE_HANDS
-
-#ifdef KEYBOARD_crkbd_rev1
- // Corne overrides
-# ifdef RGBLED_NUM
-# undef RGBLED_NUM
-# endif
-# ifdef DRIVER_LED_TOTAL
-# undef DRIVER_LED_TOTAL
-# endif
-# define RGBLED_NUM 48
-# define DRIVER_LED_TOTAL RGBLED_NUM
-#endif // KEYBOARD_crkbd_rev1
diff --git a/layouts/community/split_3x5_3/bbaserdem/keymap.c b/layouts/community/split_3x5_3/bbaserdem/keymap.c
deleted file mode 100644
index f39a81082e..0000000000
--- a/layouts/community/split_3x5_3/bbaserdem/keymap.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "bbaserdem.h"
-
-/* D layout
- * ┌───┬───┬───┬───┬───┐        ┌───┬───┬───┬───┬───┐
- * │' "│, <│. >│ P │ Y │        │ F │ G │ C │ R │ L │
- * ├───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┤
- * │ A │ O │ E │ U │ I │        │ D │ H │ T │ N │ S │
- * ├───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┤
- * │; :│ Q │ J │ K │ X │        │ B │ M │ W │ V │ Z │
- * └───┴───┴───┼───┼───┼───┐ ┌───┼───┼───┼───┴───┴───┘
- *            │Del│Tab│Spc│ │Ent│Esc│Bsp│
- *            └───┴───┴───┘ └───┴───┴───┘
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_split_3x5_3_wrapper(
- _BL1_5_,_BR1_5_,
- _BL2_5_,_BR2_5_,
- _BL3_5_,_BR3_5_,
- _BL4_3_,_BR4_3_
- ),
- [_CHAR] = LAYOUT_split_3x5_3_wrapper(
- _CL1_5_,_CR1_5_,
- _CL2_5_,_CR2_5_,
- _CL3_5_,_CR3_5_,
- _CL4_3_,_CR4_3_
- ),
- [_GAME] = LAYOUT_split_3x5_3_wrapper(
- _GA1_5_,___5___,
- _GA2_5_,___5___,
- _GA3_5_,___5___,
- _GA4_3_,___3___
- ),
- [_MEDI] = LAYOUT_split_3x5_3_wrapper(
- ___5___,_ME1_5_,
- ___5___,_ME2_5_,
- ___5___,_ME3_5_,
- ___3___,_ME4_3_
- ),
- [_NAVI] = LAYOUT_split_3x5_3_wrapper(
- ___5___,_NA1_5_,
- ___5___,_NA2_5_,
- ___5___,_NA3_5_,
- ___3___,_NA4_3_
- ),
- [_SYMB] = LAYOUT_split_3x5_3_wrapper(
- ___5___,_SY1_5_,
- ___5___,_SY2_5_,
- ___5___,_SY3_5_,
- ___3___,_SY4_3_
- ),
- [_NUMB] = LAYOUT_split_3x5_3_wrapper(
- _NU1_5_,___5___,
- _NU2_5_,___5___,
- _NU3_5_,___5___,
- _NU4_3_,___3___
- ),
- [_FUNC] = LAYOUT_split_3x5_3_wrapper(
- _FU1_5_,___5___,
- _FU2_5_,___5___,
- _FU3_5_,___5___,
- _FU4_3_,___3___
- ),
- [_MOUS] = LAYOUT_split_3x5_3_wrapper(
- _MO1_5_,___5___,
- _MO2_5_,___5___,
- _MO3_5_,___5___,
- _MO4_3_,___3___
- ),
- [_MUSI] = LAYOUT_split_3x5_3_wrapper(
- _MU_10_,
- _MU_10_,
- _MU_10_,
- _MUL_3_,_MUR_3_
- )
-};
-
-// RGB Matrix configuration
-#ifdef RGB_MATRIX_ENABLE
-
-// crkbd
-#ifdef KEYBOARD_crkbd_rev1
-/* This is left-right for crkbd indicator light
- * ┌──┬──┬──┬──┬──┐      ┌──┬──┬──┬──┬──┐
- * │23│18│17│10│09│      │33│34│41│42│47│
- * ├02┼──┼01┼──┼00┤      ├24┼──┼25┼──┼26┤
- * │22│19│16│11│08│     │32│35│40│43│46│
- * ├03┼──┼04┼──┼05┤      ├29┼──┼28┼──┼27┤
- * │21│20│15│12│07│     │31│36│39│44│45│
- * └──┴──┴──┼──┼──┼──┐┌──┼──┼──┼──┴──┴──┘
- *          │14│13│06││30│37│38│
- *          └──┴──┴──┘└──┴──┴──┘
- */
-
-// End of differentiations
-#endif // KEYBOARD_crkbd_rev1
-
-// End of code for the RGB_MATRIX setup
-#endif // RGB_MATRIX_ENABLE
diff --git a/layouts/community/split_3x5_3/bbaserdem/readme.md b/layouts/community/split_3x5_3/bbaserdem/readme.md
deleted file mode 100644
index 30cacd85ea..0000000000
--- a/layouts/community/split_3x5_3/bbaserdem/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-This folder contains my [split\_3x5\_3](../../../default/split_3x5_3) board layouts
-Check out the [user readme](../../../../users/bbaserdem/readme.md) for more info.
-
-# Crkbd
-
-Using a no 6th column crkbd (rev 2.1 choc) as a mobile keyboard.
-
-This version uses ProMicro as controllers; can't have OLED and RGB at the same time.
-
-## Build
-
-QMK cli commands no longer works with Archlinux (2021 Sep.) on my PC for flashing promicro.
-In the past; I used to flash Pro Micro explicitly using the following line, for referance.
-
-```
-sudo avrdude -p atmgea34u4 -P "$(ls /dev/ttyACM*)" -c avr109 -D -U flash:w:<hexfile>.hex
-```
-
diff --git a/layouts/community/split_3x5_3/bbaserdem/rules.mk b/layouts/community/split_3x5_3/bbaserdem/rules.mk
deleted file mode 100644
index 047629b401..0000000000
--- a/layouts/community/split_3x5_3/bbaserdem/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021 Batuhan Başerdem
-# <baserdem.batuhan@gmail.com> @bbaserdem
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Corne keyboard
-ifneq (,$(findstring crkbd/rev1,$(KEYBOARD)))
- RGBLIGHT_ENABLE = no
- RGB_MATRIX_ENABLE = yes
- OLED_ENABLE = no
-endif
diff --git a/layouts/community/split_3x6_3/bbaserdem/chconf.h b/layouts/community/split_3x6_3/bbaserdem/chconf.h
deleted file mode 100644
index 4c6d15441f..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/chconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Code pertaining the ARM crkbd version
-#ifdef KEYBOARD_crkbd_rev1
-# define CH_CFG_ST_RESOLUTION 16
-# define CH_CFG_ST_FREQUENCY 10000
-# include_next "chconf.h"
-#endif // KEYBOARD_crkbd_rev1
diff --git a/layouts/community/split_3x6_3/bbaserdem/config.h b/layouts/community/split_3x6_3/bbaserdem/config.h
deleted file mode 100644
index adf707d1ba..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/config.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-// Split definition; use the following to flash;
-// pro-micro: avrdude-split-left/right
-// elite-c: dfu-split-left/right
-
-// Code pertaining to Corne ARM; from Waffle's keymap
-#ifdef KEYBOARD_crkbd_rev1
- // Use EE_HANDS to determine handedness
-# define EE_HANDS
-
- // Rebrand the PCB
-# undef PRODUCT
-# define PRODUCT Protorne Keyboard
-# undef MANUFACTURER
-# define MANUFACTURER Waffles
-
- // Remove OLED definitions?
-# undef USE_I2C
-# undef SSD1306OLED
-
- // Audio output on pin A5 (actualy will be output on B1 using keymap init)
-# ifdef AUDIO_ENABLE
-# define AUDIO_PIN A5
-# define MUSIC_MAP
-# endif
-
- // Set serial pin as D3 for sure
-# undef SOFT_SERIAL_PIN
-# define SOFT_SERIAL_PIN D3
-# define SERIAL_USART_SPEED 921600
-# define SERIAL_USART_DRIVER SD1
-# define SERIAL_USART_TX_PAL_MODE 7
-
- // Things to make RGB matrix work on the waffle board
-# undef RGBLED_NUM
-# define RGBLED_NUM 54
-# undef RGB_DI_PIN
-# define RGB_DI_PIN B5
-# ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 100
-# define RGB_MATRIX_SPLIT { 27, 27 }
-# endif
-# define WS2812_PWM_DRIVER PWMD3
-# define WS2812_PWM_CHANNEL 3
-# define WS2812_PWM_PAL_MODE 2
-# define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-# define WS2812_DMA_CHANNEL 3
-
- // OLED related code
-# ifdef OLED_ENABLE
-# define OLED_UPDATE_INTERVAL 100
-# endif
-
- // Encoder definitons
-# define ENCODERS_PAD_A { B2 }
-# define ENCODERS_PAD_B { B6 }
-# define ENCODER_RESOLUTIONS { 4 }
-# define ENCODERS_PAD_A_RIGHT { B2 }
-# define ENCODERS_PAD_B_RIGHT { B6 }
-# define ENCODER_RESOLUTIONS_RIGHT { 2 }
-#endif
diff --git a/layouts/community/split_3x6_3/bbaserdem/halconf.h b/layouts/community/split_3x6_3/bbaserdem/halconf.h
deleted file mode 100644
index f3978c4175..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/halconf.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#ifdef KEYBOARD_crkbd_rev1
- // #define HAL_USE_DAC TRUE
-# define HAL_USE_PWM TRUE
-# define HAL_USE_SERIAL TRUE
-# include_next <halconf.h>
-#endif
diff --git a/layouts/community/split_3x6_3/bbaserdem/keymap.c b/layouts/community/split_3x6_3/bbaserdem/keymap.c
deleted file mode 100644
index 589b8eda0c..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/keymap.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "bbaserdem.h"
-
-#ifdef KEYBOARD_crkbd_rev1
-# include "bb-oled-extra.h"
-#endif // KEYBOARD_crkbd_rev1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_split_3x6_3_wrapper(
- BB_ENC0,_BL1_5_,_BR1_5_,BB_ENC1,
- _BL2_1_,_BL2_5_,_BR2_5_,_BR2_1_,
- _BL3_1_,_BL3_5_,_BR3_5_,_BR3_1_,
- _BL4_3_,_BR4_3_
- ),
- [_CHAR] = LAYOUT_split_3x6_3_wrapper(
- _______,_CL1_5_,_CR1_5_,_______,
- XXXXXXX,_CL2_5_,_CR2_5_,XXXXXXX,
- XXXXXXX,_CL3_5_,_CR3_5_,XXXXXXX,
- _CL4_3_,_CR4_3_
- ),
- [_GAME] = LAYOUT_split_3x6_3_wrapper(
- _______,_GA1_5_,___6___,
- _GA2_1_,_GA2_5_,___6___,
- _GA3_1_,_GA3_5_,___6___,
- _GA4_3_,___3___
- ),
- [_MEDI] = LAYOUT_split_3x6_3_wrapper(
- ___6___,_ME1_5_,_______,
- ___6___,_ME2_5_,xxx1xxx,
- ___6___,_ME3_5_,xxx1xxx,
- ___3___,_ME4_3_
- ),
- [_NAVI] = LAYOUT_split_3x6_3_wrapper(
- ___6___,_NA1_5_,_______,
- ___6___,_NA2_5_,xxx1xxx,
- ___6___,_NA3_5_,xxx1xxx,
- ___3___,_NA4_3_
- ),
- [_SYMB] = LAYOUT_split_3x6_3_wrapper(
- ___6___,_SY1_5_,_______,
- ___6___,_SY2_5_,xxx1xxx,
- ___6___,_SY3_5_,xxx1xxx,
- ___3___,_SY4_3_
- ),
- [_NUMB] = LAYOUT_split_3x6_3_wrapper(
- _______,_NU1_5_,___6___,
- xxx1xxx,_NU2_5_,___6___,
- xxx1xxx,_NU3_5_,___6___,
- _NU4_3_,___3___
- ),
- [_FUNC] = LAYOUT_split_3x6_3_wrapper(
- _______,_FU1_5_,___6___,
- xxx1xxx,_FU2_5_,___6___,
- xxx1xxx,_FU3_5_,___6___,
- _FU4_3_,___3___
- ),
- [_MOUS] = LAYOUT_split_3x6_3_wrapper(
- _______,_MO1_5_,___6___,
- xxx1xxx,_MO2_5_,___6___,
- xxx1xxx,_MO3_5_,___6___,
- _MO4_3_,___3___
- ),
- [_MUSI] = LAYOUT_split_3x6_3_wrapper(
- _MU_12_,
- _MU_12_,
- _MU_12_,
- _MUL_3_,_MUR_3_
- )
-};
-
-// crkbd
-#ifdef KEYBOARD_crkbd_rev1
-#ifdef AUDIO_ENABLE
-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_split_3x6_3(
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- 0, 0, 0, 0, 0, 0
-);
-#endif // AUDIO_ENABLE
-void keyboard_pre_init_keymap(void) {
-# ifdef AUDIO_ENABLE
- //thank you to @sigprof for this
- // Set audio pins to analog mode
- palSetLineMode(A5, PAL_MODE_INPUT_ANALOG);
- palSetLineMode(B1, PAL_MODE_INPUT_ANALOG);
-# endif // AUDIO_ENABLE
-# ifdef RGB_MATRIX_ENABLE
- // Led locations are different on protorne; need to be fixed
- g_led_config = (led_config_t) { {
- // Logical Layout
- // 0 1 2 3 4 5 COLS
- // -LEFT ROWS
- // 16 17 18 19 20 21 0
- // 15 14 13 12 11 10 1
- // 04 05 06 07 08 09 2
- // 03 02 01 3
- // -Right
- // 21 20 19 18 17 16 4
- // 10 11 12 13 14 15 5
- // 09 08 07 06 05 04 6
- // 01 02 03 7
- { 15, 16, 17, 18, 19, 20},
- { 14, 13, 12, 11, 10, 9 },
- { 3, 4, 5, 6, 7, 8 },
- { NO_LED, NO_LED, NO_LED, 2, 1, 0 },
- { 47, 46, 45, 44, 43, 42 },
- { 36, 37, 38, 39, 40, 41 },
- { 35, 34, 33, 32, 31, 30 },
- { NO_LED, NO_LED, NO_LED, 27, 28, 29 }
- }, {
- // Physical Layout
- // LEFT RIGHT
- // 16 17 18 19 20 21 16 17 18 19 20 21
- // 24 23 22 24 23 22
- // 15 14 13 12 11 10 15 14 13 12 11 10
- // 25 27
- // 04 05 06 07 08 09 04 05 06 07 08 09
- // 26 27 25 26
- // 03 02 01 03 02 01
- { 95, 63 }, { 80, 58 }, { 60, 55 },
- { 0, 41 }, { 16, 42 }, { 33, 37 }, { 50, 35 }, { 68, 37 }, { 85, 39 },
- { 85, 21 }, { 68, 19 }, { 50, 13 }, { 33, 20 }, { 16, 24 }, { 0, 24 },
- { 0, 7 }, { 16, 7 }, { 33, 3 }, { 50, 0 }, { 68, 2 }, { 85, 4 },
- { 85, 16 }, { 50, 13 }, { 16, 20 }, { 16, 38 }, { 50, 48 }, { 85, 52 },
- { 164, 55 }, { 144, 58 }, { 129, 63 },
- { 139, 39 }, { 156, 37 }, { 174, 35 }, { 191, 37 }, { 208, 42 }, { 224, 41 },
- { 224, 24 }, { 208, 24 }, { 191, 20 }, { 174, 13 }, { 156, 19 }, { 139, 21 },
- { 139, 4 }, { 156, 2 }, { 174, 0 }, { 191, 3 }, { 208, 7 }, { 224, 7 },
- { 208, 20 }, { 174, 13 }, { 139, 16 }, { 139, 52 }, { 174, 48 }, { 208, 38 }
- }, {
- // (x---)8 stands for indicator
- // (-x--)4 stands for per-key led
- // (--x-)2 stands for underglow led
- // (---1)1 stands for modifier key
- 12, 12, 12,
- 4, 4, 5, 4, 4, 4,
- 4, 5, 5, 5, 5, 4,
- 4, 4, 4, 4, 4, 4,
- 10, 10, 10, 10, 10, 10,
- 12, 12, 12,
- 4, 4, 4, 5, 4, 4,
- 4, 5, 5, 5, 5, 4,
- 4, 4, 4, 4, 4, 4,
- 10, 10, 10, 10, 10, 10
- } };
-# endif // RGB_MATRIX_ENABLE
-}
-
-// Enable OPAMP1 as A5 → B1 follower
-#ifdef AUDIO_ENABLE
-void keyboard_post_init_keymap(void) {
- OPAMP3->CSR = OPAMP3_CSR_VMSEL_1 | OPAMP3_CSR_VMSEL_0 | OPAMP3_CSR_VPSEL_0 | OPAMP3_CSR_OPAMP3EN;
-}
-#endif // AUDIO_ENABLE
-
-#ifdef OLED_ENABLE
-// Flip the display on the right half
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
- if (!is_keyboard_left()) {
- return OLED_ROTATION_180;
- }
- return rotation;
-}
-
-bool oled_task_keymap(void) {
- if (is_keyboard_left()) {
- render_status_left(0, 0);
- } else {
- render_status_right(0, 0);
- }
- return false;
-}
-#endif // OLED_ENABLE
-#endif // KEYBOARD_crkbd_rev1
diff --git a/layouts/community/split_3x6_3/bbaserdem/mcuconf.h b/layouts/community/split_3x6_3/bbaserdem/mcuconf.h
deleted file mode 100644
index bde80b316f..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/mcuconf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#ifdef KEYBOARD_crkbd_rev1
-# include_next <mcuconf.h>
-# undef STM32_PWM_USE_TIM3
-# define STM32_PWM_USE_TIM3 TRUE
-# undef STM32_SERIAL_USE_USART1
-# define STM32_SERIAL_USE_USART1 TRUE
-#endif
diff --git a/layouts/community/split_3x6_3/bbaserdem/readme.md b/layouts/community/split_3x6_3/bbaserdem/readme.md
deleted file mode 100644
index c3dea2882f..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-This folder contains my [split\_3x6\_3](../../../default/split_3x6_3) board layouts
-Check out the [user readme](../../../../users/bbaserdem/readme.md) for more info.
-
-# Crkbd
-
-Using [this](https://github.com/ItsWaffIe/waffle_corne) Proton-C compatible PCB.
-
-Applying the similar keymap to [@waffle](https://github.com/ItsWaffIe/waffle_corne);
-using their `crkbd:rev1:arm` build.
-
-## Build
-
-Build commands;
-
-* For ARM: `CFLAGS="-Wno-error=deprecated" qmk flash -kb crkdb/rev1 -km bbaserdem -bl dfu-util-split-{left,right}`
diff --git a/layouts/community/split_3x6_3/bbaserdem/rules.mk b/layouts/community/split_3x6_3/bbaserdem/rules.mk
deleted file mode 100644
index 09619936da..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/rules.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021 Batuhan Başerdem
-# <baserdem.batuhan@gmail.com> @bbaserdem
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Corne keyboard; with ARM
-ifneq (,$(findstring crkbd/rev1,$(KEYBOARD)))
- # Proton C conversion
- MCU = STM32F303
- CTPC = yes
- # BOARD = QMK_PROTON_C
- # BOOTLOADER = stm32-dfu
- # My usual features
- AUDIO_ENABLE = yes
- BACKLIGHT_ENABLE = no
- ENCODER_ENABLE = yes
- RGB_MATRIX_ENABLE = yes
- OLED_ENABLE = yes
- # Features that take otherwise too much space
- WPM_ENABLE = yes
- NKRO_ENABLE = yes
- # Config
- SERIAL_DRIVER = usart
- WS2812_DRIVER = pwm
- AUDIO_DRIVER = dac_basic
- SPLIT_KEYBOARD = yes
- # These are from waffle
- DEBUG_MATRIX_SCAN_RATE_ENABLE = no # output matrix scan rate in qmk console/qmk toolbox
- QUANTUM_LIB_SRC += i2c_master.c #drivers/chibios/i2cmaster.h needs patch - see lines 27/28
- VIA_ENABLE = no
- # COMMAND_ENABLE = no
- # CONSOLE_ENABLE = no
- # BOOTMAGIC_ENABLE = lite
- # LTO_ENABLE = yes
- # PIMORONI_TRACKBALL = no
-endif
diff --git a/layouts/community/split_3x6_3/bbaserdem/ssd1306.c b/layouts/community/split_3x6_3/bbaserdem/ssd1306.c
deleted file mode 100644
index 4983248555..0000000000
--- a/layouts/community/split_3x6_3/bbaserdem/ssd1306.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Batuhan Başerdem
- * <baserdem.batuhan@gmail.com> @bbaserdem
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
diff --git a/layouts/community/split_3x6_3/bcat/keymap.c b/layouts/community/split_3x6_3/bcat/keymap.c
index b7cbfa1bfd..535950da53 100644
--- a/layouts/community/split_3x6_3/bcat/keymap.c
+++ b/layouts/community/split_3x6_3/bcat/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[LAYER_LOWER] = LAYOUT_split_3x6_3(
MC_ALTT, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
KY_CSPC, KY_ZMRST, KY_ZMOUT, KY_ZMIN, KC_WBAK, KC_WFWD, KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_TILD,
- _______, KC_APP, KC_PSCR, KC_SLCK, KC_PAUS, KC_LGUI, KC_BSLS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_GRV,
+ _______, KC_APP, KC_PSCR, KC_SCRL, KC_PAUS, KC_LGUI, KC_BSLS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_GRV,
_______, _______, _______, _______, _______, _______
),
/* Raise layer: http://www.keyboard-layout-editor.com/#/gists/08b44355d4ca85d294bad9e2821f91d7 */
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
/* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee */
[LAYER_ADJUST] = LAYOUT_split_3x6_3(
- _______, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______,
+ _______, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, EE_CLR, QK_BOOT, _______, _______, _______, _______,
_______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, RGB_RMOD, RGB_VAD, RGB_VAI, RGB_MOD, RGB_SPI, _______,
_______, _______, _______, KC_MUTE, _______, _______, RGB_HUI, RGB_SAD, RGB_SAI, RGB_HUD, RGB_SPD, _______,
_______, _______, _______, RGB_TOG, _______, _______
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h
index cfcb873a80..0944e37077 100644
--- a/layouts/community/split_3x6_3/drashna/config.h
+++ b/layouts/community/split_3x6_3/drashna/config.h
@@ -46,9 +46,8 @@
# endif
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
# ifndef RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
@@ -87,9 +86,9 @@
#undef PRODUCT
#ifdef CONVERT_TO_PROTON_C
-# define PRODUCT Drashna Hacked ARM Corne Keyboard
+# define PRODUCT "Drashna Hacked ARM Corne Keyboard"
#else
-# define PRODUCT Drashna Hacked Corne Keyboard
+# define PRODUCT "Drashna Hacked Corne Keyboard"
#endif
#define TAPPING_TERM_PER_KEY
diff --git a/layouts/community/tkl_ansi/brandonschlack/config.h b/layouts/community/tkl_ansi/brandonschlack/config.h
index df29654049..f7a21c81b0 100644
--- a/layouts/community/tkl_ansi/brandonschlack/config.h
+++ b/layouts/community/tkl_ansi/brandonschlack/config.h
@@ -16,5 +16,14 @@
#pragma once
// Explicit RGB Animation Mode Include
-#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
+
#define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation
diff --git a/layouts/community/tkl_ansi/xyverz/keymap.c b/layouts/community/tkl_ansi/xyverz/keymap.c
index aec179bc12..9e08884f8c 100644
--- a/layouts/community/tkl_ansi/xyverz/keymap.c
+++ b/layouts/community/tkl_ansi/xyverz/keymap.c
@@ -13,7 +13,7 @@ enum planck_keycodes { DVORAK = SAFE_RANGE, QWERTY, COLEMAK };
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QW] = LAYOUT_tkl_ansi( /* Layer 0: Qwerty */ \
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, \
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_DV] = LAYOUT_tkl_ansi( /* Layer 1: Dvorak */ \
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, \
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, \
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \
KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, \
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_CM] = LAYOUT_tkl_ansi( /* Layer 2: Colemak */ \
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, \
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, \
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \
KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, \
diff --git a/layouts/community/tkl_ansi/yanfali/keymap.c b/layouts/community/tkl_ansi/yanfali/keymap.c
index 9cdc0c4149..a63f7e10f4 100644
--- a/layouts/community/tkl_ansi/yanfali/keymap.c
+++ b/layouts/community/tkl_ansi/yanfali/keymap.c
@@ -8,7 +8,7 @@ enum _layer {
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT_tkl_ansi( \
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SCRL,KC_PAUS, \
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_INS, KC_HOME,KC_PGUP, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSLS, KC_DEL, KC_END, KC_PGDN, \
MT(MOD_LCTL, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, \
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LALT,KC_LGUI, KC_SPC, KC_RGUI,KC_RGUI,MO(FN) ,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
[FN] = LAYOUT_tkl_ansi( \
_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, KC_WAKE,KC_PWR, KC_SLEP, \
- _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,EEP_RST, _______,_______,KC_VOLU, \
+ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,EE_CLR, _______,_______,KC_VOLU, \
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,QK_BOOT, _______,_______,KC_VOLD, \
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, \
_______,_______,_______,_______,_______,_______,_______,KC_MUTE,KC_VOLD,KC_VOLU,_______, _______, KC_MPLY, \
diff --git a/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c b/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c
index c2bd4fa1b0..be081ed647 100644
--- a/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c
+++ b/layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
*/
[_BASE] = LAYOUT_60_ansi_arrow(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH,
diff --git a/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c b/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c
index 8f240beaba..4e753c2f4c 100644
--- a/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c
+++ b/layouts/default/60_ansi_arrow_split_bs_7u_spc/default_60_ansi_arrow_split_bs_7u_spc/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
*/
[_BASE] = LAYOUT_60_ansi_arrow_split_bs_7u_spc(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH,
diff --git a/layouts/default/65_ansi/default_65_ansi/keymap.c b/layouts/default/65_ansi/default_65_ansi/keymap.c
index e206bd7851..6c9199c1e8 100644
--- a/layouts/default/65_ansi/default_65_ansi/keymap.c
+++ b/layouts/default/65_ansi/default_65_ansi/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_65_ansi(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_ansi_blocker/default_65_ansi_blocker/keymap.c b/layouts/default/65_ansi_blocker/default_65_ansi_blocker/keymap.c
index 7036e7295f..b134a5e6c7 100644
--- a/layouts/default/65_ansi_blocker/default_65_ansi_blocker/keymap.c
+++ b/layouts/default/65_ansi_blocker/default_65_ansi_blocker/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_65_ansi_blocker(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_ansi_blocker_split_bs/default_65_ansi_blocker_split_bs/keymap.c b/layouts/default/65_ansi_blocker_split_bs/default_65_ansi_blocker_split_bs/keymap.c
index 6bca761830..099e714395 100644
--- a/layouts/default/65_ansi_blocker_split_bs/default_65_ansi_blocker_split_bs/keymap.c
+++ b/layouts/default/65_ansi_blocker_split_bs/default_65_ansi_blocker_split_bs/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_65_ansi_blocker_split_bs(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_ansi_blocker_tsangan/default_65_ansi_blocker_tsangan/keymap.c b/layouts/default/65_ansi_blocker_tsangan/default_65_ansi_blocker_tsangan/keymap.c
index f899242ed4..b5935888d4 100644
--- a/layouts/default/65_ansi_blocker_tsangan/default_65_ansi_blocker_tsangan/keymap.c
+++ b/layouts/default/65_ansi_blocker_tsangan/default_65_ansi_blocker_tsangan/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_65_ansi_blocker_tsangan(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_ansi_blocker_tsangan_split_bs/default_65_ansi_blocker_tsangan_split_bs/keymap.c b/layouts/default/65_ansi_blocker_tsangan_split_bs/default_65_ansi_blocker_tsangan_split_bs/keymap.c
index 446d2c72ab..eef519f090 100644
--- a/layouts/default/65_ansi_blocker_tsangan_split_bs/default_65_ansi_blocker_tsangan_split_bs/keymap.c
+++ b/layouts/default/65_ansi_blocker_tsangan_split_bs/default_65_ansi_blocker_tsangan_split_bs/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_ansi_split_bs/default_65_ansi_split_bs/keymap.c b/layouts/default/65_ansi_split_bs/default_65_ansi_split_bs/keymap.c
index be974060e7..e1dacf6067 100644
--- a/layouts/default/65_ansi_split_bs/default_65_ansi_split_bs/keymap.c
+++ b/layouts/default/65_ansi_split_bs/default_65_ansi_split_bs/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_65_ansi_split_bs(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_iso/default_65_iso/keymap.c b/layouts/default/65_iso/default_65_iso/keymap.c
index 833945bebf..245b542c13 100644
--- a/layouts/default/65_iso/default_65_iso/keymap.c
+++ b/layouts/default/65_iso/default_65_iso/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_65_iso(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SLCK, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_iso_blocker/default_65_iso_blocker/keymap.c b/layouts/default/65_iso_blocker/default_65_iso_blocker/keymap.c
index 9e1f99afaa..1b1cbce8c4 100644
--- a/layouts/default/65_iso_blocker/default_65_iso_blocker/keymap.c
+++ b/layouts/default/65_iso_blocker/default_65_iso_blocker/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_65_iso_blocker(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SLCK, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_iso_blocker_split_bs/default_65_iso_blocker_split_bs/keymap.c b/layouts/default/65_iso_blocker_split_bs/default_65_iso_blocker_split_bs/keymap.c
index a816c3746a..33ebc159ad 100644
--- a/layouts/default/65_iso_blocker_split_bs/default_65_iso_blocker_split_bs/keymap.c
+++ b/layouts/default/65_iso_blocker_split_bs/default_65_iso_blocker_split_bs/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_65_iso_blocker_split_bs(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SLCK, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_iso_blocker_tsangan/default_65_iso_blocker_tsangan/keymap.c b/layouts/default/65_iso_blocker_tsangan/default_65_iso_blocker_tsangan/keymap.c
index 7a0197df19..4dbd379f89 100644
--- a/layouts/default/65_iso_blocker_tsangan/default_65_iso_blocker_tsangan/keymap.c
+++ b/layouts/default/65_iso_blocker_tsangan/default_65_iso_blocker_tsangan/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_65_iso_blocker_tsangan(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SLCK, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_iso_blocker_tsangan_split_bs/default_65_iso_blocker_tsangan_split_bs/keymap.c b/layouts/default/65_iso_blocker_tsangan_split_bs/default_65_iso_blocker_tsangan_split_bs/keymap.c
index c5b5dad8a1..fa21d951bd 100644
--- a/layouts/default/65_iso_blocker_tsangan_split_bs/default_65_iso_blocker_tsangan_split_bs/keymap.c
+++ b/layouts/default/65_iso_blocker_tsangan_split_bs/default_65_iso_blocker_tsangan_split_bs/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_65_iso_blocker_tsangan_split_bs(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SLCK, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
diff --git a/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c b/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c
index 70c91a43b2..4cd8ddd53b 100644
--- a/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c
+++ b/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[1] = LAYOUT_65_iso_split_bs(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SLCK, _______,
+ _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______