Keymap: Updated keymap with better F positioning (#4463)

* added own keymap for planck * Update Readme.md * Update Readme.md * Update Readme.md * Update Readme.md * Update Readme.md * dynamic macros * Update Readme.md * moved the reset button * Update readme for volume explanation * Format * Update Readme.md * Update Readme.md * added safe double shift * changed the modified shift to regular shift, for allowing shift + F keys * moved power stuff to the function layer * del button on raise * Update Readme.md * updated F keys * Update Readme.md * Update Readme.md * moved F keys * fixed conflicts * missed something * moved F11 and F12 * Update layout in the image * Update keyboards/planck/keymaps/dr_notsokind/keymap.c Co-Authored-By: pnikosis <pnikosis@gmail.com> * Apply suggestions from code review Co-Authored-By: pnikosis <pnikosis@gmail.com>
author: Nico Hormazábal <pnikosis@gmail.com> 2018-12-07 23:00:26 +0100
committer: Drashna Jaelre <drashna@live.com> 2018-12-07 14:00:26 -0800
commit: 7749f4590f5f69cb7cae758cae5e45111b68d042 (patch)
tree: b792df06b8fabaf5613b589879008b1b6d85ab8c
parent: 5b7260fc5327f195f63d872f856391e0bd168d27 (diff)
download: qmk_firmware-7749f4590f5f69cb7cae758cae5e45111b68d042.tar.gz
qmk_firmware-7749f4590f5f69cb7cae758cae5e45111b68d042.zip
2 files changed, 54 insertions, 56 deletions
diff --git a/keyboards/planck/keymaps/dr_notsokind/Readme.md b/keyboards/planck/keymaps/dr_notsokind/Readme.md
index e7e29cb7d..a336de2f3 100644
--- a/keyboards/planck/keymaps/dr_notsokind/Readme.md
+++ b/keyboards/planck/keymaps/dr_notsokind/Readme.md
@@ -70,7 +70,7 @@ When you are done, press `Media` and `Enter`. You will finally hear a tune confi
 Press `Media` and the key where you stored your Macro, either `;` or `'`. The Macro will play.
-![Imgur](https://i.imgur.com/ri4lEcl.png)
+![Imgur](https://i.imgur.com/TcVyNag.png)
 http://www.keyboard-layout-editor.com/#/gists/4cfb26f84bbb4fabe5e6c7cc22c85e24
diff --git a/keyboards/planck/keymaps/dr_notsokind/keymap.c b/keyboards/planck/keymaps/dr_notsokind/keymap.c
index f43fc37bc..64650aaa8 100644
--- a/keyboards/planck/keymaps/dr_notsokind/keymap.c
+++ b/keyboards/planck/keymaps/dr_notsokind/keymap.c
@@ -1,8 +1,6 @@
 // Layout picture at http://www.keyboard-layout-editor.com/#/gists/125febfad6960add078e6f14256539b6
-#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"
+#include QMK_KEYBOARD_H
-#include "planck.h"
-#include "action_layer.h"
 #ifdef AUDIO_ENABLE
 #include "audio.h"
 #endif
@@ -79,12 +77,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * | Ctrl | GUI  | Alt  | Mute | Lower|    Space    | Raise|   /  | Left | Down | Right|
 * `-----------------------------------------------------------------------------------'
 */
-[_QWERTY] = {
+[_QWERTY] = LAYOUT_planck_grid(
-    {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_SCLN, KC_QUOT},
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    {SFT_CAP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   SFT_ENT},
+    SFT_CAP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   SFT_ENT,
-    {KC_LCTL, KC_LGUI, KC_LALT, MEDIA,   LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT}
+    KC_LCTL, KC_LGUI, KC_LALT, MEDIA,   LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
-},
+),
 /* NUMPAD
 * ,-----------------------------------------------------------------------------------.
@@ -97,12 +95,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |      |      |      |      |      |             |      |   0  |   .  |   ,  |   =  |
 * `-----------------------------------------------------------------------------------'
 */
-[_NUMPAD] = {
+[_NUMPAD] = LAYOUT_planck_grid(
-  {QWERTY,  XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS,  KC_P7,  KC_P8,   KC_P9,   KC_PMNS},
+    QWERTY,  XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS,  KC_P7,  KC_P8,   KC_P9,   KC_PMNS,
-  {_______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST,  KC_P4,  KC_P5,   KC_P6,   KC_PPLS},
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST,  KC_P4,  KC_P5,   KC_P6,   KC_PPLS,
-  {_______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC,  KC_P1,  KC_P2,   KC_P3,   KC_PENT},
+    _______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC,  KC_P1,  KC_P2,   KC_P3,   KC_PENT,
-  {_______, _______, _______, _______, _______, _______, _______, _______,  KC_P0,  KC_PDOT, KC_PCMM, KC_PEQL}
+    _______, _______, _______, _______, _______, _______, _______, _______,  KC_P0,  KC_PDOT, KC_PCMM, KC_PEQL
-},
+),
 /* LOCK
 * ,-----------------------------------------------------------------------------------.
@@ -115,30 +113,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |      | NULL |      |      |      |             |      |      |      |      |      |
 * `-----------------------------------------------------------------------------------'
 */
-[_LOCKED] = {
+[_LOCKED] = LAYOUT_planck_grid(
-    {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    {KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_ENT},
+    KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_ENT,
-    {_______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
+    _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-},
+),
 /* RAISE
 * ,-----------------------------------------------------------------------------------.
 * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |      |   -  |   =  |   [  |   ]  |  \   |
+ * | Del  |  F11 |  F12 |  F13 |  F14 |  F15 |      |   -  |   =  |   [  |   ]  |  \   |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |LShift|  F6  |  F7  |  F8  |  F9  |  F10 |      |ISO # |ISO / | NULL | PgUp | Enter|
+ * |LShift|  F16 |  F17 |  F18 |  F19 |  F20 |      |ISO # |ISO / | NULL | PgUp | Enter|
 * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |  F11 |      |      F12    |      |      | Home | PgDn |  End |
+ * |      |      |      |      |      |             |      |      | Home | PgDn |  End |
 * `-----------------------------------------------------------------------------------'
 */
-[_RAISE] = {
+[_RAISE] = LAYOUT_planck_grid(
-  {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_GRV , KC_1,    KC_2,      KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL,
-  {KC_DEL ,  KC_F1,   KC_F2,  KC_F3,    KC_F4, KC_F5,  _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},
+    KC_DEL , KC_F11,  KC_F12,   KC_F13,  KC_F14, KC_F15, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  {KC_LSFT,  KC_F6,   KC_F7,  KC_F8,    KC_F9, KC_F10, _______, KC_NUHS, KC_NUBS, XXXXXXX, KC_PGUP, KC_ENT },
+    KC_LSFT, KC_F16,  KC_F17,   KC_F18,  KC_F19, KC_F20, _______, KC_NUHS, KC_NUBS, XXXXXXX, KC_PGUP, KC_ENT,
-  {_______, _______, _______, KC_F11, _______, KC_F12,  KC_F12, _______, _______, KC_HOME, KC_PGDN, KC_END }
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END 
-},
+),
 /* LOWER
 * ,-----------------------------------------------------------------------------------.
@@ -148,15 +146,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * |LShift|  F6  |  F7  |  F8  |  F9  |  F10 |      |ISO ~ |ISO | | NULL | PgUp | Enter|
 * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |  F11 |      |      F12    |      |      | Home | PgDn |  End |
+ * |      |      |      |      |      |             |      |      | Home | PgDn |  End |
 * `-----------------------------------------------------------------------------------'
 */
-[_LOWER] = {
+[_LOWER] = LAYOUT_planck_grid(
-  {KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL },
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL ,
-  {KC_DEL , KC_F1,   KC_F2,   KC_F3,    KC_F4, KC_F5,   _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE},
+    KC_DEL , KC_F1,   KC_F2,   KC_F3,    KC_F4, KC_F5,   _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  {KC_LSFT, KC_F6,   KC_F7,   KC_F8,    KC_F9, KC_F10,  _______, S(KC_NUHS), S(KC_NUBS), XXXXXXX, KC_PGUP, KC_ENT },
+    KC_LSFT, KC_F6,   KC_F7,   KC_F8,    KC_F9, KC_F10,  _______, S(KC_NUHS), S(KC_NUBS), XXXXXXX, KC_PGUP, KC_ENT ,
-  {_______, _______, _______, KC_F11, _______, KC_F12,   KC_F12, _______, _______, KC_HOME, KC_PGDN, KC_END }
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END 
-},
+),
 /* MEDIA AND COMMANDS
 * ,-----------------------------------------------------------------------------------.
@@ -169,12 +167,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |ONESHT| NULL | NULL |      | Vol- |     Mute    | Vol+ |Zoom 0| Stop | Next | Play |
 * `-----------------------------------------------------------------------------------'
 */
-[_MEDIA] = {
+[_MEDIA] = LAYOUT_planck_grid(
-    {XXXXXXX, XXXXXXX, KC_WHOM, XXXXXXX, XXXXXXX, XXXXXXX, KC_AGAIN, XXXXXXX, KC_INS,   XXXXXXX, KC_PSCR, XXXXXXX},
+        XXXXXXX, XXXXXXX, KC_WHOM, XXXXXXX, XXXXXXX, XXXXXXX, KC_AGAIN, XXXXXXX, KC_INS,   XXXXXXX, KC_PSCR, XXXXXXX,
-    {XXXXXXX, XXXXXXX, KC_WSCH, XXXXXXX, KC_FIND, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2 },
+        XXXXXXX, XXXXXXX, KC_WSCH, XXXXXXX, KC_FIND, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,
-    {KC_LSFT, XXXXXXX, XXXXXXX, KC_CALC, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, ZOOM_OUT, ZOOM_IN, KC_MPRV, DYN_REC_STOP },
+        KC_LSFT, XXXXXXX, XXXXXXX, KC_CALC, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, ZOOM_OUT, ZOOM_IN, KC_MPRV, DYN_REC_STOP,
-    {ONESHOT, XXXXXXX, XXXXXXX, _______, KC_VOLD, KC_MUTE, KC_MUTE,  KC_VOLU, ZOOM_NML, KC_MSTP, KC_MNXT, KC_MPLY }
+        ONESHOT, XXXXXXX, XXXXXXX, _______, KC_VOLD, KC_MUTE, KC_MUTE,  KC_VOLU, ZOOM_NML, KC_MSTP, KC_MNXT, KC_MPLY 
-},
+),
 /* ONESHOT
 * ,-----------------------------------------------------------------------------------.
@@ -187,12 +185,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |      |      |      |      |      |             |      |      |      |      |      |
 * `-----------------------------------------------------------------------------------'
 */
-[_ONESHOT] = {
+[_ONESHOT] = LAYOUT_planck_grid(
-    {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DYN_REC_START1, DYN_REC_START2},
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DYN_REC_START1, DYN_REC_START2,
-    {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-},
+),
 /* FUNCTIONS
 * ,-----------------------------------------------------------------------------------.
@@ -205,12 +203,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * | Reset| NULL | LOCK | NULL |      |     NULL    |      | NULL |AGNorm|Voice-|AGSwap|
 * `-----------------------------------------------------------------------------------'
 */
-[_FUNCTN] = {
+[_FUNCTN] = LAYOUT_planck_grid(
-    {KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PWR },
+        KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PWR,
-    {KC_WAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
+        KC_WAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    {XXXXXXX, XXXXXXX, XXXXXXX, AU_OFF,  MU_OFF,  QWERTY,  NUMPAD,  MU_ON,   AU_ON,   XXXXXXX, MUV_IN,  KC_SYSREQ},
+        XXXXXXX, XXXXXXX, XXXXXXX, AU_OFF,  MU_OFF,  QWERTY,  NUMPAD,  MU_ON,   AU_ON,   XXXXXXX, MUV_IN,  KC_SYSREQ,
-    {RESET,   XXXXXXX, LOCK,    XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, AG_NORM, MUV_DE,  AG_SWAP}
+        RESET,   XXXXXXX, LOCK,    XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, AG_NORM, MUV_DE,  AG_SWAP
-}
+)
 };
author	Nico Hormazábal <pnikosis@gmail.com>	2018-12-07 23:00:26 +0100
committer	Drashna Jaelre <drashna@live.com>	2018-12-07 14:00:26 -0800
commit	7749f4590f5f69cb7cae758cae5e45111b68d042 (patch)
tree	b792df06b8fabaf5613b589879008b1b6d85ab8c
parent	5b7260fc5327f195f63d872f856391e0bd168d27 (diff)
download	qmk_firmware-7749f4590f5f69cb7cae758cae5e45111b68d042.tar.gz qmk_firmware-7749f4590f5f69cb7cae758cae5e45111b68d042.zip

diff --git a/keyboards/planck/keymaps/dr_notsokind/Readme.md b/keyboards/planck/keymaps/dr_notsokind/Readme.md index e7e29cb7d..a336de2f3 100644 --- a/keyboards/planck/keymaps/dr_notsokind/Readme.md +++ b/keyboards/planck/keymaps/dr_notsokind/Readme.md
@@ -70,7 +70,7 @@ When you are done, press `Media` and `Enter`. You will finally hear a tune confi
70		70
71	Press `Media` and the key where you stored your Macro, either `;` or `'`. The Macro will play.	71	Press `Media` and the key where you stored your Macro, either `;` or `'`. The Macro will play.
72		72
73	![Imgur](https://i.imgur.com/ri4lEcl.png)	73	![Imgur](https://i.imgur.com/TcVyNag.png)
74		74
75	http://www.keyboard-layout-editor.com/#/gists/4cfb26f84bbb4fabe5e6c7cc22c85e24	75	http://www.keyboard-layout-editor.com/#/gists/4cfb26f84bbb4fabe5e6c7cc22c85e24
76		76


diff --git a/keyboards/planck/keymaps/dr_notsokind/keymap.c b/keyboards/planck/keymaps/dr_notsokind/keymap.c index f43fc37bc..64650aaa8 100644 --- a/keyboards/planck/keymaps/dr_notsokind/keymap.c +++ b/keyboards/planck/keymaps/dr_notsokind/keymap.c
@@ -1,8 +1,6 @@
1	// Layout picture at http://www.keyboard-layout-editor.com/#/gists/125febfad6960add078e6f14256539b6	1	// Layout picture at http://www.keyboard-layout-editor.com/#/gists/125febfad6960add078e6f14256539b6
2		2
3	#pragma message "You may need to add LAYOUT_planck_grid to your keymap layers - see default for an example"	3	#include QMK_KEYBOARD_H
4	#include "planck.h"
5	#include "action_layer.h"
6	#ifdef AUDIO_ENABLE	4	#ifdef AUDIO_ENABLE
7	#include "audio.h"	5	#include "audio.h"
8	#endif	6	#endif
@@ -79,12 +77,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
79	* \| Ctrl \| GUI \| Alt \| Mute \| Lower\| Space \| Raise\| / \| Left \| Down \| Right\|	77	* \| Ctrl \| GUI \| Alt \| Mute \| Lower\| Space \| Raise\| / \| Left \| Down \| Right\|
80	* `-----------------------------------------------------------------------------------'	78	* `-----------------------------------------------------------------------------------'
81	*/	79	*/
82	[_QWERTY] = {	80	[_QWERTY] = LAYOUT_planck_grid(
83	{KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC},	81	KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
84	{KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT},	82	KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
85	{SFT_CAP, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, SFT_ENT},	83	SFT_CAP, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, SFT_ENT,
86	{KC_LCTL, KC_LGUI, KC_LALT, MEDIA, LOWER, KC_SPC, KC_SPC, RAISE, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT}	84	KC_LCTL, KC_LGUI, KC_LALT, MEDIA, LOWER, KC_SPC, KC_SPC, RAISE, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
87	},	85	),
88		86
89	/* NUMPAD	87	/* NUMPAD
90	* ,-----------------------------------------------------------------------------------.	88	* ,-----------------------------------------------------------------------------------.
@@ -97,12 +95,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
97	* \| \| \| \| \| \| \| \| 0 \| . \| , \| = \|	95	* \| \| \| \| \| \| \| \| 0 \| . \| , \| = \|
98	* `-----------------------------------------------------------------------------------'	96	* `-----------------------------------------------------------------------------------'
99	*/	97	*/
100	[_NUMPAD] = {	98	[_NUMPAD] = LAYOUT_planck_grid(
101	{QWERTY, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS},	99	QWERTY, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS,
102	{_______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS},	100	_______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS,
103	{_______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC, KC_P1, KC_P2, KC_P3, KC_PENT},	101	_______, KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC, KC_P1, KC_P2, KC_P3, KC_PENT,
104	{_______, _______, _______, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, KC_PCMM, KC_PEQL}	102	_______, _______, _______, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, KC_PCMM, KC_PEQL
105	},	103	),
106		104
107	/* LOCK	105	/* LOCK
108	* ,-----------------------------------------------------------------------------------.	106	* ,-----------------------------------------------------------------------------------.
@@ -115,30 +113,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
115	* \| \| NULL \| \| \| \| \| \| \| \| \| \|	113	* \| \| NULL \| \| \| \| \| \| \| \| \| \|
116	* `-----------------------------------------------------------------------------------'	114	* `-----------------------------------------------------------------------------------'
117	*/	115	*/
118	[_LOCKED] = {	116	[_LOCKED] = LAYOUT_planck_grid(
119	{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},	117	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
120	{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},	118	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
121	{KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ENT},	119	KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ENT,
122	{_______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}	120	_______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
123	},	121	),
124		122
125	/* RAISE	123	/* RAISE
126	* ,-----------------------------------------------------------------------------------.	124	* ,-----------------------------------------------------------------------------------.
127	* \| ` \| 1 \| 2 \| 3 \| 4 \| 5 \| 6 \| 7 \| 8 \| 9 \| 0 \| Del \|	125	* \| ` \| 1 \| 2 \| 3 \| 4 \| 5 \| 6 \| 7 \| 8 \| 9 \| 0 \| Del \|
128	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	126	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
129	* \| Del \| F1 \| F2 \| F3 \| F4 \| F5 \| \| - \| = \| [ \| ] \| \ \|	127	* \| Del \| F11 \| F12 \| F13 \| F14 \| F15 \| \| - \| = \| [ \| ] \| \ \|
130	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	128	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
131	* \|LShift\| F6 \| F7 \| F8 \| F9 \| F10 \| \|ISO # \|ISO / \| NULL \| PgUp \| Enter\|	129	* \|LShift\| F16 \| F17 \| F18 \| F19 \| F20 \| \|ISO # \|ISO / \| NULL \| PgUp \| Enter\|
132	* \|------+------+------+------+------+-------------+------+------+------+------+------\|	130	* \|------+------+------+------+------+-------------+------+------+------+------+------\|
133	* \| \| \| \| F11 \| \| F12 \| \| \| Home \| PgDn \| End \|	131	* \| \| \| \| \| \| \| \| \| Home \| PgDn \| End \|
134	* `-----------------------------------------------------------------------------------'	132	* `-----------------------------------------------------------------------------------'
135	*/	133	*/
136	[_RAISE] = {	134	[_RAISE] = LAYOUT_planck_grid(
137	{KC_GRV , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL},	135	KC_GRV , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
138	{KC_DEL , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS},	136	KC_DEL , KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
139	{KC_LSFT, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, KC_NUHS, KC_NUBS, XXXXXXX, KC_PGUP, KC_ENT },	137	KC_LSFT, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, _______, KC_NUHS, KC_NUBS, XXXXXXX, KC_PGUP, KC_ENT,
140	{_______, _______, _______, KC_F11, _______, KC_F12, KC_F12, _______, _______, KC_HOME, KC_PGDN, KC_END }	138	_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
141	},	139	),
142		140
143	/* LOWER	141	/* LOWER
144	* ,-----------------------------------------------------------------------------------.	142	* ,-----------------------------------------------------------------------------------.
@@ -148,15 +146,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
148	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	146	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
149	* \|LShift\| F6 \| F7 \| F8 \| F9 \| F10 \| \|ISO ~ \|ISO \| \| NULL \| PgUp \| Enter\|	147	* \|LShift\| F6 \| F7 \| F8 \| F9 \| F10 \| \|ISO ~ \|ISO \| \| NULL \| PgUp \| Enter\|
150	* \|------+------+------+------+------+-------------+------+------+------+------+------\|	148	* \|------+------+------+------+------+-------------+------+------+------+------+------\|
151	* \| \| \| \| F11 \| \| F12 \| \| \| Home \| PgDn \| End \|	149	* \| \| \| \| \| \| \| \| \| Home \| PgDn \| End \|
152	* `-----------------------------------------------------------------------------------'	150	* `-----------------------------------------------------------------------------------'
153	*/	151	*/
154	[_LOWER] = {	152	[_LOWER] = LAYOUT_planck_grid(
155	{KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL },	153	KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL ,
156	{KC_DEL , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE},	154	KC_DEL , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
157	{KC_LSFT, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, S(KC_NUHS), S(KC_NUBS), XXXXXXX, KC_PGUP, KC_ENT },	155	KC_LSFT, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, S(KC_NUHS), S(KC_NUBS), XXXXXXX, KC_PGUP, KC_ENT ,
158	{_______, _______, _______, KC_F11, _______, KC_F12, KC_F12, _______, _______, KC_HOME, KC_PGDN, KC_END }	156	_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
159	},	157	),
160		158
161	/* MEDIA AND COMMANDS	159	/* MEDIA AND COMMANDS
162	* ,-----------------------------------------------------------------------------------.	160	* ,-----------------------------------------------------------------------------------.
@@ -169,12 +167,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
169	* \|ONESHT\| NULL \| NULL \| \| Vol- \| Mute \| Vol+ \|Zoom 0\| Stop \| Next \| Play \|	167	* \|ONESHT\| NULL \| NULL \| \| Vol- \| Mute \| Vol+ \|Zoom 0\| Stop \| Next \| Play \|
170	* `-----------------------------------------------------------------------------------'	168	* `-----------------------------------------------------------------------------------'
171	*/	169	*/
172	[_MEDIA] = {	170	[_MEDIA] = LAYOUT_planck_grid(
173	{XXXXXXX, XXXXXXX, KC_WHOM, XXXXXXX, XXXXXXX, XXXXXXX, KC_AGAIN, XXXXXXX, KC_INS, XXXXXXX, KC_PSCR, XXXXXXX},	171	XXXXXXX, XXXXXXX, KC_WHOM, XXXXXXX, XXXXXXX, XXXXXXX, KC_AGAIN, XXXXXXX, KC_INS, XXXXXXX, KC_PSCR, XXXXXXX,
174	{XXXXXXX, XXXXXXX, KC_WSCH, XXXXXXX, KC_FIND, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2 },	172	XXXXXXX, XXXXXXX, KC_WSCH, XXXXXXX, KC_FIND, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,
175	{KC_LSFT, XXXXXXX, XXXXXXX, KC_CALC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ZOOM_OUT, ZOOM_IN, KC_MPRV, DYN_REC_STOP },	173	KC_LSFT, XXXXXXX, XXXXXXX, KC_CALC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ZOOM_OUT, ZOOM_IN, KC_MPRV, DYN_REC_STOP,
176	{ONESHOT, XXXXXXX, XXXXXXX, _______, KC_VOLD, KC_MUTE, KC_MUTE, KC_VOLU, ZOOM_NML, KC_MSTP, KC_MNXT, KC_MPLY }	174	ONESHOT, XXXXXXX, XXXXXXX, _______, KC_VOLD, KC_MUTE, KC_MUTE, KC_VOLU, ZOOM_NML, KC_MSTP, KC_MNXT, KC_MPLY
177	},	175	),
178		176
179	/* ONESHOT	177	/* ONESHOT
180	* ,-----------------------------------------------------------------------------------.	178	* ,-----------------------------------------------------------------------------------.
@@ -187,12 +185,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
187	* \| \| \| \| \| \| \| \| \| \| \| \|	185	* \| \| \| \| \| \| \| \| \| \| \| \|
188	* `-----------------------------------------------------------------------------------'	186	* `-----------------------------------------------------------------------------------'
189	*/	187	*/
190	[_ONESHOT] = {	188	[_ONESHOT] = LAYOUT_planck_grid(
191	{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},	189	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
192	{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DYN_REC_START1, DYN_REC_START2},	190	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DYN_REC_START1, DYN_REC_START2,
193	{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},	191	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
194	{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}	192	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
195	},	193	),
196		194
197	/* FUNCTIONS	195	/* FUNCTIONS
198	* ,-----------------------------------------------------------------------------------.	196	* ,-----------------------------------------------------------------------------------.
@@ -205,12 +203,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
205	* \| Reset\| NULL \| LOCK \| NULL \| \| NULL \| \| NULL \|AGNorm\|Voice-\|AGSwap\|	203	* \| Reset\| NULL \| LOCK \| NULL \| \| NULL \| \| NULL \|AGNorm\|Voice-\|AGSwap\|
206	* `-----------------------------------------------------------------------------------'	204	* `-----------------------------------------------------------------------------------'
207	*/	205	*/
208	[_FUNCTN] = {	206	[_FUNCTN] = LAYOUT_planck_grid(
209	{KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PWR },	207	KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PWR,
210	{KC_WAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },	208	KC_WAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
211	{XXXXXXX, XXXXXXX, XXXXXXX, AU_OFF, MU_OFF, QWERTY, NUMPAD, MU_ON, AU_ON, XXXXXXX, MUV_IN, KC_SYSREQ},	209	XXXXXXX, XXXXXXX, XXXXXXX, AU_OFF, MU_OFF, QWERTY, NUMPAD, MU_ON, AU_ON, XXXXXXX, MUV_IN, KC_SYSREQ,
212	{RESET, XXXXXXX, LOCK, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, AG_NORM, MUV_DE, AG_SWAP}	210	RESET, XXXXXXX, LOCK, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, AG_NORM, MUV_DE, AG_SWAP
213	}	211	)
214		212
215	};	213	};
216		214