Rename MSJG keycode

plodah · Nov 4, 2024 · 6f9a56a · 6f9a56a
1 parent d0993a9
commit 6f9a56a
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 22 deletions.
diff --git a/keyboards/dztech/dz60v2/keymaps/plodah/keymap.json b/keyboards/dztech/dz60v2/keymaps/plodah/keymap.json
@@ -63,10 +63,11 @@
     "keycodes": [
         { "key": "PL_ALTTAB" },
         { "key": "PL_ALTSTAB" },
+        { "key": "PL_MSJG" },
         { "key": "PL_QFTR" },
+        { "key": "PL_QLYR" },
         { "key": "PL_QRGB" },
-        { "key": "PL_QVER" },
-        { "key": "PL_MSJIG" }
+        { "key": "PL_QVER" }
     ],
     "layers": [
         [
@@ -91,7 +92,7 @@
             "_______",  "GU_TOGG",  "_______",              "KC_SPC",               "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",  "KC_NO",    "KC_DEL",
+            "KC_GRV",   "MC_1",     "MC_2",     "MC_3",     "MC_4",     "MC_5",     "MC_6",     "PL_QFTR",  "PL_QLYR",  "PL_QRGB",  "PL_QVER",  "PL_MSJG",  "QK_MAKE",  "KC_NO",    "KC_DEL",
             "BL_TOGG",  "BL_BRTG",  "BL_UP",    "_______",  "_______",  "RGB_SPI",  "_______",  "_______",  "_______",  "_______",  "KC_PSCR",  "_______",  "_______",
             "KC_CAPS",  "BL_BRTG",  "BL_DOWN",  "_______",  "_______",  "RGB_SPD",  "_______",  "_______",  "_______",  "_______",  "_______",  "_______",  "_______",              "_______",
             "_______",  "_______",  "_______",  "_______",  "_______",  "C(S(KC_V))","_______", "NK_TOGG",  "_______",  "_______",  "_______",  "_______",              "KC_VOLU",  "_______",

diff --git a/keyboards/dztech/dz60v2/keymaps/plodahc/keymap.c b/keyboards/dztech/dz60v2/keymaps/plodahc/keymap.c
@@ -13,10 +13,11 @@
 enum keymap_keycodes {
     PL_ALTTAB = QK_USER_0,
     PL_ALTSTAB,
+    PL_MSJG,
     PL_QFTR,
+    PL_QLYR,
     PL_QRGB,
     PL_QVER,
-    PL_MSJIG,
 };
 
 enum {
@@ -27,6 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_60_b_iso(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_NO, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, 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, RSFT_T(KC_SLSH), KC_UP, KC_SLSH, KC_LCTL, KC_LGUI, KC_LALT, LT(2,KC_SPC), LT(3,KC_SPC), LT(2,KC_SPC), MT(MOD_RALT,KC_APP), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
     [1] = LAYOUT_60_b_iso(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_NO, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_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_RSFT, KC_UP, KC_SLSH, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
     [2] = LAYOUT_60_b_iso(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_DEL, 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, KC_SPC , KC_SPC, _______, _______, KC_HOME, KC_PGDN, KC_END),
-    [3] = LAYOUT_60_b_iso(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, KC_NO, KC_DEL, BL_TOGG, BL_BRTG, BL_UP, _______, _______, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, KC_CAPS, BL_BRTG, BL_DOWN, _______, _______, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C(S(KC_V)), _______, NK_TOGG, _______, _______, _______, _______, KC_VOLU, _______, _______, GU_TOGG, _______, KC_SPC, KC_SPC , KC_SPC, KC_APP, _______, KC_HOME, KC_VOLD, KC_END),
+    [3] = LAYOUT_60_b_iso(KC_GRV, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, PL_QFTR, PL_QLYR, PL_QRGB, PL_QVER, PL_MSJG, QK_MAKE, KC_NO, KC_DEL, BL_TOGG, BL_BRTG, BL_UP, _______, _______, RGB_SPI, _______, _______, _______, _______, KC_PSCR, _______, _______, KC_CAPS, BL_BRTG, BL_DOWN, _______, _______, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C(S(KC_V)), _______, NK_TOGG, _______, _______, _______, _______, KC_VOLU, _______, _______, GU_TOGG, _______, KC_SPC, KC_SPC , KC_SPC, KC_APP, _______, KC_HOME, KC_VOLD, KC_END),
     [4] = LAYOUT_60_b_iso(_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
 };
diff --git a/keyboards/keychron/q1v1/iso_encoder/keymaps/plodah/keymap.json b/keyboards/keychron/q1v1/iso_encoder/keymaps/plodah/keymap.json
@@ -132,7 +132,7 @@
         { "key": "PL_ENC_CCW" },
         { "key": "PL_ENC_CW" },
         { "key": "PL_ENC_PRS" },
-        { "key": "PL_MSJIG" },
+        { "key": "PL_MSJG" },
         { "key": "PL_QVER" }
     ],
     "encoders": [
@@ -188,7 +188,7 @@
         ],
         [
             "_______",              "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_MSJIG",
+            "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",
             "_______",  "_______",  "_______",  "_______",  "_______",  "C(S(KC_V))", "_______", "NK_TOGG", "_______",  "_______",  "_______",  "_______",                "_______",  "KC_VOLU",

diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/plodah/keymap.json b/keyboards/keychron/q8/iso_encoder/keymaps/plodah/keymap.json
@@ -129,7 +129,7 @@
         { "key": "PL_ENC_CCW" },
         { "key": "PL_ENC_CW" },
         { "key": "PL_ENC_PRS" },
-        { "key": "PL_MSJIG" },
+        { "key": "PL_MSJG" },
         { "key": "PL_QFTR" },
         { "key": "PL_QRGB"},
         { "key": "PL_QVER" }
@@ -184,7 +184,7 @@
         ],
         [
             "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_MSJIG",
+            "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",              "AG_TOGG",  "KC_SPC",   "_______",                          "_______",  "KC_SPC",   "_______",                          "KC_HOME",  "KC_PGDN",  "KC_END"

diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/plodahc/keymap.c b/keyboards/keychron/q8/iso_encoder/keymaps/plodahc/keymap.c
@@ -11,7 +11,7 @@ enum keymap_keycodes {
     PL_ENC_CCW,
     PL_ENC_CW,
     PL_ENC_PRS,
-    PL_MSJIG,
+    PL_MSJG,
     PL_QFTR,
     PL_QRGB,
     PL_QVER,
@@ -25,7 +25,7 @@ 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, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, 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),
     [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_MSJIG, _______, 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)
+    [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)
 };
 
 #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)

diff --git a/keyboards/ploopyco/madromys/keymaps/plodah/keymap.json b/keyboards/ploopyco/madromys/keymaps/plodah/keymap.json
@@ -57,7 +57,7 @@
     "keycodes": [
         { "key": "PL_ALTTAB" },
         { "key": "PL_ALTSTAB" },
-        { "key": "PL_MSJIG" },
+        { "key": "PL_MSJG" },
         { "key": "PL_QFTR" },
         { "key": "PL_QRGB" },
         { "key": "PL_QVER" }

diff --git a/keyboards/ploopyco/mouse/keymaps/plodah/keymap.json b/keyboards/ploopyco/mouse/keymaps/plodah/keymap.json
@@ -57,7 +57,7 @@
     "keycodes": [
         { "key": "PL_ALTTAB" },
         { "key": "PL_ALTSTAB" },
-        { "key": "PL_MSJIG" },
+        { "key": "PL_MSJG" },
         { "key": "PL_QFTR" },
         { "key": "PL_QRGB" },
         { "key": "PL_QVER" }

diff --git a/keyboards/ploopyco/trackball_mini/keymaps/plodah/keymap.json b/keyboards/ploopyco/trackball_mini/keymaps/plodah/keymap.json
@@ -60,7 +60,7 @@
     "keycodes": [
         { "key": "PL_ALTTAB" },
         { "key": "PL_ALTSTAB" },
-        { "key": "PL_MSJIG" },
+        { "key": "PL_MSJG" },
         { "key": "PL_QFTR" },
         { "key": "PL_QRGB" },
         { "key": "PL_QVER" }

diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/plodah/keymap.json b/keyboards/ploopyco/trackball_thumb/keymaps/plodah/keymap.json
@@ -57,7 +57,7 @@
     "keycodes": [
         { "key": "PL_ALTTAB" },
         { "key": "PL_ALTSTAB" },
-        { "key": "PL_MSJIG" },
+        { "key": "PL_MSJG" },
         { "key": "PL_QFTR" },
         { "key": "PL_QRGB" },
         { "key": "PL_QVER" }

diff --git a/keyboards/winry/winry315/keymaps/plodah/keymap.json b/keyboards/winry/winry315/keymaps/plodah/keymap.json
@@ -120,7 +120,7 @@
     "keycodes": [
         { "key": "PL_ALTTAB" },
         { "key": "PL_ALTSTAB" },
-        { "key": "PL_MSJIG" },
+        { "key": "PL_MSJG" },
         { "key": "PL_QFTR" },
         { "key": "PL_QRGB" },
         { "key": "PL_QVER" }
@@ -302,7 +302,7 @@
                         "MC_14",    "KC_NO",    "MC_15",
             "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",  "PL_MSJIG", "MO(9)"
+            "PL_QRGB",  "PL_QVER",  "QK_MAKE",  "PL_MSJG", "MO(9)"
         ],
 
         [
@@ -327,7 +327,7 @@
                         "_______",  "_______",  "_______",
             "DF(0)",    "DF(1)",    "DF(2)",    "DF(3)",    "DF(4)",
             "DF(5)",    "DF(6)",    "DF(7)",    "DF(8)",    "DF(9)",
-            "PL_MSJIG", "KC_NUM",   "_______",  "PL_QFTR",  "MO(9)"
+            "PL_MSJG", "KC_NUM",   "_______",  "PL_QFTR",  "MO(9)"
         ]
     ]
 }
diff --git a/users/plodah/functions/combos.c b/users/plodah/functions/combos.c
@@ -57,11 +57,11 @@
 
   combo_t key_combos[] = {
     COMBO(pl_combo_ms12, DRAG_SCROLL),
-    COMBO(pl_combo_ms14, PL_MSJIG),
+    COMBO(pl_combo_ms14, PL_MSJG),
     COMBO(pl_combo_ms15, C(KC_C)),
     COMBO(pl_combo_ms24, DRAG_SCROLL),
     COMBO(pl_combo_ms25, C(KC_V)),
-    COMBO(pl_combo_ms45, PL_MSJIG),
+    COMBO(pl_combo_ms45, PL_MSJG),
   };
 #endif // ! defined(IS_MOUSE)
 

diff --git a/users/plodah/functions/mouse_jiggler.c b/users/plodah/functions/mouse_jiggler.c
@@ -40,7 +40,7 @@ uint32_t jiggler_callback_subtle(uint32_t trigger_time, void* cb_arg) {
 void jiggler_onclick( uint16_t keycode ) {
   if (
     #ifndef PLODAH_MSJIGGLER_AUTOSTOP
-      keycode == PL_MSJIG &&
+      keycode == PL_MSJG &&
     #endif // PLODAH_MSJIGGLER_AUTOSTOP
     token
   ) {
@@ -49,7 +49,7 @@ void jiggler_onclick( uint16_t keycode ) {
     report = (report_mouse_t){};  // Clear the mouse.
     host_mouse_send(&report);
   }
-  else if (keycode == PL_MSJIG) {
+  else if (keycode == PL_MSJG) {
     #ifdef PLODAH_MSJIGGLER_PATTERN
       #if PLODAH_MSJIGGLER_PATTERN == 1
         token = defer_exec(1, jiggler_callback_figure, NULL);