summaryrefslogtreecommitdiff
path: root/keyboards/jian/keymaps
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/jian/keymaps')
-rw-r--r--keyboards/jian/keymaps/advanced/config.h1
-rw-r--r--keyboards/jian/keymaps/advanced/keymap.c20
-rw-r--r--keyboards/jian/keymaps/default/config.h2
-rw-r--r--keyboards/jian/keymaps/default/keymap.c20
-rw-r--r--keyboards/jian/keymaps/left_hand/config.h1
-rw-r--r--keyboards/jian/keymaps/left_hand/keymap.c70
-rw-r--r--keyboards/jian/keymaps/via/config.h1
-rw-r--r--keyboards/jian/keymaps/via/keymap.c10
8 files changed, 60 insertions, 65 deletions
diff --git a/keyboards/jian/keymaps/advanced/config.h b/keyboards/jian/keymaps/advanced/config.h
index 85b41c86d8..1a033d8311 100644
--- a/keyboards/jian/keymaps/advanced/config.h
+++ b/keyboards/jian/keymaps/advanced/config.h
@@ -22,6 +22,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define AUTO_SHIFT_TIMEOUT 150
//#define NO_AUTO_SHIFT_NUMERIC
//#define AUTO_SHIFT_MODIFIERS
-#define IGNORE_MOD_TAP_INTERRUPT
#define ALT_LAYOUTS_ENABLE
//#define TRAINING_HALFES_LOCK
diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c
index 6b308a4820..a825e061b5 100644
--- a/keyboards/jian/keymaps/advanced/keymap.c
+++ b/keyboards/jian/keymaps/advanced/keymap.c
@@ -211,18 +211,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______
),
-[_ADJUST] = LAYOUT_symmetric(
- QK_BOOT, DB_TOGG, AS_UP, CH_WMN, CH_CMK, CH_QWE, CH_DVK,
- AS_RPT, AS_TOGG, XXXXXXX, XXXXXXX, QWERTY, PLOVER,
- BL_ADJ, AS_DOWN, XXXXXXX, XXXXXXX, ISO, THUMB_ALT,
- _______, SW_TG, _______
+[_ADJUST] = LAYOUT(
+ QK_BOOT, DB_TOGG, AS_UP, CH_WMN, CH_CMK, CH_QWE, CH_DVK, CH_DVK, CH_QWE, CH_CMK, CH_WMN, AS_UP, DB_TOGG, QK_BOOT,
+ AS_RPT, AS_TOGG, XXXXXXX, XXXXXXX, QWERTY, PLOVER, PLOVER, QWERTY, XXXXXXX, XXXXXXX, AS_TOGG, AS_RPT,
+ BL_ADJ, AS_DOWN, XXXXXXX, XXXXXXX, ISO, THUMB_ALT, THUMB_ALT, ISO, XXXXXXX, XXXXXXX, AS_DOWN, BL_ADJ,
+ _______, SW_TG, _______, _______, SW_TG, _______
),
#if defined(RGBLIGHT) | defined(BACKLIGHT_ENABLE)
-[_BCKLT_ADJ] = LAYOUT_symmetric(
- XXXXXXX, XXXXXXX, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI,
- XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
- BL_ADJ, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
- _______, _______, _______
+[_BCKLT_ADJ] = LAYOUT(
+ XXXXXXX, XXXXXXX, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, RGB_HUI, RGB_HUD, RGB_VAI, BL_UP, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
+ BL_ADJ, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, BL_ADJ,
+ _______, _______, _______, _______, _______, _______
),
#endif // defined(RGBLIGHT) | defined(BACKLIGHT_ENABLE)
#ifdef TRAINING_HALFES_LOCK
diff --git a/keyboards/jian/keymaps/default/config.h b/keyboards/jian/keymaps/default/config.h
index 4d9cb17cac..314836a54d 100644
--- a/keyboards/jian/keymaps/default/config.h
+++ b/keyboards/jian/keymaps/default/config.h
@@ -18,5 +18,3 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/jian/keymaps/default/keymap.c b/keyboards/jian/keymaps/default/keymap.c
index 3948dd119f..4d0de652f1 100644
--- a/keyboards/jian/keymaps/default/keymap.c
+++ b/keyboards/jian/keymaps/default/keymap.c
@@ -71,19 +71,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______
),
-[_ADJUST] = LAYOUT_symmetric(
- QK_BOOT, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, WORKMAN, COLEMAK, DVORAK, QWERTY, XXXXXXX,
- TG(_BCKLT_ADJ), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- _______, SW_TG, _______
+[_ADJUST] = LAYOUT(
+ QK_BOOT, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DB_TOGG, QK_BOOT,
+ XXXXXXX, WORKMAN, COLEMAK, DVORAK, QWERTY, XXXXXXX, XXXXXXX, QWERTY, DVORAK, COLEMAK, WORKMAN, XXXXXXX,
+ TG(_BCKLT_ADJ), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG(_BCKLT_ADJ),
+ _______, SW_TG, _______, _______, SW_TG, _______
),
#if defined(RGBLIGHT) || defined(BACKLIGHT_ENABLE)
-[_BCKLT_ADJ] = LAYOUT_symmetric(
- XXXXXXX, XXXXXXX, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI,
- XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
- TG(_BCKLT_ADJ), BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
- _______, _______, _______
+[_BCKLT_ADJ] = LAYOUT(
+ XXXXXXX, XXXXXXX, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, RGB_HUI, RGB_HUD, RGB_VAI, BL_UP, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
+ TG(_BCKLT_ADJ), BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, TG(_BCKLT_ADJ),
+ _______, _______, _______, _______, _______, _______
)
#endif // defined(RGBLIGHT) || defined(BACKLIGHT_ENABLE)
diff --git a/keyboards/jian/keymaps/left_hand/config.h b/keyboards/jian/keymaps/left_hand/config.h
index 4d9cb17cac..cae66a5c3a 100644
--- a/keyboards/jian/keymaps/left_hand/config.h
+++ b/keyboards/jian/keymaps/left_hand/config.h
@@ -19,4 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/jian/keymaps/left_hand/keymap.c b/keyboards/jian/keymaps/left_hand/keymap.c
index 5f6b93bc6e..3f67215b8b 100644
--- a/keyboards/jian/keymaps/left_hand/keymap.c
+++ b/keyboards/jian/keymaps/left_hand/keymap.c
@@ -26,46 +26,46 @@ enum jian_layers {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_DFLT_L] = LAYOUT_symmetric_left(
- KC_LSFT, LGUI_T(KC_GRV), KC_Q, KC_W, KC_E, KC_R, KC_T,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B,
- LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT)
+[_DFLT_L] = LAYOUT(
+ KC_LSFT, LGUI_T(KC_GRV), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_T, KC_R, KC_E, KC_W, KC_Q, LGUI_T(KC_GRV), KC_LSFT,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_G, KC_F, KC_D, KC_S, KC_A, KC_LCTL,
+ KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_V, KC_C, KC_X, KC_Z, KC_LALT,
+ LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT), LT(_LOWR_L, KC_ENT), LT(_DFLT_R, KC_SPC), LT(_RAIS_L, KC_BSPC),
),
-[_DFLT_R] = LAYOUT_symmetric_right(
- KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
- LT(_LOWR_R, KC_ESC), _______, LT(_RAIS_R, KC_DEL)
+[_DFLT_R] = LAYOUT(
+ KC_RBRC, KC_LBRC, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
+ KC_QUOT, KC_SCLN, KC_L, KC_K, KC_J, KC_H, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_BSLS, KC_SLSH, KC_DOT, KC_COMM, KC_M, KC_N, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
+ LT(_RAIS_R, KC_DEL), _______, LT(_LOWR_R, KC_ESC), LT(_LOWR_R, KC_ESC), _______, LT(_RAIS_R, KC_DEL)
),
-[_RAIS_L] = LAYOUT_symmetric_left(
- _______, LGUI_T(KC_CAPS), KC_SCRL, KC_HOME, KC_PSCR, KC_PGUP, KC_VOLU,
- LCTL_T(KC_APP), KC_INS, KC_LEFT, KC_UP, KC_RGHT, KC_MUTE,
- _______, KC_PAUS, KC_END, KC_DOWN, KC_PGDN, KC_VOLD,
- _______, LT(_RAIS_R, KC_TAB) , LT(_ADJUST, KC_ESC)
+[_RAIS_L] = LAYOUT(
+ _______, LGUI_T(KC_CAPS), KC_SCRL, KC_HOME, KC_PSCR, KC_PGUP, KC_VOLU, KC_VOLU, KC_PGUP, KC_PSCR, KC_HOME, KC_SCRL, LGUI_T(KC_CAPS), _______,
+ LCTL_T(KC_APP), KC_INS, KC_LEFT, KC_UP, KC_RGHT, KC_MUTE, KC_MUTE, KC_RGHT, KC_UP, KC_LEFT, KC_INS, LGUI_T(KC_APP),
+ _______, KC_PAUS, KC_END, KC_DOWN, KC_PGDN, KC_VOLD, KC_VOLD, KC_PGDN, KC_DOWN, KC_END, KC_PAUS, _______,
+ _______, LT(_RAIS_R, KC_TAB) , LT(_ADJUST, KC_ESC), LT(_ADJUST, KC_ESC), LT(_RAIS_R, KC_TAB), _______
),
-[_RAIS_R] = LAYOUT_symmetric_left(
- KC_RSFT, KC_RGUI, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10,
- KC_RCTL, XXXXXXX, KC_F4, KC_F5, KC_F6, KC_F11,
- KC_LALT, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F12,
- LT(_ADJUST, KC_DEL), _______, _______
+[_RAIS_R] = LAYOUT(
+ KC_RSFT, KC_RGUI, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F10, KC_F9, KC_F8, KC_F7, XXXXXXX, KC_RGUI, KC_RSFT,
+ KC_RCTL, XXXXXXX, KC_F4, KC_F5, KC_F6, KC_F11, KC_F11, KC_F6, KC_F5, KC_F4, XXXXXXX, KC_RCTL,
+ KC_LALT, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F12, KC_F12, KC_F3, KC_F2, KC_F1, XXXXXXX, KC_LALT,
+ LT(_ADJUST, KC_DEL), _______, _______, _______, _______, LT(_ADJUST, KC_DEL)
),
-[_LOWR_L] = LAYOUT_symmetric_left(
- _______, _______, XXXXXXX, KC_7, KC_8, KC_9, KC_0,
- _______, KC_GRV, KC_4, KC_5, KC_6, KC_MINS,
- _______, KC_0, KC_1, KC_2, KC_3, KC_EQL,
- LT(_ADJUST, KC_DEL), LT(_LOWR_R, KC_TAB), _______
+[_LOWR_L] = LAYOUT(
+ _______, _______, XXXXXXX, KC_7, KC_8, KC_9, KC_0, KC_0, KC_9, KC_8, KC_7, XXXXXXX, _______, _______,
+ _______, KC_GRV, KC_4, KC_5, KC_6, KC_MINS, KC_MINS, KC_6, KC_5, KC_4, KC_GRV, _______,
+ _______, KC_0, KC_1, KC_2, KC_3, KC_EQL, KC_EQL, KC_3, KC_2, KC_1, KC_0, _______,
+ LT(_ADJUST, KC_DEL), LT(_LOWR_R, KC_TAB), _______, _______, LT(_LOWR_R, KC_TAB), LT(_ADJUST, KC_DEL)
),
-[_LOWR_R] = LAYOUT_symmetric_left(
- _______, _______, XXXXXXX, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
- _______, KC_TILD, KC_DLR, KC_PERC, KC_CIRC, KC_UNDS,
- _______, KC_LPRN, KC_EXLM, KC_AT, KC_HASH, KC_PLUS,
- _______, _______, LT(_ADJUST, KC_ESC)
+[_LOWR_R] = LAYOUT(
+ _______, _______, XXXXXXX, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_RPRN, KC_LPRN, KC_ASTR, KC_AMPR, XXXXXXX, _______, _______,
+ _______, KC_TILD, KC_DLR, KC_PERC, KC_CIRC, KC_UNDS, KC_UNDS, KC_CIRC, KC_PERC, KC_DLR, KC_TILD, _______,
+ _______, KC_LPRN, KC_EXLM, KC_AT, KC_HASH, KC_PLUS, KC_PLUS, KC_HASH, KC_AT, KC_EXLM, KC_LPRN, _______,
+ _______, _______, LT(_ADJUST, KC_ESC), LT(_ADJUST, KC_ESC), _______, _______
),
-[_ADJUST] = LAYOUT_symmetric_left(
- QK_BOOT, DB_TOGG, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI,
- XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
- XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
- _______, _______, _______
+[_ADJUST] = LAYOUT(
+ QK_BOOT, DB_TOGG, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, RGB_HUI, RGB_HUD, RGB_VAI, BL_UP, XXXXXXX, DB_TOGG, QK_BOOT,
+ XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
+ XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, XXXXXXX,
+ _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/jian/keymaps/via/config.h b/keyboards/jian/keymaps/via/config.h
index 4d9cb17cac..cae66a5c3a 100644
--- a/keyboards/jian/keymaps/via/config.h
+++ b/keyboards/jian/keymaps/via/config.h
@@ -19,4 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/jian/keymaps/via/keymap.c b/keyboards/jian/keymaps/via/keymap.c
index 3d6c7507ba..281cbc64eb 100644
--- a/keyboards/jian/keymaps/via/keymap.c
+++ b/keyboards/jian/keymaps/via/keymap.c
@@ -19,10 +19,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, KC_VOLD, KC_END, KC_DOWN, KC_PGDN, KC_PAUS, _______,
_______, _______, LT(3, KC_ENT), LT(3, KC_ESC), _______, _______
),
-[3] = LAYOUT_symmetric(
- QK_BOOT, DB_TOGG, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI,
- XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI,
- XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
- _______, SH_TOGG, _______
+[3] = LAYOUT(
+ QK_BOOT, DB_TOGG, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, RGB_HUI, RGB_HUD, RGB_VAI, BL_UP, XXXXXXX, DB_TOGG, QK_BOOT,
+ XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, RGB_SAI, RGB_SAD, RGB_VAD, BL_DOWN, XXXXXXX, XXXXXXX,
+ XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, RGB_MOD, RGB_RMOD,RGB_TOG, BL_TOGG, BL_BRTG, XXXXXXX,
+ _______, SH_TOGG, _______, _______, SH_TOGG, _______
)
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:10:15 +0000