1 files changed, 46 insertions, 29 deletions
diff --git a/keyboards/amj60/keymaps/default/keymap.c b/keyboards/amj60/keymaps/default/keymap.c
index c5dc25018..6a0a394f5 100644
--- a/keyboards/amj60/keymaps/default/keymap.c
+++ b/keyboards/amj60/keymaps/default/keymap.c
@@ -1,55 +1,72 @@
+/* Copyright 2016 Toni (@toneman77)
+ *           2021 James Young for QMK (@noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #include QMK_KEYBOARD_H
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
+enum layer_names {
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+    _DEF,
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
+    _FN,
-// entirely and just use numbers.
+};
-#define _DEF 0
-#define _SPC 1
 // dual-role shortcuts
-#define SPACEDUAL LT(_SPC, KC_SPACE)
+#define FN_SPC LT(_FN, KC_SPC)
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Keymap _DEF: Default Layer
     * ,-----------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| \ | ~ |
+     * |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ~ |
     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| bspc|
+     * |Tab  | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bspc|
     * |-----------------------------------------------------------|
-     * |Caps   | A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| Return |
+     * |Caps  | A | S | D | F | G | H | J | K | L | ; | ' | Return |
     * |-----------------------------------------------------------|
-     * |Sft | Fn0|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| Sft |Fn2|
+     * |Sft | \ | Z | X | C | V | B | N | M | , | . | / |Shift |Fn |
     * |-----------------------------------------------------------|
-     * |Ctrl|Win |Alt |      Space/Fn0         |Alt |Win |Menu|RCtl|
+     * |Ctrl|GUI |Alt |        Space/Fn        |Alt |GUI | Fn |RCtl|
     * `-----------------------------------------------------------'
     */
-    [_DEF] = LAYOUT_max(
+    [_DEF] = LAYOUT_all(
-        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_BSLS, KC_GRV, \
+        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_BSLS, KC_GRV,
-        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_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_BSPC,
-        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_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,  F(0),    KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,    F(1),     \
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
-        KC_LCTL,  KC_LALT, KC_LGUI,             SPACEDUAL,                       KC_RGUI, KC_RALT, KC_RCTL,    F(2)),
+        KC_LCTL, KC_LGUI, KC_LALT,                            FN_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL
+    ),
    /* Keymap 1: F-and-vim Layer, modified with Space (by holding space)
     * ,-----------------------------------------------------------.
-     * |PrSc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |  |
+     * |PSc|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|   |   |
     * |-----------------------------------------------------------|
-     * |    |Paus| Up| [ | ] |   |   |   | ( | ) |   |   |   | Del |
+     * |     |Pau| Up|   |   |   |   |   | ( | ) |   |   |   | Del |
     * |-----------------------------------------------------------|
-     * |      |Lft|Dwn|Rgt|   |   |Left|Down|Right|Up|  |   | PLAY |
+     * |      |Lft|Dwn|Rgt|   |   |Lft|Dwn|Up |Rgh|   |   |  Play  |
     * |-----------------------------------------------------------|
-     * |    |   |   |   | < | > |   |M0 |   |   |   |   | Vol+ |   |
+     * |    |   |   |   |   |   |Spc|   |   |   |   |   | Vol+ |   |
     * |-----------------------------------------------------------|
-     * |    |    |    |                        |Alt |Prev|Vol-|Next|
+     * |    |    |    |                        |    |Prev|Vol-|Next|
     * `-----------------------------------------------------------'
     */
-    [_SPC] = LAYOUT_max(
+    [_FN] = LAYOUT_all(
-        KC_PSCR, 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_PSCR, 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_PAUS, KC_UP,   _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, KC_DEL, \
+        _______, KC_PAUS, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_LEFT,  KC_DOWN,   KC_UP,     KC_RGHT, _______, _______, KC_MPLY, \
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______, KC_MPLY,
-        _______, _______, _______, _______,  _______, _______, KC_SPACE, M(0),      _______,   _______, _______, _______, KC_VOLU, _______, \
+        _______, _______, _______, _______, _______, _______, KC_SPC,  _______, _______, _______, _______, _______, KC_VOLU, _______,
-        _______, _______, _______,                                  _______,                                 _______, KC_MPRV, KC_VOLD, KC_MNXT),
+        _______, _______, _______,                            _______,                            _______, KC_MPRV, KC_VOLD, KC_MNXT
+    ),
 };

diff --git a/keyboards/amj60/keymaps/default/keymap.c b/keyboards/amj60/keymaps/default/keymap.c index c5dc25018..6a0a394f5 100644 --- a/keyboards/amj60/keymaps/default/keymap.c +++ b/keyboards/amj60/keymaps/default/keymap.c
@@ -1,55 +1,72 @@
		1	/* Copyright 2016 Toni (@toneman77)
		2	* 2021 James Young for QMK (@noroadsleft)
		3	*
		4	* This program is free software: you can redistribute it and/or modify
		5	* it under the terms of the GNU General Public License as published by
		6	* the Free Software Foundation, either version 2 of the License, or
		7	* (at your option) any later version.
		8	*
		9	* This program is distributed in the hope that it will be useful,
		10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	* GNU General Public License for more details.
		13	*
		14	* You should have received a copy of the GNU General Public License
		15	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	*/
1		17
2	#include QMK_KEYBOARD_H	18	#include QMK_KEYBOARD_H
3		19
4	// Each layer gets a name for readability, which is then used in the keymap matrix below.	20	enum layer_names {
5	// The underscores don't mean anything - you can have a layer called STUFF or any other name.	21	_DEF,
6	// Layer names don't all need to be of the same length, obviously, and you can also skip them	22	_FN,
7	// entirely and just use numbers.	23	};
8	#define _DEF 0
9	#define _SPC 1
10		24
11	// dual-role shortcuts	25	// dual-role shortcuts
12	#define SPACEDUAL LT(_SPC, KC_SPACE)	26	#define FN_SPC LT(_FN, KC_SPC)
13		27
14	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	28	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		29
15	/* Keymap _DEF: Default Layer	30	/* Keymap _DEF: Default Layer
16	* ,-----------------------------------------------------------.	31	* ,-----------------------------------------------------------.
17	* \|Esc\| 1\| 2\| 3\| 4\| 5\| 6\| 7\| 8\| 9\| 0\| -\| =\| \ \| ~ \|	32	* \|Esc\| 1 \| 2 \| 3 \| 4 \| 5 \| 6 \| 7 \| 8 \| 9 \| 0 \| - \| = \| \ \| ~ \|
18	* \|-----------------------------------------------------------\|	33	* \|-----------------------------------------------------------\|
19	* \|Tab \| Q\| W\| E\| R\| T\| Y\| U\| I\| O\| P\| [\| ]\| bspc\|	34	* \|Tab \| Q \| W \| E \| R \| T \| Y \| U \| I \| O \| P \| [ \| ] \| Bspc\|
20	* \|-----------------------------------------------------------\|	35	* \|-----------------------------------------------------------\|
21	* \|Caps \| A\| S\| D\| F\| G\| H\| J\| K\| L\| ;\| '\| Return \|	36	* \|Caps \| A \| S \| D \| F \| G \| H \| J \| K \| L \| ; \| ' \| Return \|
22	* \|-----------------------------------------------------------\|	37	* \|-----------------------------------------------------------\|
23	* \|Sft \| Fn0\| Z\| X\| C\| V\| B\| N\| M\| ,\| .\| /\| Sft \|Fn2\|	38	* \|Sft \| \ \| Z \| X \| C \| V \| B \| N \| M \| , \| . \| / \|Shift \|Fn \|
24	* \|-----------------------------------------------------------\|	39	* \|-----------------------------------------------------------\|
25	* \|Ctrl\|Win \|Alt \| Space/Fn0 \|Alt \|Win \|Menu\|RCtl\|	40	* \|Ctrl\|GUI \|Alt \| Space/Fn \|Alt \|GUI \| Fn \|RCtl\|
26	* `-----------------------------------------------------------'	41	* `-----------------------------------------------------------'
27	*/	42	*/
28	[_DEF] = LAYOUT_max(	43	[_DEF] = LAYOUT_all(
29	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_BSLS, KC_GRV, \	44	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_BSLS, KC_GRV,
30	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_BSPC, \	45	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_BSPC,
31	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, \	46	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,
32	KC_LSFT, F(0), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, F(1), \	47	KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
33	KC_LCTL, KC_LALT, KC_LGUI, SPACEDUAL, KC_RGUI, KC_RALT, KC_RCTL, F(2)),	48	KC_LCTL, KC_LGUI, KC_LALT, FN_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
		49	),
34		50
35	/* Keymap 1: F-and-vim Layer, modified with Space (by holding space)	51	/* Keymap 1: F-and-vim Layer, modified with Space (by holding space)
36	* ,-----------------------------------------------------------.	52	* ,-----------------------------------------------------------.
37	* \|PrSc\| F1\| F2\| F3\| F4\| F5\| F6\| F7\| F8\| F9\|F10\|F11\|F12\| \| \|	53	* \|PSc\|F1 \|F2 \|F3 \|F4 \|F5 \|F6 \|F7 \|F8 \|F9 \|F10\|F11\|F12\| \| \|
38	* \|-----------------------------------------------------------\|	54	* \|-----------------------------------------------------------\|
39	* \| \|Paus\| Up\| [ \| ] \| \| \| \| ( \| ) \| \| \| \| Del \|	55	* \| \|Pau\| Up\| \| \| \| \| \| ( \| ) \| \| \| \| Del \|
40	* \|-----------------------------------------------------------\|	56	* \|-----------------------------------------------------------\|
41	* \| \|Lft\|Dwn\|Rgt\| \| \|Left\|Down\|Right\|Up\| \| \| PLAY \|	57	* \| \|Lft\|Dwn\|Rgt\| \| \|Lft\|Dwn\|Up \|Rgh\| \| \| Play \|
42	* \|-----------------------------------------------------------\|	58	* \|-----------------------------------------------------------\|
43	* \| \| \| \| \| < \| > \| \|M0 \| \| \| \| \| Vol+ \| \|	59	* \| \| \| \| \| \| \|Spc\| \| \| \| \| \| Vol+ \| \|
44	* \|-----------------------------------------------------------\|	60	* \|-----------------------------------------------------------\|
45	* \| \| \| \| \|Alt \|Prev\|Vol-\|Next\|	61	* \| \| \| \| \| \|Prev\|Vol-\|Next\|
46	* `-----------------------------------------------------------'	62	* `-----------------------------------------------------------'
47	*/	63	*/
48	[_SPC] = LAYOUT_max(	64	[_FN] = LAYOUT_all(
49	KC_PSCR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, \	65	KC_PSCR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
50	_______, KC_PAUS, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \	66	_______, KC_PAUS, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
51	_______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, KC_MPLY, \	67	_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, KC_MPLY,
52	_______, _______, _______, _______, _______, _______, KC_SPACE, M(0), _______, _______, _______, _______, KC_VOLU, _______, \	68	_______, _______, _______, _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______, KC_VOLU, _______,
53	_______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT),	69	_______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
		70	),
54		71
55	};	72	};