commit 18f58aa012daf51008c8bcf3f54d135c3a7c06cb
parent 3b8369abaeb47b198422ab194cf3365d68944692
Author: Jack Sangdahl <jack@pngu.org>
Date: Sun, 7 Dec 2025 09:21:34 +0100
Update layer names and layout macros
Diffstat:
15 files changed, 171 insertions(+), 154 deletions(-)
diff --git a/keyboards/bioi/f60/keymaps/jack/keymap.c b/keyboards/bioi/f60/keymaps/jack/keymap.c
@@ -7,25 +7,25 @@
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_jack_60_ts(
+ [LAYER0] = LAYOUT_jack_60_ts(
_______, ___NONE___,
- _______, ___BASE1___, KC_BSPC, _______, PNP,
- _______, ___BASE2___, _______, _______,
- _______, ___BASE3___, _______,
+ _______, ___LAYER00___, KC_BSPC, _______, PNP,
+ _______, ___LAYER01___, _______, _______,
+ _______, ___LAYER02___, _______,
_______, _______, KC_ESC, LWRSPC, PSTRSE, _______, _______
),
- [_LOWER] = LAYOUT_jack_60_ts(
+ [LAYER1] = LAYOUT_jack_60_ts(
_______, ___NONE___,
- _______, ___LOWER1___, _______, _______, _______,
- _______, ___LOWER2___, _______, _______,
- _______, ___LOWER3___, _______,
+ _______, ___LAYER10___, _______, _______, _______,
+ _______, ___LAYER11___, _______, _______,
+ _______, ___LAYER12___, _______,
_______, _______, _______, _______, _______, _______, _______
),
- [_RAISE] = LAYOUT_jack_60_ts(
+ [LAYER3] = LAYOUT_jack_60_ts(
_______, ___NONE___,
- _______, ___RAISE1___, _______, _______, _______,
- _______, ___RAISE2___, _______, _______,
- _______, ___RAISE3___, _______,
+ _______, ___LAYER30___, _______, _______, _______,
+ _______, ___LAYER31___, _______, _______,
+ _______, ___LAYER32___, _______,
_______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/boardsource/beiwagon/keymaps/jack/keymap.c b/keyboards/boardsource/beiwagon/keymaps/jack/keymap.c
@@ -1,16 +1,16 @@
-// Copyright 2025 jack_all@pngu.org
+// Copyright 2025 jack@pngu.org
// SPDX-License-Identifier: GPL-3.0-or-later
#include "jack.h"
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_jack(
+ [LAYER0] = LAYOUT_jack(
G(KC_F), G(KC_Q), G(KC_R),
KC_VOLD, PNP, KC_VOLU,
REMOVE, XRGB_HUI, XRGB_NXT,
- XRGB_TOG, XRGB_HUD, TG(_LOWER)
+ XRGB_TOG, XRGB_HUD, TG(LAYER1)
),
- [_LOWER] = LAYOUT_jack(
+ [LAYER1] = LAYOUT_jack(
QK_BOOT, EE_CLR, QK_MAKE,
_______, _______, _______,
_______, _______, _______,
diff --git a/keyboards/endgame/keymaps/jack/keymap.c b/keyboards/endgame/keymaps/jack/keymap.c
@@ -4,23 +4,23 @@
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_jack(
- ___BASE1___,
- ___BASE2___,
- ___BASE3___,
- _______, ___BASE4___, _______
+ [LAYER0] = LAYOUT_jack(
+ ___LAYER00___,
+ ___LAYER01___,
+ ___LAYER02___,
+ _______, ___LAYER03___, _______
),
- [_LOWER] = LAYOUT_jack(
- ___LOWER1___,
- ___LOWER2___,
- ___LOWER3___,
- _______, ___LOWER4___, _______
+ [LAYER1] = LAYOUT_jack(
+ ___LAYER10___,
+ ___LAYER11___,
+ ___LAYER12___,
+ _______, ___LAYER13___, _______
),
- [_RAISE] = LAYOUT_jack(
- ___RAISE1___,
- ___RAISE2___,
- ___RAISE3___,
- _______, ___RAISE4___, _______
+ [LAYER3] = LAYOUT_jack(
+ ___LAYER30___,
+ ___LAYER31___,
+ ___LAYER32___,
+ _______, ___LAYER33___, _______
)
};
// clang-format on
diff --git a/keyboards/locus/keymaps/jack/keymap.c b/keyboards/locus/keymaps/jack/keymap.c
@@ -4,22 +4,22 @@
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_jack(
- _______, ___BASE1___, _______,
- _______, ___BASE2___,
- _______, ___BASE3___,
+ [LAYER0] = LAYOUT_jack(
+ _______, ___LAYER00___, _______,
+ _______, ___LAYER01___,
+ _______, ___LAYER02___,
UPDIR, KC_ESC, LWRSPC, RSEBSP, C(S(KC_V)), PNP
),
- [_LOWER] = LAYOUT_jack(
- _______, ___LOWER1___, _______,
- _______, ___LOWER2___,
- _______, ___LOWER3___,
+ [LAYER1] = LAYOUT_jack(
+ _______, ___LAYER10___, _______,
+ _______, ___LAYER11___,
+ _______, ___LAYER12___,
_______, _______, _______, _______, _______, _______
),
- [_RAISE] = LAYOUT_jack(
- _______, ___RAISE1___, _______,
- _______, ___RAISE2___,
- _______, ___RAISE3___,
+ [LAYER3] = LAYOUT_jack(
+ _______, ___LAYER30___, _______,
+ _______, ___LAYER31___,
+ _______, ___LAYER32___,
_______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/mkh_studio/bully/keymaps/jack/keymap.c b/keyboards/mkh_studio/bully/keymaps/jack/keymap.c
@@ -4,22 +4,22 @@
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_jack(
- XXXXXXX, ___BASE1___, KC_BSPC, KC_BSPC,
- REMOVE, ___BASE2___, PNP,
- XXXXXXX, ___BASE3___, XXXXXXX,
+ [LAYER0] = LAYOUT_jack(
+ XXXXXXX, ___LAYER00___, KC_BSPC, KC_BSPC,
+ REMOVE, ___LAYER01___, PNP,
+ XXXXXXX, ___LAYER02___, XXXXXXX,
KC_VOLD, UPDIR, KC_ESC, XXXXXXX, LWRSPC, XXXXXXX, PSTRSE, XXXXXXX, KC_VOLU
),
- [_LOWER] = LAYOUT_jack(
- _______, ___LOWER1___, _______, _______,
- _______, ___LOWER2___, _______,
- _______, ___LOWER3___, _______,
+ [LAYER1] = LAYOUT_jack(
+ _______, ___LAYER10___, _______, _______,
+ _______, ___LAYER11___, _______,
+ _______, ___LAYER12___, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [_RAISE] = LAYOUT_jack(
- _______, ___RAISE1___, _______, _______,
- _______, ___RAISE2___, _______,
- _______, ___RAISE3___, _______,
+ [LAYER3] = LAYOUT_jack(
+ _______, ___LAYER30___, _______, _______,
+ _______, ___LAYER31___, _______,
+ _______, ___LAYER32___, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/projectcain/relic/keymaps/jack/keymap.c b/keyboards/projectcain/relic/keymaps/jack/keymap.c
@@ -4,22 +4,22 @@
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_jack_all(
- ___BASE1___, PNP,
- ___BASE2___,
- ___BASE3___,
+ [LAYER0] = LAYOUT_jack_all(
+ ___LAYER00___, PNP,
+ ___LAYER01___,
+ ___LAYER02___,
KC_VOLD, KC_ESC, XXXXXXX, LWRSPC, XXXXXXX, RSEBSP, XXXXXXX, C(S(KC_V)), KC_VOLU
),
- [_LOWER] = LAYOUT_jack_all(
- ___LOWER1___, _______,
- ___LOWER2___,
- ___LOWER3___,
+ [LAYER1] = LAYOUT_jack_all(
+ ___LAYER10___, _______,
+ ___LAYER11___,
+ ___LAYER12___,
_______, _______, _______, _______, _______, SWTCH, _______, _______, _______
),
- [_RAISE] = LAYOUT_jack_all(
- ___RAISE1___, _______,
- ___RAISE2___,
- ___RAISE3___,
+ [LAYER3] = LAYOUT_jack_all(
+ ___LAYER30___, _______,
+ ___LAYER31___,
+ ___LAYER32___,
_______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/projectcain/vault35/keymaps/jack/keymap.c b/keyboards/projectcain/vault35/keymaps/jack/keymap.c
@@ -1,25 +1,25 @@
-// Copyright 2025 jack_all@pngu.org
+// Copyright 2025 jack@pngu.org
// SPDX-License-Identifier: GPL-3.0-or-later
#include "jack.h"
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_jack_all(
- ___BASE1___, XXXXXXX,
- ___BASE2___,
- ___BASE3___,
+ [LAYER0] = LAYOUT_jack_all(
+ ___LAYER00___, XXXXXXX,
+ ___LAYER01___,
+ ___LAYER02___,
UPDIR, KC_ESC, LWRSPC, XXXXXXX, RSEBSP, C(S(KC_V)), PNP
),
- [_LOWER] = LAYOUT_jack_all(
- ___LOWER1___, _______,
- ___LOWER2___,
- ___LOWER3___,
+ [LAYER1] = LAYOUT_jack_all(
+ ___LAYER10___, _______,
+ ___LAYER11___,
+ ___LAYER12___,
_______, _______, _______, _______, SWTCH, _______, _______
),
- [_RAISE] = LAYOUT_jack_all(
- ___RAISE1___, _______,
- ___RAISE2___,
- ___RAISE3___,
+ [LAYER3] = LAYOUT_jack_all(
+ ___LAYER30___, _______,
+ ___LAYER31___,
+ ___LAYER32___,
_______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/pseusplit/keymaps/jack/keymap.c b/keyboards/pseusplit/keymaps/jack/keymap.c
@@ -4,23 +4,23 @@
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_jack(
- ___BASE1___,
- ___BASE2___,
- ___BASE3___,
- _______, ___BASE4___, _______
+ [LAYER0] = LAYOUT_jack(
+ ___LAYER00___,
+ ___LAYER01___,
+ ___LAYER02___,
+ _______, ___LAYER03___, _______
),
- [_LOWER] = LAYOUT_jack(
- ___LOWER1___,
- ___LOWER2___,
- ___LOWER3___,
- _______, ___LOWER4___, _______
+ [LAYER1] = LAYOUT_jack(
+ ___LAYER10___,
+ ___LAYER11___,
+ ___LAYER12___,
+ _______, ___LAYER13___, _______
),
- [_RAISE] = LAYOUT_jack(
- ___RAISE1___,
- ___RAISE2___,
- ___RAISE3___,
- _______, ___RAISE4___, _______
+ [LAYER3] = LAYOUT_jack(
+ ___LAYER30___,
+ ___LAYER31___,
+ ___LAYER32___,
+ _______, ___LAYER33___, _______
)
};
// clang-format on
diff --git a/keyboards/splitkb/kyria/keymaps/jack/keymap.c b/keyboards/splitkb/kyria/keymaps/jack/keymap.c
@@ -4,21 +4,21 @@
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_jack(
+ [LAYER0] = LAYOUT_jack(
XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX,
XXXXXXX, HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN), XXXXXXX,
XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_SPC, XXXXXXX, XXXXXXX, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX,
XXXXXXX, UPDIR, ESCLWR, KC_SPC, XXXXXXX, XXXXXXX, KC_BSPC, PSTRSE, PNP, XXXXXXX
),
- [_LOWER] = LAYOUT_jack(
+ [LAYER1] = LAYOUT_jack(
_______, 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(
+ [LAYER3] = LAYOUT_jack(
_______, 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, _______,
@@ -41,7 +41,7 @@ bool oled_task_keymap(void) {
static bool scrolling = false;
layer_state_t layer_state_set_user(layer_state_t state) {
switch (get_highest_layer(state)) {
- case _LOWER:
+ case LAYER1:
scrolling = true;
pointing_device_set_cpi(64);
break;
diff --git a/keyboards/sweep/keymaps/jack/keymap.c b/keyboards/sweep/keymaps/jack/keymap.c
@@ -4,23 +4,23 @@
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_jack(
- ___BASE1___,
- ___BASE2___,
- ___BASE3___,
- ___BASE4___
+ [LAYER0] = LAYOUT_jack(
+ ___LAYER00___,
+ ___LAYER01___,
+ ___LAYER02___,
+ ___LAYER03___
),
- [_LOWER] = LAYOUT_jack(
- ___LOWER1___,
- ___LOWER2___,
- ___LOWER3___,
- ___LOWER4___
+ [LAYER1] = LAYOUT_jack(
+ ___LAYER10___,
+ ___LAYER11___,
+ ___LAYER12___,
+ ___LAYER13___
),
- [_RAISE] = LAYOUT_jack(
- ___RAISE1___,
- ___RAISE2___,
- ___RAISE3___,
- ___RAISE4___
+ [LAYER3] = LAYOUT_jack(
+ ___LAYER30___,
+ ___LAYER31___,
+ ___LAYER32___,
+ ___LAYER33___
)
};
// clang-format on
diff --git a/keyboards/xyz60/keymaps/jack/keymap.c b/keyboards/xyz60/keymaps/jack/keymap.c
@@ -7,25 +7,25 @@
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_jack_60_ts(
+ [LAYER0] = LAYOUT_jack_60_ts(
_______, ___NONE___,
- _______, ___BASE1___, KC_BSPC, _______, PNP,
- _______, ___BASE2___, _______, _______,
- _______, ___BASE3___, _______,
+ _______, ___LAYER00___, KC_BSPC, _______, PNP,
+ _______, ___LAYER01___, _______, _______,
+ _______, ___LAYER02___, _______,
_______, _______, KC_ESC, LWRSPC, PSTRSE, _______, _______
),
- [_LOWER] = LAYOUT_jack_60_ts(
+ [LAYER1] = LAYOUT_jack_60_ts(
_______, ___NONE___,
- _______, ___LOWER1___, _______, _______, _______,
- _______, ___LOWER2___, _______, _______,
- _______, ___LOWER3___, _______,
+ _______, ___LAYER10___, _______, _______, _______,
+ _______, ___LAYER11___, _______, _______,
+ _______, ___LAYER12___, _______,
_______, _______, _______, _______, _______, _______, _______
),
- [_RAISE] = LAYOUT_jack_60_ts(
+ [LAYER3] = LAYOUT_jack_60_ts(
_______, ___NONE___,
- _______, ___RAISE1___, _______, _______, _______,
- _______, ___RAISE2___, _______, _______,
- _______, ___RAISE3___, _______,
+ _______, ___LAYER30___, _______, _______, _______,
+ _______, ___LAYER31___, _______, _______,
+ _______, ___LAYER32___, _______,
_______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/users/jack/config.h b/users/jack/config.h
@@ -61,7 +61,7 @@
#undef ENABLE_RGB_MATRIX_DUAL_BEACON
#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#undef ENABLE_RGB_MATRIX_FLOWER_BLOOMING
+#undef ENABLE_RGB_MATRIX_FLAYER1_BLOOMING
#undef ENABLE_RGB_MATRIX_RAINDROPS
#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
#undef ENABLE_RGB_MATRIX_HUE_BREATHING
diff --git a/users/jack/jack.h b/users/jack/jack.h
@@ -3,7 +3,7 @@
#pragma once
#include QMK_KEYBOARD_H
-enum layers { _BASE, _LOWER, _RAISE };
+enum layers { LAYER0, LAYER1, LAYER3 };
enum tapdances { EM_DASH_MINS, PLY_NXT_PRV, CBRACKET, SBRACKET };
@@ -96,29 +96,46 @@ void housekeeping_task_keymap(void);
#define XRGB_VAD _______
#endif
-#define ESCLWR LT(_LOWER, KC_ESC)
-#define PSTRSE LT(_RAISE, KC_PSTE)
-#define LWRSPC LT(_LOWER, KC_SPC)
-#define RSEBSP LT(_RAISE, KC_BSPC)
+#define ESCLWR LT(LAYER1, KC_ESC)
+#define PSTRSE LT(LAYER3, KC_PSTE)
+#define LWRSPC LT(LAYER1, KC_SPC)
+#define RSEBSP LT(LAYER3, KC_BSPC)
#define PNP TD(PLY_NXT_PRV)
#define HRML(k1, k2, k3, k4) LALT_T(k1), LGUI_T(k2), LCTL_T(k3), LSFT_T(k4)
#define HRMR(k1, k2, k3, k4) RSFT_T(k1), RCTL_T(k2), RGUI_T(k3), RALT_T(k4)
// clang-format off
-#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___ 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___ _______, _______, _______, 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___ UPDIR, _______, _______, _______
+#define ___LAYER00___ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P
+#define ___LAYER01___ HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN)
+#define ___LAYER02___ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
+#define ___LAYER03___ ESCLWR, KC_SPC, KC_BSPC, PSTRSE
+
+// https://oxey.dev/sturdy/index.html
+// #define ___LAYER00___ KC_V, KC_M, KC_L, KC_C, KC_P, KC_X, KC_F, KC_O, KC_U, KC_J
+// #define ___LAYER01___ KC_S, KC_T, KC_R, KC_D, KC_Y, KC_DOT, KC_N, KC_A, KC_E, KC_I
+// #define ___LAYER02___ KC_Z, KC_K, KC_Q, KC_G, KC_W, KC_B, KC_H, KC_QUOT, KC_SCLN, KC_COMM
+// #define ___LAYER03___ _______, _______, _______, _______
+
+// https://github.com/GalileoBlues/Gallium
+// #define ___LAYER00___ KC_B, KC_L, KC_D, KC_C, KC_V KC_J, KC_Y, KC_O, KC_U, KC_COMM
+// #define ___LAYER00___ KC_N, KC_R, KC_T, KC_S, KC_G, KC_P, KC_H, KC_A, KC_E, KC_I
+// #define ___LAYER00___ KC_X, KC_Q, KC_M, KC_W, KC_Z, KC_K, KC_F, KC_QUOT, KC_SCLN, KC_DOT
+// #define ___LAYER03___ _______, _______, _______, _______
+
+#define ___LAYER10___ KC_GRV, KC_LT, KC_RT, KC_DQUO, KC_DOT, KC_AMPR, REMOVE, KC_LBRC, KC_RBRC, KC_PERC
+#define ___LAYER11___ HRML(KC_EXLM, KC_MINS, KC_PLUS, KC_EQL), KC_HASH, KC_PIPE, HRMR(KC_COLN, KC_LPRN, KC_RPRN, KC_QUES)
+#define ___LAYER12___ KC_CIRC, KC_SLSH, KC_ASTR, KC_BSLS, UPDIR, KC_TILD, KC_DLR, KC_LCBR, KC_RCBR, KC_AT
+#define ___LAYER13___ _______, _______, _______, _______
+
+// #define ___LAYER10___ _______, KC_9, KC_8, KC_7, KC_TAB, _______, _______, _______, _______, _______
+// #define ___LAYER11___ HRML(KC_VOLU, KC_3, KC_2, KC_1), KC_CAPS, KC_LEFT, HRMR(KC_DOWN, KC_UP, KC_RGHT, _______)
+// #define ___LAYER12___ KC_VOLD, KC_6, KC_5, KC_4, _______, _______, _______, _______, _______, _______
+// #define ___LAYER13___ _______, _______, _______, _______
+
+#define ___LAYER30___ XRGB_TOG, XRGB_NXT, XRGB_HUI, XRGB_SAI, XRGB_VAI, UC_NOMODE, UC_SCRIPT, UC_BLOCKS, UC_REGIONAL, QK_MAKE
+#define ___LAYER31___ MS_JIGGLE, XRGB_PRV, XRGB_HUD, XRGB_SAD, XRGB_VAD, UC_WIDE, UC_AUSSIE, UC_ZALGO, UC_SUPER, QK_BOOT
+#define ___LAYER32___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10
+#define ___LAYER33___ _______, _______, _______, _______
// clang-format on
#define LAYOUT_jack_60_ts(...) LAYOUT_60_ansi_tsangan(__VA_ARGS__)
diff --git a/users/jack/oled.c b/users/jack/oled.c
@@ -82,13 +82,13 @@ void oled_layer_anim(void) {
if (timer_elapsed(layer_anim_timer) > 200) {
layer_anim_timer = timer_read();
switch (get_highest_layer(layer_state)) {
- case _BASE:
+ case LAYER0:
anim_frame(520, tap_num);
break;
- case _LOWER:
+ case LAYER1:
anim_frame(650, tap_sym);
break;
- case _RAISE:
+ case LAYER3:
anim_frame(520, tap_sys);
break;
}
@@ -106,10 +106,10 @@ void oled_layer_status(void) {
0x20, 0xb7, 0xb8, 0xb9, 0x20,
0x20, 0xd7, 0xd8, 0xd9, 0x20};
switch (get_highest_layer(layer_state)) {
- case _LOWER:
+ case LAYER1:
oled_write(lower, false);
break;
- case _RAISE:
+ case LAYER3:
oled_write(raise, false);
break;
default:
diff --git a/users/jack/user_introspection.c b/users/jack/user_introspection.c
@@ -13,9 +13,9 @@ tap_dance_action_t tap_dance_actions[] = {
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [_BASE] = {{KC_VOLU, KC_VOLD}, {KC_MNXT, KC_MPRV}},
- [_LOWER] = {{XRGB_SAI, XRGB_SAD}, {XRGB_HUI, XRGB_HUD}},
- [_RAISE] = {{C(KC_LEFT), C(KC_RGHT)}, {C(S(KC_TAB)), C(KC_TAB)}}};
+ [LAYER0] = {{KC_VOLU, KC_VOLD}, {KC_MNXT, KC_MPRV}},
+ [LAYER1] = {{XRGB_SAI, XRGB_SAD}, {XRGB_HUI, XRGB_HUD}},
+ [LAYER3] = {{C(KC_LEFT), C(KC_RGHT)}, {C(S(KC_TAB)), C(KC_TAB)}}};
#endif
#ifdef COMBO_ENABLE
