From 8761f250b387dd78613cc3bace82c785169b96b4 Mon Sep 17 00:00:00 2001 From: plodah Date: Mon, 9 Dec 2024 01:03:14 +0000 Subject: [PATCH] Shorten encoder KCs --- .../iso_encoder/keymaps/plodah/keymap.json | 24 +++--- .../q10/iso_encoder/keymaps/plodahc/keymap.c | 18 ++--- .../iso_encoder/keymaps/plodah/keymap.json | 24 +++--- .../q1v1/iso_encoder/keymaps/plodahc/keymap.c | 18 ++--- .../q3/iso_encoder/keymaps/plodah/keymap.json | 24 +++--- .../q3/iso_encoder/keymaps/plodahc/keymap.c | 18 ++--- .../q8/iso_encoder/keymaps/plodah/keymap.json | 24 +++--- .../q8/iso_encoder/keymaps/plodahc/keymap.c | 18 ++--- .../q9/iso_encoder/keymaps/plodah/keymap.json | 30 +++---- .../q9/iso_encoder/keymaps/plodahc/keymap.c | 22 ++--- .../v2/iso_encoder/keymaps/plodah/keymap.json | 24 +++--- .../v2/iso_encoder/keymaps/plodahc/keymap.c | 18 ++--- .../v6/iso_encoder/keymaps/plodah/keymap.json | 24 +++--- .../v6/iso_encoder/keymaps/plodahc/keymap.c | 18 ++--- users/plodah/functions/encoder_actions.c | 80 +++++++++---------- users/plodah/functions/process_record_user.c | 6 +- 16 files changed, 195 insertions(+), 195 deletions(-) diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/plodah/keymap.json b/keyboards/keychron/q10/iso_encoder/keymaps/plodah/keymap.json index b3e4b817137..6520d4c1c3e 100644 --- a/keyboards/keychron/q10/iso_encoder/keymaps/plodah/keymap.json +++ b/keyboards/keychron/q10/iso_encoder/keymaps/plodah/keymap.json @@ -126,9 +126,9 @@ "keycodes": [ { "key": "PL_ALTTAB" }, { "key": "PL_ALTSTAB" }, - { "key": "PL_ENC_CCW" }, - { "key": "PL_ENC_CW" }, - { "key": "PL_ENC_PRS" }, + { "key": "PL_EC_CCW" }, + { "key": "PL_EC_CW" }, + { "key": "PL_EC_PR" }, { "key": "PL_MSJG" }, { "key": "PL_QFTR" }, { "key": "PL_QRGB"}, @@ -137,8 +137,8 @@ "encoders": [ [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ @@ -149,20 +149,20 @@ ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ] ], "layers": [ [ - "PL_ENC_PRS", "KC_ESC", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_PSCR", "KC_DEL", + "PL_EC_PR", "KC_ESC", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_PSCR", "KC_DEL", "MC_0", "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_HOME", "MC_1", "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_PGUP", "MC_2", "LT(3,KC_BSPC)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT", "KC_PGDN", @@ -178,7 +178,7 @@ "KC_HOME", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_SPC", "MO(3)", "KC_LEFT", "KC_DOWN", "KC_RGHT" ], [ - "PL_ENC_PRS", "_______", "KC_F13", "KC_F14", "KC_F15", "KC_F16", "KC_F17", "KC_F18", "KC_F19", "KC_F20", "KC_F21", "KC_F22", "KC_F23", "KC_F24", "_______", "_______", + "PL_EC_PR", "_______", "KC_F13", "KC_F14", "KC_F15", "KC_F16", "KC_F17", "KC_F18", "KC_F19", "KC_F20", "KC_F21", "KC_F22", "KC_F23", "KC_F24", "_______", "_______", "PL_MSJG", "MC_0", "MC_1", "MC_2", "MC_3", "MC_4", "MC_5", "MC_6", "MC_7", "MC_8", "PL_QFTR", "PL_QRGB", "PL_QVER", "QK_MAKE", "_______", "KC_END", "_______", "KC_ENT", "KC_PGUP", "KC_UP", "KC_PGDN", "_______", "_______", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "_______", "_______", "KC_CAPS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_ENT", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", @@ -186,7 +186,7 @@ "_______", "_______", "GU_TOGG", "_______", "KC_SPC", "_______", "KC_SPC", "KC_APP", "KC_HOME", "KC_PGDN", "KC_END" ], [ - "PL_ENC_PRS", "_______", "KC_BRID", "KC_BRIU", "LGUI(KC_TAB)", "LGUI(KC_E)", "RGB_VAD", "RGB_VAI", "KC_MPRV", "KC_MPLY", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "_______", "_______", + "PL_EC_PR", "_______", "KC_BRID", "KC_BRIU", "G(KC_TAB)", "G(KC_E)", "RGB_VAD", "RGB_VAI", "KC_MPRV", "KC_MPLY", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "_______", "_______", "_______", "_______", "KC_P1", "KC_P2", "KC_P3", "KC_P4", "KC_P5", "KC_P6", "KC_P7", "KC_P8", "KC_P9", "KC_P0", "_______", "_______", "_______", "KC_END", "_______", "RGB_TOG", "RGB_MOD", "RGB_VAI", "RGB_HUI", "RGB_SAI", "RGB_SPI", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "_______", "PL_QVER", "KC_CAPS", "RGB_RMOD", "RGB_VAD", "RGB_HUD", "RGB_SAD", "RGB_SPD", "_______", "_______", "DM_RSTP", "DM_REC1", "DM_REC2", "_______", "_______", "_______", "_______", diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/plodahc/keymap.c b/keyboards/keychron/q10/iso_encoder/keymaps/plodahc/keymap.c index 5d980762427..2dcbe08cf9b 100644 --- a/keyboards/keychron/q10/iso_encoder/keymaps/plodahc/keymap.c +++ b/keyboards/keychron/q10/iso_encoder/keymaps/plodahc/keymap.c @@ -8,9 +8,9 @@ enum keymap_keycodes { PL_ALTTAB = QK_USER_0, PL_ALTSTAB, - PL_ENC_CCW, - PL_ENC_CW, - PL_ENC_PRS, + PL_EC_CCW, + PL_EC_CW, + PL_EC_PR, PL_MSJG, PL_QFTR, PL_QRGB, @@ -22,17 +22,17 @@ enum { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso_90(PL_ENC_PRS, TD(TD_ESC_RAGEQUIT), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, MC_0, 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_HOME, MC_1, 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_PGUP, MC_2, LT(3,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, KC_END, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_HOME, KC_LCTL, KC_LGUI, KC_LALT, LT(2,KC_SPC), KC_RALT, LT(3,KC_SPC), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [0] = LAYOUT_iso_90(PL_EC_PR, TD(TD_ESC_RAGEQUIT), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, MC_0, 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_HOME, MC_1, 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_PGUP, MC_2, LT(3,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, KC_END, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_HOME, KC_LCTL, KC_LGUI, KC_LALT, LT(2,KC_SPC), KC_RALT, LT(3,KC_SPC), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_iso_90(KC_MUTE, TD(TD_ESC_RAGEQUIT), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, MC_0, 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_HOME, MC_1, 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_PGUP, MC_2, 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_NUHS, KC_ENT, KC_PGDN, KC_END, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_HOME, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_SPC, MO(3), KC_LEFT, KC_DOWN, KC_RGHT), - [2] = LAYOUT_iso_90(PL_ENC_PRS, _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, _______, PL_MSJG, MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, PL_QFTR, PL_QRGB, PL_QVER, QK_MAKE, _______, KC_END, _______, KC_ENT, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, CW_TOGG, KC_PGUP, _______, _______, GU_TOGG, _______, KC_SPC, _______, KC_SPC, KC_APP, KC_HOME, KC_PGDN, KC_END), - [3] = LAYOUT_iso_90(PL_ENC_PRS, _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, _______, KC_END, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, PL_QVER, KC_CAPS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, DM_RSTP, DM_REC1, DM_REC2, _______, _______, _______, _______, QK_MAKE, _______, _______, _______, _______, _______, S(C(KC_V)), _______, _______, NK_TOGG, _______, _______, DM_PLY1, DM_PLY2, _______, KC_VOLU, _______, _______, GU_TOGG, _______, KC_SPC, _______, KC_SPC, KC_APP, KC_HOME, KC_VOLD, KC_END) + [2] = LAYOUT_iso_90(PL_EC_PR, _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, _______, PL_MSJG, MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, PL_QFTR, PL_QRGB, PL_QVER, QK_MAKE, _______, KC_END, _______, KC_ENT, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, CW_TOGG, KC_PGUP, _______, _______, GU_TOGG, _______, KC_SPC, _______, KC_SPC, KC_APP, KC_HOME, KC_PGDN, KC_END), + [3] = LAYOUT_iso_90(PL_EC_PR, _______, KC_BRID, KC_BRIU, LGUI(KC_TAB), LGUI(KC_E), RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, _______, KC_END, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, PL_QVER, KC_CAPS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, DM_RSTP, DM_REC1, DM_REC2, _______, _______, _______, _______, QK_MAKE, _______, _______, _______, _______, _______, S(C(KC_V)), _______, _______, NK_TOGG, _______, _______, DM_PLY1, DM_PLY2, _______, KC_VOLU, _______, _______, GU_TOGG, _______, KC_SPC, _______, KC_SPC, KC_APP, KC_HOME, KC_VOLD, KC_END) }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, + [0] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, [1] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [2] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, - [3] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)} + [2] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, + [3] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)} }; #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) diff --git a/keyboards/keychron/q1v1/iso_encoder/keymaps/plodah/keymap.json b/keyboards/keychron/q1v1/iso_encoder/keymaps/plodah/keymap.json index eeeb602faea..80ddfb1238a 100644 --- a/keyboards/keychron/q1v1/iso_encoder/keymaps/plodah/keymap.json +++ b/keyboards/keychron/q1v1/iso_encoder/keymaps/plodah/keymap.json @@ -129,17 +129,17 @@ "keycodes": [ { "key": "PL_ALTTAB" }, { "key": "PL_ALTSTAB" }, - { "key": "PL_ENC_CCW" }, - { "key": "PL_ENC_CW" }, - { "key": "PL_ENC_PRS" }, + { "key": "PL_EC_CCW" }, + { "key": "PL_EC_CW" }, + { "key": "PL_EC_PR" }, { "key": "PL_MSJG" }, { "key": "PL_QVER" } ], "encoders": [ [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ @@ -150,20 +150,20 @@ ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ] ], "layers": [ [ - "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_DEL", "PL_ENC_PRS", + "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_DEL", "PL_EC_PR", "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_PGUP", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_PGDN", "LT(3,KC_BSPC)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT", "KC_HOME", @@ -179,7 +179,7 @@ "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "MO(3)", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT" ], [ - "_______", "KC_BRID", "KC_BRIU", "G(KC_TAB)", "G(KC_E)", "RGB_VAD", "RGB_VAI", "KC_MPRV", "KC_MPLY", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "_______", "PL_ENC_PRS", + "_______", "KC_BRID", "KC_BRIU", "G(KC_TAB)", "G(KC_E)", "RGB_VAD", "RGB_VAI", "KC_MPRV", "KC_MPLY", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "_______", "PL_EC_PR", "_______", "KC_P1", "KC_P2", "KC_P3", "KC_P4", "KC_P5", "KC_P6", "KC_P7", "KC_P8", "KC_P9", "KC_P0", "_______", "_______", "_______", "KC_END", "KC_ENT", "KC_PGUP", "KC_UP", "KC_PGDN", "_______", "_______", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "C(KC_F4)", "KC_CAPS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_ENT", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "S(C(KC_T))", @@ -187,7 +187,7 @@ "_______", "GU_TOGG", "_______", "KC_SPC", "_______", "_______", "_______", "KC_HOME", "KC_PGDN", "KC_END" ], [ - "_______", "KC_F13", "KC_F14", "KC_F15", "KC_F16", "KC_F17", "KC_F18", "KC_F19", "KC_F20", "KC_F21", "KC_F22", "KC_F23", "KC_F24", "_______", "PL_ENC_PRS", + "_______", "KC_F13", "KC_F14", "KC_F15", "KC_F16", "KC_F17", "KC_F18", "KC_F19", "KC_F20", "KC_F21", "KC_F22", "KC_F23", "KC_F24", "_______", "PL_EC_PR", "MC_0", "MC_1", "MC_2", "MC_3", "MC_4", "MC_5", "MC_6", "MC_7", "MC_8", "MC_9", "MC_10", "PL_QVER", "QK_MAKE", "_______", "PL_MSJG", "RGB_TOG", "RGB_MOD", "RGB_VAI", "RGB_HUI", "RGB_SAI", "RGB_SPI", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "_______", "KC_CAPS", "RGB_RMOD", "RGB_VAD", "RGB_HUD", "RGB_SAD", "RGB_SPD", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "KC_END", diff --git a/keyboards/keychron/q1v1/iso_encoder/keymaps/plodahc/keymap.c b/keyboards/keychron/q1v1/iso_encoder/keymaps/plodahc/keymap.c index 32d4d17d89c..e28ad408fb3 100644 --- a/keyboards/keychron/q1v1/iso_encoder/keymaps/plodahc/keymap.c +++ b/keyboards/keychron/q1v1/iso_encoder/keymaps/plodahc/keymap.c @@ -8,9 +8,9 @@ enum keymap_keycodes { PL_ALTTAB = QK_USER_0, PL_ALTSTAB, - PL_ENC_CCW, - PL_ENC_CW, - PL_ENC_PRS, + PL_EC_CCW, + PL_EC_CW, + PL_EC_PR, PL_MSJG, PL_QVER, }; @@ -20,17 +20,17 @@ enum { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso_83(TD(TD_ESC_RAGEQUIT), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, PL_ENC_PRS, 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_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, LT(3,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, LT(2,KC_SPC), KC_RALT, LT(3,KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [0] = LAYOUT_iso_83(TD(TD_ESC_RAGEQUIT), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, PL_EC_PR, 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_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, LT(3,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, LT(2,KC_SPC), KC_RALT, LT(3,KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_iso_83(TD(TD_ESC_RAGEQUIT), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_MUTE, KC_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_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [2] = LAYOUT_iso_83(_______, KC_BRID, KC_BRIU, G(KC_TAB), G(KC_E), RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, PL_ENC_PRS, _______, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, _______, KC_END, KC_ENT, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, C(KC_F4), KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, S(C(KC_T)), _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, _______, KC_PGUP, _______, GU_TOGG, _______, KC_SPC, _______, _______, _______, KC_HOME, KC_PGDN, KC_END), - [3] = LAYOUT_iso_83(_______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, PL_ENC_PRS, MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_10, PL_QVER, QK_MAKE, _______, PL_MSJG, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, KC_CAPS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, DM_RSTP, DM_REC1, DM_REC2, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, C(S(KC_V)), _______, NK_TOGG, _______, _______, DM_PLY1, DM_PLY2, _______, KC_VOLU, _______, GU_TOGG, _______, KC_SPC, _______, _______, _______, KC_HOME, KC_VOLD, KC_END) + [2] = LAYOUT_iso_83(_______, KC_BRID, KC_BRIU, G(KC_TAB), G(KC_E), RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, PL_EC_PR, _______, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, _______, KC_END, KC_ENT, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, C(KC_F4), KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, S(C(KC_T)), _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, _______, KC_PGUP, _______, GU_TOGG, _______, KC_SPC, _______, _______, _______, KC_HOME, KC_PGDN, KC_END), + [3] = LAYOUT_iso_83(_______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, PL_EC_PR, MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_10, PL_QVER, QK_MAKE, _______, PL_MSJG, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, KC_CAPS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, DM_RSTP, DM_REC1, DM_REC2, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, C(S(KC_V)), _______, NK_TOGG, _______, _______, DM_PLY1, DM_PLY2, _______, KC_VOLU, _______, GU_TOGG, _______, KC_SPC, _______, _______, _______, KC_HOME, KC_VOLD, KC_END) }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, + [0] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, [1] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [2] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, - [3] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)} + [2] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, + [3] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)} }; #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/plodah/keymap.json b/keyboards/keychron/q3/iso_encoder/keymaps/plodah/keymap.json index f16fd3667ae..41fbab46d1d 100644 --- a/keyboards/keychron/q3/iso_encoder/keymaps/plodah/keymap.json +++ b/keyboards/keychron/q3/iso_encoder/keymaps/plodah/keymap.json @@ -126,9 +126,9 @@ "keycodes": [ { "key": "PL_ALTTAB" }, { "key": "PL_ALTSTAB" }, - { "key": "PL_ENC_CCW" }, - { "key": "PL_ENC_CW" }, - { "key": "PL_ENC_PRS" }, + { "key": "PL_EC_CCW" }, + { "key": "PL_EC_CW" }, + { "key": "PL_EC_PR" }, { "key": "PL_QFTR" }, { "key": "PL_QRGB"}, { "key": "PL_QVER" } @@ -136,8 +136,8 @@ "encoders": [ [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ @@ -148,20 +148,20 @@ ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ] ], "layers": [ [ - "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", "PL_ENC_PRS", "LCA(KC_DEL)", "KC_MPLY", "RGB_TOG", + "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", "PL_EC_PR", "LCA(KC_DEL)", "KC_MPLY", "RGB_TOG", "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_PSCR", "KC_HOME", "KC_PGUP", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_DEL", "KC_END", "KC_PGDN", "LT(3,KC_BSPC)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT", @@ -177,7 +177,7 @@ "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_RGUI", "MO(3)", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT" ], [ - "_______", "KC_BRID", "KC_BRIU", "G(KC_TAB)", "G(KC_E)", "RGB_VAD", "RGB_VAI", "KC_MPRV", "KC_MPLY", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "PL_ENC_PRS", "C(KC_F4)", "C(S(KC_T))", "_______", + "_______", "KC_BRID", "KC_BRIU", "G(KC_TAB)", "G(KC_E)", "RGB_VAD", "RGB_VAI", "KC_MPRV", "KC_MPLY", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "PL_EC_PR", "C(KC_F4)", "C(S(KC_T))", "_______", "_______", "KC_P1", "KC_P2", "KC_P3", "KC_P4", "KC_P5", "KC_P6", "KC_P7", "KC_P8", "KC_P9", "KC_P0", "_______", "_______", "KC_DEL", "KC_INS", "_______", "_______", "KC_ENT", "KC_PGUP", "KC_UP", "KC_PGDN", "_______", "_______", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "_______", "_______", "_______", "KC_CAPS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_ENT", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", @@ -185,7 +185,7 @@ "_______", "GU_TOGG", "_______", "KC_SPC", "_______", "GU_TOGG", "_______", "_______", "KC_HOME", "KC_PGDN", "KC_END" ], [ - "_______", "KC_F13", "KC_F14", "KC_F15", "KC_F16", "KC_F17", "KC_F18", "KC_F19", "KC_F20", "KC_F21", "KC_F22", "KC_F23", "KC_F24", "PL_ENC_PRS", "C(KC_F4)", "C(S(KC_T))", "_______", + "_______", "KC_F13", "KC_F14", "KC_F15", "KC_F16", "KC_F17", "KC_F18", "KC_F19", "KC_F20", "KC_F21", "KC_F22", "KC_F23", "KC_F24", "PL_EC_PR", "C(KC_F4)", "C(S(KC_T))", "_______", "MC_0", "MC_1", "MC_2", "MC_3", "MC_4", "MC_5", "MC_6", "MC_7", "MC_8", "PL_QFTR", "PL_QRGB", "PL_QVER", "QK_MAKE", "_______", "KC_INS", "_______", "_______", "RGB_TOG", "RGB_MOD", "RGB_VAI", "RGB_HUI", "RGB_SAI", "RGB_SPI", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "_______", "DF(3)", "_______", "KC_CAPS", "RGB_RMOD", "RGB_VAD", "RGB_HUD", "RGB_SAD", "RGB_SPD", "_______", "_______", "DM_RSTP", "DM_REC1", "DM_REC2", "_______", "_______", "_______", diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/plodahc/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/plodahc/keymap.c index 1774e0d79be..ea3fbbb9781 100644 --- a/keyboards/keychron/q3/iso_encoder/keymaps/plodahc/keymap.c +++ b/keyboards/keychron/q3/iso_encoder/keymaps/plodahc/keymap.c @@ -3,9 +3,9 @@ enum keymap_keycodes { PL_ALTTAB = QK_USER_0, PL_ALTSTAB, - PL_ENC_CCW, - PL_ENC_CW, - PL_ENC_PRS, + PL_EC_CCW, + PL_EC_CW, + PL_EC_PR, PL_QFTR, PL_QRGB, PL_QVER, @@ -16,17 +16,17 @@ enum { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_tkl_f13_iso(TD(TD_ESC_RAGEQUIT), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, PL_ENC_PRS, LCA(KC_DEL), KC_MPLY, RGB_TOG, 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_PSCR, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, LT(3,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, LT(2,KC_SPC), KC_RALT, KC_RGUI, LT(3,KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [0] = LAYOUT_tkl_f13_iso(TD(TD_ESC_RAGEQUIT), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, PL_EC_PR, LCA(KC_DEL), KC_MPLY, RGB_TOG, 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_PSCR, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, LT(3,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, LT(2,KC_SPC), KC_RALT, KC_RGUI, LT(3,KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_tkl_f13_iso(TD(TD_ESC_RAGEQUIT), 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_MUTE, KC_PSCR, KC_F13, RGB_TOG, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [2] = LAYOUT_tkl_f13_iso(_______, KC_BRID, KC_BRIU, G(KC_TAB), G(KC_E), RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, PL_ENC_PRS, C(KC_F4), C(S(KC_T)), _______, _______, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, KC_DEL, KC_INS, _______, _______, KC_ENT, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, CW_TOGG, KC_PGUP, _______, GU_TOGG, _______, KC_SPC, _______, GU_TOGG, _______, _______, KC_HOME, KC_PGDN, KC_END), - [3] = LAYOUT_tkl_f13_iso(_______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, PL_ENC_PRS, C(KC_F4), C(S(KC_T)), _______, MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, PL_QFTR, PL_QRGB, PL_QVER, QK_MAKE, _______, KC_INS, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, DF(3), _______, KC_CAPS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, DM_RSTP, DM_REC1, DM_REC2, _______, _______, _______, _______, _______, _______, _______, _______, C(S(KC_V)), _______, NK_TOGG, _______, _______, DM_PLY1, DM_PLY2, _______, KC_VOLU, _______, GU_TOGG, _______, KC_SPC, _______, GU_TOGG, _______, _______, KC_HOME, KC_VOLD, KC_END) + [2] = LAYOUT_tkl_f13_iso(_______, KC_BRID, KC_BRIU, G(KC_TAB), G(KC_E), RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, PL_EC_PR, C(KC_F4), C(S(KC_T)), _______, _______, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, KC_DEL, KC_INS, _______, _______, KC_ENT, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, CW_TOGG, KC_PGUP, _______, GU_TOGG, _______, KC_SPC, _______, GU_TOGG, _______, _______, KC_HOME, KC_PGDN, KC_END), + [3] = LAYOUT_tkl_f13_iso(_______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, PL_EC_PR, C(KC_F4), C(S(KC_T)), _______, MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, PL_QFTR, PL_QRGB, PL_QVER, QK_MAKE, _______, KC_INS, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, DF(3), _______, KC_CAPS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, DM_RSTP, DM_REC1, DM_REC2, _______, _______, _______, _______, _______, _______, _______, _______, C(S(KC_V)), _______, NK_TOGG, _______, _______, DM_PLY1, DM_PLY2, _______, KC_VOLU, _______, GU_TOGG, _______, KC_SPC, _______, GU_TOGG, _______, _______, KC_HOME, KC_VOLD, KC_END) }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, + [0] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, [1] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [2] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, - [3] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)} + [2] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, + [3] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)} }; #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/plodah/keymap.json b/keyboards/keychron/q8/iso_encoder/keymaps/plodah/keymap.json index 971e7c0e666..667c0b0d8a2 100644 --- a/keyboards/keychron/q8/iso_encoder/keymaps/plodah/keymap.json +++ b/keyboards/keychron/q8/iso_encoder/keymaps/plodah/keymap.json @@ -126,9 +126,9 @@ "keycodes": [ { "key": "PL_ALTTAB" }, { "key": "PL_ALTSTAB" }, - { "key": "PL_ENC_CCW" }, - { "key": "PL_ENC_CW" }, - { "key": "PL_ENC_PRS" }, + { "key": "PL_EC_CCW" }, + { "key": "PL_EC_CW" }, + { "key": "PL_EC_PR" }, { "key": "PL_MSJG" }, { "key": "PL_QFTR" }, { "key": "PL_QRGB"}, @@ -137,8 +137,8 @@ "encoders": [ [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ @@ -149,20 +149,20 @@ ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ] ], "layers": [ [ - "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", "PL_ENC_PRS", + "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", "PL_EC_PR", "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_END", "LT(3,KC_BSPC)","KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT", "KC_HOME", "KC_LSFT", "KC_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", @@ -176,14 +176,14 @@ "KC_LCTL", "KC_LWIN", "KC_LALT", "KC_SPC", "MO(3)", "MO(2)", "KC_SPC", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT" ], [ - "KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "PL_ENC_PRS", + "KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "PL_EC_PR", "KC_ENT", "KC_PGUP", "KC_UP", "KC_PGDN", "_______", "_______", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "KC_PGUP", "KC_CAPS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_ENT", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "KC_PGDN", "_______", "_______", "_______", "_______", "KC_BTN1", "KC_BTN1", "KC_BTN1", "KC_BTN1", "KC_BTN1", "KC_BTN1", "KC_BTN1", "_______", "_______", "CW_TOGG", "KC_PGUP", "_______", "GU_TOGG", "_______", "KC_SPC", "_______", "_______", "KC_SPC", "_______", "KC_HOME", "KC_PGDN", "KC_END" ], [ - "KC_GRV", "MC_1", "MC_2", "MC_3", "MC_4", "MC_5", "MC_6", "MC_7", "MC_8", "PL_QFTR", "PL_QRGB", "PL_QVER", "QK_MAKE", "_______", "PL_ENC_PRS", + "KC_GRV", "MC_1", "MC_2", "MC_3", "MC_4", "MC_5", "MC_6", "MC_7", "MC_8", "PL_QFTR", "PL_QRGB", "PL_QVER", "QK_MAKE", "_______", "PL_EC_PR", "RGB_TOG", "RGB_MOD", "RGB_VAI", "RGB_HUI", "RGB_SAI", "RGB_SPI", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "PL_MSJG", "_______", "RGB_RMOD", "RGB_VAD", "RGB_HUD", "RGB_SAD", "RGB_SPD", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "C(S(KC_V))","_______", "_______", "NK_TOGG", "_______", "_______", "_______", "_______", "_______", "KC_VOLU", diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/plodahc/keymap.c b/keyboards/keychron/q8/iso_encoder/keymaps/plodahc/keymap.c index 0a8d677ce63..66beebb296d 100644 --- a/keyboards/keychron/q8/iso_encoder/keymaps/plodahc/keymap.c +++ b/keyboards/keychron/q8/iso_encoder/keymaps/plodahc/keymap.c @@ -8,9 +8,9 @@ enum keymap_keycodes { PL_ALTTAB = QK_USER_0, PL_ALTSTAB, - PL_ENC_CCW, - PL_ENC_CW, - PL_ENC_PRS, + PL_EC_CCW, + PL_EC_CW, + PL_EC_PR, PL_MSJG, PL_QFTR, PL_QRGB, @@ -24,17 +24,17 @@ enum { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso_70(TD(TD_ESC_RAGEQUIT), KC_1, KC_2, KC_3, KC_4, TD(TD_F5), KC_6, KC_7, KC_8, KC_9, KC_0, TD(TD_F11), KC_EQL, KC_BSPC, PL_ENC_PRS, 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_END, LT(3,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LWIN, KC_LALT, LT(2,KC_SPC), LT(3,KC_APP), LT(3,KC_APP), LT(2,KC_SPC), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), + [0] = LAYOUT_iso_70(TD(TD_ESC_RAGEQUIT), KC_1, KC_2, KC_3, KC_4, TD(TD_F5), KC_6, KC_7, KC_8, KC_9, KC_0, TD(TD_F11), KC_EQL, KC_BSPC, PL_EC_PR, 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_END, LT(3,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LWIN, KC_LALT, LT(2,KC_SPC), LT(3,KC_APP), LT(3,KC_APP), LT(2,KC_SPC), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_iso_70(TD(TD_ESC_RAGEQUIT), 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_MUTE, 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_END, 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_NUHS, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(3), MO(2), KC_SPC, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [2] = LAYOUT_iso_70(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, PL_ENC_PRS, KC_ENT, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, KC_PGUP, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, CW_TOGG, KC_PGUP, _______, GU_TOGG, _______, KC_SPC, _______, _______, KC_SPC, _______, KC_HOME, KC_PGDN, KC_END), - [3] = LAYOUT_iso_70(KC_GRV, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, PL_QFTR, PL_QRGB, PL_QVER, QK_MAKE, _______, PL_ENC_PRS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, PL_MSJG, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C(S(KC_V)), _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______, GU_TOGG, _______, KC_SPC, _______, _______, KC_SPC, _______, KC_HOME, KC_PGDN, KC_END) + [2] = LAYOUT_iso_70(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, PL_EC_PR, KC_ENT, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, KC_PGUP, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, CW_TOGG, KC_PGUP, _______, GU_TOGG, _______, KC_SPC, _______, _______, KC_SPC, _______, KC_HOME, KC_PGDN, KC_END), + [3] = LAYOUT_iso_70(KC_GRV, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, PL_QFTR, PL_QRGB, PL_QVER, QK_MAKE, _______, PL_EC_PR, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, PL_MSJG, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C(S(KC_V)), _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______, GU_TOGG, _______, KC_SPC, _______, _______, KC_SPC, _______, KC_HOME, KC_PGDN, KC_END) }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, + [0] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, [1] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [2] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, - [3] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)} + [2] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, + [3] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)} }; #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) diff --git a/keyboards/keychron/q9/iso_encoder/keymaps/plodah/keymap.json b/keyboards/keychron/q9/iso_encoder/keymaps/plodah/keymap.json index 9ccd625466b..7482b539082 100644 --- a/keyboards/keychron/q9/iso_encoder/keymaps/plodah/keymap.json +++ b/keyboards/keychron/q9/iso_encoder/keymaps/plodah/keymap.json @@ -126,9 +126,9 @@ "keycodes": [ { "key": "PL_ALTTAB" }, { "key": "PL_ALTSTAB" }, - { "key": "PL_ENC_CCW" }, - { "key": "PL_ENC_CW" }, - { "key": "PL_ENC_PRS" }, + { "key": "PL_EC_CCW" }, + { "key": "PL_EC_CW" }, + { "key": "PL_EC_PR" }, { "key": "PL_QFTR" }, { "key": "PL_QRGB"}, { "key": "PL_QVER" } @@ -136,50 +136,50 @@ "encoders": [ [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ] ], "layers": [ [ - "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", "PL_ENC_PRS", + "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", "PL_EC_PR", "LT(2,KC_BSPC)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT", "KC_BSPC", "KC_LSFT", "KC_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "RSFT_T(KC_BSPC)", "KC_UP", "KC_LCTL", "KC_LWIN", "KC_LALT", "LT(1,KC_SPC)", "KC_RALT", "LT(2,KC_APP)", "MO(3)", "KC_LEFT", "KC_DOWN", "KC_RGHT" ], [ - "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", "PL_ENC_PRS", + "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", "PL_EC_PR", "KC_DEL", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "KC_BSPC", "KC_DEL", "_______", "_______", "_______", "KC_BTN1", "KC_BTN1", "KC_BTN1", "KC_BTN1", "KC_BTN1", "KC_BTN1", "KC_BTN1", "_______", "_______", "CW_TOGG", "KC_VOLU", "_______", "_______", "MO(2)", "KC_SPC", "_______", "_______", "LCA(KC_DEL)", "KC_HOME", "KC_VOLD", "KC_END" ], [ - "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", "PL_ENC_PRS", + "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", "PL_EC_PR", "MC_0", "MC_1", "MC_2", "MC_3", "MC_4", "MC_5", "MC_6", "MC_7", "MC_8", "PL_QFTR", "PL_QRGB", "PL_QVER", "QK_MAKE", "KC_BSPC", "KC_PSCR", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "KC_SPC", "_______", "_______", "LCA(KC_DEL)", "_______", "_______", "_______" ], [ - "RGB_TOG", "RGB_MOD", "RGB_VAI", "RGB_HUI", "RGB_SAI", "RGB_SPI", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "PL_ENC_PRS", + "RGB_TOG", "RGB_MOD", "RGB_VAI", "RGB_HUI", "RGB_SAI", "RGB_SPI", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "PL_EC_PR", "KC_CAPS", "RGB_RMOD","RGB_VAD", "RGB_HUD", "RGB_SAD", "RGB_SPD", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "LCA(KC_DEL)", "KC_PSCR", "_______", "_______", "_______", "_______", "_______","C(S(KC_V))","_______", "NK_TOGG", "_______", "_______", "_______", "_______", "_______", "KC_PGUP", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "KC_HOME", "KC_PGDN", "KC_END" diff --git a/keyboards/keychron/q9/iso_encoder/keymaps/plodahc/keymap.c b/keyboards/keychron/q9/iso_encoder/keymaps/plodahc/keymap.c index b545b953a6b..de4021dcbb9 100644 --- a/keyboards/keychron/q9/iso_encoder/keymaps/plodahc/keymap.c +++ b/keyboards/keychron/q9/iso_encoder/keymaps/plodahc/keymap.c @@ -8,9 +8,9 @@ enum keymap_keycodes { PL_ALTTAB = QK_USER_0, PL_ALTSTAB, - PL_ENC_CCW, - PL_ENC_CW, - PL_ENC_PRS, + PL_EC_CCW, + PL_EC_CW, + PL_EC_PR, PL_QFTR, PL_QRGB, PL_QVER, @@ -21,18 +21,18 @@ enum { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso_53(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, PL_ENC_PRS, LT(2,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_BSPC, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_BSPC), KC_UP, KC_LCTL, KC_LWIN, KC_LALT, LT(1,KC_SPC), KC_RALT, LT(2,KC_APP), MO(3), KC_LEFT, KC_DOWN, KC_RGHT), - [1] = LAYOUT_iso_53(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, PL_ENC_PRS, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, KC_DEL, _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, _______, KC_VOLU, _______, _______, MO(2), KC_SPC, _______, _______, LCA(KC_DEL), KC_HOME, KC_VOLD, KC_END), - [2] = LAYOUT_iso_53(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, PL_ENC_PRS, MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, PL_QFTR, PL_QRGB, PL_QVER, QK_MAKE, KC_BSPC, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SPC, _______, _______, LCA(KC_DEL), _______, _______, _______), - [3] = LAYOUT_iso_53(RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, PL_ENC_PRS, KC_CAPS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, LCA(KC_DEL), KC_PSCR, _______, _______, _______, _______, _______, C(S(KC_V)), _______, NK_TOGG, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END) + [0] = LAYOUT_iso_53(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, PL_EC_PR, LT(2,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_BSPC, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_BSPC), KC_UP, KC_LCTL, KC_LWIN, KC_LALT, LT(1,KC_SPC), KC_RALT, LT(2,KC_APP), MO(3), KC_LEFT, KC_DOWN, KC_RGHT), + [1] = LAYOUT_iso_53(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, PL_EC_PR, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, KC_DEL, _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, _______, KC_VOLU, _______, _______, MO(2), KC_SPC, _______, _______, LCA(KC_DEL), KC_HOME, KC_VOLD, KC_END), + [2] = LAYOUT_iso_53(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, PL_EC_PR, MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, PL_QFTR, PL_QRGB, PL_QVER, QK_MAKE, KC_BSPC, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SPC, _______, _______, LCA(KC_DEL), _______, _______, _______), + [3] = LAYOUT_iso_53(RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, PL_EC_PR, KC_CAPS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, LCA(KC_DEL), KC_PSCR, _______, _______, _______, _______, _______, C(S(KC_V)), _______, NK_TOGG, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END) }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, - [1] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, - [2] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, - [3] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)} + [0] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, + [1] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, + [2] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, + [3] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)} }; #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) diff --git a/keyboards/keychron/v2/iso_encoder/keymaps/plodah/keymap.json b/keyboards/keychron/v2/iso_encoder/keymaps/plodah/keymap.json index 90043cbce61..9ed69c5cf5f 100644 --- a/keyboards/keychron/v2/iso_encoder/keymaps/plodah/keymap.json +++ b/keyboards/keychron/v2/iso_encoder/keymaps/plodah/keymap.json @@ -126,9 +126,9 @@ "keycodes": [ { "key": "PL_ALTTAB" }, { "key": "PL_ALTSTAB" }, - { "key": "PL_ENC_CCW" }, - { "key": "PL_ENC_CW" }, - { "key": "PL_ENC_PRS" }, + { "key": "PL_EC_CCW" }, + { "key": "PL_EC_CW" }, + { "key": "PL_EC_PR" }, { "key": "PL_MSJG" }, { "key": "PL_QFTR" }, { "key": "PL_QRGB"}, @@ -137,8 +137,8 @@ "encoders": [ [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ @@ -149,20 +149,20 @@ ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ] ], "layers": [ [ - "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", "PL_ENC_PRS", + "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", "PL_EC_PR", "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_END", "LT(3,KC_BSPC)","KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT", "KC_HOME", "KC_LSFT", "KC_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", @@ -176,14 +176,14 @@ "KC_LCTL", "KC_LWIN", "KC_LALT", "KC_SPC", "KC_RALT", "MO(2)", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT" ], [ - "KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "PL_ENC_PRS", + "KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "PL_EC_PR", "KC_ENT", "KC_PGUP", "KC_UP", "KC_PGDN", "_______", "_______", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "KC_PGUP", "KC_CAPS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_ENT", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "KC_PGDN", "_______", "_______", "_______", "_______", "KC_BTN1", "KC_BTN1", "KC_BTN1", "KC_BTN1", "KC_BTN1", "KC_BTN1", "_______", "_______", "CW_TOGG", "KC_PGUP", "_______", "GU_TOGG", "_______", "KC_SPC", "_______", "_______", "_______", "KC_HOME", "KC_PGDN", "KC_END" ], [ - "KC_GRV", "MC_1", "MC_2", "MC_3", "MC_4", "MC_5", "MC_6", "MC_7", "MC_8", "PL_QFTR", "PL_QRGB", "PL_QVER", "QK_MAKE", "_______", "PL_ENC_PRS", + "KC_GRV", "MC_1", "MC_2", "MC_3", "MC_4", "MC_5", "MC_6", "MC_7", "MC_8", "PL_QFTR", "PL_QRGB", "PL_QVER", "QK_MAKE", "_______", "PL_EC_PR", "RGB_TOG", "RGB_MOD", "RGB_VAI", "RGB_HUI", "RGB_SAI", "RGB_SPI", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "PL_MSJG", "_______", "RGB_RMOD", "RGB_VAD", "RGB_HUD", "RGB_SAD", "RGB_SPD", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "TO(3)", "_______", "_______", "_______", "_______", "_______", "C(S(KC_V))","_______", "NK_TOGG", "_______", "_______", "_______", "_______", "_______", "KC_VOLU", diff --git a/keyboards/keychron/v2/iso_encoder/keymaps/plodahc/keymap.c b/keyboards/keychron/v2/iso_encoder/keymaps/plodahc/keymap.c index 3328c1fa9bc..0a6448d35d6 100644 --- a/keyboards/keychron/v2/iso_encoder/keymaps/plodahc/keymap.c +++ b/keyboards/keychron/v2/iso_encoder/keymaps/plodahc/keymap.c @@ -8,9 +8,9 @@ enum keymap_keycodes { PL_ALTTAB = QK_USER_0, PL_ALTSTAB, - PL_ENC_CCW, - PL_ENC_CW, - PL_ENC_PRS, + PL_EC_CCW, + PL_EC_CW, + PL_EC_PR, PL_MSJG, PL_QFTR, PL_QRGB, @@ -24,17 +24,17 @@ enum { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso_68(TD(TD_ESC_RAGEQUIT), KC_1, KC_2, KC_3, KC_4, TD(TD_F5), KC_6, KC_7, KC_8, KC_9, KC_0, TD(TD_F11), KC_EQL, KC_BSPC, PL_ENC_PRS, 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_END, LT(3,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LWIN, KC_LALT, LT(2,KC_SPC), KC_RALT, LT(3,KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [0] = LAYOUT_iso_68(TD(TD_ESC_RAGEQUIT), KC_1, KC_2, KC_3, KC_4, TD(TD_F5), KC_6, KC_7, KC_8, KC_9, KC_0, TD(TD_F11), KC_EQL, KC_BSPC, PL_EC_PR, 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_END, LT(3,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LWIN, KC_LALT, LT(2,KC_SPC), KC_RALT, LT(3,KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_iso_68(TD(TD_ESC_RAGEQUIT), 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_MUTE, 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_END, 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_NUHS, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [2] = LAYOUT_iso_68(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, PL_ENC_PRS, KC_ENT, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, KC_PGUP, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, CW_TOGG, KC_PGUP, _______, GU_TOGG, _______, KC_SPC, _______, _______, _______, KC_HOME, KC_PGDN, KC_END), - [3] = LAYOUT_iso_68(KC_GRV, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, PL_QFTR, PL_QRGB, PL_QVER, QK_MAKE, _______, PL_ENC_PRS, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, PL_MSJG, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, TO(3), _______, _______, _______, _______, _______, C(S(KC_V)), _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______, GU_TOGG, _______, KC_SPC, _______, _______, _______, KC_HOME, KC_VOLD, KC_END) + [2] = LAYOUT_iso_68(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, PL_EC_PR, KC_ENT, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, KC_PGUP, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, CW_TOGG, KC_PGUP, _______, GU_TOGG, _______, KC_SPC, _______, _______, _______, KC_HOME, KC_PGDN, KC_END), + [3] = LAYOUT_iso_68(KC_GRV, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, PL_QFTR, PL_QRGB, PL_QVER, QK_MAKE, _______, PL_EC_PR, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, PL_MSJG, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, TO(3), _______, _______, _______, _______, _______, C(S(KC_V)), _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______, GU_TOGG, _______, KC_SPC, _______, _______, _______, KC_HOME, KC_VOLD, KC_END) }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, + [0] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, [1] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [2] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, - [3] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)} + [2] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, + [3] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)} }; #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) diff --git a/keyboards/keychron/v6/iso_encoder/keymaps/plodah/keymap.json b/keyboards/keychron/v6/iso_encoder/keymaps/plodah/keymap.json index ffa8c7a4fd5..79045f8b580 100644 --- a/keyboards/keychron/v6/iso_encoder/keymaps/plodah/keymap.json +++ b/keyboards/keychron/v6/iso_encoder/keymaps/plodah/keymap.json @@ -126,9 +126,9 @@ "keycodes": [ { "key": "PL_ALTTAB" }, { "key": "PL_ALTSTAB" }, - { "key": "PL_ENC_CCW" }, - { "key": "PL_ENC_CW" }, - { "key": "PL_ENC_PRS" }, + { "key": "PL_EC_CCW" }, + { "key": "PL_EC_CW" }, + { "key": "PL_EC_PR" }, { "key": "PL_QFTR" }, { "key": "PL_QRGB"}, { "key": "PL_QVER" } @@ -136,8 +136,8 @@ "encoders": [ [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ @@ -148,20 +148,20 @@ ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ], [ { - "ccw": "PL_ENC_CCW", - "cw": "PL_ENC_CW" + "ccw": "PL_EC_CCW", + "cw": "PL_EC_CW" } ] ], "layers": [ [ - "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", "PL_ENC_PRS", "LCA(KC_DEL)", "KC_MPLY", "RGB_TOG", "DM_REC1", "DM_PLY1", "DM_REC2", "DM_PLY2", + "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", "PL_EC_PR", "LCA(KC_DEL)", "KC_MPLY", "RGB_TOG", "DM_REC1", "DM_PLY1", "DM_REC2", "DM_PLY2", "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_PSCR", "KC_HOME", "KC_PGUP", "KC_NUM", "KC_PSLS", "KC_PAST", "KC_PMNS", "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_DEL", "KC_END", "KC_PGDN", "KC_P7", "KC_P8", "KC_P9", "LT(3,KC_BSPC)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT", "KC_P4", "KC_P5", "KC_P6", "KC_PPLS", @@ -177,7 +177,7 @@ "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_RGUI", "MO(3)", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_P0", "KC_PDOT", "KC_PENT" ], [ - "_______", "KC_BRID", "KC_BRIU", "G(KC_TAB)", "G(KC_E)", "RGB_VAD", "RGB_VAI", "KC_MPRV", "KC_MPLY", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "PL_ENC_PRS", "C(KC_F4)", "C(S(KC_T))", "_______", "_______", "_______", "_______", "_______", + "_______", "KC_BRID", "KC_BRIU", "G(KC_TAB)", "G(KC_E)", "RGB_VAD", "RGB_VAI", "KC_MPRV", "KC_MPLY", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "PL_EC_PR", "C(KC_F4)", "C(S(KC_T))", "_______", "_______", "_______", "_______", "_______", "_______", "KC_P1", "KC_P2", "KC_P3", "KC_P4", "KC_P5", "KC_P6", "KC_P7", "KC_P8", "KC_P9", "KC_P0", "_______", "_______", "_______", "KC_INS", "_______", "_______", "KC_NUM", "_______", "_______", "_______", "KC_ENT", "KC_PGUP", "KC_UP", "KC_PGDN", "_______", "_______", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "KC_CAPS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_ENT", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", @@ -185,7 +185,7 @@ "_______", "GU_TOGG", "_______", "KC_SPC", "_______", "GU_TOGG", "_______", "_______", "KC_HOME", "KC_PGDN", "KC_END", "_______", "_______", "_______" ], [ - "_______", "KC_F13", "KC_F14", "KC_F15", "KC_F16", "KC_F17", "KC_F18", "KC_F19", "KC_F20", "KC_F21", "KC_F22", "KC_F23", "KC_F24", "PL_ENC_PRS", "C(KC_F4)", "C(S(KC_T))", "_______", "_______", "_______", "_______", "_______", + "_______", "KC_F13", "KC_F14", "KC_F15", "KC_F16", "KC_F17", "KC_F18", "KC_F19", "KC_F20", "KC_F21", "KC_F22", "KC_F23", "KC_F24", "PL_EC_PR", "C(KC_F4)", "C(S(KC_T))", "_______", "_______", "_______", "_______", "_______", "MC_0", "MC_1", "MC_2", "MC_3", "MC_4", "MC_5", "MC_6", "MC_7", "MC_8", "PL_QFTR", "PL_QRGB", "PL_QVER", "QK_MAKE", "_______", "KC_INS", "_______", "_______", "_______", "_______", "_______", "_______", "RGB_TOG", "RGB_MOD", "RGB_VAI", "RGB_HUI", "RGB_SAI", "RGB_SPI", "_______", "_______", "_______", "_______", "KC_PSCR", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "KC_CAPS", "RGB_RMOD", "RGB_VAD", "RGB_HUD", "RGB_SAD", "RGB_SPD", "_______", "_______", "DM_RSTP", "DM_REC1", "DM_REC2", "_______", "_______", "_______", "_______", "_______", "_______", "_______", diff --git a/keyboards/keychron/v6/iso_encoder/keymaps/plodahc/keymap.c b/keyboards/keychron/v6/iso_encoder/keymaps/plodahc/keymap.c index 7551eceef7d..75c78eca249 100644 --- a/keyboards/keychron/v6/iso_encoder/keymaps/plodahc/keymap.c +++ b/keyboards/keychron/v6/iso_encoder/keymaps/plodahc/keymap.c @@ -8,26 +8,26 @@ enum keymap_keycodes { PL_ALTTAB = QK_USER_0, PL_ALTSTAB, - PL_ENC_CCW, - PL_ENC_CW, - PL_ENC_PRS, + PL_EC_CCW, + PL_EC_CW, + PL_EC_PR, PL_QFTR, PL_QRGB, PL_QVER, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso_110(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, PL_ENC_PRS, LCA(KC_DEL), KC_MPLY, RGB_TOG, DM_REC1, DM_PLY1, DM_REC2, DM_PLY2, 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_PSCR, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, LT(3,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_LCTL, KC_LGUI, KC_LALT, LT(2,KC_SPC), KC_RALT, KC_RGUI, LT(3,KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT), + [0] = LAYOUT_iso_110(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, PL_EC_PR, LCA(KC_DEL), KC_MPLY, RGB_TOG, DM_REC1, DM_PLY1, DM_REC2, DM_PLY2, 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_PSCR, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, LT(3,KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_LCTL, KC_LGUI, KC_LALT, LT(2,KC_SPC), KC_RALT, KC_RGUI, LT(3,KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT), [1] = LAYOUT_iso_110(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_MUTE, KC_PSCR, KC_F13, RGB_TOG, _______, _______, _______, _______, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, 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_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT), - [2] = LAYOUT_iso_110(_______, KC_BRID, KC_BRIU, G(KC_TAB), G(KC_E), RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, PL_ENC_PRS, C(KC_F4), C(S(KC_T)), _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, _______, KC_INS, _______, _______, KC_NUM, _______, _______, _______, KC_ENT, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, CW_TOGG, KC_PGUP, _______, _______, _______, _______, GU_TOGG, _______, KC_SPC, _______, GU_TOGG, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______), - [3] = LAYOUT_iso_110(_______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, PL_ENC_PRS, C(KC_F4), C(S(KC_T)), _______, _______, _______, _______, _______, MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, PL_QFTR, PL_QRGB, PL_QVER, QK_MAKE, _______, KC_INS, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, DM_RSTP, DM_REC1, DM_REC2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C(S(KC_V)), _______, NK_TOGG, _______, _______, DM_PLY1, DM_PLY2, _______, KC_VOLU, _______, _______, _______, _______, GU_TOGG, _______, KC_SPC, _______, GU_TOGG, _______, _______, KC_HOME, KC_VOLD, KC_END, _______, _______, _______) + [2] = LAYOUT_iso_110(_______, KC_BRID, KC_BRIU, G(KC_TAB), G(KC_E), RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, PL_EC_PR, C(KC_F4), C(S(KC_T)), _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, _______, KC_INS, _______, _______, KC_NUM, _______, _______, _______, KC_ENT, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, KC_BTN1, _______, _______, CW_TOGG, KC_PGUP, _______, _______, _______, _______, GU_TOGG, _______, KC_SPC, _______, GU_TOGG, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______), + [3] = LAYOUT_iso_110(_______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, PL_EC_PR, C(KC_F4), C(S(KC_T)), _______, _______, _______, _______, _______, MC_0, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, PL_QFTR, PL_QRGB, PL_QVER, QK_MAKE, _______, KC_INS, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, DM_RSTP, DM_REC1, DM_REC2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C(S(KC_V)), _______, NK_TOGG, _______, _______, DM_PLY1, DM_PLY2, _______, KC_VOLU, _______, _______, _______, _______, GU_TOGG, _______, KC_SPC, _______, GU_TOGG, _______, _______, KC_HOME, KC_VOLD, KC_END, _______, _______, _______) }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, + [0] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, [1] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [2] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)}, - [3] = {ENCODER_CCW_CW(PL_ENC_CCW, PL_ENC_CW)} + [2] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)}, + [3] = {ENCODER_CCW_CW(PL_EC_CCW, PL_EC_CW)} }; #endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) diff --git a/users/plodah/functions/encoder_actions.c b/users/plodah/functions/encoder_actions.c index 57afb798e3b..202e2cc6775 100644 --- a/users/plodah/functions/encoder_actions.c +++ b/users/plodah/functions/encoder_actions.c @@ -18,20 +18,20 @@ if( (get_highest_layer(layer_state | default_layer_state) == PLODAH_BORING_LAYER) ){ enc_layer = 0; } #endif // PLODAH_BORING_LAYER - if( keycode != (PL_ENC_PRS & 0xff) && !(mod_state == MOD_MASK_ALT || mod_state == MOD_BIT(KC_LALT) || mod_state == MOD_BIT(KC_RALT))){ + if( keycode != (PL_EC_PR & 0xff) && !(mod_state == MOD_MASK_ALT || mod_state == MOD_BIT(KC_LALT) || mod_state == MOD_BIT(KC_RALT))){ unregister_mods(mod_state); } if (ctl_pressed && alt_pressed && sft_pressed) { //CAS switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: tap_code16(C(KC_LEFT)); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: tap_code16(C(KC_RGHT)); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: break; } @@ -41,13 +41,13 @@ //CGS #ifdef RGB_MATRIX_ENABLE switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: rgb_matrix_decrease_speed(); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: rgb_matrix_increase_speed(); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: rgb_matrix_toggle(); break; @@ -59,13 +59,13 @@ //CGA #ifdef RGB_MATRIX_ENABLE switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: rgb_matrix_decrease_hue(); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: rgb_matrix_increase_hue(); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: rgb_matrix_toggle(); break; @@ -76,13 +76,13 @@ else if (ctl_pressed && alt_pressed) { //CA switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: tap_code16(C(KC_MINS)); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: tap_code16(C(KC_EQL)); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: tap_code16(C(KC_0)); tap_code16(C(KC_P0)); @@ -93,13 +93,13 @@ else if (ctl_pressed && sft_pressed) { //CS switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: tap_code(KC_PGUP); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: tap_code(KC_PGDN); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: break; } @@ -108,13 +108,13 @@ else if (alt_pressed && sft_pressed) { //AS switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: tap_code(KC_LEFT); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: tap_code(KC_RGHT); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: tap_code(KC_ENT); break; @@ -124,13 +124,13 @@ else if (ctl_pressed) { //C switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: tap_code16(C(KC_PGUP)); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: tap_code16(C(KC_PGDN)); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: tap_code16(C(KC_F4)); break; @@ -140,13 +140,13 @@ else if (gui_pressed) { //G switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: tap_code16(S(KC_SPC)); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: tap_code(KC_SPC); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: break; } @@ -155,13 +155,13 @@ else if (alt_pressed) { //A switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: plodah_alttab_start(true); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: plodah_alttab_start(false); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: tap_code16(A(KC_F4)); break; @@ -171,13 +171,13 @@ else if (sft_pressed) { //S switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: tap_code(KC_MPRV); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: tap_code(KC_MNXT); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: tap_code(KC_MPLY); break; @@ -188,13 +188,13 @@ // ODD & NOT BORING #ifdef RGB_MATRIX_ENABLE switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: rgb_matrix_decrease_sat(); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: rgb_matrix_increase_sat(); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: rgb_matrix_toggle(); break; @@ -206,13 +206,13 @@ // EVEN, NONZERO & NOT BORING #ifdef RGB_MATRIX_ENABLE switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: rgb_matrix_decrease_val(); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: rgb_matrix_increase_val(); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: rgb_matrix_toggle(); break; @@ -223,13 +223,13 @@ else { // ELSE switch (keycode) { - case PL_ENC_CCW & 0xff: + case PL_EC_CCW & 0xff: tap_code16_delay(KC_VOLD, 2); break; - case PL_ENC_CW & 0xff: + case PL_EC_CW & 0xff: tap_code16_delay(KC_VOLU, 2); break; - case PL_ENC_PRS & 0xff: + case PL_EC_PR & 0xff: default: tap_code(KC_MUTE); break; diff --git a/users/plodah/functions/process_record_user.c b/users/plodah/functions/process_record_user.c index 90921bb0046..23cb33772f6 100644 --- a/users/plodah/functions/process_record_user.c +++ b/users/plodah/functions/process_record_user.c @@ -120,9 +120,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #endif // defined(PLODAH_ALTTAB_ENHANCEMENTS_ENABLE) #if defined(PLODAH_KNOB_ENHANCEMENTS_ENABLE) - case PL_ENC_CCW: - case PL_ENC_CW: - case PL_ENC_PRS: + case PL_EC_CCW: + case PL_EC_CW: + case PL_EC_PR: if (record->event.pressed) { enc_act(keycode & 0xff, ctl_pressed, gui_pressed, alt_pressed, sft_pressed); }