1 files changed, 30 insertions, 29 deletions
diff --git a/keyboards/mechmini/v1/keymaps/default/keymap.c b/keyboards/mechmini/v1/keymaps/default/keymap.c
index f9e446064..e0b746df9 100644
--- a/keyboards/mechmini/v1/keymaps/default/keymap.c
+++ b/keyboards/mechmini/v1/keymaps/default/keymap.c
@@ -15,35 +15,36 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
-#define _BL  0   // base layer
+enum layer_names {
-#define _FN1 1  // function layer 1
+    _BL,  // base layer
-#define _FN2 2  // function layer 2
+    _NV,  // navigation layer
-#define _FN3 3  // function layer 3
+    _NP,  // numbers and punctuation layer
-#define _____ KC_TRNS
+    _FN   // function keys
+};
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [_BL] = KEYMAP(
+    [_BL] = LAYOUT(
-     KC_ESC,     KC_Q,       KC_W,       KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-     KC_TAB,     KC_A,       KC_S,       KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_ENT,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
-     KC_LSFT,    KC_Z,       KC_X,       KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   MO(_FN2),
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MO(_NP),
-     KC_LCTL,    KC_LGUI,    KC_LALT,         _____,         KC_SPC,        _____,                   MO(_FN1), MO(_FN3)
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             MO(_NV), MO(_FN)
-   ),
+    ),
-   [_FN1] = KEYMAP(
+    [_NV] = LAYOUT(
-     KC_GRAVE,   _____,      KC_UP,      KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_MRWD,  KC_MPLY,  KC_MFFD,  KC_SLCK,  KC_PAUS,  KC_DEL,
+        KC_GRV,  _______, KC_UP,   KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MPLY, KC_MFFD, KC_SLCK, KC_PAUS, KC_DEL,
-     KC_CAPS,    KC_LEFT,    KC_DOWN,    KC_RIGHT, _____,    _____,    _____,    KC_INS,   KC_HOME,  KC_PGUP,  KC_PSCR,
+        KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, KC_PSCR,
-     _____,      _____,      M(0),       M(1),     M(2),     _____,    _____,    KC_END,   KC_PGDN,  _____,    _____,
+        _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
-     _____,      _____,      _____,            _____,        _____,         _____,                   _____,    _____
+        _______, _______, _______,                   _______,                            _______, _______
-   ),
+    ),
-   [_FN2] = KEYMAP(
+    [_NP] = LAYOUT(
-     KC_GRAVE,   KC_1,       KC_2,       KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_DEL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-     KC_CAPS,    _____,      _____,      _____,    _____,    KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_MINS,  KC_EQL,   _____,
+        KC_CAPS, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, KC_MINS, KC_EQL,  _______,
-     _____,      _____,      _____,      _____,    _____,    _____,    _____,    KC_SCLN,  KC_QUOT,  KC_SLSH,  _____,
+        _______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_SLSH, _______,
-     _____,      _____,      _____,            _____,        _____,         _____,                   _____,    _____
+        _______, _______, _______,                   _______,                            _______, _______
-   ),
+    ),
-   [_FN3] = KEYMAP(
+    [_FN] = LAYOUT(
-     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_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-     _____,      M(3),       M(4),       M(5),     _____,    _____,    _____,    _____,    _____,    _____,    _____,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     _____,      M(6),       _____,      _____,    _____,    _____,    _____,    _____,    _____,    _____,    _____,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     _____,      _____,      _____,            _____,        _____,         _____,                   _____,    _____
+        _______, _______, _______,                   _______,                            _______, _______
-   )
+    )
 };

diff --git a/keyboards/mechmini/v1/keymaps/default/keymap.c b/keyboards/mechmini/v1/keymaps/default/keymap.c index f9e446064..e0b746df9 100644 --- a/keyboards/mechmini/v1/keymaps/default/keymap.c +++ b/keyboards/mechmini/v1/keymaps/default/keymap.c
@@ -15,35 +15,36 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
15		15
16	#include QMK_KEYBOARD_H	16	#include QMK_KEYBOARD_H
17		17
18	#define _BL 0 // base layer	18	enum layer_names {
19	#define _FN1 1 // function layer 1	19	_BL, // base layer
20	#define _FN2 2 // function layer 2	20	_NV, // navigation layer
21	#define _FN3 3 // function layer 3	21	_NP, // numbers and punctuation layer
22	#define _____ KC_TRNS	22	_FN // function keys
		23	};
23		24
24	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	25	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
25	[_BL] = KEYMAP(	26	[_BL] = LAYOUT(
26	KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,	27	KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
27	KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,	28	KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
28	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(_FN2),	29	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(_NP),
29	KC_LCTL, KC_LGUI, KC_LALT, _____, KC_SPC, _____, MO(_FN1), MO(_FN3)	30	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_NV), MO(_FN)
30	),	31	),
31	[_FN1] = KEYMAP(	32	[_NV] = LAYOUT(
32	KC_GRAVE, _____, KC_UP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MPLY, KC_MFFD, KC_SLCK, KC_PAUS, KC_DEL,	33	KC_GRV, _______, KC_UP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MRWD, KC_MPLY, KC_MFFD, KC_SLCK, KC_PAUS, KC_DEL,
33	KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, _____, _____, _____, KC_INS, KC_HOME, KC_PGUP, KC_PSCR,	34	KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, KC_PSCR,
34	_____, _____, M(0), M(1), M(2), _____, _____, KC_END, KC_PGDN, _____, _____,	35	_______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, _______, _______,
35	_____, _____, _____, _____, _____, _____, _____, _____	36	_______, _______, _______, _______, _______, _______
36	),	37	),
37	[_FN2] = KEYMAP(	38	[_NP] = LAYOUT(
38	KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,	39	KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
39	KC_CAPS, _____, _____, _____, _____, KC_LBRC, KC_RBRC, KC_BSLS, KC_MINS, KC_EQL, _____,	40	KC_CAPS, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, KC_MINS, KC_EQL, _______,
40	_____, _____, _____, _____, _____, _____, _____, KC_SCLN, KC_QUOT, KC_SLSH, _____,	41	_______, _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_SLSH, _______,
41	_____, _____, _____, _____, _____, _____, _____, _____	42	_______, _______, _______, _______, _______, _______
42	),	43	),
43	[_FN3] = KEYMAP(	44	[_FN] = LAYOUT(
44	KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,	45	KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
45	_____, M(3), M(4), M(5), _____, _____, _____, _____, _____, _____, _____,	46	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
46	_____, M(6), _____, _____, _____, _____, _____, _____, _____, _____, _____,	47	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
47	_____, _____, _____, _____, _____, _____, _____, _____	48	_______, _______, _______, _______, _______, _______
48	)	49	)
49	};	50	};