commit a1d7185135dcaa41cc914855e68f60cb4e27da21 parent abae900571585ca2faf8c42d1fe128c0101ec4c8 Author: Jack Sangdahl <jack@pngu.org> Date: Sun, 14 Sep 2025 10:43:16 -0600 Add switcher module support, rename introspection file to allow for modules Diffstat:
15 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/keyboards/endgame/keymaps/jack/keymap.c b/keyboards/endgame/keymaps/jack/keymap.c @@ -8,19 +8,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___BASE1___, ___BASE2___, ___BASE3___, - ___BASE4___ + _______, ___BASE4___, _______ ), [_LOWER] = LAYOUT_jack( ___LOWER1___, ___LOWER2___, ___LOWER3___, - ___LOWER4___ + _______, ___LOWER4___, _______ ), [_RAISE] = LAYOUT_jack( ___RAISE1___, ___RAISE2___, ___RAISE3___, - ___RAISE4___ + _______, ___RAISE4___, _______ ) }; // clang-format on diff --git a/keyboards/endgame/keymaps/jack/keymap.json b/keyboards/endgame/keymaps/jack/keymap.json @@ -0,0 +1,5 @@ +{ + "modules": [ + "dave-thompson/switcher" + ] +} diff --git a/keyboards/projectcain/relic/keymaps/jack/keymap.c b/keyboards/projectcain/relic/keymaps/jack/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___LOWER1___, _______, ___LOWER2___, ___LOWER3___, - _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, SWTCH, _______, _______, _______ ), [_RAISE] = LAYOUT_jack_all( ___RAISE1___, _______, diff --git a/keyboards/projectcain/relic/keymaps/jack/keymap.json b/keyboards/projectcain/relic/keymaps/jack/keymap.json @@ -0,0 +1,5 @@ +{ + "modules": [ + "dave-thompson/switcher" + ] +} diff --git a/keyboards/projectcain/vault35/keymaps/jack/keymap.c b/keyboards/projectcain/vault35/keymaps/jack/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___LOWER1___, _______, ___LOWER2___, ___LOWER3___, - _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, SWTCH, _______, _______ ), [_RAISE] = LAYOUT_jack_all( ___RAISE1___, _______, diff --git a/keyboards/projectcain/vault35/keymaps/jack/keymap.json b/keyboards/projectcain/vault35/keymaps/jack/keymap.json @@ -0,0 +1,5 @@ +{ + "modules": [ + "dave-thompson/switcher" + ] +} diff --git a/keyboards/pseusplit/keymaps/jack/keymap.c b/keyboards/pseusplit/keymaps/jack/keymap.c @@ -8,19 +8,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___BASE1___, ___BASE2___, ___BASE3___, - ___BASE4___ + _______, ___BASE4___, _______ ), [_LOWER] = LAYOUT_jack( ___LOWER1___, ___LOWER2___, ___LOWER3___, - ___LOWER4___ + _______, ___LOWER4___, _______ ), [_RAISE] = LAYOUT_jack( ___RAISE1___, ___RAISE2___, ___RAISE3___, - ___RAISE4___ + _______, ___RAISE4___, _______ ) }; // clang-format on diff --git a/keyboards/splitkb/kyria/keymaps/jack/keymap.c b/keyboards/splitkb/kyria/keymaps/jack/keymap.c @@ -15,14 +15,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_1, KC_2 , KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN), _______, _______, KC_VOLD, KC_TAB, KC_CAPS, REMOVE, KC_GRV, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, SWTCH, _______, _______ ), [_RAISE] = LAYOUT_jack( - _______, XRGB_TOG, XRGB_MOD, XRGB_HUI, XRGB_SAI, XRGB_VAI, UC_NOMODE, UC_SCRIPT, UC_BLOCKS, UC_REGIONAL, QK_MAKE, _______, - _______, MS_JIGGLE, XRGB_RMOD, XRGB_HUD, XRGB_SAD, XRGB_VAD, UC_WIDE, UC_AUSSIE, UC_ZALGO, UC_SUPER, QK_BOOT, _______, - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, XRGB_TOG, XRGB_NXT, XRGB_HUI, XRGB_SAI, XRGB_VAI, UC_NOMODE, UC_SCRIPT, UC_BLOCKS, UC_REGIONAL, QK_MAKE, _______, + _______, MS_JIGGLE, XRGB_PRV, XRGB_HUD, XRGB_SAD, XRGB_VAD, UC_WIDE, UC_AUSSIE, UC_ZALGO, UC_SUPER, QK_BOOT, _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; // clang-format on diff --git a/keyboards/splitkb/kyria/keymaps/jack/keymap.json b/keyboards/splitkb/kyria/keymaps/jack/keymap.json @@ -1,5 +1,6 @@ { "modules": [ - "getreuer/palettefx" + "getreuer/palettefx", + "dave-thompson/switcher" ] } diff --git a/keyboards/sweep/keymaps/jack/keymap.c b/keyboards/sweep/keymaps/jack/keymap.c @@ -11,19 +11,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___BASE1___, ___BASE2___, ___BASE3___, - ESCLWR, KC_SPC, KC_BSPC, PSTRSE + ___BASE4___ ), [_LOWER] = LAYOUT_jack( ___LOWER1___, ___LOWER2___, ___LOWER3___, - _______, _______, _______, UPDIR + ___LOWER4___ ), [_RAISE] = LAYOUT_jack( ___RAISE1___, ___RAISE2___, ___RAISE3___, - PNP, _______, _______, _______ + ___RAISE4___ ) }; // clang-format on diff --git a/keyboards/sweep/keymaps/jack/keymap.json b/keyboards/sweep/keymaps/jack/keymap.json @@ -1,5 +1,6 @@ { "modules": [ - "getreuer/palettefx" + "getreuer/palettefx", + "dave-thompson/switcher" ] } diff --git a/users/jack/config.h b/users/jack/config.h @@ -10,6 +10,7 @@ #define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_MACOS #define ENABLE_COMPILE_KEYCODE #define LAYER_STATE_8BIT +#define SWITCHER_MACOS_APP_SWITCHER #undef LOCKING_SUPPORT_ENABLE #undef LOCKING_RESYNC_ENABLE #undef MANUFACTURER diff --git a/users/jack/jack.h b/users/jack/jack.h @@ -91,17 +91,17 @@ bool oled_task_keymap(void); #define ___BASE1___ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P #define ___BASE2___ HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN) #define ___BASE3___ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH -#define ___BASE4___ UPDIR, ESCLWR, KC_SPC, KC_BSPC, PSTRSE, PNP +#define ___BASE4___ ESCLWR, KC_SPC, KC_BSPC, PSTRSE #define ___LOWER1___ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0 #define ___LOWER2___ HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN) #define ___LOWER3___ KC_VOLD, KC_TAB, KC_CAPS, REMOVE, KC_GRV, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU -#define ___LOWER4___ _______, _______, _______, _______, _______, _______ +#define ___LOWER4___ _______, _______, SWTCH, PNP #define ___RAISE1___ XRGB_TOG, XRGB_NXT, XRGB_HUI, XRGB_SAI, XRGB_VAI, UC_NOMODE, UC_SCRIPT, UC_BLOCKS, UC_REGIONAL, QK_MAKE #define ___RAISE2___ MS_JIGGLE, XRGB_PRV, XRGB_HUD, XRGB_SAD, XRGB_VAD, UC_WIDE, UC_AUSSIE, UC_ZALGO, UC_SUPER, QK_BOOT #define ___RAISE3___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 -#define ___RAISE4___ _______, _______, _______, _______, _______, _______ +#define ___RAISE4___ _______, UPDIR, _______, _______ // clang-format on #define LAYOUT_jack_60_ts(...) LAYOUT_60_ansi_tsangan(__VA_ARGS__) diff --git a/users/jack/rules.mk b/users/jack/rules.mk @@ -16,7 +16,7 @@ MOUSE_JIGGLE_ENABLE = yes OS_DETECTION_ENABLE = yes DEBOUNCE_TYPE = asym_eager_defer_pk AVR_CFLAGS += -mrelax -INTROSPECTION_KEYMAP_C = introspection.c +INTROSPECTION_KEYMAP_C = user_introspection.c SRC += $(USER_PATH)/jack.c $(USER_PATH)/tapping.c diff --git a/users/jack/introspection.c b/users/jack/user_introspection.c