From f20ee40cbfab59d689ca0490116a927151393ef9 Mon Sep 17 00:00:00 2001
From: mahlon <>
Date: Tue, 3 Dec 2024 00:02:34 +0000
Subject: [PATCH] Enable tri-layer - empty for now.  Macros, perhaps?

FossilOrigin-Name: 8548b582c865ebfa913fb26aacbee79718ccec5550b80e6bc9543ef84bc27be1
---
 .../keychron/q4/ansi/keymaps/mahlon/config.h  |  7 ++++++
 .../keychron/q4/ansi/keymaps/mahlon/keymap.c  | 22 ++++++++++++++-----
 .../keychron/q4/ansi/keymaps/mahlon/rules.mk  |  2 +-
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 keyboards/keychron/q4/ansi/keymaps/mahlon/config.h

diff --git a/keyboards/keychron/q4/ansi/keymaps/mahlon/config.h b/keyboards/keychron/q4/ansi/keymaps/mahlon/config.h
new file mode 100644
index 0000000..b030c16
--- /dev/null
+++ b/keyboards/keychron/q4/ansi/keymaps/mahlon/config.h
@@ -0,0 +1,7 @@
+
+#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
+#define TRI_LAYER_LOWER_LAYER 2
+#define TRI_LAYER_UPPER_LAYER 3
+#define TRI_LAYER_ADJUST_LAYER 4
+
+
diff --git a/keyboards/keychron/q4/ansi/keymaps/mahlon/keymap.c b/keyboards/keychron/q4/ansi/keymaps/mahlon/keymap.c
index 6863dd9..257cfef 100644
--- a/keyboards/keychron/q4/ansi/keymaps/mahlon/keymap.c
+++ b/keyboards/keychron/q4/ansi/keymaps/mahlon/keymap.c
@@ -59,20 +59,25 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 */
 
+
+// The keychron keyboards have a physical switch that sets the persistent
+// layer. When set to 'mac', it's 0.  When 'win', it's 1.
+//
 enum layers {
     _DEFAULT = 0,  // MAC_BASE
     _BASE,         // WIN_BASE switch
     _FN1,
-    _FN2
+    _FN2,
+    _ADJUST
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_ansi_61(
-        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,
+        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,
         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_BSLS,
         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_ENT,
         KC_LSFT,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,            KC_RSFT,
-        KC_LCTL, KC_LALT,  KC_LGUI,                            KC_SPC,                             KC_RALT,  TT(_FN1), TT(_FN2), KC_RCTL),
+        KC_LCTL, KC_LALT,  KC_LGUI,                            KC_SPC,                             KC_RALT,  TL_LOWR,  TL_UPPR,  KC_RCTL),
 
     [_FN1] = LAYOUT_ansi_61(
         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,   _______,
@@ -82,10 +87,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______,  _______,                            _______,                            _______,  _______,  _______,  _______),
 
     [_FN2] = LAYOUT_ansi_61(
-        _______, KC_BRID,  KC_BRIU, KC_NO,   KC_NO,   RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE,  KC_VOLD,  KC_VOLU,  RGB_TOG,
+        _______, KC_BRID,  KC_BRIU, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE,  KC_VOLD,  KC_VOLU,  RGB_TOG,
         _______, RGB_MOD,  RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, MS_BTN1, MS_BTN3, MS_BTN2, _______,  _______,  _______,  _______,
         _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, MS_WHLD, MS_UP,   MS_WHLU, _______,  _______,            _______,
         _______,           _______, _______, _______, MS_ACL0, MS_ACL1, MS_ACL2, MS_LEFT, MS_DOWN, MS_RGHT,  _______,            _______,
-        _______, _______,  _______,                            _______,                            QK_LOCK,  _______,  _______,  _______)
+        _______, _______,  _______,                            _______,                            QK_LOCK,  _______,  _______,  _______),
+
+    [_ADJUST] = LAYOUT_ansi_61(
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______,
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______,
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,            _______,
+        _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,            _______,
+        _______, _______,  _______,                            _______,                            _______,  _______,  _______,  _______)
 };
 
diff --git a/keyboards/keychron/q4/ansi/keymaps/mahlon/rules.mk b/keyboards/keychron/q4/ansi/keymaps/mahlon/rules.mk
index 4321160..2148174 100644
--- a/keyboards/keychron/q4/ansi/keymaps/mahlon/rules.mk
+++ b/keyboards/keychron/q4/ansi/keymaps/mahlon/rules.mk
@@ -1,7 +1,7 @@
 
 CAPS_WORD_ENABLE = yes
 COMMAND_ENABLE = no
-DYNAMIC_MACRO_ENABLE = yes
 KEY_LOCK_ENABLE = yes
 KEY_OVERRIDE_ENABLE = yes
+TRI_LAYER_ENABLE = yes