aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2018-05-03 07:56:12 -0700
committerDrashna Jaelre <drashna@live.com>2018-05-03 07:56:12 -0700
commit72b276bd8f94ac5fb2a91a01d2351d853a1e6ee3 (patch)
tree8ba2eb33a9f2f3c44c5f6ca4f84d3b3d6ae56b3b
parentc52b3c6126228b571891d2ad6553913a6cc7ebf4 (diff)
downloadqmk_firmware-72b276bd8f94ac5fb2a91a01d2351d853a1e6ee3.tar.gz
qmk_firmware-72b276bd8f94ac5fb2a91a01d2351d853a1e6ee3.zip
QMK Configurator updates: Atom47, Atomic and Atreus (#2883)
* QMK Configurator update for Alpha 28-key * QMK Configurator update for AMJ40 * QMK Configurator update for AMJ Pad * QMK Configurator update for Atom47 * QMK Configurator update for OLKB Atomic * QMK Configurator updates: Atom47 and Atreus * QMK Configurator updates: Atom47 and Atreus * QMK Configurator update for OLKB Atomic and Atreus * QMK C10R: Attempting fixes for Atreus keymap errors * QMK C10R: Attempting fixes for Atreus keymap errors * QMK Configurator: Bug fixes for Atreus keymaps
Diffstat
-rw-r--r--keyboards/atom47/keymaps/default/keymap.c10
-rw-r--r--keyboards/atom47/keymaps/maartenwut/keymap.c8
-rw-r--r--keyboards/atom47/rev2/keymaps/LEdiodes/keymap.c10
-rw-r--r--keyboards/atom47/rev2/keymaps/default/keymap.c10
-rw-r--r--keyboards/atomic/atomic.h6
-rw-r--r--keyboards/atomic/keymaps/abienz.c49
-rw-r--r--keyboards/atomic/keymaps/default/keymap.c295
-rw-r--r--keyboards/atomic/keymaps/michelle.c345
-rw-r--r--keyboards/atomic/keymaps/pvc/keymap.c259
-rw-r--r--keyboards/atomic/keymaps/twolayer.c116
-rw-r--r--keyboards/atreus/atreus.h2
-rw-r--r--keyboards/atreus/info.json13
-rw-r--r--keyboards/atreus/keymaps/alphadox/keymap.c15
-rw-r--r--keyboards/atreus/keymaps/classic/keymap.c35
-rw-r--r--keyboards/atreus/keymaps/default/keymap.c79
-rw-r--r--keyboards/atreus/keymaps/dvorak_42_key/keymap.c105
-rw-r--r--keyboards/atreus/keymaps/erlandsona/keymap.c60
-rw-r--r--keyboards/atreus/keymaps/gerb/keymap.c83
-rw-r--r--keyboards/atreus/keymaps/henxing/keymap.c152
-rw-r--r--keyboards/atreus/keymaps/jeremy/keymap.c70
-rw-r--r--keyboards/atreus/keymaps/khitsule/keymap.c49
-rw-r--r--keyboards/atreus/keymaps/replicaJunction/keymap.c283
-rw-r--r--keyboards/atreus/keymaps/xk/keymap.c357
-rw-r--r--keyboards/atreus/keymaps/xyverz/keymap.c203
24 files changed, 1307 insertions, 1307 deletions
diff --git a/keyboards/atom47/keymaps/default/keymap.c b/keyboards/atom47/keymaps/default/keymap.c
index 233ff2b8b..945e66ab7 100644
--- a/keyboards/atom47/keymaps/default/keymap.c
+++ b/keyboards/atom47/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
1#include "atom47.h" 1#include QMK_KEYBOARD_H
2 2
3// Each layer gets a name for readability, which is then used in the keymap matrix below. 3// Each layer gets a name for readability, which is then used in the keymap matrix below.
4// The underscores don't mean anything - you can have a layer called STUFF or any other name. 4// The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -13,25 +13,25 @@
13#define _______ KC_TRNS 13#define _______ KC_TRNS
14 14
15const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 15const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
16[_MA] = KEYMAP_ANSI( 16[_MA] = LAYOUT_ansi(
17 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, \ 17 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, \
18 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ 18 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \
19 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(_FN1), \ 19 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(_FN1), \
20 KC_LCTL, KC_LGUI, KC_LALT, MO(_PN), KC_SPC, KC_SPC, MO(_FN), KC_RALT, KC_APP, KC_RCTRL), \ 20 KC_LCTL, KC_LGUI, KC_LALT, MO(_PN), KC_SPC, KC_SPC, MO(_FN), KC_RALT, KC_APP, KC_RCTRL), \
21 21
22[_FN] = KEYMAP_ANSI( 22[_FN] = LAYOUT_ansi(
23 _______, KC_VOLD, KC_VOLU, KC_MUTE, RESET, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, \ 23 _______, KC_VOLD, KC_VOLU, KC_MUTE, RESET, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, \
24 KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, _______, \ 24 KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, _______, \
25 _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC, BL_INC, _______, _______, \ 25 _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC, BL_INC, _______, _______, \
26 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \ 26 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \
27 27
28[_FN1] = KEYMAP_ANSI( 28[_FN1] = LAYOUT_ansi(
29 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, \ 29 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, \
30 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, \ 30 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, \
31 _______, _______, _______, _______, _______, KC_QUOT, KC_SLSH, KC_LBRC, KC_RBRC, KC_BSLS, KC_RSFT, _______, \ 31 _______, _______, _______, _______, _______, KC_QUOT, KC_SLSH, KC_LBRC, KC_RBRC, KC_BSLS, KC_RSFT, _______, \
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \ 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \
33 33
34[_PN] = KEYMAP_ANSI( 34[_PN] = LAYOUT_ansi(
35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
36 RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, \ 36 RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, \
37 RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, \ 37 RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/atom47/keymaps/maartenwut/keymap.c b/keyboards/atom47/keymaps/maartenwut/keymap.c
index d526d836c..abe63a41e 100644
--- a/keyboards/atom47/keymaps/maartenwut/keymap.c
+++ b/keyboards/atom47/keymaps/maartenwut/keymap.c
@@ -1,4 +1,4 @@
1#include "atom47.h" 1#include QMK_KEYBOARD_H
2 2
3// Each layer gets a name for readability, which is then used in the keymap matrix below. 3// Each layer gets a name for readability, which is then used in the keymap matrix below.
4// The underscores don't mean anything - you can have a layer called STUFF or any other name. 4// The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -19,19 +19,19 @@ enum custom_keycodes {
19}; 19};
20 20
21const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 21const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
22[_MA] = KEYMAP_ANSI( 22[_MA] = LAYOUT_ansi(
23 KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, \ 23 KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, \
24 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ 24 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \
25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ 25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
26 KC_LCTL, KC_LGUI, KC_LALT, MO(_LO), KC_SPC, KC_SPC, MO(_RA), KC_RALT, KC_APP, KC_RCTRL), \ 26 KC_LCTL, KC_LGUI, KC_LALT, MO(_LO), KC_SPC, KC_SPC, MO(_RA), KC_RALT, KC_APP, KC_RCTRL), \
27 27
28[_LO] = KEYMAP_ANSI( 28[_LO] = LAYOUT_ansi(
29 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, \ 29 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, \
30 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, \ 30 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, \
31 _______, CTRLZ, CTRLX, CTRLC, CTRLV, _______, _______, KC_QUOT, KC_LBRC, KC_RBRC, KC_BSLS, _______, \ 31 _______, CTRLZ, CTRLX, CTRLC, CTRLV, _______, _______, KC_QUOT, KC_LBRC, KC_RBRC, KC_BSLS, _______, \
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET), \ 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET), \
33 33
34[_RA] = KEYMAP_ANSI( 34[_RA] = LAYOUT_ansi(
35 _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, \ 35 _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, \
36 KC_CAPS, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, \ 36 KC_CAPS, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, \
37 _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY, KC_PSCR, \ 37 _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY, KC_PSCR, \
diff --git a/keyboards/atom47/rev2/keymaps/LEdiodes/keymap.c b/keyboards/atom47/rev2/keymaps/LEdiodes/keymap.c
index 75c8654ba..b987c433f 100644
--- a/keyboards/atom47/rev2/keymaps/LEdiodes/keymap.c
+++ b/keyboards/atom47/rev2/keymaps/LEdiodes/keymap.c
@@ -1,4 +1,4 @@
1#include "atom47.h" 1#include QMK_KEYBOARD_H
2 2
3// These are all aliases for the function layers. 3// These are all aliases for the function layers.
4#define _L0 0 4#define _L0 0
@@ -9,25 +9,25 @@
9#define _______ KC_TRNS 9#define _______ KC_TRNS
10 10
11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
12[_L0] = KEYMAP_ANSI( 12[_L0] = LAYOUT_ansi(
13 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, \ 13 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, \
14 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ 14 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \
15 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(_L1), \ 15 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(_L1), \
16 KC_LCTL, KC_LGUI, KC_LALT, TG(_L3), KC_SPC, KC_SPC, MO(_L2), KC_RALT, KC_APP, KC_RCTRL), \ 16 KC_LCTL, KC_LGUI, KC_LALT, TG(_L3), KC_SPC, KC_SPC, MO(_L2), KC_RALT, KC_APP, KC_RCTRL), \
17 17
18[_L2] = KEYMAP_ANSI( 18[_L2] = LAYOUT_ansi(
19 _______, KC_VOLD, KC_VOLU, KC_MUTE, RESET, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, \ 19 _______, KC_VOLD, KC_VOLU, KC_MUTE, RESET, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, \
20 KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, _______, \ 20 KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, _______, \
21 _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC, BL_INC, _______, _______, \ 21 _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC, BL_INC, _______, _______, \
22 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \ 22 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \
23 23
24[_L1] = KEYMAP_ANSI( 24[_L1] = LAYOUT_ansi(
25 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, \ 25 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, \
26 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, \ 26 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, \
27 _______, _______, _______, _______, _______, KC_QUOT, KC_SLSH, KC_LBRC, KC_RBRC, KC_BSLS, KC_RSFT, _______, \ 27 _______, _______, _______, _______, _______, KC_QUOT, KC_SLSH, KC_LBRC, KC_RBRC, KC_BSLS, KC_RSFT, _______, \
28 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \ 28 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \
29 29
30[_L3] = KEYMAP_ANSI( 30[_L3] = LAYOUT_ansi(
31 _______, _______, _______, KC_7, KC_8, KC_9, _______, _______, _______, _______, _______, _______, _______, \ 31 _______, _______, _______, KC_7, KC_8, KC_9, _______, _______, _______, _______, _______, _______, _______, \
32 _______, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, _______, _______, _______, \ 32 _______, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, _______, _______, _______, \
33 _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, _______, _______, _______, _______, \ 33 _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/atom47/rev2/keymaps/default/keymap.c b/keyboards/atom47/rev2/keymaps/default/keymap.c
index 1473863c4..5f74416ce 100644
--- a/keyboards/atom47/rev2/keymaps/default/keymap.c
+++ b/keyboards/atom47/rev2/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
1#include "atom47.h" 1#include QMK_KEYBOARD_H
2 2
3// Each layer gets a name for readability, which is then used in the keymap matrix below. 3// Each layer gets a name for readability, which is then used in the keymap matrix below.
4// The underscores don't mean anything - you can have a layer called STUFF or any other name. 4// The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -13,25 +13,25 @@
13#define _______ KC_TRNS 13#define _______ KC_TRNS
14 14
15const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 15const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
16[_MA] = KEYMAP_ANSI( 16[_MA] = LAYOUT_ansi(
17 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, \ 17 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, \
18 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ 18 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \
19 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(_FN1), \ 19 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(_FN1), \
20 KC_LCTL, KC_LGUI, KC_LALT, MO(_PN), KC_SPC, KC_SPC, MO(_FN), KC_RALT, KC_APP, KC_RCTRL), \ 20 KC_LCTL, KC_LGUI, KC_LALT, MO(_PN), KC_SPC, KC_SPC, MO(_FN), KC_RALT, KC_APP, KC_RCTRL), \
21 21
22[_FN] = KEYMAP_ANSI( 22[_FN] = LAYOUT_ansi(
23 _______, KC_VOLD, KC_VOLU, KC_MUTE, RESET, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, \ 23 _______, KC_VOLD, KC_VOLU, KC_MUTE, RESET, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, \
24 KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, _______, \ 24 KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, _______, \
25 _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC, BL_INC, _______, _______, \ 25 _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC, BL_INC, _______, _______, \
26 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \ 26 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \
27 27
28[_FN1] = KEYMAP_ANSI( 28[_FN1] = LAYOUT_ansi(
29 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, \ 29 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, \
30 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, \ 30 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, \
31 _______, _______, _______, _______, _______, KC_QUOT, KC_SLSH, KC_LBRC, KC_RBRC, KC_BSLS, KC_RSFT, _______, \ 31 _______, _______, _______, _______, _______, KC_QUOT, KC_SLSH, KC_LBRC, KC_RBRC, KC_BSLS, KC_RSFT, _______, \
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \ 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \
33 33
34[_PN] = KEYMAP_ANSI( 34[_PN] = LAYOUT_ansi(
35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/atomic/atomic.h b/keyboards/atomic/atomic.h
index b7ceb68d0..a22029f76 100644
--- a/keyboards/atomic/atomic.h
+++ b/keyboards/atomic/atomic.h
@@ -10,7 +10,7 @@
10// The following is an example using the Planck MIT layout 10// The following is an example using the Planck MIT layout
11// The first section contains all of the arguements 11// The first section contains all of the arguements
12// The second converts the arguments into a two-dimensional array 12// The second converts the arguments into a two-dimensional array
13#define KEYMAP_SEMI_STANDARD( \ 13#define LAYOUT_semi_standard( \
14 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \ 14 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
15 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ 15 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
16 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ 16 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
@@ -24,7 +24,7 @@
24 { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E } \ 24 { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E } \
25} 25}
26 26
27#define KEYMAP_GRID( \ 27#define LAYOUT_grid( \
28 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\ 28 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
29 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\ 29 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
30 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,\ 30 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,\
@@ -38,6 +38,6 @@
38 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E } \ 38 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E } \
39} 39}
40 40
41#define LAYOUT_ortho_5x15 KEYMAP_GRID 41#define LAYOUT_ortho_5x15 LAYOUT_grid
42 42
43#endif \ No newline at end of file 43#endif \ No newline at end of file
diff --git a/keyboards/atomic/keymaps/abienz.c b/keyboards/atomic/keymaps/abienz.c
index 589a64dc4..2e69165f2 100644
--- a/keyboards/atomic/keymaps/abienz.c
+++ b/keyboards/atomic/keymaps/abienz.c
@@ -1,36 +1,33 @@
1#include "atomic.h" 1#include QMK_KEYBOARD_H
2 2
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [0] = { /* Colemak */ 4 [0] = LAYOUT_grid( /* Colemak */
5 { KC_ESC, 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_NO }, 5 KC_ESC, 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_NO ,
6 { KC_TAB, CM_Q, CM_W, CM_F, CM_P, CM_G, CM_J, CM_L, CM_U, CM_Y, CM_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, 6 KC_TAB, CM_Q, CM_W, CM_F, CM_P, CM_G, CM_J, CM_L, CM_U, CM_Y, CM_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL ,
7 { KC_BSPC, CM_A, CM_R, CM_S, CM_T, CM_D, CM_H, CM_N, CM_E, CM_I, CM_O, KC_QUOT, KC_ENT, KC_NO, KC_PGUP }, 7 KC_BSPC, CM_A, CM_R, CM_S, CM_T, CM_D, CM_H, CM_N, CM_E, CM_I, CM_O, KC_QUOT, KC_ENT, KC_NO, KC_PGUP,
8 { KC_LSFT, CM_Z, CM_X, CM_C, CM_V, CM_B, CM_K, CM_M, CM_COMM, CM_DOT, CM_SLSH, KC_RSFT, KC_NO, KC_UP, KC_PGDN }, 8 KC_LSFT, CM_Z, CM_X, CM_C, CM_V, CM_B, CM_K, CM_M, CM_COMM, CM_DOT, CM_SLSH, KC_RSFT, KC_NO, KC_UP, KC_PGDN,
9 { KC_LCTL, KC_LGUI, KC_NO, KC_LALT, FUNC(1), KC_SPC, KC_NO, KC_RALT, FUNC(2), KC_RGUI, KC_NO, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, 9 KC_LCTL, KC_LGUI, KC_NO, KC_LALT, FUNC(1), KC_SPC, KC_NO, KC_RALT, FUNC(2), KC_RGUI, KC_NO, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT,
10 }, 10 ),
11 [1] = { /* function */ 11 [1] = LAYOUT_grid( /* function */
12 { 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_BSPC, KC_NO }, 12 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_BSPC, KC_NO ,
13 { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS }, 13 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
14 { KC_TRNS, KC_TRNS, KC_TRNS, KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS }, 14 KC_TRNS, KC_TRNS, KC_TRNS, KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
15 { KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MPLY }, 15 KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MPLY,
16 { KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, FUNC(1), KC_TRNS, KC_NO, KC_TRNS, FUNC(2), KC_TRNS, KC_NO, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT }, 16 KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, FUNC(1), KC_TRNS, KC_NO, KC_TRNS, FUNC(2), KC_TRNS, KC_NO, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT,
17 } 17 ),
18}; 18};
19 19
20const uint16_t PROGMEM fn_actions[] = { 20const uint16_t PROGMEM fn_actions[] = {
21 [1] = ACTION_LAYER_MOMENTARY(1), 21 [1] = ACTION_LAYER_MOMENTARY(1),
22 [2] = ACTION_LAYER_MOMENTARY(1), 22 [2] = ACTION_LAYER_MOMENTARY(1),
23
24}; 23};
25 24
26const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 25const macro_t * action_get_macro(keyrecord_t * record, uint8_t id, uint8_t opt) {
27{
28 // MACRODOWN only works in this function 26 // MACRODOWN only works in this function
29 switch(id) { 27 switch (id) {
30 case 0: 28 case 0:
31 return MACRODOWN(TYPE(KC_T), END); 29 return MACRODOWN(TYPE(KC_T), END);
32 break; 30 break;
33 } 31 }
34 return MACRO_NONE; 32 return MACRO_NONE;
35}; 33};
36
diff --git a/keyboards/atomic/keymaps/default/keymap.c b/keyboards/atomic/keymaps/default/keymap.c
index 0ede363a1..ae1efb2b6 100644
--- a/keyboards/atomic/keymaps/default/keymap.c
+++ b/keyboards/atomic/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
1#include "atomic.h" 1#include QMK_KEYBOARD_H
2 2
3// Fillers to make layering more clear 3// Fillers to make layering more clear
4#define _______ KC_TRNS 4#define _______ KC_TRNS
@@ -21,7 +21,7 @@
21 * | KEY . XXXXXX | 21 * | KEY . XXXXXX |
22 * '-----------------' 22 * '-----------------'
23 */ 23 */
24 24
25/* ROW 2 OPTIONS 25/* ROW 2 OPTIONS
26 * .--------------------------------------------------------------------------------------------------------------------------------------. 26 * .--------------------------------------------------------------------------------------------------------------------------------------.
27 * | | | | | | | | | | | | | | | | 27 * | | | | | | | | | | | | | | | |
@@ -30,7 +30,7 @@
30 * | KEY . XXXXXX | | KEY . XXXXXX | 30 * | KEY . XXXXXX | | KEY . XXXXXX |
31 * '-----------------' '-----------------' 31 * '-----------------' '-----------------'
32 */ 32 */
33 33
34/* ROW 3 OPTIONS 34/* ROW 3 OPTIONS
35 * .--------------------------------------------------------------------------------------------------------------------------------------. 35 * .--------------------------------------------------------------------------------------------------------------------------------------.
36 * | | | | | | | | | | | | | | | | 36 * | | | | | | | | | | | | | | | |
@@ -42,7 +42,7 @@
42 * | X | 42 * | X |
43 * '-----------------' 43 * '-----------------'
44 */ 44 */
45 45
46/* ROW 4 OPTIONS 46/* ROW 4 OPTIONS
47 * .--------------------------------------------------------------------------------------------------------------------------------------. 47 * .--------------------------------------------------------------------------------------------------------------------------------------.
48 * | | | | | | | | | | | | | | | | 48 * | | | | | | | | | | | | | | | |
@@ -78,157 +78,156 @@
78 78
79const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 79const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
80 80
81/* QWERTY - MIT ENHANCED / GRID COMPATIBLE 81 /* QWERTY - MIT ENHANCED / GRID COMPATIBLE
82 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. 82 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
83 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | 83 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP |
84 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 84 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
85 * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL | 85 * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL |
86 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| 86 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
87 * | ESC | A | S | D | F | G | H | J | K | L | ; | ' | XXXXXX . ENTER | PG UP | 87 * | ESC | A | S | D | F | G | H | J | K | L | ; | ' | XXXXXX . ENTER | PG UP |
88 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| 88 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
89 * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | 89 * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN |
90 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| 90 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
91 * | BRITE | LCTRL | LALT | LGUI | RAISE | XXXXXX . SPACE | LOWER | RGUI | RALT | RCTRL | FN | LEFT | DOWN | RIGHT | 91 * | BRITE | LCTRL | LALT | LGUI | RAISE | XXXXXX . SPACE | LOWER | RGUI | RALT | RCTRL | FN | LEFT | DOWN | RIGHT |
92 * '--------------------------------------------------------------------------------------------------------------------------------------' 92 * '--------------------------------------------------------------------------------------------------------------------------------------'
93 */ 93 */
94
95 [_QW] = { /* QWERTY */
96 { 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_BSPC },
97 { 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 },
98 { 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, KC_ENT, KC_PGUP },
99 { 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_RSFT, KC_UP, KC_PGDN },
100 { M(0), KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC, KC_SPC, MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT },
101 },
102
103/* COLEMAK - MIT ENHANCED / GRID COMPATIBLE
104 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
105 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP |
106 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
107 * | TAB | Q | W | F | P | G | J | L | U | Y | ; | [ | ] | \ | DEL |
108 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
109 * | ESC | A | R | S | T | D | H | N | E | I | O | ' | XXXXXX . ENTER | PG UP |
110 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
111 * | LSHIFT | Z | X | C | V | B | K | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN |
112 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
113 * | BRITE | LCTRL | LALT | LGUI | RAISE | XXXXXX . SPACE | LOWER | RGUI | RALT | RCTRL | FN | LEFT | DOWN | RIGHT |
114 * '--------------------------------------------------------------------------------------------------------------------------------------'
115 */
116
117 [_CM] = { /* COLEMAK */
118 { 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_BSPC },
119 { 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 },
120 { KC_ESC, 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_ENT, KC_PGUP },
121 { 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_RSFT, KC_UP, KC_PGDN },
122 { M(0), KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC, KC_SPC, MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT },
123 },
124
125/* DVORAK - MIT ENHANCED / GRID COMPATIBLE
126 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
127 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP |
128 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
129 * | TAB | ' | , | . | P | Y | F | G | C | R | L | [ | ] | \ | DEL |
130 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
131 * | ESC | A | O | E | U | I | D | H | T | N | S | / | XXXXXX . ENTER | PG UP |
132 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
133 * | LSHIFT | ; | Q | J | K | X | B | M | W | V | Z | XXXXXX . RSHIFT | UP | PG DN |
134 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
135 * | BRITE | LCTRL | LALT | LGUI | RAISE | XXXXXX . SPACE | LOWER | RGUI | RALT | RCTRL | FN | LEFT | DOWN | RIGHT |
136 * '--------------------------------------------------------------------------------------------------------------------------------------'
137 */
138 94
139 [_DV] = { /* DVORAK */ 95 [_QW] = LAYOUT_grid( /* QWERTY */
140 { 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_BSPC }, 96 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_BSPC,
141 { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, 97 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 ,
142 { KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, KC_ENT, KC_ENT, KC_PGUP }, 98 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, KC_ENT, KC_PGUP,
143 { 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_RSFT, KC_UP, KC_PGDN }, 99 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_RSFT, KC_UP, KC_PGDN,
144 { M(0), KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC, KC_SPC, MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT }, 100 M(0), KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC, KC_SPC, MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
145 }, 101 ),
146 102
147/* LOWERED 103 /* COLEMAK - MIT ENHANCED / GRID COMPATIBLE
148 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. 104 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
149 * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . | 105 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP |
150 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 106 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
151 * | | ! | @ | # | $ | % | ^ | & | * | ( | ) | | | | INS | 107 * | TAB | Q | W | F | P | G | J | L | U | Y | ; | [ | ] | \ | DEL |
152 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| 108 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
153 * | | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | XXXXXX . | | 109 * | ESC | A | R | S | T | D | H | N | E | I | O | ' | XXXXXX . ENTER | PG UP |
154 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| 110 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
155 * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | | XXXXXX . | | | 111 * | LSHIFT | Z | X | C | V | B | K | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN |
156 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| 112 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
157 * | | | | | | XXXXXX . | | | | | | | | | 113 * | BRITE | LCTRL | LALT | LGUI | RAISE | XXXXXX . SPACE | LOWER | RGUI | RALT | RCTRL | FN | LEFT | DOWN | RIGHT |
158 * '--------------------------------------------------------------------------------------------------------------------------------------' 114 * '--------------------------------------------------------------------------------------------------------------------------------------'
159 */ 115 */
160 116
161 [_LW] = { /* LOWERED */ 117 [_CM] = LAYOUT_grid( /* COLEMAK */
162 { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, 118 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_BSPC,
163 { _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS }, 119 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 ,
164 { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______ }, 120 KC_ESC, 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_ENT, KC_PGUP,
165 { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, ___T___, ___T___, _______, _______ }, 121 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_RSFT, KC_UP, KC_PGDN,
166 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, 122 M(0), KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC, KC_SPC, MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
167 }, 123 ),
168 124
169/* RAISED 125 /* DVORAK - MIT ENHANCED / GRID COMPATIBLE
170 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. 126 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
171 * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . | 127 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP |
172 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 128 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
173 * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | | | INS | 129 * | TAB | ' | , | . | P | Y | F | G | C | R | L | [ | ] | \ | DEL |
174 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| 130 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
175 * | | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | XXXXXX . | | 131 * | ESC | A | O | E | U | I | D | H | T | N | S | / | XXXXXX . ENTER | PG UP |
176 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| 132 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
177 * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | | XXXXXX . | | | 133 * | LSHIFT | ; | Q | J | K | X | B | M | W | V | Z | XXXXXX . RSHIFT | UP | PG DN |
178 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| 134 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
179 * | | | | | | XXXXXX . | | | | | | | | | 135 * | BRITE | LCTRL | LALT | LGUI | RAISE | XXXXXX . SPACE | LOWER | RGUI | RALT | RCTRL | FN | LEFT | DOWN | RIGHT |
180 * '--------------------------------------------------------------------------------------------------------------------------------------' 136 * '--------------------------------------------------------------------------------------------------------------------------------------'
181 */ 137 */
182 138
183 [_RS] = { /* RAISED */ 139 [_DV] = LAYOUT_grid( /* DVORAK */
184 { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, 140 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_BSPC,
185 { _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, KC_INS }, 141 KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL ,
186 { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______ }, 142 KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, KC_ENT, KC_ENT, KC_PGUP,
187 { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, ___T___, ___T___, _______, _______ }, 143 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_RSFT, KC_UP, KC_PGDN,
188 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, 144 M(0), KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC, KC_SPC, MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
189 }, 145 ),
190 146
191/* FUNCTION 147 /* LOWERED
192 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. 148 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
193 * | NUM LK | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . | 149 * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . |
194 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 150 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
195 * | SCR LK | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 | PAUSE | PR SCR | 151 * | | ! | @ | # | $ | % | ^ | & | * | ( | ) | | | | INS |
196 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| 152 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
197 * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT | VOL+ | VOL- | PLAY | | XXXXXX . | WHEEL+ | 153 * | | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | XXXXXX . | |
198 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| 154 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
199 * | | | QWERTY | COLEMK | DVORAK | | | | | | | XXXXXX . | MOUS U | WHEEL- | 155 * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | | XXXXXX . | | |
200 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| 156 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
201 * | | | | | | XXXXXX . MS BT1 | | | | | | MOUS L | MOUS D | MOUS R | 157 * | | | | | | XXXXXX . | | | | | | | | |
202 * '--------------------------------------------------------------------------------------------------------------------------------------' 158 * '--------------------------------------------------------------------------------------------------------------------------------------'
203 */ 159 */
204 160
205 [_FN] = { /* FUNCTION */ 161 [_LW] = LAYOUT_grid( /* LOWERED */
206 { KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___ }, 162 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___,
207 { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR }, 163 _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS ,
208 { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U }, 164 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______,
209 { _______, _______, DF(_QW), DF(_CM), DF(_DV), _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D }, 165 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, ___T___, ___T___, _______, _______,
210 { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R }, 166 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
211 }, 167 ),
168
169 /* RAISED
170 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
171 * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . |
172 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
173 * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | | | INS |
174 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
175 * | | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | XXXXXX . | |
176 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
177 * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | | XXXXXX . | | |
178 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
179 * | | | | | | XXXXXX . | | | | | | | | |
180 * '--------------------------------------------------------------------------------------------------------------------------------------'
181 */
182
183 [_RS] = LAYOUT_grid( /* RAISED */
184 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___,
185 _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, KC_INS ,
186 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______,
187 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, ___T___, ___T___, _______, _______,
188 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
189 ),
190
191 /* FUNCTION
192 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
193 * | NUM LK | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . |
194 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
195 * | SCR LK | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 | PAUSE | PR SCR |
196 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
197 * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT | VOL+ | VOL- | PLAY | | XXXXXX . | WHEEL+ |
198 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
199 * | | | QWERTY | COLEMK | DVORAK | | | | | | | XXXXXX . | MOUS U | WHEEL- |
200 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
201 * | | | | | | XXXXXX . MS BT1 | | | | | | MOUS L | MOUS D | MOUS R |
202 * '--------------------------------------------------------------------------------------------------------------------------------------'
203 */
204
205 [_FN] = LAYOUT_grid( /* FUNCTION */
206 KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___,
207 KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR,
208 KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U,
209 _______, _______, DF(_QW), DF(_CM), DF(_DV), _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D,
210 _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
211 ),
212}; 212};
213 213
214const uint16_t PROGMEM fn_actions[] = { 214const uint16_t PROGMEM fn_actions[] = {
215 215
216}; 216};
217 217
218const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 218const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
219{
220 // MACRODOWN only works in this function 219 // MACRODOWN only works in this function
221 switch(id) { 220 switch(id) {
222 case 0: 221 case 0:
223 if (record->event.pressed) { 222 if (record->event.pressed) {
224 register_code(KC_RSFT); 223 register_code(KC_RSFT);
225 #ifdef BACKLIGHT_ENABLE 224 #ifdef BACKLIGHT_ENABLE
226 backlight_step(); 225 backlight_step();
227 #endif 226 #endif
228 } else { 227 } else {
229 unregister_code(KC_RSFT); 228 unregister_code(KC_RSFT);
230 }
231 break;
232 } 229 }
233 return MACRO_NONE; 230 break;
231 }
232 return MACRO_NONE;
234}; 233};
diff --git a/keyboards/atomic/keymaps/michelle.c b/keyboards/atomic/keymaps/michelle.c
index 2364c46a1..9c22423d6 100644
--- a/keyboards/atomic/keymaps/michelle.c
+++ b/keyboards/atomic/keymaps/michelle.c
@@ -1,183 +1,182 @@
1#include "atomic.h" 1#include QMK_KEYBOARD_H
2 2
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [0] = { /* Dvorak */ 4 [0] = LAYOUT_grid( /* Dvorak */
5 { KC_ESC, 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_NO }, 5 KC_ESC, 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_NO ,
6// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 6 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
7// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 7 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
8// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 8 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
9// ┌─ 2u ────────────┐ 9 // ┌─ 2u ────────────┐
10// │ X │ 10 // │ X │
11// └─────────────────┘ 11 // └─────────────────┘
12 { 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_INS, KC_DEL }, 12 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_INS, KC_DEL ,
13// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 13 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
14// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 14 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
15// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 15 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
16// ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ 16 // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐
17// │ X │ │ X │ 17 // │ X │ │ X │
18// └─────────────────┘ └─────────────────┘ 18 // └─────────────────┘ └─────────────────┘
19 { 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, KC_NO, KC_PGUP }, 19 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, KC_NO, KC_PGUP ,
20// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 20 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
21// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 21 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
22// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 22 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
23// ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ 23 // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐
24// │ X │ │ X │ 24 // │ X │ │ X │
25// └─────────────────┘ └─────────────────┘ 25 // └─────────────────┘ └─────────────────┘
26// ┌─ 2u ────────────┐ 26 // ┌─ 2u ────────────┐
27// │ X │ 27 // │ X │
28// └─────────────────┘ 28 // └─────────────────┘
29 { 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_NO, KC_UP, KC_PGDN }, 29 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_NO, KC_UP, KC_PGDN ,
30// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 30 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
31// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 31 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
32// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 32 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
33// ┌─ 2u ────────────┐ 33 // ┌─ 2u ────────────┐
34// │ X │ 34 // │ X │
35// └─────────────────┘ 35 // └─────────────────┘
36// ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ 36 // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐
37// │ X │ │ X │ 37 // │ X │ │ X │
38// └─────────────────┘ └─────────────────┘ 38 // └─────────────────┘ └─────────────────┘
39// ┌─ 2u ────────────┐ 39 // ┌─ 2u ────────────┐
40// │ X │ 40 // │ X │
41// └─────────────────┘ 41 // └─────────────────┘
42 { KC_LCTL, MO(1), KC_NO, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_LGUI, MO(2), KC_LEFT, KC_DOWN, KC_RGHT }, 42 KC_LCTL, MO(1), KC_NO, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_LGUI, MO(2), KC_LEFT, KC_DOWN, KC_RGHT ,
43// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 43 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
44// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 44 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
45// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 45 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
46// ┌─ 1.25u ──┬ 1.25u ───┬─── 1.25u ┬─── 1.25u ─┬─ 2u ────────────┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬──── 1.25u ┐ 46 // ┌─ 1.25u ──┬ 1.25u ───┬─── 1.25u ┬─── 1.25u ─┬─ 2u ────────────┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬──── 1.25u ┐
47// │ X │ X │ X │ X │ X │ X │ X │ X │ X │ 47 // │ X │ X │ X │ X │ X │ X │ X │ X │ X │
48// └──────────┴──────────┴──────────┴───────────┴─────────────────┴──────────┴──────────┴──────────┴───────────┘ 48 // └──────────┴──────────┴──────────┴───────────┴─────────────────┴──────────┴──────────┴──────────┴───────────┘
49// ┌─ 2u ────────────┐ 49 // ┌─ 2u ────────────┐
50// │ X │ 50 // │ X │
51// └─────────────────┘ 51 // └─────────────────┘
52// ┌───────────────────── 6.25u ────────────────────────────┐ 52 // ┌───────────────────── 6.25u ────────────────────────────┐
53// │ X │ 53 // │ X │
54// └────────────────────────────────────────────────────────┘ 54 // └────────────────────────────────────────────────────────┘
55// ┌─────────────────────── 6.25u ──────────────────────────┬─ 1.25u ──┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬── 1.25u ──┐ 55 // ┌─────────────────────── 6.25u ──────────────────────────┬─ 1.25u ──┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬── 1.25u ──┐
56// │ X │ X │ X │ X │ X │ X │ 56 // │ X │ X │ X │ X │ X │ X │
57// └────────────────────────────────────────────────────────┴──────────┴──────────┴──────────┴──────────┴───────────┘ 57 // └────────────────────────────────────────────────────────┴──────────┴──────────┴──────────┴──────────┴───────────┘
58 }, 58 ),
59 [1] = { /* Qwerty + F keys */ 59 [1] = LAYOUT_grid( /* Qwerty + F keys */
60 { 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_BSPC, KC_NO }, 60 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_BSPC, KC_NO ,
61// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 61 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
62// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 62 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
63// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 63 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
64// ┌─ 2u ────────────┐ 64 // ┌─ 2u ────────────┐
65// │ X │ 65 // │ X │
66// └─────────────────┘ 66 // └─────────────────┘
67 { 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_INS, KC_DEL }, 67 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_INS, KC_DEL ,
68// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 68 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
69// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 69 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
70// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 70 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
71// ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ 71 // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐
72// │ X │ │ X │ 72 // │ X │ │ X │
73// └─────────────────┘ └─────────────────┘ 73 // └─────────────────┘ └─────────────────┘
74 { 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, KC_NO, KC_PGUP }, 74 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, KC_NO, KC_PGUP ,
75// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 75 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
76// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 76 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
77// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 77 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
78// ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ 78 // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐
79// │ X │ │ X │ 79 // │ X │ │ X │
80// └─────────────────┘ └─────────────────┘ 80 // └─────────────────┘ └─────────────────┘
81// ┌─ 2u ────────────┐ 81 // ┌─ 2u ────────────┐
82// │ X │ 82 // │ X │
83// └─────────────────┘ 83 // └─────────────────┘
84 { 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_NO, KC_UP, KC_PGDN }, 84 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_NO, KC_UP, KC_PGDN ,
85// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 85 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
86// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 86 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
87// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 87 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
88// ┌─ 2u ────────────┐ 88 // ┌─ 2u ────────────┐
89// │ X │ 89 // │ X │
90// └─────────────────┘ 90 // └─────────────────┘
91// ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ 91 // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐
92// │ X │ │ X │ 92 // │ X │ │ X │
93// └─────────────────┘ └─────────────────┘ 93 // └─────────────────┘ └─────────────────┘
94// ┌─ 2u ────────────┐ 94 // ┌─ 2u ────────────┐
95// │ X │ 95 // │ X │
96// └─────────────────┘ 96 // └─────────────────┘
97 { KC_LCTL, KC_TRNS, KC_NO, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_LGUI, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT }, 97 KC_LCTL, KC_TRNS, KC_NO, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_LGUI, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT ,
98// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 98 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
99// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 99 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
100// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 100 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
101// ┌─ 1.25u ──┬ 1.25u ───┬─── 1.25u ┬─── 1.25u ─┬─ 2u ────────────┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬──── 1.25u ┐ 101 // ┌─ 1.25u ──┬ 1.25u ───┬─── 1.25u ┬─── 1.25u ─┬─ 2u ────────────┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬──── 1.25u ┐
102// │ X │ X │ X │ X │ X │ X │ X │ X │ X │ 102 // │ X │ X │ X │ X │ X │ X │ X │ X │ X │
103// └──────────┴──────────┴──────────┴───────────┴─────────────────┴──────────┴──────────┴──────────┴───────────┘ 103 // └──────────┴──────────┴──────────┴───────────┴─────────────────┴──────────┴──────────┴──────────┴───────────┘
104// ┌─ 2u ────────────┐ 104 // ┌─ 2u ────────────┐
105// │ X │ 105 // │ X │
106// └─────────────────┘ 106 // └─────────────────┘
107// ┌───────────────────── 6.25u ────────────────────────────┐ 107 // ┌───────────────────── 6.25u ────────────────────────────┐
108// │ X │ 108 // │ X │
109// └────────────────────────────────────────────────────────┘ 109 // └────────────────────────────────────────────────────────┘
110// ┌─────────────────────── 6.25u ──────────────────────────┬─ 1.25u ──┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬── 1.25u ──┐ 110 // ┌─────────────────────── 6.25u ──────────────────────────┬─ 1.25u ──┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬── 1.25u ──┐
111// │ X │ X │ X │ X │ X │ X │ 111 // │ X │ X │ X │ X │ X │ X │
112// └────────────────────────────────────────────────────────┴──────────┴──────────┴──────────┴──────────┴───────────┘ 112 // └────────────────────────────────────────────────────────┴──────────┴──────────┴──────────┴──────────┴───────────┘
113 }, 113 ),
114 [2] = { /* Numpad + qwerty shortcut keys */ 114 [2] = LAYOUT_grid( /* Numpad + qwerty shortcut keys */
115 { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_P7, KC_P8, KC_P9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_NO }, 115 { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_P7, KC_P8, KC_P9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_NO ,
116// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 116 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
117// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 117 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
118// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 118 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
119// ┌─ 2u ────────────┐ 119 // ┌─ 2u ────────────┐
120// │ X │ 120 // │ X │
121// └─────────────────┘ 121 // └─────────────────┘
122 { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_P4, KC_P5, KC_P6, KC_L, KC_SLSH, KC_EQL, KC_INS, KC_DEL }, 122 KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_P4, KC_P5, KC_P6, KC_L, KC_SLSH, KC_EQL, KC_INS, KC_DEL ,
123// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 123 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
124// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 124 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
125// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 125 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
126// ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ 126 // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐
127// │ X │ │ X │ 127 // │ X │ │ X │
128// └─────────────────┘ └─────────────────┘ 128 // └─────────────────┘ └─────────────────┘
129 { KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_P1, KC_P2, KC_P3, KC_S, KC_MINS, KC_ENT, KC_NO, KC_PGUP }, 129 KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_P1, KC_P2, KC_P3, KC_S, KC_MINS, KC_ENT, KC_NO, KC_PGUP ,
130// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 130 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
131// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 131 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
132// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 132 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
133// ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ 133 // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐
134// │ X │ │ X │ 134 // │ X │ │ X │
135// └─────────────────┘ └─────────────────┘ 135 // └─────────────────┘ └─────────────────┘
136// ┌─ 2u ────────────┐ 136 // ┌─ 2u ────────────┐
137// │ X │ 137 // │ X │
138// └─────────────────┘ 138 // └─────────────────┘
139 { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_X, KC_B, KC_P0, KC_P0, KC_PENT, KC_Z, KC_RSFT, KC_NO, KC_UP, KC_PGDN }, 139 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_X, KC_B, KC_P0, KC_P0, KC_PENT, KC_Z, KC_RSFT, KC_NO, KC_UP, KC_PGDN ,
140// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 140 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
141// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 141 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
142// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 142 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
143// ┌─ 2u ────────────┐ 143 // ┌─ 2u ────────────┐
144// │ X │ 144 // │ X │
145// └─────────────────┘ 145 // └─────────────────┘
146// ┌─ 2u ────────────┐ ┌─ 2u ────────────┐ 146 // ┌─ 2u ────────────┐ ┌─ 2u ────────────┐
147// │ X │ │ X │ 147 // │ X │ │ X │
148// └─────────────────┘ └─────────────────┘ 148 // └─────────────────┘ └─────────────────┘
149// ┌─ 2u ────────────┐ 149 // ┌─ 2u ────────────┐
150// │ X │ 150 // │ X │
151// └─────────────────┘ 151 // └─────────────────┘
152 { KC_LCTL, KC_TRNS, KC_NO, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_LGUI, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT }, 152 KC_LCTL, KC_TRNS, KC_NO, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_NO, KC_LGUI, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT ,
153// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐ 153 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
154// │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 154 // │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
155// └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘ 155 // └────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┘
156// ┌─ 1.25u ──┬ 1.25u ───┬─── 1.25u ┬─── 1.25u ─┬─ 2u ────────────┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬──── 1.25u ┐ 156 // ┌─ 1.25u ──┬ 1.25u ───┬─── 1.25u ┬─── 1.25u ─┬─ 2u ────────────┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬──── 1.25u ┐
157// │ X │ X │ X │ X │ X │ X │ X │ X │ X │ 157 // │ X │ X │ X │ X │ X │ X │ X │ X │ X │
158// └──────────┴──────────┴──────────┴───────────┴─────────────────┴──────────┴──────────┴──────────┴───────────┘ 158 // └──────────┴──────────┴──────────┴───────────┴─────────────────┴──────────┴──────────┴──────────┴───────────┘
159// ┌─ 2u ────────────┐ 159 // ┌─ 2u ────────────┐
160// │ X │ 160 // │ X │
161// └─────────────────┘ 161 // └─────────────────┘
162// ┌───────────────────── 6.25u ────────────────────────────┐ 162 // ┌───────────────────── 6.25u ────────────────────────────┐
163// │ X │ 163 // │ X │
164// └────────────────────────────────────────────────────────┘ 164 // └────────────────────────────────────────────────────────┘
165// ┌─────────────────────── 6.25u ──────────────────────────┬─ 1.25u ──┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬── 1.25u ──┐ 165 // ┌─────────────────────── 6.25u ──────────────────────────┬─ 1.25u ──┬─ 1.25u ──┬─ 1.25u ──┬─── 1.25u ┬── 1.25u ──┐
166// │ X │ X │ X │ X │ X │ X │ 166 // │ X │ X │ X │ X │ X │ X │
167// └────────────────────────────────────────────────────────┴──────────┴──────────┴──────────┴──────────┴───────────┘ 167 // └────────────────────────────────────────────────────────┴──────────┴──────────┴──────────┴──────────┴───────────┘
168 }, 168 ),
169}; 169};
170 170
171const uint16_t PROGMEM fn_actions[] = { 171const uint16_t PROGMEM fn_actions[] = {
172}; 172};
173 173
174const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 174const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
175{
176 // MACRODOWN only works in this function 175 // MACRODOWN only works in this function
177 switch(id) { 176 switch(id) {
178 case 0: 177 case 0:
179 return MACRODOWN(TYPE(KC_T), END); 178 return MACRODOWN(TYPE(KC_T), END);
180 break; 179 break;
181 } 180 }
182 return MACRO_NONE; 181 return MACRO_NONE;
183}; 182};
diff --git a/keyboards/atomic/keymaps/pvc/keymap.c b/keyboards/atomic/keymaps/pvc/keymap.c
index 43ec0b23b..4ccac63f6 100644
--- a/keyboards/atomic/keymaps/pvc/keymap.c
+++ b/keyboards/atomic/keymaps/pvc/keymap.c
@@ -1,4 +1,4 @@
1#include "atomic.h" 1#include QMK_KEYBOARD_H
2#include "action_layer.h" 2#include "action_layer.h"
3#include "eeconfig.h" 3#include "eeconfig.h"
4#include "led.h" 4#include "led.h"
@@ -111,126 +111,126 @@ enum keyboard_macros {
111 111
112const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 112const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
113 113
114/* LAYER = LAYER_QWERTY 114 /* LAYER = LAYER_QWERTY
115 .--------------------------------------------------------------------------------------------------------------------------------------. 115 .--------------------------------------------------------------------------------------------------------------------------------------.
116 | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | BACKSP . BACKSP | 116 | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | BACKSP . BACKSP |
117 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 117 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
118 | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL | 118 | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL |
119 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 119 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
120 | CAP LK | A | S | D | F | G | H | J | K | L | ; | ' | ENTER . ENTER | PG UP | 120 | CAP LK | A | S | D | F | G | H | J | K | L | ; | ' | ENTER . ENTER | PG UP |
121 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 121 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
122 | LSHIFT | Z | X | C | V | B | N | M | , | . | / | RSHIFT . RSHIFT | UP | PG DN | 122 | LSHIFT | Z | X | C | V | B | N | M | , | . | / | RSHIFT . RSHIFT | UP | PG DN |
123 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 123 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
124 | LCTRL | LWIN | FN | LALT | UPPER | SPACE . SPACE | LOWER | OSHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT | 124 | LCTRL | LWIN | FN | LALT | UPPER | SPACE . SPACE | LOWER | OSHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT |
125 '--------------------------------------------------------------------------------------------------------------------------------------' 125 '--------------------------------------------------------------------------------------------------------------------------------------'
126*/ 126 */
127[LAYER_QWERTY] = { 127 [LAYER_QWERTY] = LAYOUT_grid(
128 { KC_ESC , 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 }, 128 KC_ESC , 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,
129 { 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 }, 129 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 ,
130 { 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_ENT , KC_PGUP }, 130 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_ENT , KC_PGUP,
131 { 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_RSFT, KC_UP , KC_PGDN }, 131 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_RSFT, KC_UP , KC_PGDN,
132 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC , KC_SPC , M_LOWER, OS_SHFT, KC_RALT, KC_APP , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT } 132 KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC , KC_SPC , M_LOWER, OS_SHFT, KC_RALT, KC_APP , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
133}, 133 ),
134/* LAYER = LAYER_UPPER 134 /* LAYER = LAYER_UPPER
135 .--------------------------------------------------------------------------------------------------------------------------------------. 135 .--------------------------------------------------------------------------------------------------------------------------------------.
136 | PRINT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | NUM LK | KP / | KP * | KP - | XXXXXX | XXXXXX | ______ . ______ | 136 | PRINT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | NUM LK | KP / | KP * | KP - | XXXXXX | XXXXXX | ______ . ______ |
137 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 137 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
138 | PAUSE | F1 | F2 | F3 | F4 | NUM LK | KP / | KP 7 | KP 8 | KP 9 | KP - | ______ | ______ | ______ | INS | 138 | PAUSE | F1 | F2 | F3 | F4 | NUM LK | KP / | KP 7 | KP 8 | KP 9 | KP - | ______ | ______ | ______ | INS |
139 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 139 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
140 | ______ | F5 | F6 | F7 | F8 | CAP LK | KP * | KP 4 | KP 5 | KP 6 | KP + | ______ | ______ . ______ | HOME | 140 | ______ | F5 | F6 | F7 | F8 | CAP LK | KP * | KP 4 | KP 5 | KP 6 | KP + | ______ | ______ . ______ | HOME |
141 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 141 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
142 | ______ | F9 | F10 | F11 | F12 | SCR LK | KP 0 | KP 1 | KP 2 | KP 3 | KP ENT | ______ . ______ | ______ | END | 142 | ______ | F9 | F10 | F11 | F12 | SCR LK | KP 0 | KP 1 | KP 2 | KP 3 | KP ENT | ______ . ______ | ______ | END |
143 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 143 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
144 | ______ | ______ | ______ | ______ | UPPER | KP 0 . KP 0 | ______ | RALT | KP . | KP ENT | ______ | ______ | ______ | ______ | 144 | ______ | ______ | ______ | ______ | UPPER | KP 0 . KP 0 | ______ | RALT | KP . | KP ENT | ______ | ______ | ______ | ______ |
145 '--------------------------------------------------------------------------------------------------------------------------------------' 145 '--------------------------------------------------------------------------------------------------------------------------------------'
146*/ 146 */
147[LAYER_UPPER] = { 147 [LAYER_UPPER] = LAYOUT_grid(
148 { KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX, _______, _______ }, 148 KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, XXXXXXX, _______, _______,
149 { KC_PAUS, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, _______, _______, KC_INS }, 149 KC_PAUS, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, _______, _______, KC_INS ,
150 { _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_CAPS, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, _______, _______, KC_HOME }, 150 _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_CAPS, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, _______, _______, KC_HOME,
151 { _______, KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_SLCK, KC_KP_0, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______, _______, _______, KC_END }, 151 _______, KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_SLCK, KC_KP_0, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______, _______, _______, KC_END ,
152 { _______, _______, _______, _______, M_UPPER, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, _______, _______, _______, _______ } 152 _______, _______, _______, _______, M_UPPER, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, _______, _______, _______, _______
153}, 153 ),
154/* LAYER = LAYER_LOWER 154 /* LAYER = LAYER_LOWER
155 .--------------------------------------------------------------------------------------------------------------------------------------. 155 .--------------------------------------------------------------------------------------------------------------------------------------.
156 | PRINT | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | ______ . ______ | 156 | PRINT | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | ______ . ______ |
157 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 157 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
158 | ______ | $ | { | [ | ( | % | # | ) | ] | } | @ | ______ | ______ | ______ | INS | 158 | ______ | $ | { | [ | ( | % | # | ) | ] | } | @ | ______ | ______ | ______ | INS |
159 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 159 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
160 | ______ | ^ | * | + | - | / | \ | _ | ' | " | ` | ______ | ______ . ______ | HOME | 160 | ______ | ^ | * | + | - | / | \ | _ | ' | " | ` | ______ | ______ . ______ | HOME |
161 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 161 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
162 | ______ | | | & | ! | ~ | ; | : | = | < | > | ? | ______ . ______ | ______ | END | 162 | ______ | | | & | ! | ~ | ; | : | = | < | > | ? | ______ . ______ | ______ | END |
163 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 163 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
164 | ______ | ______ | ______ | ______ | ______ | ______ . ______ | LOWER | ______ | ______ | ______ | ______ | ______ | ______ | ______ | 164 | ______ | ______ | ______ | ______ | ______ | ______ . ______ | LOWER | ______ | ______ | ______ | ______ | ______ | ______ | ______ |
165 '--------------------------------------------------------------------------------------------------------------------------------------' 165 '--------------------------------------------------------------------------------------------------------------------------------------'
166*/ 166 */
167[LAYER_LOWER] = { 167 [LAYER_LOWER] = LAYOUT_grid(
168 { KC_PSCR, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______ }, 168 KC_PSCR, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______,
169 { _______, KC_DLR , KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT , _______, _______, _______, KC_INS }, 169 _______, KC_DLR , KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT , _______, _______, _______, KC_INS ,
170 { _______, KC_CIRC, KC_ASTR, KC_PLUS, KC_MINS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT , KC_GRV , _______, _______, _______, KC_HOME }, 170 _______, KC_CIRC, KC_ASTR, KC_PLUS, KC_MINS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT , KC_GRV , _______, _______, _______, KC_HOME,
171 { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL , KC_LT , KC_GT , KC_QUES, _______, _______, _______, KC_END }, 171 _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL , KC_LT , KC_GT , KC_QUES, _______, _______, _______, KC_END ,
172 { _______, _______, _______, _______, _______, _______, _______, M_LOWER, _______, _______, _______, _______, _______, _______, _______ } 172 _______, _______, _______, _______, _______, _______, _______, M_LOWER, _______, _______, _______, _______, _______, _______, _______
173}, 173 ),
174/* LAYER = LAYER_FUNCTION 174 /* LAYER = LAYER_FUNCTION
175 .--------------------------------------------------------------------------------------------------------------------------------------. 175 .--------------------------------------------------------------------------------------------------------------------------------------.
176 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | 176 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX |
177 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 177 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
178 | XXXXXX | F13 | F14 | F15 | F16 | NUM LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | 178 | XXXXXX | F13 | F14 | F15 | F16 | NUM LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
179 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 179 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
180 | XXXXXX | F17 | F18 | F19 | F20 | SCR LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | XXXXXX | 180 | XXXXXX | F17 | F18 | F19 | F20 | SCR LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | XXXXXX |
181 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 181 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
182 | ______ | F21 | F22 | F23 | F24 | CAP LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | ______ . ______ | VOL UP | MUTE | 182 | ______ | F21 | F22 | F23 | F24 | CAP LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | ______ . ______ | VOL UP | MUTE |
183 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 183 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
184 | ______ | ______ | FN | ______ | ______ | PLAY . PLAY | ______ | ______ | ______ | ______ | ______ | PREV | VOL DN | NEXT | 184 | ______ | ______ | FN | ______ | ______ | PLAY . PLAY | ______ | ______ | ______ | ______ | ______ | PREV | VOL DN | NEXT |
185 '--------------------------------------------------------------------------------------------------------------------------------------' 185 '--------------------------------------------------------------------------------------------------------------------------------------'
186*/ 186 */
187[LAYER_FUNCTION] = { 187 [LAYER_FUNCTION] = LAYOUT_grid(
188 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 188 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
189 { XXXXXXX, KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 189 XXXXXXX, KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
190 { XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 190 XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
191 { _______, KC_F21 , KC_F22 , KC_F23 , KC_F24 , KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_VOLU, KC_MUTE }, 191 _______, KC_F21 , KC_F22 , KC_F23 , KC_F24 , KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_VOLU, KC_MUTE,
192 { _______, _______, M_FUNCT, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT } 192 _______, _______, M_FUNCT, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
193}, 193 ),
194/* LAYER = LAYER_MOUSE 194 /* LAYER = LAYER_MOUSE
195 .--------------------------------------------------------------------------------------------------------------------------------------. 195 .--------------------------------------------------------------------------------------------------------------------------------------.
196 | ESC | MS AC0 | MS AC1 | MS AC2 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | 196 | ESC | MS AC0 | MS AC1 | MS AC2 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX |
197 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 197 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
198 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS UL | MS U | MS UR | XXXXXX | XXXXXX | XXXXXX | MS WHL | MS WHR | 198 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS UL | MS U | MS UR | XXXXXX | XXXXXX | XXXXXX | MS WHL | MS WHR |
199 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 199 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
200 | XXXXXX | MS BT5 | MS BT4 | MS BT3 | MS BT2 | XXXXXX | XXXXXX | MS L | XXXXXX | MS R | XXXXXX | XXXXXX | XXXXXX . XXXXXX | MS WHU | 200 | XXXXXX | MS BT5 | MS BT4 | MS BT3 | MS BT2 | XXXXXX | XXXXXX | MS L | XXXXXX | MS R | XXXXXX | XXXXXX | XXXXXX . XXXXXX | MS WHU |
201 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 201 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
202 | ______ | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS DL | MS D | MS DR | XXXXXX | ______ . ______ | MS U | MS WHD | 202 | ______ | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MS DL | MS D | MS DR | XXXXXX | ______ . ______ | MS U | MS WHD |
203 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 203 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
204 | ______ | ______ | ______ | ______ | ______ | MS BT1 . MS BT1 | ______ | ______ | ______ | ______ | ______ | MS L | MS D | MS R | 204 | ______ | ______ | ______ | ______ | ______ | MS BT1 . MS BT1 | ______ | ______ | ______ | ______ | ______ | MS L | MS D | MS R |
205 '--------------------------------------------------------------------------------------------------------------------------------------' 205 '--------------------------------------------------------------------------------------------------------------------------------------'
206*/ 206 */
207[LAYER_MOUSE] = { 207 [LAYER_MOUSE] = LAYOUT_grid(
208 { KC_ESC , KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 208 KC_ESC , KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
209 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_UL, KC_MS_U, M_MS_UR, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_R }, 209 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_UL, KC_MS_U, M_MS_UR, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_R,
210 { XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, KC_MS_L, XXXXXXX, KC_MS_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U }, 210 XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, KC_MS_L, XXXXXXX, KC_MS_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U,
211 { _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_DL, KC_MS_D, M_MS_DR, XXXXXXX, _______, _______, KC_MS_U, KC_WH_D }, 211 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_MS_DL, KC_MS_D, M_MS_DR, XXXXXXX, _______, _______, KC_MS_U, KC_WH_D,
212 { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R } 212 _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
213}, 213 ),
214/* LAYER = LAYER_ADJUST 214 /* LAYER = LAYER_ADJUST
215 .--------------------------------------------------------------------------------------------------------------------------------------. 215 .--------------------------------------------------------------------------------------------------------------------------------------.
216 | XXXXXX | HELP 1 | HELP 2 | HELP 3 | HELP 4 | HELP 5 | HELP 6 | HELP 7 | HELP 8 | HELP 9 | XXXXXX | MUSIC | AUDIO | XXXXXX . XXXXXX | 216 | XXXXXX | HELP 1 | HELP 2 | HELP 3 | HELP 4 | HELP 5 | HELP 6 | HELP 7 | HELP 8 | HELP 9 | XXXXXX | MUSIC | AUDIO | XXXXXX . XXXXXX |
217 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 217 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
218 | XXXXXX | BRTOG | BRSPD+ | BRSPD- | BRDFLT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | 218 | XXXXXX | BRTOG | BRSPD+ | BRSPD- | BRDFLT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
219 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 219 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
220 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | XXXXXX | 220 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | XXXXXX |
221 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 221 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
222 | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | RESET | XXXXXX | MOUSE | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | VOICE+ | XXXXXX | 222 | XXXXXX | QWERTY | XXXXXX | XXXXXX | BACKLT | RESET | XXXXXX | MOUSE | XXXXXX | XXXXXX | XXXXXX | XXXXXX . XXXXXX | VOICE+ | XXXXXX |
223 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 223 |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
224 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | UPPER | XXXXXX . XXXXXX | LOWER | XXXXXX | XXXXXX | XXXXXX | XXXXXX | TEMPO- | VOICE- | TEMPO+ | 224 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | UPPER | XXXXXX . XXXXXX | LOWER | XXXXXX | XXXXXX | XXXXXX | XXXXXX | TEMPO- | VOICE- | TEMPO+ |
225 '--------------------------------------------------------------------------------------------------------------------------------------' 225 '--------------------------------------------------------------------------------------------------------------------------------------'
226*/ 226 */
227[LAYER_ADJUST] = { 227 [LAYER_ADJUST] = LAYOUT_grid(
228 { XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, M_HELP5, M_HELP6, M_HELP7, M_HELP8, M_HELP9, XXXXXXX, MU_TOG , AU_TOG , XXXXXXX, XXXXXXX }, 228 XXXXXXX, M_HELP1, M_HELP2, M_HELP3, M_HELP4, M_HELP5, M_HELP6, M_HELP7, M_HELP8, M_HELP9, XXXXXXX, MU_TOG , AU_TOG , XXXXXXX, XXXXXXX,
229 { XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 229 XXXXXXX, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
230 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 230 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
231 { XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, RESET , XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MUV_IN , XXXXXXX }, 231 XXXXXXX, M_QWRTY, XXXXXXX, XXXXXXX, M_BACKL, RESET , XXXXXXX, M_MOUSE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MUV_IN , XXXXXXX,
232 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_UPPER, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TMPO_DN, MUV_DE , TMPO_UP } 232 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_UPPER, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TMPO_DN, MUV_DE , TMPO_UP
233}, 233 ),
234}; 234};
235 235
236#ifdef AUDIO_ENABLE 236#ifdef AUDIO_ENABLE
@@ -255,22 +255,19 @@ float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
255 255
256#endif /* AUDIO_ENABLE */ 256#endif /* AUDIO_ENABLE */
257 257
258void persistent_default_layer_set(uint16_t default_layer) 258void persistent_default_layer_set(uint16_t default_layer) {
259{ 259 eeconfig_update_default_layer(default_layer);
260 eeconfig_update_default_layer(default_layer); 260 default_layer_set(default_layer);
261 default_layer_set(default_layer);
262} 261}
263 262
264const uint16_t PROGMEM fn_actions[] = { 263const uint16_t PROGMEM fn_actions[] = {
265 [0] = ACTION_MODS_ONESHOT(MOD_LSFT), 264 [0] = ACTION_MODS_ONESHOT(MOD_LSFT),
266}; 265};
267 266
268const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 267const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
269{
270 268
271 // MACRODOWN only works in this function 269 // MACRODOWN only works in this function
272 switch(id) 270 switch(id) {
273 {
274 271
275 case MACRO_HELP_1: 272 case MACRO_HELP_1:
276 if (record->event.pressed) 273 if (record->event.pressed)
diff --git a/keyboards/atomic/keymaps/twolayer.c b/keyboards/atomic/keymaps/twolayer.c
index 8ea045d80..f0ff56467 100644
--- a/keyboards/atomic/keymaps/twolayer.c
+++ b/keyboards/atomic/keymaps/twolayer.c
@@ -1,72 +1,68 @@
1#include "atomic.h" 1#include QMK_KEYBOARD_H
2 2
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 4
5/* QWERTY - MIT ENHANCED / GRID COMPATIBLE 5 /* QWERTY - MIT ENHANCED / GRID COMPATIBLE
6 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. 6 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
7 * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | 7 * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP |
8 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 8 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
9 * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL | 9 * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL |
10 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| 10 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
11 * | LCTRL1 | A | S | D | F | G | H | J | K | L | ; | ' | XXXXXX . ENTER | PG UP | 11 * | LCTRL1 | A | S | D | F | G | H | J | K | L | ; | ' | XXXXXX . ENTER | PG UP |
12 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| 12 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
13 * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | 13 * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN |
14 * |--------+--------+--------+--------+--------+- 6.25u ---------+--------+--------+--------+--------+-----------------+--------+--------| 14 * |--------+--------+--------+--------+--------+- 6.25u ---------+--------+--------+--------+--------+-----------------+--------+--------|
15 * | BRITE | LALT | FN | XXXXXX . SPACE | RCTRL | RALT | FN | LEFT | DOWN | RIGHT | 15 * | BRITE | LALT | FN | XXXXXX . SPACE | RCTRL | RALT | FN | LEFT | DOWN | RIGHT |
16 * '--------------------------------------------------------------------------------------------------------------------------------------' 16 * '--------------------------------------------------------------------------------------------------------------------------------------'
17 */ 17 */
18 18 [0] = LAYOUT_grid( /* QWERTY */
19 [0] = { /* QWERTY */ 19 KC_ESC, 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,
20 { KC_ESC, 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 }, 20 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,
21 { 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 }, 21 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_ENT, KC_PGUP,
22 { 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_ENT, KC_PGUP }, 22 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_RSFT, KC_UP, KC_PGDN,
23 { 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_RSFT, KC_UP, KC_PGDN }, 23 M(0), KC_ALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RCTL, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT,
24 { M(0), KC_ALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RCTL, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT }, 24 ),
25 },
26 25
27 26 /* FUNCTION
28/* FUNCTION 27 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
29 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. 28 * | GRV | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . |
30 * | GRV | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . | 29 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
31 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 30 * | SCR LK | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 | PAUSE | PR SCR |
32 * | SCR LK | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 | PAUSE | PR SCR | 31 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
33 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| 32 * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT | VOL+ | VOL- | PLAY | | XXXXXX . | WHEEL+ |
34 * | CAP LK | MS BT5 | MS BT4 | MS BT3 | MS BT2 | SLOW M | FAST M | NEXT | VOL+ | VOL- | PLAY | | XXXXXX . | WHEEL+ | 33 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
35 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| 34 * | NUM LK | | | | | | | | INSERT | END1 | HOME | XXXXXX . | MOUS U | WHEEL- |
36 * | NUM LK | | | | | | | | INSERT | END1 | HOME | XXXXXX . | MOUS U | WHEEL- | 35 * |--------+--------+--------+--------+--------+- 6.25 ------------+--------+--------+------+--------+-----------------+--------+--------|
37 * |--------+--------+--------+--------+--------+- 6.25 ------------+--------+--------+------+--------+-----------------+--------+--------| 36 * | | | FN | XXXXXX . MS BT1 | | | FN | MOUS L | MOUS D | MOUS R |
38 * | | | FN | XXXXXX . MS BT1 | | | FN | MOUS L | MOUS D | MOUS R | 37 * '--------------------------------------------------------------------------------------------------------------------------------------'
39 * '--------------------------------------------------------------------------------------------------------------------------------------' 38 */
40 */ 39 [1] = LAYOUT_grid( /* FUNCTION LAYER*/
41 40 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, ___T___, ___T___,
42 [1] = { /* FUNCTION LAYER*/ 41 KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR,
43 { 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, ___T___, ___T___ }, 42 KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U,
44 { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR }, 43 KC_NLCK, _______, _______, _______, _______, _______, _______, _______, KC_INSERT, KC_END, KC_HOME, ___T___, ___T___, KC_MS_U, KC_WH_D,
45 { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U }, 44 _______, _______, MO(1), _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, MO(1), KC_MS_L, KC_MS_D, KC_MS_R,
46 { KC_NLCK, _______, _______, _______, _______, _______, _______, _______, KC_INSERT, KC_END, KC_HOME, ___T___, ___T___, KC_MS_U, KC_WH_D }, 45 ),
47 { _______, _______, MO(1), _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, MO(1), KC_MS_L, KC_MS_D, KC_MS_R },
48 },
49}; 46};
50 47
51const uint16_t PROGMEM fn_actions[] = { 48const uint16_t PROGMEM fn_actions[] = {
52 [1] = ACTION_LAYER_MOMENTARY(1), 49 [1] = ACTION_LAYER_MOMENTARY(1),
53 [2] = ACTION_LAYER_MOMENTARY(1), 50 [2] = ACTION_LAYER_MOMENTARY(1),
54}; 51};
55 52
56const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 53const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
57{
58 // MACRODOWN only works in this function 54 // MACRODOWN only works in this function
59 switch(id) { 55 switch(id) {
60 case 0: 56 case 0:
61 if (record->event.pressed) { 57 if (record->event.pressed) {
62 register_code(KC_RSFT); 58 register_code(KC_RSFT);
63 #ifdef BACKLIGHT_ENABLE 59 #ifdef BACKLIGHT_ENABLE
64 backlight_step(); 60 backlight_step();
65 #endif 61 #endif
66 } else { 62 } else {
67 unregister_code(KC_RSFT); 63 unregister_code(KC_RSFT);
68 }
69 break;
70 } 64 }
71 return MACRO_NONE; 65 break;
66 }
67 return MACRO_NONE;
72}; 68};
diff --git a/keyboards/atreus/atreus.h b/keyboards/atreus/atreus.h
index f841c3519..8e868ecc0 100644
--- a/keyboards/atreus/atreus.h
+++ b/keyboards/atreus/atreus.h
@@ -9,7 +9,7 @@
9// This a shortcut to help you visually see your layout. 9// This a shortcut to help you visually see your layout.
10// The first section contains all of the arguements 10// The first section contains all of the arguements
11// The second converts the arguments into a two-dimensional array 11// The second converts the arguments into a two-dimensional array
12#define KEYMAP( \ 12#define LAYOUT( \
13 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ 13 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
14 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \ 14 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
15 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ 15 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
diff --git a/keyboards/atreus/info.json b/keyboards/atreus/info.json
new file mode 100644
index 000000000..34933672f
--- /dev/null
+++ b/keyboards/atreus/info.json
@@ -0,0 +1,13 @@
1{
2 "keyboard_name": "Atreus",
3 "url": "",
4 "maintainer": "qmk",
5 "bootloader": "",
6 "width": 12.5,
7 "height": 4.6,
8 "layouts": {
9 "LAYOUT": {
10 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "h":1.5}, {"x":6.5, "y":3, "h":1.5}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}]
11 }
12 }
13} \ No newline at end of file
diff --git a/keyboards/atreus/keymaps/alphadox/keymap.c b/keyboards/atreus/keymaps/alphadox/keymap.c
index b8ec0e032..575a640c4 100644
--- a/keyboards/atreus/keymaps/alphadox/keymap.c
+++ b/keyboards/atreus/keymaps/alphadox/keymap.c
@@ -1,4 +1,4 @@
1#include "atreus.h" 1#include QMK_KEYBOARD_H
2 2
3#define BASE 0 3#define BASE 0
4#define SYMB 1 4#define SYMB 1
@@ -9,27 +9,26 @@ enum macro_id {
9}; 9};
10 10
11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
12 12 [BASE] = LAYOUT(
13[BASE] = KEYMAP(
14 KC_Q, KC_W, KC_D, KC_F, KC_K, KC_J, KC_U, KC_R, KC_L, KC_SCLN, 13 KC_Q, KC_W, KC_D, KC_F, KC_K, KC_J, KC_U, KC_R, KC_L, KC_SCLN,
15 LT(ETC,KC_A), KC_S, KC_E, KC_T, KC_G, KC_Y, KC_N, KC_I, KC_O, KC_H, 14 LT(ETC,KC_A), KC_S, KC_E, KC_T, KC_G, KC_Y, KC_N, KC_I, KC_O, KC_H,
16 SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_P, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH), 15 SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_P, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH),
17 KC_GRV, KC_DEL, KC_LALT, GUI_T(KC_TAB), LT(SYMB,KC_BSPC), CTL_T(KC_ESC), SFT_T(KC_ENT), LT(SYMB,KC_SPC), GUI_T(KC_LEFT), KC_DOWN, KC_UP, LCAG_T(KC_RGHT) 16 KC_GRV, KC_DEL, KC_LALT, GUI_T(KC_TAB), LT(SYMB,KC_BSPC), CTL_T(KC_ESC), SFT_T(KC_ENT), LT(SYMB,KC_SPC), GUI_T(KC_LEFT), KC_DOWN, KC_UP, LCAG_T(KC_RGHT)
18), 17 ),
19 18
20[SYMB] = KEYMAP( 19 [SYMB] = LAYOUT(
21 KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_EQL, KC_7, KC_8, KC_9, KC_PLUS, 20 KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_EQL, KC_7, KC_8, KC_9, KC_PLUS,
22 KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BSLS, KC_MINS, KC_4, KC_5, KC_6, KC_QUOT, 21 KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BSLS, KC_MINS, KC_4, KC_5, KC_6, KC_QUOT,
23 KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_ASTR, KC_UNDS, KC_1, KC_2, KC_3, KC_DQUO, 22 KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_ASTR, KC_UNDS, KC_1, KC_2, KC_3, KC_DQUO,
24 KC_TILD, KC_AMPR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_NO, KC_DOT, KC_TRNS 23 KC_TILD, KC_AMPR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_NO, KC_DOT, KC_TRNS
25), 24 ),
26 25
27[ETC] = KEYMAP( 26 [ETC] = LAYOUT(
28 RESET, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_HOME, 27 RESET, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_VOLU, KC_F7, KC_F8, KC_F9, KC_HOME,
29 LT(ETC,KC_A), KC_NO, KC_NO, KC_NO, KC_PGDN, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_END, 28 LT(ETC,KC_A), KC_NO, KC_NO, KC_NO, KC_PGDN, KC_VOLD, KC_F4, KC_F5, KC_F6, KC_END,
30 KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_INS, 29 KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL, KC_MUTE, KC_F1, KC_F2, KC_F3, KC_INS,
31 KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO 30 KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO
32), 31 ),
33}; 32};
34 33
35const uint16_t PROGMEM fn_actions[] = { 34const uint16_t PROGMEM fn_actions[] = {
diff --git a/keyboards/atreus/keymaps/classic/keymap.c b/keyboards/atreus/keymaps/classic/keymap.c
index d07411626..529b58a13 100644
--- a/keyboards/atreus/keymaps/classic/keymap.c
+++ b/keyboards/atreus/keymaps/classic/keymap.c
@@ -1,4 +1,4 @@
1#include "atreus.h" 1#include QMK_KEYBOARD_H
2 2
3// Each layer gets a name for readability, which is then used in the keymap matrix below. 3// Each layer gets a name for readability, which is then used in the keymap matrix below.
4// The underscores don't mean anything - you can have a layer called STUFF or any other name. 4// The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -9,23 +9,26 @@
9#define _LW 2 9#define _LW 2
10 10
11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
12 [_QW] = KEYMAP( /* Qwerty */ 12 [_QW] = LAYOUT( /* Qwerty */
13 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P , 13 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P ,
14 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN , 14 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN ,
15 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH , 15 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH ,
16 KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, MO(_RS), KC_MINS, KC_QUOT, KC_ENT ), 16 KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, MO(_RS), KC_MINS, KC_QUOT, KC_ENT
17 ),
17 18
18 [_RS] = KEYMAP( /* [> RAISE <] */ 19 [_RS] = LAYOUT( /* [> RAISE <] */
19 KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_PGUP, KC_7, KC_8, KC_9, KC_ASTR , 20 KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_PGUP, KC_7, KC_8, KC_9, KC_ASTR ,
20 KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_PGDN, KC_4, KC_5, KC_6, KC_PLUS , 21 KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_PGDN, KC_4, KC_5, KC_6, KC_PLUS ,
21 KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS , 22 KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS ,
22 TG(_LW), KC_INS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, KC_TRNS, KC_DOT, KC_0, KC_EQL ), 23 TG(_LW), KC_INS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, KC_TRNS, KC_DOT, KC_0, KC_EQL
24 ),
23 25
24 [_LW] = KEYMAP( /* [> LOWER <] */ 26 [_LW] = LAYOUT( /* [> LOWER <] */
25 KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 , 27 KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 ,
26 KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 , 28 KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 ,
27 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F12 , 29 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F12 ,
28 KC_TRNS, KC_TRNS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, DF(_QW), KC_TRNS, KC_TRNS, RESET ) 30 KC_TRNS, KC_TRNS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, DF(_QW), KC_TRNS, KC_TRNS, RESET
31 ),
29}; 32};
30 33
31const uint16_t PROGMEM fn_actions[] = { 34const uint16_t PROGMEM fn_actions[] = {
diff --git a/keyboards/atreus/keymaps/default/keymap.c b/keyboards/atreus/keymaps/default/keymap.c
index 9e91233c3..2e991ac6f 100644
--- a/keyboards/atreus/keymaps/default/keymap.c
+++ b/keyboards/atreus/keymaps/default/keymap.c
@@ -1,7 +1,7 @@
1// this is the style you want to emulate. 1// this is the style you want to emulate.
2// This is the canonical layout file for the Quantum project. If you want to add another keyboard, 2// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
3 3
4#include "atreus.h" 4#include QMK_KEYBOARD_H
5 5
6// Each layer gets a name for readability, which is then used in the keymap matrix below. 6// Each layer gets a name for readability, which is then used in the keymap matrix below.
7// The underscores don't mean anything - you can have a layer called STUFF or any other name. 7// The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -12,50 +12,51 @@
12#define _LW 2 12#define _LW 2
13 13
14const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 14const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
15[_QW] = KEYMAP( /* Qwerty */ 15 [_QW] = LAYOUT( /* Qwerty */
16 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P , 16 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P ,
17 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN , 17 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN ,
18 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH , 18 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH ,
19 KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, MO(_RS), KC_MINS, KC_QUOT, KC_ENT ), 19 KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, MO(_RS), KC_MINS, KC_QUOT, KC_ENT
20/* 20 ),
21 * ! @ up { } || pgup 7 8 9 * 21
22 * # left down right $ || pgdn 4 5 6 + 22 /*
23 * [ ] ( ) & || ` 1 2 3 \ 23 * ! @ up { } || pgup 7 8 9 *
24 * lower insert super shift bksp ctrl || alt space fn . 0 = 24 * # left down right $ || pgdn 4 5 6 +
25 */ 25 * [ ] ( ) & || ` 1 2 3 \
26[_RS] = KEYMAP( /* [> RAISE <] */ 26 * lower insert super shift bksp ctrl || alt space fn . 0 =
27 KC_EXLM, KC_AT, KC_UP, KC_LCBR, KC_RCBR, KC_PGUP, KC_7, KC_8, KC_9, KC_ASTR , 27 */
28 KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DLR, KC_PGDN, KC_4, KC_5, KC_6, KC_PLUS , 28 [_RS] = LAYOUT( /* [> RAISE <] */
29 KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR, KC_GRV, KC_1, KC_2, KC_3, KC_BSLS , 29 KC_EXLM, KC_AT, KC_UP, KC_LCBR, KC_RCBR, KC_PGUP, KC_7, KC_8, KC_9, KC_ASTR ,
30 TG(_LW), KC_INS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, KC_TRNS, KC_DOT, KC_0, KC_EQL ), 30 KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DLR, KC_PGDN, KC_4, KC_5, KC_6, KC_PLUS ,
31/* 31 KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR, KC_GRV, KC_1, KC_2, KC_3, KC_BSLS ,
32 * insert home up end pgup || up F7 F8 F9 F10 32 TG(_LW), KC_INS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, KC_TRNS, KC_DOT, KC_0, KC_EQL ),
33 * del left down right pgdn || down F4 F5 F6 F11 33 /*
34 * volup reset || F1 F2 F3 F12 34 * insert home up end pgup || up F7 F8 F9 F10
35 * voldn super shift bksp ctrl || alt space L0 prtsc scroll pause 35 * del left down right pgdn || down F4 F5 F6 F11
36 */ 36 * volup reset || F1 F2 F3 F12
37[_LW] = KEYMAP( /* [> LOWER <] */ 37 * voldn super shift bksp ctrl || alt space L0 prtsc scroll pause
38 KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 , 38 */
39 KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 , 39 [_LW] = LAYOUT( /* [> LOWER <] */
40 KC_NO, KC_VOLU, KC_NO, KC_NO, RESET, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , 40 KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 ,
41 KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS ) 41 KC_DELT, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 ,
42 KC_NO, KC_VOLU, KC_NO, KC_NO, RESET, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 ,
43 KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
42}; 44};
43 45
44const uint16_t PROGMEM fn_actions[] = { 46const uint16_t PROGMEM fn_actions[] = {
45 47
46}; 48};
47 49
48const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 50const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
49{
50 // MACRODOWN only works in this function 51 // MACRODOWN only works in this function
51 switch(id) { 52 switch(id) {
52 case 0: 53 case 0:
53 if (record->event.pressed) { 54 if (record->event.pressed) {
54 register_code(KC_RSFT); 55 register_code(KC_RSFT);
55 } else { 56 } else {
56 unregister_code(KC_RSFT); 57 unregister_code(KC_RSFT);
57 }
58 break;
59 } 58 }
60 return MACRO_NONE; 59 break;
60 }
61 return MACRO_NONE;
61}; 62};
diff --git a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
index 15064eb8c..ba343ce4d 100644
--- a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
@@ -1,5 +1,5 @@
1 1
2#include "atreus.h" 2#include QMK_KEYBOARD_H
3 3
4// layers 4// layers
5#define BASE 0 5#define BASE 0
@@ -25,7 +25,7 @@ enum custom_keycodes {
25 CLOUD9_GOTO_SYMBOL, 25 CLOUD9_GOTO_SYMBOL,
26 CLOUD9_GOTO_LINE, 26 CLOUD9_GOTO_LINE,
27 CLOUD9_NAVIGATE, 27 CLOUD9_NAVIGATE,
28 28
29}; 29};
30 30
31// building instructions: 31// building instructions:
@@ -35,50 +35,47 @@ enum custom_keycodes {
35// avrdude -p atmega32u4 -c avr109 -U flash:w:atreus_dvorak_42_key.hex -P COM7 35// avrdude -p atmega32u4 -c avr109 -U flash:w:atreus_dvorak_42_key.hex -P COM7
36 36
37const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 37const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
38 38 [BASE] = LAYOUT(
39[BASE] = { 39 KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L,
40 {KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, KC_TRNS, KC_F, KC_G, KC_C, KC_R, KC_L, }, 40 KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S,
41 {KC_A, KC_O, KC_E, KC_U, KC_I, KC_TRNS, KC_D, KC_H, KC_T, KC_N, KC_S, }, 41 KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,
42 {KC_SCOLON, KC_Q, KC_J, KC_K, KC_X, MO(KEYNAV), KC_B, KC_M, KC_W, KC_V, KC_Z, }, 42 OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), MO(KEYNAV), KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT)
43 {OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL), MO(COMBINED), KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT), } 43 ),
44}, 44
45 45 [KEYNAV] = LAYOUT(
46[KEYNAV] = { 46 KC_ESC, CLOUD9_GOTO_LINE, RCTL(KC_Z), RCTL(KC_S), MEH(KC_F10), KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP,
47 {KC_ESC, CLOUD9_GOTO_LINE, RCTL(KC_Z), RCTL(KC_S), MEH(KC_F10), KC_TRNS, KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, }, 47 MEH(KC_F11), CLOUD9_GOTO_SYMBOL, RSFT(KC_TAB), KC_TAB, MEH(KC_A), LCTL(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, LCTL(KC_RIGHT),
48 {MEH(KC_F11), CLOUD9_GOTO_SYMBOL, RSFT(KC_TAB), KC_TAB, MEH(KC_A), KC_TRNS, LCTL(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, LCTL(KC_RIGHT), }, 48 MEH(KC_B), CLOUD9_NAVIGATE, CLOUD9_TAB_LEFT, CLOUD9_TAB_RIGHT, CLOUD9_TAB_CLOSE, KC_TRNS, RCTL(KC_C), RCTL(KC_X), RCTL(KC_V), KC_PGDOWN,
49 {MEH(KC_B), CLOUD9_NAVIGATE, CLOUD9_TAB_LEFT, CLOUD9_TAB_RIGHT, CLOUD9_TAB_CLOSE, KC_TRNS, KC_TRNS, RCTL(KC_C), RCTL(KC_X), RCTL(KC_V), KC_PGDOWN, }, 49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_DELETE, LCTL(KC_DELETE)
50 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_DELETE, LCTL(KC_DELETE), } 50 ),
51}, 51
52 52 [KEYSEL] = LAYOUT(
53[KEYSEL] = { 53 MEH(KC_G), MEH(KC_H),MEH(KC_I), MEH(KC_J), MEH(KC_K), KC_TRNS, RSFT(KC_HOME), RSFT(KC_UP), RSFT(KC_END), RSFT(KC_PGUP),
54 {MEH(KC_G), MEH(KC_H),MEH(KC_I), MEH(KC_J), MEH(KC_K), KC_TRNS, KC_TRNS, RSFT(KC_HOME), RSFT(KC_UP), RSFT(KC_END), RSFT(KC_PGUP), }, 54 MEH(KC_L), MEH(KC_M),MEH(KC_N), MEH(KC_O), MEH(KC_P), RSFT(RCTL(KC_LEFT)), RSFT(KC_LEFT), RSFT(KC_DOWN), RSFT(KC_RIGHT), RSFT(RCTL(KC_RIGHT)),
55 {MEH(KC_L), MEH(KC_M),MEH(KC_N), MEH(KC_O), MEH(KC_P), KC_TRNS, RSFT(RCTL(KC_LEFT)), RSFT(KC_LEFT), RSFT(KC_DOWN), RSFT(KC_RIGHT), RSFT(RCTL(KC_RIGHT)), }, 55 MEH(KC_Q), MEH(KC_R),MEH(KC_S), MEH(KC_T), MEH(KC_U), KC_TRNS, RCTL(KC_C), RCTL(KC_X), RCTL(KC_V), RSFT(KC_PGDN),
56 {MEH(KC_Q), MEH(KC_R),MEH(KC_S), MEH(KC_T), MEH(KC_U), KC_TRNS, KC_TRNS, RCTL(KC_C),RCTL(KC_X), RCTL(KC_V), RSFT(KC_PGDN), }, 56 RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_DELETE, LCTL(KC_DELETE)
57 {RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENTER, KC_SPACE, KC_BSPC, RCTL(KC_BSPC), KC_DELETE, LCTL(KC_DELETE), } 57 ),
58}, 58
59 59 [COMBINED] = LAYOUT(
60[COMBINED] = { 60 KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_PLUS, KC_7, KC_8, KC_9, KC_ASTR,
61 {KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_PLUS, KC_7, KC_8, KC_9, KC_ASTR, }, 61 KC_LPRN, KC_RPRN, KC_LBRACKET, KC_RBRACKET, KC_UNDS, KC_MINS, KC_4, KC_5, KC_6, KC_SLSH,
62 {KC_LPRN, KC_RPRN, KC_LBRACKET, KC_RBRACKET, KC_UNDS, KC_TRNS, KC_MINS, KC_4, KC_5, KC_6, KC_SLSH, }, 62 KC_COLN, KC_DQUO, KC_LCBR, KC_RCBR, KC_AMPR, KC_EQUAL, KC_1, KC_2, KC_3, KC_QUES,
63 {KC_COLN, KC_DQUO, KC_LCBR, KC_RCBR, KC_AMPR, KC_TRNS, KC_EQUAL, KC_1, KC_2, KC_3, KC_QUES, }, 63 KC_TRNS, KC_TILD, KC_GRAVE, KC_CIRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_DOT, KC_PIPE, KC_BSLS
64 {KC_TRNS, KC_TILD, KC_GRAVE, KC_CIRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_DOT, KC_PIPE, KC_BSLS, } 64 ),
65}, 65
66 66 [MOUSE] = LAYOUT(
67[MOUSE] = { 67 KC_TRNS, KC_PGUP, KC_MS_WH_UP, KC_UP, KC_TRNS, KC_UP, KC_HOME, KC_MS_U, KC_END, KC_MS_WH_UP,
68 {KC_TRNS, KC_PGUP, KC_MS_WH_UP, KC_UP, KC_TRNS, KC_TRNS, KC_UP, KC_HOME, KC_MS_U, KC_END, KC_MS_WH_UP, }, 68 KC_MS_ACCEL0, KC_PGDN, KC_MS_WH_DOWN, KC_DOWN, KC_TRNS, KC_DOWN, KC_MS_L, KC_MS_D, KC_MS_R, KC_MS_WH_DOWN,
69 {KC_MS_ACCEL0, KC_PGDN, KC_MS_WH_DOWN, KC_DOWN, KC_TRNS, KC_TRNS, KC_DOWN, KC_MS_L, KC_MS_D, KC_MS_R, KC_MS_WH_DOWN, }, 69 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MEH(KC_X), MEH(KC_Y), MEH(KC_Z), KC_F5, RCTL(KC_W),
70 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN3, MEH(KC_X), MEH(KC_Y), MEH(KC_Z), KC_F5, RCTL(KC_W), }, 70 KC_TRNS, M(MOUSE_LOCK), KC_TRNS, KC_MS_ACCEL0, KC_TRNS, KC_BTN3, KC_BTN1, KC_BTN2, RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), RCTL(KC_T), LALT(KC_LEFT)
71 {KC_TRNS, M(MOUSE_LOCK), KC_TRNS, KC_MS_ACCEL0, KC_TRNS, KC_BTN1, KC_BTN2, RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), RCTL(KC_T), LALT(KC_LEFT), } 71 ),
72}, 72
73 73 [BROWSER_CONTROL] = LAYOUT(
74[BROWSER_CONTROL] = { 74 KC_TRNS, KC_BTN3, KC_MS_U, KC_BTN1, KC_BTN2, KC_UP, KC_PGUP, KC_PGDN, KC_MS_WH_UP, KC_TRNS,
75 {KC_TRNS, KC_BTN3, KC_MS_U, KC_BTN1, KC_BTN2, KC_TRNS, KC_UP, KC_PGUP, KC_PGDN, KC_MS_WH_UP, KC_TRNS, }, 75 KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_DOWN, RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), KC_MS_WH_DOWN, LALT(KC_LEFT),
76 {KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_DOWN, RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), KC_MS_WH_DOWN, LALT(KC_LEFT), }, 76 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RCTL(KC_1), RCTL(KC_9), KC_F6, KC_F5,
77 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RCTL(KC_1), RCTL(KC_9), KC_F6, KC_F5, }, 77 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RCTL(KC_W), RCTL(KC_T), RSFT(RCTL(KC_TAB)), KC_TRNS, KC_TRNS, KC_TRNS
78 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RCTL(KC_W), RCTL(KC_T), RSFT(RCTL(KC_TAB)), KC_TRNS, KC_TRNS, KC_TRNS, } 78 ),
79},
80
81
82}; 79};
83 80
84const uint16_t PROGMEM fn_actions[] = { 81const uint16_t PROGMEM fn_actions[] = {
@@ -91,31 +88,31 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
91 // Cloud9 macros 88 // Cloud9 macros
92 case CLOUD9_TAB_LEFT: 89 case CLOUD9_TAB_LEFT:
93 SEND_STRING(SS_LCTRL("[")); 90 SEND_STRING(SS_LCTRL("["));
94 return true; 91 return true;
95 break; 92 break;
96 case CLOUD9_TAB_RIGHT: 93 case CLOUD9_TAB_RIGHT:
97 SEND_STRING(SS_LCTRL("]")); 94 SEND_STRING(SS_LCTRL("]"));
98 return true; 95 return true;
99 break; 96 break;
100 case CLOUD9_TAB_CLOSE: 97 case CLOUD9_TAB_CLOSE:
101 SEND_STRING(SS_LALT("w")); 98 SEND_STRING(SS_LALT("w"));
102 return true; 99 return true;
103 break; 100 break;
104 case CLOUD9_GOTO_SYMBOL: 101 case CLOUD9_GOTO_SYMBOL:
105 SEND_STRING(SS_LSFT(SS_LCTRL("e"))); 102 SEND_STRING(SS_LSFT(SS_LCTRL("e")));
106 return true; 103 return true;
107 break; 104 break;
108 case CLOUD9_GOTO_LINE: 105 case CLOUD9_GOTO_LINE:
109 SEND_STRING(SS_LCTRL("g")); 106 SEND_STRING(SS_LCTRL("g"));
110 return true; 107 return true;
111 break; 108 break;
112 case CLOUD9_NAVIGATE: 109 case CLOUD9_NAVIGATE:
113 SEND_STRING(SS_LCTRL("e")); 110 SEND_STRING(SS_LCTRL("e"));
114 return true; 111 return true;
115 break; 112 break;
116 } 113 }
117 } 114 }
118 115
119 return true; 116 return true;
120} 117}
121 118
@@ -142,7 +139,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
142 else 139 else
143 mouse_lock = true; 140 mouse_lock = true;
144 } 141 }
145 break; 142 break;
146 } 143 }
147 return MACRO_NONE; 144 return MACRO_NONE;
148}; 145};
diff --git a/keyboards/atreus/keymaps/erlandsona/keymap.c b/keyboards/atreus/keymaps/erlandsona/keymap.c
index 32c8826e0..232c700e9 100644
--- a/keyboards/atreus/keymaps/erlandsona/keymap.c
+++ b/keyboards/atreus/keymaps/erlandsona/keymap.c
@@ -1,7 +1,7 @@
1// this is the style you want to emulate. 1// this is the style you want to emulate.
2// This is the canonical layout file for the Quantum project. If you want to add another keyboard, 2// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
3 3
4#include "atreus.h" 4#include QMK_KEYBOARD_H
5 5
6// Each layer gets a name for readability, which is then used in the keymap matrix below. 6// Each layer gets a name for readability, which is then used in the keymap matrix below.
7// The underscores don't mean anything - you can have a layer called STUFF or any other name. 7// The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -17,23 +17,26 @@
17 17
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20[BASE] = KEYMAP( /* Qwerty */ 20 [BASE] = LAYOUT( /* Qwerty */
21 KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , 21 KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,
22 KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN , 22 KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN ,
23 SFT_T(KC_Z), KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , SFT_T(KC_QUOT), 23 SFT_T(KC_Z), KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , SFT_T(KC_QUOT),
24 KC_LCTL , KC_LALT, KC_LALT, KC_LGUI, KC_BSPC, KC_ESC, KC_ENT, KC_SPC, F(NUMS), KC_RALT, KC_SLSH, KC_BSLS ), 24 KC_LCTL , KC_LALT, KC_LALT, KC_LGUI, KC_BSPC, KC_ESC, KC_ENT, KC_SPC, F(NUMS), KC_RALT, KC_SLSH, KC_BSLS
25 25 ),
26[NUMS] = KEYMAP( /* Numbers / Arrows / Symbols */ 26
27 KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_LPRN, KC_RPRN, KC_MINS, KC_EQL , KC_LBRC, 27 [NUMS] = LAYOUT( /* Numbers / Arrows / Symbols */
28 KC_TAB , KC_5 , KC_6 , KC_7 , KC_8 , KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_RBRC, 28 KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_LPRN, KC_RPRN, KC_MINS, KC_EQL , KC_LBRC,
29 _______, KC_9 , KC_0 , KC_DOT , KC_COMM, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______, 29 KC_TAB , KC_5 , KC_6 , KC_7 , KC_8 , KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_RBRC,
30 _______, _______, _______, _______, KC_DEL , F(MOUS), _______, _______, _______, _______, _______, _______), 30 _______, KC_9 , KC_0 , KC_DOT , KC_COMM, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
31 31 _______, _______, _______, _______, KC_DEL , F(MOUS), _______, _______, _______, _______, _______, _______
32[MOUS] = KEYMAP( /* Mouse and Media Keys */ 32 ),
33 KC_SLCK, KC_PAUSE, KC_F11 , KC_F10 , KC_F9 , KC_F8 , KC_F7 , KC_F6 , KC_F5 , KC_F4, 33
34 KC_VOLD, KC_ACL0 , KC_ACL1, KC_ACL2, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_F3, 34 [MOUS] = LAYOUT( /* Mouse and Media Keys */
35 KC_MUTE, KC_MPRV , KC_MPLY, KC_MNXT, KC_MUTE, KC_WH_R, KC_WH_U, KC_WH_D, KC_WH_L, KC_F2, 35 KC_SLCK, KC_PAUSE, KC_F11 , KC_F10 , KC_F9 , KC_F8 , KC_F7 , KC_F6 , KC_F5 , KC_F4,
36 _______, _______ , _______, _______, _______, _______, _______, KC_BTN1, F(BASE), RESET , KC_F12 , KC_F1) 36 KC_VOLD, KC_ACL0 , KC_ACL1, KC_ACL2, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_F3,
37 KC_MUTE, KC_MPRV , KC_MPLY, KC_MNXT, KC_MUTE, KC_WH_R, KC_WH_U, KC_WH_D, KC_WH_L, KC_F2,
38 _______, _______ , _______, _______, _______, _______, _______, KC_BTN1, F(BASE), RESET , KC_F12 , KC_F1
39 ),
37}; 40};
38 41
39 42
@@ -45,17 +48,16 @@ const uint16_t PROGMEM fn_actions[] = {
45 [MOUS] = ACTION_LAYER_ON(2, 1) // switch to layer 2 48 [MOUS] = ACTION_LAYER_ON(2, 1) // switch to layer 2
46}; 49};
47 50
48const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 51const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
49{
50 // MACRODOWN only works in this function 52 // MACRODOWN only works in this function
51 switch(id) { 53 switch(id) {
52 case 0: 54 case 0:
53 if (record->event.pressed) { 55 if (record->event.pressed) {
54 register_code(KC_RSFT); 56 register_code(KC_RSFT);
55 } else { 57 } else {
56 unregister_code(KC_RSFT); 58 unregister_code(KC_RSFT);
57 }
58 break;
59 } 59 }
60 return MACRO_NONE; 60 break;
61 }
62 return MACRO_NONE;
61}; 63};
diff --git a/keyboards/atreus/keymaps/gerb/keymap.c b/keyboards/atreus/keymaps/gerb/keymap.c
index 1ba3942e3..c52f32ef6 100644
--- a/keyboards/atreus/keymaps/gerb/keymap.c
+++ b/keyboards/atreus/keymaps/gerb/keymap.c
@@ -1,7 +1,7 @@
1// This is the personal keymap of Chris Gerber (@gerbercj). I haven't worked out the kinks 1// This is the personal keymap of Chris Gerber (@gerbercj). I haven't worked out the kinks
2// with the Colemak and Dvorak support yet, but everything else works nicely. 2// with the Colemak and Dvorak support yet, but everything else works nicely.
3 3
4#include "atreus.h" 4#include QMK_KEYBOARD_H
5 5
6// Each layer gets a name for readability, which is then used in the keymap matrix below. 6// Each layer gets a name for readability, which is then used in the keymap matrix below.
7// The underscores don't mean anything - you can have a layer called STUFF or any other name. 7// The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -14,53 +14,52 @@
14#define _L2 4 14#define _L2 4
15 15
16const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 16const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
17 [_QW] = { /* Qwerty */ 17 [_QW] = LAYOUT( /* Qwerty */
18 {KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_Y, KC_U, KC_I, KC_O, KC_P }, 18 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
19 {KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, KC_H, KC_J, KC_K, KC_L, KC_SCLN}, 19 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
20 {KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LALT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH}, 20 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
21 {KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_RCTL, KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_ENT } 21 KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_RCTL, KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_ENT
22 }, 22 ),
23 [_CM] = { /* Colemak */ 23 [_CM] = LAYOUT( /* Colemak */
24 {KC_Q, KC_W, KC_F, KC_P, KC_G, KC_NO, KC_J, KC_L, KC_U, KC_Y, KC_SCLN}, 24 KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
25 {KC_A, KC_R, KC_S, KC_T, KC_D, KC_NO, KC_H, KC_N, KC_E, KC_I, KC_O }, 25 KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
26 {KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LALT, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH}, 26 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH,
27 {KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_RCTL, KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_ENT } 27 KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_RCTL, KC_SPC, MO(_L1), KC_MINS, KC_QUOT, KC_ENT
28 }, 28 ),
29 [_DV] = { /* Dvorak */ 29 [_DV] = LAYOUT( /* Dvorak */
30 {KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_NO, KC_F, KC_G, KC_C, KC_R, KC_L }, 30 KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L,
31 {KC_A, KC_O, KC_E, KC_U, KC_I, KC_NO, KC_D, KC_H, KC_T, KC_N, KC_S }, 31 KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S,
32 {KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_LALT, KC_B, KC_M, KC_W, KC_V, KC_Z }, 32 KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,
33 {KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_RCTL, KC_SPC, MO(_L1), KC_MINS, KC_SLSH, KC_ENT } 33 KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_RCTL, KC_SPC, MO(_L1), KC_MINS, KC_SLSH, KC_ENT
34 }, 34 ),
35 [_L1] = { /* LAYER 1 */ 35 [_L1] = LAYOUT( /* LAYER 1 */
36 {KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_NO, KC_VOLU, KC_7, KC_8, KC_9, KC_LBRC}, 36 KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_VOLU, KC_7, KC_8, KC_9, KC_LBRC,
37 {KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_VOLD, KC_4, KC_5, KC_6, KC_RBRC}, 37 KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLD, KC_4, KC_5, KC_6, KC_RBRC,
38 {KC_GRV, KC_MPRV, KC_MPLY, KC_MNXT, KC_MINS, KC_LALT, KC_MUTE, KC_1, KC_2, KC_3, KC_BSLS}, 38 KC_GRV, KC_MPRV, KC_MPLY, KC_MNXT, KC_MINS, KC_MUTE, KC_1, KC_2, KC_3, KC_BSLS,
39 {TG(_L2), KC_APP, KC_LGUI, KC_LSFT, KC_BSPC, KC_RCTL, KC_SPC, KC_TRNS, KC_DOT, KC_0, KC_EQL } 39 TG(_L2), KC_APP, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_RCTL, KC_SPC, KC_TRNS, KC_DOT, KC_0, KC_EQL
40 }, 40 ),
41 [_L2] = { /* LAYER 2 */ 41 [_L2] = LAYOUT( /* LAYER 2 */
42 {KC_TRNS, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U, KC_NO, DF(_QW), KC_F7, KC_F8, KC_F9, KC_F10 }, 42 KC_TRNS, KC_WH_L, KC_MS_U, KC_WH_R, KC_WH_U, DF(_QW), KC_F7, KC_F8, KC_F9, KC_F10,
43 {KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_NO, DF(_CM), KC_F6, KC_F5, KC_F6, KC_F11 }, 43 KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, DF(_CM), KC_F6, KC_F5, KC_F6, KC_F11,
44 {KC_BTN4, KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, KC_LALT, DF(_DV), KC_F1, KC_F2, KC_F3, KC_F12 }, 44 KC_BTN4, KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, DF(_DV), KC_F1, KC_F2, KC_F3, KC_F12,
45 {KC_TRNS, KC_TRNS, KC_LGUI, KC_LSFT, KC_BSPC, KC_RCTL, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, RESET } 45 KC_TRNS, KC_TRNS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LALT, KC_RCTL, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, RESET
46 } 46 ),
47}; 47};
48 48
49const uint16_t PROGMEM fn_actions[] = { 49const uint16_t PROGMEM fn_actions[] = {
50 50
51}; 51};
52 52
53const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 53const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
54{
55 // MACRODOWN only works in this function 54 // MACRODOWN only works in this function
56 switch(id) { 55 switch(id) {
57 case 0: 56 case 0:
58 if (record->event.pressed) { 57 if (record->event.pressed) {
59 register_code(KC_RSFT); 58 register_code(KC_RSFT);
60 } else { 59 } else {
61 unregister_code(KC_RSFT); 60 unregister_code(KC_RSFT);
62 }
63 break;
64 } 61 }
65 return MACRO_NONE; 62 break;
63 }
64 return MACRO_NONE;
66}; 65};
diff --git a/keyboards/atreus/keymaps/henxing/keymap.c b/keyboards/atreus/keymaps/henxing/keymap.c
index e5ff5f5d3..51a46fa37 100644
--- a/keyboards/atreus/keymaps/henxing/keymap.c
+++ b/keyboards/atreus/keymaps/henxing/keymap.c
@@ -1,4 +1,4 @@
1#include "atreus.h" 1#include QMK_KEYBOARD_H
2#include "action_layer.h" 2#include "action_layer.h"
3#include "eeconfig.h" 3#include "eeconfig.h"
4 4
@@ -19,87 +19,85 @@ enum custom_keycodes {
19}; 19};
20 20
21const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 21const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
22 22 /*
23 /* 23 * q w e r t || y u i o p
24 * q w e r t || y u i o p 24 * a s d f g || h j k l ;
25 * a s d f g || h j k l ; 25 * z x c v b || n m , . /
26 * z x c v b || n m , . / 26 * esc tab gui shift bksp ctrl || alt space lower - ' enter
27 * esc tab gui shift bksp ctrl || alt space lower - ' enter 27 */
28 */ 28 [_QWERTY] = LAYOUT( \
29 [_QWERTY] = KEYMAP( \ 29 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \
30 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ 30 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \
31 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ 31 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \
32 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ 32 KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, LOWER, KC_MINS, KC_QUOT, KC_ENT \
33 KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, LOWER, KC_MINS, KC_QUOT, KC_ENT \ 33 ),
34 ), 34
35 35 /*
36 /* 36 * ! @ up { } || pgup 7 8 9 *
37 * ! @ up { } || pgup 7 8 9 * 37 * # left down right $ || pgdn 4 5 6 +
38 * # left down right $ || pgdn 4 5 6 + 38 * [ ] ( ) & || ` 1 2 3 \
39 * [ ] ( ) & || ` 1 2 3 \ 39 * raise insert gui shift bksp ctrl || alt space ____ . 0 =
40 * raise insert gui shift bksp ctrl || alt space ____ . 0 = 40 */
41 */ 41 [_LOWER] = LAYOUT( \
42 [_LOWER] = KEYMAP( \ 42 KC_EXLM, KC_AT, KC_UP, KC_LCBR, KC_RCBR, KC_PGUP, KC_7, KC_8, KC_9, KC_ASTR, \
43 KC_EXLM, KC_AT, KC_UP, KC_LCBR, KC_RCBR, KC_PGUP, KC_7, KC_8, KC_9, KC_ASTR, \ 43 KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_PGDN, KC_4, KC_5, KC_6, KC_PLUS, \
44 KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_PGDN, KC_4, KC_5, KC_6, KC_PLUS, \ 44 KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR, KC_GRV, KC_1, KC_2, KC_3, KC_BSLS, \
45 KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR, KC_GRV, KC_1, KC_2, KC_3, KC_BSLS, \ 45 RAISE, KC_INS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, KC_TRNS, KC_DOT, KC_0, KC_EQL \
46 RAISE, KC_INS, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, KC_TRNS, KC_DOT, KC_0, KC_EQL \ 46 ),
47 ), 47
48 48 /*
49 /* 49 * insert home up end pgup || up F7 F8 F9 F10
50 * insert home up end pgup || up F7 F8 F9 F10 50 * del left down right pgdn || down F4 F5 F6 F11
51 * del left down right pgdn || down F4 F5 F6 F11 51 * volup reset || F1 F2 F3 F12
52 * volup reset || F1 F2 F3 F12 52 * voldn super shift bksp ctrl || alt space QWERTY prtsc scroll pause
53 * voldn super shift bksp ctrl || alt space QWERTY prtsc scroll pause 53 */
54 */ 54 [_RAISE] = LAYOUT( \
55 [_RAISE] = KEYMAP( \ 55 KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10, \
56 KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10, \ 56 KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11, \
57 KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11, \ 57 KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F12, \
58 KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F12, \ 58 KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, QWERTY, KC_PSCR, KC_SLCK, KC_PAUS \
59 KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, QWERTY, KC_PSCR, KC_SLCK, KC_PAUS \ 59 ),
60 )
61
62}; 60};
63 61
64void persistent_default_layer_set(uint16_t default_layer) { 62void persistent_default_layer_set(uint16_t default_layer) {
65 eeconfig_update_default_layer(default_layer); 63 eeconfig_update_default_layer(default_layer);
66 default_layer_set(default_layer); 64 default_layer_set(default_layer);
67} 65}
68 66
69bool process_record_user(uint16_t keycode, keyrecord_t *record) { 67bool process_record_user(uint16_t keycode, keyrecord_t *record) {
70 68
71 // The value to return 69 // The value to return
72 bool return_value = false; 70 bool return_value = false;
73 71
74 switch (keycode) { 72 switch (keycode) {
75 case QWERTY: 73 case QWERTY:
76 if (record->event.pressed) { 74 if (record->event.pressed) {
77 persistent_default_layer_set(1UL<<_QWERTY); 75 persistent_default_layer_set(1UL<<_QWERTY);
78 } 76 }
79 break; 77 break;
80 78
81 case LOWER: 79 case LOWER:
82 // Toggle LOWER layer on when key pressed and off when released 80 // Toggle LOWER layer on when key pressed and off when released
83 if (record->event.pressed) { 81 if (record->event.pressed) {
84 layer_on(_LOWER); 82 layer_on(_LOWER);
85 } else { 83 } else {
86 layer_off(_LOWER); 84 layer_off(_LOWER);
87 } 85 }
88 break; 86 break;
89 87
90 case RAISE: 88 case RAISE:
91 if (record->event.pressed) { 89 if (record->event.pressed) {
92 persistent_default_layer_set(1UL<<_RAISE); 90 persistent_default_layer_set(1UL<<_RAISE);
93 } 91 }
94 break; 92 break;
95 93
96 default: 94 default:
97 95
98 // If the keycode is not handled by any of the other cases, the 96 // If the keycode is not handled by any of the other cases, the
99 // function should return true 97 // function should return true
100 return_value = true; 98 return_value = true;
101 break; 99 break;
102 } 100 }
103 101
104 return return_value; 102 return return_value;
105} 103}
diff --git a/keyboards/atreus/keymaps/jeremy/keymap.c b/keyboards/atreus/keymaps/jeremy/keymap.c
index 90ec6f904..42bef9d80 100644
--- a/keyboards/atreus/keymaps/jeremy/keymap.c
+++ b/keyboards/atreus/keymaps/jeremy/keymap.c
@@ -1,6 +1,6 @@
1// This is the personal keymap of Jeremy Cowgar (@jcowgar). It is written for the programmer. 1// This is the personal keymap of Jeremy Cowgar (@jcowgar). It is written for the programmer.
2 2
3#include "atreus.h" 3#include QMK_KEYBOARD_H
4#include "action_layer.h" 4#include "action_layer.h"
5#include "keymap_colemak.h" 5#include "keymap_colemak.h"
6 6
@@ -25,41 +25,43 @@
25#define KM_REDO LGUI(LSFT(KC_Z)) 25#define KM_REDO LGUI(LSFT(KC_Z))
26 26
27const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 27const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
28[ALPH] = { 28 [ALPH] = LAYOUT(
29 {KC_Q, KC_W, KC_E, KC_R, KC_T, KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P}, 29 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
30 {KC_A, LT(NUMS, KC_S), LT(FKEY, KC_D), KC_F, KC_G, KC_TRNS, KC_H, KC_J, LT(CURS, KC_K), LT(SYMB, KC_L), KC_SCLN}, 30 KC_A, LT(NUMS, KC_S), LT(FKEY, KC_D), KC_F, KC_G, KC_H, KC_J, LT(CURS, KC_K), LT(SYMB, KC_L), KC_SCLN,
31 {KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LALT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH}, 31 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
32 {KC_LCTL, KC_ESC, KC_NO, KC_LSFT, KC_SPC, KC_LGUI, KC_ENT, KC_RSFT, KC_NO, KC_ESC, KC_RCTL} 32 KC_LCTL, KC_ESC, KC_NO, KC_LSFT, KC_SPC, KC_LALT, KC_LGUI, KC_ENT, KC_RSFT, KC_NO, KC_ESC, KC_RCTL
33}, 33 ),
34[NUMS] = { 34 [NUMS] = LAYOUT(
35 {KC_TRNS, KC_TRNS, KC_TRNS, KC_ASTR, KC_SLSH, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, KC_SLSH}, 35 KC_TRNS, KC_TRNS, KC_TRNS, KC_ASTR, KC_SLSH, KC_TRNS, KC_7, KC_8, KC_9, KC_SLSH,
36 {KC_TRNS, KC_TRNS, KC_EQL, KC_PLUS, KC_MINS, KC_TRNS, KC_LPRN, KC_4, KC_5, KC_6, KC_ASTR}, 36 KC_TRNS, KC_TRNS, KC_EQL, KC_PLUS, KC_MINS, KC_LPRN, KC_4, KC_5, KC_6, KC_ASTR,
37 {KC_TRNS, KC_TRNS, KC_DOT, KC_COMM, CM_SCLN, KC_TRNS, KC_RPRN, KC_1, KC_2, KC_3, KC_MINS}, 37 KC_TRNS, KC_TRNS, KC_DOT, KC_COMM, CM_SCLN, KC_RPRN, KC_1, KC_2, KC_3, KC_MINS,
38 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_DOT, KC_EQL, KC_PLUS} 38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_DOT, KC_EQL, KC_PLUS
39}, 39 ),
40[CURS] = { 40 [CURS] = LAYOUT(
41 {KC_TRNS, KC_BSPC, KC_UP, KC_DELT, KC_PGUP, KC_TRNS, KC_TRNS, KM_SAVE, KC_TRNS, KM_OPEN, KC_TRNS}, 41 KC_TRNS, KC_BSPC, KC_UP, KC_DELT, KC_PGUP, KC_TRNS, KM_SAVE, KC_TRNS, KM_OPEN, KC_TRNS,
42 {KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KM_UNDO, KC_LALT, KC_TRNS, KC_LGUI, KC_TRNS}, 42 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KM_UNDO, KC_LALT, KC_TRNS, KC_LGUI, KC_TRNS,
43 {KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_MPLY, KM_COPY, KM_REDO, KM_CLSE, KC_TRNS, KC_TRNS, KC_TRNS}, 43 KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_MPLY, KM_REDO, KM_CLSE, KC_TRNS, KC_TRNS, KC_TRNS,
44 {KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TAB, KM_CUT, KM_PAST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} 44 KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TAB, KM_COPY, KM_CUT, KM_PAST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
45}, 45 ),
46[SYMB] = { 46 [SYMB] = LAYOUT(
47 {KC_BSLS, KC_EXLM, KC_LABK, KC_RABK, CM_COLN, KC_TRNS, KC_UNDS, KC_DLR, KC_QUES, KC_TRNS, KC_PERC}, 47 KC_BSLS, KC_EXLM, KC_LABK, KC_RABK, CM_COLN, KC_UNDS, KC_DLR, KC_QUES, KC_TRNS, KC_PERC,
48 {KC_AT, KC_AMPR, KC_LPRN, KC_RPRN, CM_SCLN, KC_TRNS, KC_COMM, KC_DOT, KC_QUOT, KC_TRNS, KC_TILD}, 48 KC_AT, KC_AMPR, KC_LPRN, KC_RPRN, CM_SCLN, KC_COMM, KC_DOT, KC_QUOT, KC_TRNS, KC_TILD,
49 {KC_HASH, KC_PIPE, KC_LCBR, KC_RCBR, KC_SLSH, KC_TRNS, KC_TRNS, KC_GRV, KC_DQT, KC_TRNS, KC_CIRC}, 49 KC_HASH, KC_PIPE, KC_LCBR, KC_RCBR, KC_SLSH, KC_TRNS, KC_GRV, KC_DQT, KC_TRNS, KC_CIRC,
50 {KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} 50 KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
51}, 51 ),
52[FKEY] = { 52 [FKEY] = LAYOUT(
53 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12}, 53 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12,
54 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F5, KC_F6, KC_F7, KC_F8}, 54 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F5, KC_F6, KC_F7, KC_F8,
55 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4}, 55 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4,
56 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} 56 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
57}}; 57 ),
58};
59
60const uint16_t PROGMEM fn_actions[] = {
58 61
59const uint16_t PROGMEM fn_actions[] = {}; 62};
60 63
61const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 64const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
62{
63 switch(id) {} 65 switch(id) {}
64 66
65 return MACRO_NONE; 67 return MACRO_NONE;
diff --git a/keyboards/atreus/keymaps/khitsule/keymap.c b/keyboards/atreus/keymaps/khitsule/keymap.c
index 23fabf0d7..04cd4d591 100644
--- a/keyboards/atreus/keymaps/khitsule/keymap.c
+++ b/keyboards/atreus/keymaps/khitsule/keymap.c
@@ -1,10 +1,10 @@
1// Personal keymap of khitsule 1// Personal keymap of khitsule
2 2
3#include "atreus.h" 3#include QMK_KEYBOARD_H
4 4
5#define ALPH 0 5#define ALPH 0
6#define LOWR 1 6#define LOWR 1
7#define RAIS 2 7#define RAIS 2
8 8
9// enum layers { 9// enum layers {
10// ALPH, //alpha qwerty 10// ALPH, //alpha qwerty
@@ -24,24 +24,24 @@
24 24
25 25
26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 26const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27[ALPH] = { 27 [ALPH] = LAYOUT(
28 {KC_Q, KC_W, KC_E, KC_R, KC_T, KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P}, 28 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
29 {KC_A, KC_S, KC_D, KC_F, KC_G, KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN}, 29 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
30 {KC_Z, KC_X, KC_C, KC_V, KC_B, CTL_T(KC_SPC), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH}, 30 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
31 {KC_ESC, KC_TRNS, KC_TRNS, ALT_T(KC_ENT), LT(LOWR, KC_TAB), SFT_T(KC_BSPC), LT(RAIS, KC_DEL), KC_LGUI, KC_TRNS, KC_QUOT, KC_MINUS} 31 KC_ESC, KC_TRNS, KC_TRNS, ALT_T(KC_ENT), LT(LOWR, KC_TAB), CTL_T(KC_SPC), SFT_T(KC_BSPC), LT(RAIS, KC_DEL), KC_LGUI, KC_TRNS, KC_QUOT, KC_MINUS
32}, 32 ),
33[LOWR] = { 33 [LOWR] = LAYOUT(
34 {KC_PSCR, KC_HOME, KC_UP, KC_END, KC_TRNS, KC_TRNS, KC_LPRN, KC_F7, KC_F8, KC_F9, KC_RPRN}, 34 KC_PSCR, KC_HOME, KC_UP, KC_END, KC_TRNS, KC_LPRN, KC_F7, KC_F8, KC_F9, KC_RPRN,
35 {KC_VOLU, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGUP, KC_TRNS, KC_LBRC, KC_F4, KC_F5, KC_F6, KC_RBRC}, 35 KC_VOLU, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGUP, KC_LBRC, KC_F4, KC_F5, KC_F6, KC_RBRC,
36 {KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_PGDN, KC_TRNS, LSFT(KC_LBRC), KC_F1, KC_F2, KC_F3, LSFT(KC_RBRC)}, 36 KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_PGDN, LSFT(KC_LBRC), KC_F1, KC_F2, KC_F3, LSFT(KC_RBRC),
37 {KM_DLEFT, KM_DRIGHT, LALT(KC_TAB), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} 37 KM_DLEFT, KM_DRIGHT, LALT(KC_TAB), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
38}, 38 ),
39[RAIS] = { 39 [RAIS] = LAYOUT(
40 {KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, KC_TRNS}, 40 KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_TRNS, KC_7, KC_8, KC_9, KC_TRNS,
41 {KC_CIRC, KC_AMPR, KC_GRV, KC_TILD, KC_PIPE, KC_TRNS, KC_PLUS, KC_4, KC_5, KC_6, KC_ASTR}, 41 KC_CIRC, KC_AMPR, KC_GRV, KC_TILD, KC_PIPE, KC_PLUS, KC_4, KC_5, KC_6, KC_ASTR,
42 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_MINUS, KC_1, KC_2, KC_3, KC_SLASH}, 42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_MINUS, KC_1, KC_2, KC_3, KC_SLASH,
43 {RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_DOT, KC_EQL} 43 RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_DOT, KC_EQL
44} 44 ),
45}; 45};
46 46
47const uint16_t PROGMEM fn_actions[] = { 47const uint16_t PROGMEM fn_actions[] = {
@@ -49,9 +49,8 @@ const uint16_t PROGMEM fn_actions[] = {
49 [2] = ACTION_MACRO_TAP(2) 49 [2] = ACTION_MACRO_TAP(2)
50}; 50};
51 51
52const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 52const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
53{ 53 switch(id) {
54 switch(id) {
55 case 1: 54 case 1:
56 return tap_mod_macro(record, LGUI, MACRO( D(LSFT), T(9), U(LSFT), END)); 55 return tap_mod_macro(record, LGUI, MACRO( D(LSFT), T(9), U(LSFT), END));
57 break; 56 break;
diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index d39a184d4..2d8f0d70f 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -15,7 +15,7 @@
15 * here: https://colemakmods.github.io/mod-dh/ 15 * here: https://colemakmods.github.io/mod-dh/
16 */ 16 */
17 17
18#include "atreus.h" 18#include QMK_KEYBOARD_H
19 19
20// Each layer gets a name for readability, which is then used in the keymap matrix below. 20// Each layer gets a name for readability, which is then used in the keymap matrix below.
21// The underscores don't mean anything - you can have a layer called STUFF or any other name. 21// The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -47,136 +47,136 @@
47; // This doesn't do anything. It's just for VSCode because its syntax highlighting is weird for the above #define statements. 47; // This doesn't do anything. It's just for VSCode because its syntax highlighting is weird for the above #define statements.
48 48
49const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 49const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
50 50 /*
51/* 51 * Colemak-ModDH
52 * Colemak-ModDH 52 *
53 * 53 * ,----------------------------------. ,----------------------------------.
54 * ,----------------------------------. ,----------------------------------. 54 * | Q | W | F | P | B | | J | L | U | Y | ; |
55 * | Q | W | F | P | B | | J | L | U | Y | ; | 55 * +------+------+------+------+------| +------+------+------+------+------|
56 * +------+------+------+------+------| +------+------+------+------+------| 56 * | A | R | S | T | G | | M | N | E | I | O |
57 * | A | R | S | T | G | | M | N | E | I | O | 57 * +------+------+------+------+------| +------+------+------+------+------|
58 * +------+------+------+------+------| +------+------+------+------+------| 58 * |Z Shft| X | C | D | V | ,------. ,------. | K | H | , | . |/ Shft|
59 * |Z Shft| X | C | D | V | ,------. ,------. | K | H | , | . |/ Shft| 59 * +------+------+------+------+------| | Ctrl | | Alt | +------+------+------+------+------|
60 * +------+------+------+------+------| | Ctrl | | Alt | +------+------+------+------+------| 60 * | Esc | Gui | Tab | _FN | Bksp | | Del | | Enter| |Sp/_NU| _EX | - | ' | = |
61 * | Esc | Gui | Tab | _FN | Bksp | | Del | | Enter| |Sp/_NU| _EX | - | ' | = | 61 * `----------------------------------' `------' `------' `----------------------------------'
62 * `----------------------------------' `------' `------' `----------------------------------' 62 *
63 * 63 */
64 */ 64 [_CO] = LAYOUT(
65[_CO] = KEYMAP( 65 KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
66 KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, 66 KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O,
67 KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, 67 SFT_T(KC_Z), KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, SFT_T(KC_SLSH),
68 SFT_T(KC_Z), KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, SFT_T(KC_SLSH), 68 KC_ESC, KC_LGUI, KC_TAB, MO(_FN), KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
69 KC_ESC, KC_LGUI, KC_TAB, MO(_FN), KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL 69 ),
70), 70
71 71 /*
72/* 72 * QWERTY
73 * QWERTY 73 *
74 * 74 * ,----------------------------------. ,----------------------------------.
75 * ,----------------------------------. ,----------------------------------. 75 * | Q | W | E | R | T | | Y | U | I | O | P |
76 * | Q | W | E | R | T | | Y | U | I | O | P | 76 * +------+------+------+------+------| +------+------+------+------+------|
77 * +------+------+------+------+------| +------+------+------+------+------| 77 * | A | S | D | F | G | | H | J | K | L | ; |
78 * | A | S | D | F | G | | H | J | K | L | ; | 78 * +------+------+------+------+------| +------+------+------+------+------|
79 * +------+------+------+------+------| +------+------+------+------+------| 79 * |Z Shft| X | C | V | B | ,------. ,------. | N | M | , | . |/ Shft|
80 * |Z Shft| X | C | V | B | ,------. ,------. | N | M | , | . |/ Shft| 80 * +------+------+------+------+------| | Ctrl | | Alt | +------+------+------+------+------|
81 * +------+------+------+------+------| | Ctrl | | Alt | +------+------+------+------+------| 81 * | Esc | Gui | Tab | _FN | Bksp | | Del | | Enter| |Sp/_NU| _EX | - | ' | = |
82 * | Esc | Gui | Tab | _FN | Bksp | | Del | | Enter| |Sp/_NU| _EX | - | ' | = | 82 * `----------------------------------' `------' `------' `----------------------------------'
83 * `----------------------------------' `------' `------' `----------------------------------' 83 *
84 * 84 */
85 */ 85 [_QW] = LAYOUT( /* Qwerty */
86[_QW] = KEYMAP( /* Qwerty */ 86 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
87 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 87 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
88 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, 88 SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH),
89 SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH), 89 KC_ESC, KC_LGUI, KC_TAB, MO(_FN), KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL
90 KC_ESC, KC_LGUI, KC_TAB, MO(_FN), KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL 90 ),
91), 91
92 92 /*
93/* 93 * Extend
94 * Extend 94 *
95 * 95 * Ctrl+` is a keyboard shortcut for the program ConEmu, which brings up a dropdown console window.
96 * Ctrl+` is a keyboard shortcut for the program ConEmu, which brings up a dropdown console window. 96 *
97 * 97 * Also note that some dual-role keys are overridden here with their modifiers
98 * Also note that some dual-role keys are overridden here with their modifiers 98 *
99 * 99 * ,----------------------------------. ,----------------------------------.
100 * ,----------------------------------. ,----------------------------------. 100 * | | | | |Ctrl `| | PgUp | Home | Up | End | Del |
101 * | | | | |Ctrl `| | PgUp | Home | Up | End | Del | 101 * +------+------+------+------+------| +------+------+------+------+------|
102 * +------+------+------+------+------| +------+------+------+------+------| 102 * | Gui | Shift| Alt | Ctrl | | | PgDn | Left | Down | Right| Bksp |
103 * | Gui | Shift| Alt | Ctrl | | | PgDn | Left | Down | Right| Bksp | 103 * +------+------+------+------+------| +------+------+------+------+------|
104 * +------+------+------+------+------| +------+------+------+------+------| 104 * | Shift| Cut | Copy | | Paste| ,------. ,------. | | ^Tab | Tab | |Insert|
105 * | Shift| Cut | Copy | | Paste| ,------. ,------. | | ^Tab | Tab | |Insert| 105 * +------+------+------+------+------| | Del | | Enter| +------+------+------+------+------|
106 * +------+------+------+------+------| | Del | | Enter| +------+------+------+------+------| 106 * | | | | | | | | | | | Space|XXXXXX| | |PrntSc|
107 * | | | | | | | | | | | Space|XXXXXX| | |PrntSc| 107 * `----------------------------------' `------' `------' `----------------------------------'
108 * `----------------------------------' `------' `------' `----------------------------------' 108 *
109 * 109 */
110 */ 110 [_EX] = LAYOUT( /* Extend */
111[_EX] = KEYMAP( /* Extend */ 111 _______, _______, _______, _______, LCTL(KC_GRV), KC_PGUP, KC_HOME, KC_UP, KC_END, KC_DEL,
112 _______, _______, _______, _______, LCTL(KC_GRV), KC_PGUP, KC_HOME, KC_UP, KC_END, KC_DEL, 112 KC_LGUI, KC_LSFT, KC_LALT, KC_LCTL, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
113 KC_LGUI, KC_LSFT, KC_LALT, KC_LCTL, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, 113 KC_LSFT, KX_CUT, KX_COPY, _______, KX_PAST, _______, KCX_LST, KC_TAB, _______, KC_INS,
114 KC_LSFT, KX_CUT, KX_COPY, _______, KX_PAST, _______, KCX_LST, KC_TAB, _______, KC_INS, 114 _______, _______, _______, _______, _______, KC_DEL, KC_ENT, KC_SPC, _______, _______, _______, KC_PSCR
115 _______, _______, _______, _______, _______, KC_DEL, KC_ENT, KC_SPC, _______, _______, _______, KC_PSCR 115 ),
116), 116
117 117 /*
118/* 118 * Numbers and symbols
119 * Numbers and symbols 119 *
120 * 120 * ,----------------------------------. ,----------------------------------.
121 * ,----------------------------------. ,----------------------------------. 121 * | ! | @ | { | } | & | | / | 7 | 8 | 9 | * |
122 * | ! | @ | { | } | & | | / | 7 | 8 | 9 | * | 122 * +------+------+------+------+------| +------+------+------+------+------|
123 * +------+------+------+------+------| +------+------+------+------+------| 123 * | # | $ | ( | ) | ~ | | | | 4 | 5 | 6 | - |
124 * | # | $ | ( | ) | ~ | | | | 4 | 5 | 6 | - | 124 * +------+------+------+------+------| +------+------+------+------+------|
125 * +------+------+------+------+------| +------+------+------+------+------| 125 * | % | ^ | [ | ] | ` | ,------. ,------. | \ | 1 | 2 | 3 | + |
126 * | % | ^ | [ | ] | ` | ,------. ,------. | \ | 1 | 2 | 3 | + | 126 * +------+------+------+------+------| | | | | +------+------+------+------+------|
127 * +------+------+------+------+------| | | | | +------+------+------+------+------| 127 * | | _GA | | | | | | | | |XXXXXX| 0 | . | = | |
128 * | | _GA | | | | | | | | |XXXXXX| 0 | . | = | | 128 * `----------------------------------' `------' `------' `----------------------------------'
129 * `----------------------------------' `------' `------' `----------------------------------' 129 *
130 * 130 */
131 */ 131 [_NU] = LAYOUT( /* Numbers and symbols */
132[_NU] = KEYMAP( /* Numbers and symbols */ 132 KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, KC_SLSH, KC_7, KC_8, KC_9, KC_ASTR,
133 KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, KC_SLSH, KC_7, KC_8, KC_9, KC_ASTR, 133 KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_TILD, KC_PIPE, KC_4, KC_5, KC_6, KC_MINS,
134 KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_TILD, KC_PIPE, KC_4, KC_5, KC_6, KC_MINS, 134 KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, KC_BSLS, KC_1, KC_2, KC_3, KC_PLUS,
135 KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, KC_BSLS, KC_1, KC_2, KC_3, KC_PLUS, 135 _______, TG(_GA), _______, _______, _______, _______, _______, _______, KC_0, KC_DOT, KC_EQL, _______
136 _______, TG(_GA), _______, _______, _______, _______, _______, _______, KC_0, KC_DOT, KC_EQL, _______ 136 ),
137), 137
138 138 /*
139/* 139 * Functions
140 * Functions 140 *
141 * 141 * ,----------------------------------. ,----------------------------------.
142 * ,----------------------------------. ,----------------------------------. 142 * | Caps | F9 | F10 | F11 | F12 | | _USER|Whl Up| MUp |Whl Dn| |
143 * | Caps | F9 | F10 | F11 | F12 | | _USER|Whl Up| MUp |Whl Dn| | 143 * +------+------+------+------+------| +------+------+------+------+------|
144 * +------+------+------+------+------| +------+------+------+------+------| 144 * | | F5 | F6 | F7 | F8 | | Vol ^| MLeft| MDown|MRight| |
145 * | | F5 | F6 | F7 | F8 | | Vol ^| MLeft| MDown|MRight| | 145 * +------+------+------+------+------| +------+------+------+------+------|
146 * +------+------+------+------+------| +------+------+------+------+------| 146 * | | F1 | F2 | F3 | F4 | ,------. ,------. | Vol v| | | | |
147 * | | F1 | F2 | F3 | F4 | ,------. ,------. | Vol v| | | | | 147 * +------+------+------+------+------| | | |RClick| +------+------+------+------+------|
148 * +------+------+------+------+------| | | |RClick| +------+------+------+------+------| 148 * | | | |XXXXXX| | | | | | |LClick|MClick| _CO | _GA | RESET|
149 * | | | |XXXXXX| | | | | | |LClick|MClick| _CO | _GA | RESET| 149 * `----------------------------------' `------' `------' `----------------------------------'
150 * `----------------------------------' `------' `------' `----------------------------------' 150 *
151 * 151 */
152 */ 152 [_FN] = LAYOUT( /* Functions */
153[_FN] = KEYMAP( /* Functions */ 153 KC_CAPS, KC_F9, KC_F10, KC_F11, KC_F12, M(_USER),KC_WH_U, KC_MS_U, KC_WH_D, _______,
154 KC_CAPS, KC_F9, KC_F10, KC_F11, KC_F12, M(_USER),KC_WH_U, KC_MS_U, KC_WH_D, _______, 154 _______, KC_F5, KC_F6, KC_F7, KC_F8, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_R, _______,
155 _______, KC_F5, KC_F6, KC_F7, KC_F8, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_R, _______, 155 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_VOLD, _______, _______, _______, _______,
156 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_VOLD, _______, _______, _______, _______, 156 _______, _______, _______, _______, _______, _______, KC_BTN2, KC_BTN1, KC_BTN3, DF(_CO), DF(_QW), RESET
157 _______, _______, _______, _______, _______, _______, KC_BTN2, KC_BTN1, KC_BTN3, DF(_CO), DF(_QW), RESET 157 ),
158), 158
159 159 /*
160/* 160 * Gaming
161 * Gaming 161 *
162 * 162 * ,----------------------------------. ,----------------------------------.
163 * ,----------------------------------. ,----------------------------------. 163 * | | | | | | | |Whl Up| MUp |Whl Dn| |
164 * | | | | | | | |Whl Up| MUp |Whl Dn| | 164 * +------+------+------+------+------| +------+------+------+------+------|
165 * +------+------+------+------+------| +------+------+------+------+------| 165 * | | | | | | | | MLeft| MDown|MRight| |
166 * | | | | | | | | MLeft| MDown|MRight| | 166 * +------+------+------+------+------| +------+------+------+------+------|
167 * +------+------+------+------+------| +------+------+------+------+------| 167 * | Z | | | | | ,------. ,------. | | | | | |
168 * | Z | | | | | ,------. ,------. | | | | | | 168 * +------+------+------+------+------| | Bksp | |RClick| +------+------+------+------+------|
169 * +------+------+------+------+------| | Bksp | |RClick| +------+------+------+------+------| 169 * | | _GA | | Shift| Space| | | | | |LClick|MClick| | | |
170 * | | _GA | | Shift| Space| | | | | |LClick|MClick| | | | 170 * `----------------------------------' `------' `------' `----------------------------------'
171 * `----------------------------------' `------' `------' `----------------------------------' 171 *
172 * 172 */
173 */ 173 [_GA] = LAYOUT( /* Gaming */
174[_GA] = KEYMAP( /* Gaming */ 174 _______, _______, _______, _______, _______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______,
175 _______, _______, _______, _______, _______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______, 175 _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,
176 _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, 176 KC_Z, _______, _______, _______, _______, _______, _______, KC_MS_D, _______, _______,
177 KC_Z, _______, _______, _______, _______, _______, _______, KC_MS_D, _______, _______, 177 _______, TG(_GA), _______, KC_LSFT, KC_SPC, KC_BSPC, KC_BTN2, KC_BTN1, KC_BTN3, _______, _______, _______
178 _______, TG(_GA), _______, KC_LSFT, KC_SPC, KC_BSPC, KC_BTN2, KC_BTN1, KC_BTN3, _______, _______, _______ 178 )
179)}; 179};
180 180
181/* 181/*
182 * Template 182 * Template
@@ -197,17 +197,16 @@ const uint16_t PROGMEM fn_actions[] = {
197 197
198}; 198};
199 199
200const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 200const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
201{
202 // MACRODOWN only works in this function 201 // MACRODOWN only works in this function
203 switch(id) { 202 switch(id) {
204 case _USER: 203 case _USER:
205 if (record->event.pressed) { 204 if (record->event.pressed) {
206 register_code(KC_RSFT); 205 register_code(KC_RSFT);
207 } else { 206 } else {
208 unregister_code(KC_RSFT); 207 unregister_code(KC_RSFT);
209 }
210 break;
211 } 208 }
212 return MACRO_NONE; 209 break;
210 }
211 return MACRO_NONE;
213}; 212};
diff --git a/keyboards/atreus/keymaps/xk/keymap.c b/keyboards/atreus/keymaps/xk/keymap.c
index 9ac1138ec..ed1f634ce 100644
--- a/keyboards/atreus/keymaps/xk/keymap.c
+++ b/keyboards/atreus/keymaps/xk/keymap.c
@@ -1,7 +1,7 @@
1// this is the style you want to emulate. 1// this is the style you want to emulate.
2// This is the canonical layout file for the Quantum project. If you want to add another keyboard, 2// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
3 3
4#include "atreus.h" 4#include QMK_KEYBOARD_H
5 5
6#define _COLEMAK 0 6#define _COLEMAK 0
7#define _KAMELOC 1 7#define _KAMELOC 1
@@ -109,169 +109,170 @@ OSX,
109 109
110const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 110const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
111 111
112/* 112 /*
113 TAP 113 TAP
114 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐ 114 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
115 │ Q │ W │ F │ P │ B │ │ J │ L │ U │ Y │ ; │ 115 │ Q │ W │ F │ P │ B │ │ J │ L │ U │ Y │ ; │
116 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 116 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
117 │ A │ R │ S │ T │ G │ │ M │ N │ E │ I │ O │ 117 │ A │ R │ S │ T │ G │ │ M │ N │ E │ I │ O │
118 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 118 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
119 │ X │ C │ D │ V │ Z ├────┐ ┌────┤ K │ H │ , │ . │ / │ 119 │ X │ C │ D │ V │ Z ├────┐ ┌────┤ K │ H │ , │ . │ / │
120 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤ 120 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
121 │SFTn│CTLn│ALTn│ROUS│SPC │BKSP│ │TAB │ENT │PGDN│ ' │ \ │ESC │ 121 │SFTn│CTLn│ALTn│ROUS│SPC │BKSP│ │TAB │ENT │PGDN│ ' │ \ │ESC │
122 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘ 122 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
123 HOLD 123 HOLD
124 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐ 124 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
125 │ │ │ │ │ │ │ │ │ │ │ALT │ 125 │ │ │ │ │ │ │ │ │ │ │ALT │
126 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 126 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
127 │ │ │ │ │ │ │ │ │ │ │ │ 127 │ │ │ │ │ │ │ │ │ │ │ │
128 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 128 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
129 │ │ │ │ │ ├────┐ ┌────┤ │ │ │ │CTL │ 129 │ │ │ │ │ ├────┐ ┌────┤ │ │ │ │CTL │
130 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤ 130 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
131 │SFT │CTL │ALT │ROUS│L123│L OH│ │L OH│L123│L!@#│ │L FN│LESC│ 131 │SFT │CTL │ALT │ROUS│L123│L OH│ │L OH│L123│L!@#│ │L FN│LESC│
132 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘ 132 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
133 DOUBLETAP 133 DOUBLETAP
134 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐ 134 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
135 │ │ │ │ │ │ │ │ │ │ │ │ 135 │ │ │ │ │ │ │ │ │ │ │ │
136 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 136 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
137 │ │ │ │ │ │ │ │ │ │ │ │ 137 │ │ │ │ │ │ │ │ │ │ │ │
138 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 138 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
139 │ │ │ │ │ ├────┐ ┌────┤ │ │ │ │ │ 139 │ │ │ │ │ ├────┐ ┌────┤ │ │ │ │ │
140 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤ 140 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
141 │OSML│OSML│OSML│NADA│ │ │ │ │ │ │ │ │ │ 141 │OSML│OSML│OSML│NADA│ │ │ │ │ │ │ │ │ │
142 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘ 142 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
143*/ 143 */
144 144
145// Colemak PB&J (Mod-DH) 145 // Colemak PB&J (Mod-DH)
146[_COLEMAK] = KEYMAP( \ 146 [_COLEMAK] = LAYOUT( \
147 KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, ALT_IT, \ 147 KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, ALT_IT, \
148 KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, \ 148 KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, \
149 KC_X, KC_C, KC_D, KC_V, KC_Z, KC_K, KC_H, KC_COMM, SFT_IT, CTL_IT, \ 149 KC_X, KC_C, KC_D, KC_V, KC_Z, KC_K, KC_H, KC_COMM, SFT_IT, CTL_IT, \
150 KYCTL, KYSFT, KYALT, TT(_MLAYER), XK_SPC, XK_TAB, XK_BSP, XK_ENT, XK_PGDN, XK_APO, PIPBOY, XK_ESC \ 150 KYCTL, KYSFT, KYALT, TT(_MLAYER), XK_SPC, XK_TAB, XK_BSP, XK_ENT, XK_PGDN, XK_APO, PIPBOY, XK_ESC \
151), 151 ),
152 152
153// useful for one-handed typing 153 // useful for one-handed typing
154[_KAMELOC] = KEYMAP( \ 154 [_KAMELOC] = LAYOUT( \
155 KC_SCLN, KC_Y, KC_U, KC_L, KC_J, KC_B, KC_P, KC_F, KC_W, KC_Q, \ 155 KC_SCLN, KC_Y, KC_U, KC_L, KC_J, KC_B, KC_P, KC_F, KC_W, KC_Q, \
156 KC_O, KC_I, KC_E, KC_N, KC_M, KC_G, KC_T, KC_S, KC_R, KC_A, \ 156 KC_O, KC_I, KC_E, KC_N, KC_M, KC_G, KC_T, KC_S, KC_R, KC_A, \
157 KC_SLSH, KC_DOT, KC_COMM, KC_H, KC_K, KC_Z, KC_V, KC_D, KC_C, KC_X, \ 157 KC_SLSH, KC_DOT, KC_COMM, KC_H, KC_K, KC_Z, KC_V, KC_D, KC_C, KC_X, \
158 XK_ESC, PIPBOY, TT(_MLAYER), KC_PGDN, KC_ENT, _______, _______, XK_SPC, KC_PGUP, KYALT, KYCTL, KYSFT \ 158 XK_ESC, PIPBOY, TT(_MLAYER), KC_PGDN, KC_ENT, _______, _______, XK_SPC, KC_PGUP, KYALT, KYCTL, KYSFT \
159), 159 ),
160 160
161/* 161 /*
162 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐ 162 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
163 │ 1 │ 2 │ 3 │ 4 │ 5 │ │ 6 │ 7 │ 8 │ 9 │ 0 │ 163 │ 1 │ 2 │ 3 │ 4 │ 5 │ │ 6 │ 7 │ 8 │ 9 │ 0 │
164 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 164 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
165 │ M │ V- │ V+ │NEXT│PLAY│ │ ← │ ↓ │ ↑ │ → │DASH│ 165 │ M │ V- │ V+ │NEXT│PLAY│ │ ← │ ↓ │ ↑ │ → │DASH│
166 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 166 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
167 │ - │ = │ ` │GUI │UNDO├────┐ ┌────┤HOME│END │HOME│INS │ \ │ 167 │ - │ = │ ` │GUI │UNDO├────┐ ┌────┤HOME│END │HOME│INS │ \ │
168 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤ 168 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
169 │ │ │ │ │ │ │ │ │ │GUI │ │ │ │ 169 │ │ │ │ │ │ │ │ │ │GUI │ │ │ │
170 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘ 170 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
171*/ 171 */
172 172
173[_IKAPILA] = KEYMAP( \ 173 [_IKAPILA] = LAYOUT( \
174 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ 174 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \
175 KC_MUTE, KC_VOLD, KC_VOLU, TD(MND), KC_MPLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TD(DSH), \ 175 KC_MUTE, KC_VOLD, KC_VOLU, TD(MND), KC_MPLY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TD(DSH), \
176 KC_MINS, KC_EQL, KC_GRV, KC_LGUI, LCTL(KC_Z), TD(HND), KC_HOME, TD(HND), KC_INS, KC_BSLS, \ 176 KC_MINS, KC_EQL, KC_GRV, KC_LGUI, LCTL(KC_Z), TD(HND), KC_HOME, TD(HND), KC_INS, KC_BSLS, \
177 _______, _______, _______, _______, _______, _______, _______, _______, KC_LGUI, _______, _______, KYSFT \ 177 _______, _______, _______, _______, _______, _______, _______, _______, KC_LGUI, _______, _______, KYSFT \
178), 178 ),
179 179
180/* 180 /*
181 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐ 181 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
182 │ ! │ @ │ # │ $ │ % │ │ ^ │ & │ * │ ( │ ) │ 182 │ ! │ @ │ # │ $ │ % │ │ ^ │ & │ * │ ( │ ) │
183 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 183 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
184 │PSCR│ ← │ ↓ │ ↑ │ → │ │NEXT│PGUP│ V+ │ V- │DASH│ 184 │PSCR│ ← │ ↓ │ ↑ │ → │ │NEXT│PGUP│ V+ │ V- │DASH│
185 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 185 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
186 │ _ │ + │ ~ │HOME│END ├────┐ ┌────┤ {} │ () │ <> │ [ │ ] │ 186 │ _ │ + │ ~ │HOME│END ├────┐ ┌────┤ {} │ () │ <> │ [ │ ] │
187 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤ 187 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
188 │ │ │ │ │ │DEL │ │BKSP│ │ │ │ │ │ 188 │ │ │ │ │ │DEL │ │BKSP│ │ │ │ │ │
189 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘ 189 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
190*/ 190 */
191 191
192[_IKASHFT] = KEYMAP( \ 192 [_IKASHFT] = LAYOUT( \
193 KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, \ 193 KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, \
194 KC_PSCR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TD(MND), KC_PGUP, KC_VOLU, TD(VOM), KC_MDSH, \ 194 KC_PSCR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TD(MND), KC_PGUP, KC_VOLU, TD(VOM), KC_MDSH, \
195 KC_UNDS, KC_PLUS, KC_TILD, KC_HOME, KC_END, M(1), M(0), M(5), KC_LBRC, KC_RBRC, \ 195 KC_UNDS, KC_PLUS, KC_TILD, KC_HOME, KC_END, M(1), M(0), M(5), KC_LBRC, KC_RBRC, \
196 _______, _______, _______, _______, _______, KC_BSPC, KC_DEL, _______, _______, _______, _______, _______ \ 196 _______, _______, _______, _______, _______, KC_BSPC, KC_DEL, _______, _______, _______, _______, _______ \
197), 197 ),
198 198
199/* 199 /*
200 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐ 200 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
201 │ F1 │ F2 │ F3 │ F4 │ F5 │ │ F6 │ F7 │ F8 │ F9 │ F10│ 201 │ F1 │ F2 │ F3 │ F4 │ F5 │ │ F6 │ F7 │ F8 │ F9 │ F10│
202 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 202 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
203 │ F21│ F22│ F23│ F24│PAUS│ │ │SCLK│BOOT│ │NKRO│ 203 │ F21│ F22│ F23│ F24│PAUS│ │ │SCLK│BOOT│ │NKRO│
204 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 204 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
205 │ │ │ │ │ ├────┐ ┌────┤ │ │ │ │CAPS│ 205 │ │ │ │ │ ├────┐ ┌────┤ │ │ │ │CAPS│
206 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤ 206 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
207 │ │ │ │ │ │ │ │ │ │ │ │ │ │ 207 │ │ │ │ │ │ │ │ │ │ │ │ │ │
208 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘ 208 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
209*/ 209 */
210 210
211[_FNCTION] = KEYMAP( \ 211 [_FNCTION] = LAYOUT( \
212 TD(F11), TD(F12), TD(F13), TD(F14), TD(F15), TD(F16), TD(F17), TD(F18), TD(F19), TD(F20), \ 212 TD(F11), TD(F12), TD(F13), TD(F14), TD(F15), TD(F16), TD(F17), TD(F18), TD(F19), TD(F20), \
213 KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX, XXXXXXX, KC_SLCK, XXXXXXX, XXXXXXX, TGNKRO, \ 213 KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX, XXXXXXX, KC_SLCK, XXXXXXX, XXXXXXX, TGNKRO, \
214 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS, \ 214 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS, \
215 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ 215 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
216), 216 ),
217 217
218[_GAMEQWERTY] = KEYMAP( \ 218 [_GAMEQWERTY] = LAYOUT( \
219 KC_P, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, \ 219 KC_P, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, \
220 KC_SCLN, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, \ 220 KC_SCLN, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, \
221 KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, TD(COD), \ 221 KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, TD(COD), \
222 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ 222 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
223), 223 ),
224 224
225/* 225 /*
226 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐ 226 ┌────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┐
227 │^HOM│^PGD│^UP │^PGU│^PGU│ │ │MW_L│ MU │MW_R│ AC2│ 227 │^HOM│^PGD│^UP │^PGU│^PGU│ │ │MW_L│ MU │MW_R│ AC2│
228 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 228 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
229 │^END│^LFT│^DWN│^RGT│^PGD│ │ │ ML │ MD │ MR │ AC1│ 229 │^END│^LFT│^DWN│^RGT│^PGD│ │ │ ML │ MD │ MR │ AC1│
230 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤ 230 ├────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┤
231 │ M5 │ M2 │ M4 │ M3 │ M1 ├────┐ ┌────┤ │MW_D│MW_U│ │ AC0│ 231 │ M5 │ M2 │ M4 │ M3 │ M1 ├────┐ ┌────┤ │MW_D│MW_U│ │ AC0│
232 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤ 232 ├────┼────┼────┼────┼────┤ │ │ ├────┼────┼────┼────┼────┤
233 │ │ │ │ │ │ │ │ │ │ │ │ │ │ 233 │ │ │ │ │ │ │ │ │ │ │ │ │ │
234 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘ 234 └────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
235*/ 235 */
236 236
237[_MLAYER] = KEYMAP( \ 237 [_MLAYER] = LAYOUT( \
238 LALT(KC_ESC), KC_9, KC_8, KC_7, KC_6, M(1), M(0), KC_MS_U, M(0), M(2), \ 238 LALT(KC_ESC), KC_9, KC_8, KC_7, KC_6, M(1), M(0), KC_MS_U, M(0), M(2), \
239 KC_0, KC_2, KC_3, KC_4, KC_5, M(5), KC_MS_L, KC_MS_D, KC_MS_R, KC_ACL2, \ 239 KC_0, KC_2, KC_3, KC_4, KC_5, M(5), KC_MS_L, KC_MS_D, KC_MS_R, KC_ACL2, \
240 KC_1, KC_0, XXXXXXX, XXXXXXX, KC_BTN5, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, M(5), \ 240 KC_1, KC_0, XXXXXXX, XXXXXXX, KC_BTN5, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, M(5), \
241 _______, _______, _______, _______, KC_BTN1, KC_BTN2, KC_BTN2, KC_BTN1, KC_BTN2, _______, KC_ACL0, _______ \ 241 _______, _______, _______, _______, KC_BTN1, KC_BTN2, KC_BTN2, KC_BTN1, KC_BTN2, _______, KC_ACL0, _______ \
242), 242 ),
243 243
244//one_ring=2__rule__them-all 244 //one_ring=2__rule__them-all
245[_GRVTABL] = KEYMAP( \ 245 [_GRVTABL] = LAYOUT( \
246 LALT(KC_PSCR), M(4), KC_PWR, KC_POWER, RESET, RESET, KC_R, KC_E, KC_I, LALT(KC_PSCR), \ 246 LALT(KC_PSCR), M(4), KC_PWR, KC_POWER, RESET, RESET, KC_R, KC_E, KC_I, LALT(KC_PSCR), \
247 TG(_NINEKEY), TG(_FNCTION), TG(_MLAYER), TG(_IKASHFT), TG(_IKAPILA), TG(_IKAPILA), KC_S, KC_U, KC_B, TG(_NINEKEY), \ 247 TG(_NINEKEY), TG(_FNCTION), TG(_MLAYER), TG(_IKASHFT), TG(_IKAPILA), TG(_IKAPILA), KC_S, KC_U, KC_B, TG(_NINEKEY), \
248 M(3), TG(_GAMEQWERTY), XXXXXXX, XXXXXXX, XXXXXXX, KC_MYCM, KC_CALC, XXXXXXX, TG(_GAMEQWERTY), M(3), \ 248 M(3), TG(_GAMEQWERTY), XXXXXXX, XXXXXXX, XXXXXXX, KC_MYCM, KC_CALC, XXXXXXX, TG(_GAMEQWERTY), M(3), \
249 TT(_GRVTABL), TG(_FNCTION), TG(_MLAYER), TG(_IKASHFT), TG(_IKAPILA), _______, _______, TG(_IKAPILA), TG(_IKASHFT), TG(_MLAYER), TG(_MLAYER), TG(_NINEKEY) \ 249 TT(_GRVTABL), TG(_FNCTION), TG(_MLAYER), TG(_IKASHFT), TG(_IKAPILA), _______, _______, TG(_IKAPILA), TG(_IKASHFT), TG(_MLAYER), TG(_MLAYER), TG(_NINEKEY) \
250)}; 250 ),
251};
251 252
252qk_tap_dance_action_t tap_dance_actions[] = { 253qk_tap_dance_action_t tap_dance_actions[] = {
253 [VOM] = ACTION_TAP_DANCE_DOUBLE(KC_VOLD, KC_MUTE), 254 [VOM] = ACTION_TAP_DANCE_DOUBLE(KC_VOLD, KC_MUTE),
254 [PRN] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN), 255 [PRN] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN),
255 [EGT] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR), 256 [EGT] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR),
256 [HRD] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), 257 [HRD] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
257 [DSH] = ACTION_TAP_DANCE_DOUBLE(KC_NDSH, KC_MDSH), 258 [DSH] = ACTION_TAP_DANCE_DOUBLE(KC_NDSH, KC_MDSH),
258 [ESC] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, LALT(KC_F4)), 259 [ESC] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, LALT(KC_F4)),
259 [EQE] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_ENT), 260 [EQE] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_ENT),
260 [UND] = ACTION_TAP_DANCE_DOUBLE(KC_Z, LCTL(KC_Z)), 261 [UND] = ACTION_TAP_DANCE_DOUBLE(KC_Z, LCTL(KC_Z)),
261 [PGN] = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, KC_PGUP), 262 [PGN] = ACTION_TAP_DANCE_DOUBLE(KC_PGDN, KC_PGUP),
262 [HND] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END), 263 [HND] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END),
263 [COD] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_DOT), 264 [COD] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_DOT),
264 [MND] = ACTION_TAP_DANCE_DOUBLE(KC_MNXT, KC_MPRV), 265 [MND] = ACTION_TAP_DANCE_DOUBLE(KC_MNXT, KC_MPRV),
265 [F11] = ACTION_TAP_DANCE_DOUBLE(KC_F1, KC_F11), 266 [F11] = ACTION_TAP_DANCE_DOUBLE(KC_F1, KC_F11),
266 [F12] = ACTION_TAP_DANCE_DOUBLE(KC_F2, KC_F12), 267 [F12] = ACTION_TAP_DANCE_DOUBLE(KC_F2, KC_F12),
267 [F13] = ACTION_TAP_DANCE_DOUBLE(KC_F3, KC_F13), 268 [F13] = ACTION_TAP_DANCE_DOUBLE(KC_F3, KC_F13),
268 [F14] = ACTION_TAP_DANCE_DOUBLE(KC_F4, KC_F14), 269 [F14] = ACTION_TAP_DANCE_DOUBLE(KC_F4, KC_F14),
269 [F15] = ACTION_TAP_DANCE_DOUBLE(KC_F5, KC_F15), 270 [F15] = ACTION_TAP_DANCE_DOUBLE(KC_F5, KC_F15),
270 [F16] = ACTION_TAP_DANCE_DOUBLE(KC_F6, KC_F16), 271 [F16] = ACTION_TAP_DANCE_DOUBLE(KC_F6, KC_F16),
271 [F17] = ACTION_TAP_DANCE_DOUBLE(KC_F7, KC_F17), 272 [F17] = ACTION_TAP_DANCE_DOUBLE(KC_F7, KC_F17),
272 [F18] = ACTION_TAP_DANCE_DOUBLE(KC_F8, KC_F18), 273 [F18] = ACTION_TAP_DANCE_DOUBLE(KC_F8, KC_F18),
273 [F19] = ACTION_TAP_DANCE_DOUBLE(KC_F9, KC_F19), 274 [F19] = ACTION_TAP_DANCE_DOUBLE(KC_F9, KC_F19),
274 [F20] = ACTION_TAP_DANCE_DOUBLE(KC_F10, KC_F20), 275 [F20] = ACTION_TAP_DANCE_DOUBLE(KC_F10, KC_F20),
275}; 276};
276 277
277void matrix_init_user(){ 278void matrix_init_user(){
@@ -281,33 +282,33 @@ void matrix_init_user(){
281const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { 282const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
282 if (record->event.pressed) { 283 if (record->event.pressed) {
283 switch(id) { 284 switch(id) {
284 case 0: 285 case 0:
285 return MACRO( D(LSFT), T(9), U(LSFT), D(LSFT), T(0), U(LSFT), T(LEFT), END ); 286 return MACRO( D(LSFT), T(9), U(LSFT), D(LSFT), T(0), U(LSFT), T(LEFT), END );
286 case 1: 287 case 1:
287 return MACRO( D(LSFT), T(LBRC), U(LSFT), D(LSFT), T(RBRC), U(LSFT), T(LEFT), END ); 288 return MACRO( D(LSFT), T(LBRC), U(LSFT), D(LSFT), T(RBRC), U(LSFT), T(LEFT), END );
288 case 2: 289 case 2:
289 return MACRO( T(LBRC), T(RBRC), T(LEFT), END); 290 return MACRO( T(LBRC), T(RBRC), T(LEFT), END);
290 case 5: 291 case 5:
291 return MACRO( D(LSFT), T(COMMA), U(LSFT), D(LSFT), T(DOT), U(LSFT), END ); 292 return MACRO( D(LSFT), T(COMMA), U(LSFT), D(LSFT), T(DOT), U(LSFT), END );
292 case 3: 293 case 3:
293 clear_keyboard(); 294 clear_keyboard();
294 return false; 295 return false;
295 break; 296 break;
296 case 4: 297 case 4:
297 return MACRO( D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(9), U(LSFT), D(LSFT), T(0), U(LSFT), D(LSFT), T(LBRACKET), U(LSFT), D(LSFT), T(9), U(LSFT), D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(0), U(LSFT), D(LSFT), T(BSLASH), U(LSFT), D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(7), U(LSFT), D(LSFT), T(RBRACKET), U(LSFT), T(SCOLON), D(LSFT), T(SCOLON), U(LSFT), END ); 298 return MACRO( D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(9), U(LSFT), D(LSFT), T(0), U(LSFT), D(LSFT), T(LBRACKET), U(LSFT), D(LSFT), T(9), U(LSFT), D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(0), U(LSFT), D(LSFT), T(BSLASH), U(LSFT), D(LSFT), T(SCOLON), U(LSFT), D(LSFT), T(7), U(LSFT), D(LSFT), T(RBRACKET), U(LSFT), T(SCOLON), D(LSFT), T(SCOLON), U(LSFT), END );
298 case WINSH: 299 case WINSH:
299 set_unicode_input_mode(UC_WIN); 300 set_unicode_input_mode(UC_WIN);
300 return false; 301 return false;
301 break; 302 break;
302 case WIN: 303 case WIN:
303 set_unicode_input_mode(UC_WINC); 304 set_unicode_input_mode(UC_WINC);
304 return false; 305 return false;
305 break; 306 break;
306 case OSX: 307 case OSX:
307 set_unicode_input_mode(UC_OSX); 308 set_unicode_input_mode(UC_OSX);
308 return false; 309 return false;
309 break; 310 break;
310 } 311 }
311 } 312 }
312 return MACRO_NONE; 313 return MACRO_NONE;
313}; 314};
diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c
index 347445ef6..fb0c5077f 100644
--- a/keyboards/atreus/keymaps/xyverz/keymap.c
+++ b/keyboards/atreus/keymaps/xyverz/keymap.c
@@ -2,7 +2,7 @@
2// Chris Gerber (@gerbercj), with the addition of persistent layers like the Planck and 2// Chris Gerber (@gerbercj), with the addition of persistent layers like the Planck and
3// Preonic keyboards by Jack Humbert. 3// Preonic keyboards by Jack Humbert.
4 4
5#include "atreus.h" 5#include QMK_KEYBOARD_H
6#include "action_layer.h" 6#include "action_layer.h"
7#include "eeconfig.h" 7#include "eeconfig.h"
8 8
@@ -43,7 +43,7 @@ enum planck_keycodes {
43#define XXXXXXX KC_NO 43#define XXXXXXX KC_NO
44 44
45const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 45const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
46/* Dvorak Layer 46 /* Dvorak Layer
47 ,----------------------------------. ,----------------------------------. 47 ,----------------------------------. ,----------------------------------.
48 | ' | , | . | P | Y | | F | G | C | R | L | 48 | ' | , | . | P | Y | | F | G | C | R | L |
49 |------+------+------+------+------| |------+------+------+------+------| 49 |------+------+------+------+------| |------+------+------+------+------|
@@ -53,14 +53,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
53 |------+------+------+------+------| ||Enter |------+------+------+------+------| 53 |------+------+------+------+------| ||Enter |------+------+------+------+------|
54 | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | / | \ | 54 | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | / | \ |
55 `----------------------------------' `----------------------------------' */ 55 `----------------------------------' `----------------------------------' */
56 [_DVORAK] = { 56 [_DVORAK] = LAYOUT(
57 {KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, XXXXXXX, KC_F, KC_G, KC_C, KC_R, KC_L }, 57 KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L ,
58 {KC_A, KC_O, KC_E, KC_U, KC_I, XXXXXXX, KC_D, KC_H, KC_T, KC_N, KC_S }, 58 KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S ,
59 {SFTSCLN, KC_Q, KC_J, KC_K, KC_X, KC_LCTL, KC_B, KC_M, KC_W, KC_V, SFTZED }, 59 SFTSCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, SFTZED ,
60 {ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS} 60 ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, KC_LCTL, ALTENT, KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS
61 }, 61 ),
62 62
63/* QWERTY Layer 63 /* QWERTY Layer
64 ,----------------------------------. ,----------------------------------. 64 ,----------------------------------. ,----------------------------------.
65 | Q | W | E | R | T | | Y | U | I | O | P | 65 | Q | W | E | R | T | | Y | U | I | O | P |
66 |------+------+------+------+------| |------+------+------+------+------| 66 |------+------+------+------+------| |------+------+------+------+------|
@@ -70,14 +70,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
70 |------+------+------+------+------| ||Enter |------+------+------+------+------| 70 |------+------+------+------+------| ||Enter |------+------+------+------+------|
71 | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | \ | 71 | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | \ |
72 `----------------------------------' `----------------------------------' */ 72 `----------------------------------' `----------------------------------' */
73 [_QWERTY] = { 73 [_QWERTY] = LAYOUT(
74 {KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, KC_Y, KC_U, KC_I, KC_O, KC_P }, 74 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P ,
75 {KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, KC_H, KC_J, KC_K, KC_L, KC_SCLN}, 75 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
76 {SFTZED, KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_N, KC_M, KC_COMM, KC_DOT, SFTSLSH}, 76 SFTZED, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SFTSLSH,
77 {ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS} 77 ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, KC_LCTL, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS
78 }, 78 ),
79 79
80/* Colemak Layer 80 /* Colemak Layer
81 ,----------------------------------. ,----------------------------------. 81 ,----------------------------------. ,----------------------------------.
82 | Q | W | F | P | G | | J | L | U | Y | L | 82 | Q | W | F | P | G | | J | L | U | Y | L |
83 |------+------+------+------+------| |------+------+------+------+------| 83 |------+------+------+------+------| |------+------+------+------+------|
@@ -87,14 +87,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
87 |------+------+------+------+------| ||Enter |------+------+------+------+------| 87 |------+------+------+------+------| ||Enter |------+------+------+------+------|
88 | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | \ | 88 | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | \ |
89 `----------------------------------' `----------------------------------'*/ 89 `----------------------------------' `----------------------------------'*/
90 [_COLEMAK] = { 90 [_COLEMAK] = LAYOUT(
91 {KC_Q, KC_W, KC_F, KC_P, KC_G, XXXXXXX, KC_J, KC_L, KC_U, KC_Y, KC_SCLN}, 91 KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
92 {KC_A, KC_R, KC_S, KC_T, KC_D, XXXXXXX, KC_H, KC_N, KC_E, KC_I, KC_O }, 92 KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O ,
93 {SFTZED, KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_K, KC_M, KC_COMM, KC_DOT, SFTSLSH}, 93 SFTZED, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, SFTSLSH,
94 {ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS} 94 ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, KC_LCTL, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS
95 }, 95 ),
96 96
97/* Dvorak Layer with Command key on left thumb instead of Control 97 /* Dvorak Layer with Command key on left thumb instead of Control
98 ,----------------------------------. ,----------------------------------. 98 ,----------------------------------. ,----------------------------------.
99 | ' | , | . | P | Y | | F | G | C | R | L | 99 | ' | , | . | P | Y | | F | G | C | R | L |
100 |------+------+------+------+------| |------+------+------+------+------| 100 |------+------+------+------+------| |------+------+------+------+------|
@@ -104,14 +104,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
104 |------+------+------+------+------| ||Enter |------+------+------+------+------| 104 |------+------+------+------+------| ||Enter |------+------+------+------+------|
105 | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | / | \ | 105 | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | / | \ |
106 `----------------------------------' `----------------------------------' */ 106 `----------------------------------' `----------------------------------' */
107 [_DVORMAC] = { 107 [_DVORMAC] = LAYOUT(
108 {KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, XXXXXXX, KC_F, KC_G, KC_C, KC_R, KC_L }, 108 KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L ,
109 {KC_A, KC_O, KC_E, KC_U, KC_I, XXXXXXX, KC_D, KC_H, KC_T, KC_N, KC_S }, 109 KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S ,
110 {SFTSCLN, KC_Q, KC_J, KC_K, KC_X, KC_LGUI, KC_B, KC_M, KC_W, KC_V, SFTZED }, 110 SFTSCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, SFTZED ,
111 {ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, ALTENT, KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS} 111 ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, KC_LGUI, ALTENT, KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS
112 }, 112 ),
113 113
114/* LOWER Layer 114 /* LOWER Layer
115 ,----------------------------------. ,----------------------------------. 115 ,----------------------------------. ,----------------------------------.
116 | ! | @ | # | $ | % | | ^ | & | * | ( | ) | 116 | ! | @ | # | $ | % | | ^ | & | * | ( | ) |
117 |------+------+------+------+------| |------+------+------+------+------| 117 |------+------+------+------+------| |------+------+------+------+------|
@@ -121,14 +121,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
121 |------+------+------+------+------| || |------+------+------+------+------| 121 |------+------+------+------+------| || |------+------+------+------+------|
122 | ~ | | | | Del |------'`------| Ins | | | | | 122 | ~ | | | | Del |------'`------| Ins | | | | |
123 `----------------------------------' `----------------------------------'*/ 123 `----------------------------------' `----------------------------------'*/
124 [_LOWER] = { 124 [_LOWER] = LAYOUT(
125 {KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, XXXXXXX, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN}, 125 KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
126 {KC_CAPS, _______, KC_UP, _______, KC_HOME, XXXXXXX, KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR}, 126 KC_CAPS, _______, KC_UP, _______, KC_HOME, KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR,
127 {_______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, _______, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______}, 127 _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______,
128 {KC_TILD, _______, _______, _______, KC_DEL, _______, KC_INS, _______, _______, _______, _______} 128 KC_TILD, _______, _______, _______, KC_DEL, _______, _______, KC_INS, _______, _______, _______, _______
129 }, 129 ),
130 130
131/* RAISE Layer 131 /* RAISE Layer
132 ,----------------------------------. ,----------------------------------. 132 ,----------------------------------. ,----------------------------------.
133 | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | 133 | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 |
134 |------+------+------+------+------| |------+------+------+------+------| 134 |------+------+------+------+------| |------+------+------+------+------|
@@ -138,14 +138,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
138 |------+------+------+------+------| || |------+------+------+------+------| 138 |------+------+------+------+------| || |------+------+------+------+------|
139 | ` | | | | Del |------'`------| Ins | | | | | 139 | ` | | | | Del |------'`------| Ins | | | | |
140 `----------------------------------' `----------------------------------'*/ 140 `----------------------------------' `----------------------------------'*/
141 [_RAISE] = { 141 [_RAISE] = LAYOUT(
142 {KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, KC_6, KC_7, KC_8, KC_9, KC_0 }, 142 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0 ,
143 {KC_CAPS, _______, KC_UP, _______, KC_HOME, XXXXXXX, KC_PGUP, _______, KC_EQL, KC_LBRC, KC_RBRC}, 143 KC_CAPS, _______, KC_UP, _______, KC_HOME, KC_PGUP, _______, KC_EQL, KC_LBRC, KC_RBRC,
144 {_______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, _______, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, _______}, 144 _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, _______,
145 {KC_GRV, _______, _______, _______, KC_DEL, _______, KC_INS, _______, _______, _______, _______} 145 KC_GRV, _______, _______, _______, KC_DEL, _______, _______, KC_INS, _______, _______, _______, _______
146 }, 146 ),
147 147
148/* ADJUST Layer 148 /* ADJUST Layer
149 ,----------------------------------. ,----------------------------------. 149 ,----------------------------------. ,----------------------------------.
150 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | 150 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 |
151 |------+------+------+------+------| |------+------+------+------+------| 151 |------+------+------+------+------| |------+------+------+------+------|
@@ -155,13 +155,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
155 |------+------+------+------+------| || |------+------+------+------+------| 155 |------+------+------+------+------| || |------+------+------+------+------|
156 | | | | | |------'`------| | | | | RESET| 156 | | | | | |------'`------| | | | | RESET|
157 `----------------------------------' `----------------------------------'*/ 157 `----------------------------------' `----------------------------------'*/
158 [_ADJUST] = { 158 [_ADJUST] = LAYOUT(
159 {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 }, 159 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 ,
160 {KC_F11, _______, _______, _______, _______, XXXXXXX, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 }, 160 KC_F11, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 ,
161 {_______, QWERTY, COLEMAK, DVORAK, DVORMAC, _______, _______, _______, _______, _______, _______}, 161 _______, QWERTY, COLEMAK, DVORAK, DVORMAC, _______, _______, _______, _______, _______,
162 {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET } 162 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET
163 } 163 ),
164
165}; 164};
166 165
167const uint16_t PROGMEM fn_actions[] = { 166const uint16_t PROGMEM fn_actions[] = {
@@ -175,50 +174,50 @@ void persistent_default_layer_set(uint16_t default_layer) {
175 174
176bool process_record_user(uint16_t keycode, keyrecord_t *record) { 175bool process_record_user(uint16_t keycode, keyrecord_t *record) {
177 switch (keycode) { 176 switch (keycode) {
178 case QWERTY: 177 case QWERTY:
179 if (record->event.pressed) { 178 if (record->event.pressed) {
180 persistent_default_layer_set(1UL<<_QWERTY); 179 persistent_default_layer_set(1UL<<_QWERTY);
181 } 180 }
182 return false; 181 return false;
183 break; 182 break;
184 case COLEMAK: 183 case COLEMAK:
185 if (record->event.pressed) { 184 if (record->event.pressed) {
186 persistent_default_layer_set(1UL<<_COLEMAK); 185 persistent_default_layer_set(1UL<<_COLEMAK);
187 } 186 }
188 return false; 187 return false;
189 break; 188 break;
190 case DVORAK: 189 case DVORAK:
191 if (record->event.pressed) { 190 if (record->event.pressed) {
192 persistent_default_layer_set(1UL<<_DVORAK); 191 persistent_default_layer_set(1UL<<_DVORAK);
193 }
194 return false;
195 break;
196 case DVORMAC:
197 if (record->event.pressed) {
198 persistent_default_layer_set(1UL<<_DVORMAC);
199 }
200 return false;
201 break;
202 case LOWER:
203 if (record->event.pressed) {
204 layer_on(_LOWER);
205 update_tri_layer(_LOWER, _RAISE, _ADJUST);
206 } else {
207 layer_off(_LOWER);
208 update_tri_layer(_LOWER, _RAISE, _ADJUST);
209 }
210 return false;
211 break;
212 case RAISE:
213 if (record->event.pressed) {
214 layer_on(_RAISE);
215 update_tri_layer(_LOWER, _RAISE, _ADJUST);
216 } else {
217 layer_off(_RAISE);
218 update_tri_layer(_LOWER, _RAISE, _ADJUST);
219 }
220 return false;
221 break;
222 } 192 }
223 return true; 193 return false;
194 break;
195 case DVORMAC:
196 if (record->event.pressed) {
197 persistent_default_layer_set(1UL<<_DVORMAC);
198 }
199 return false;
200 break;
201 case LOWER:
202 if (record->event.pressed) {
203 layer_on(_LOWER);
204 update_tri_layer(_LOWER, _RAISE, _ADJUST);
205 } else {
206 layer_off(_LOWER);
207 update_tri_layer(_LOWER, _RAISE, _ADJUST);
208 }
209 return false;
210 break;
211 case RAISE:
212 if (record->event.pressed) {
213 layer_on(_RAISE);
214 update_tri_layer(_LOWER, _RAISE, _ADJUST);
215 } else {
216 layer_off(_RAISE);
217 update_tri_layer(_LOWER, _RAISE, _ADJUST);
218 }
219 return false;
220 break;
221 }
222 return true;
224}; 223};
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-21 07:08:38 +0000