Merge remote-tracking branch 'upstream/master'

4 files changed, 95 insertions, 70 deletions

diff --git a/keyboards/planck/keymaps/espynn/keyboard-layout.jpg b/keyboards/planck/keymaps/espynn/keyboard-layout.jpg
index 55e5396bf..c5e438f6a 100644
--- a/keyboards/planck/keymaps/espynn/keyboard-layout.jpg
+++ b/keyboards/planck/keymaps/espynn/keyboard-layout.jpg
diff --git a/keyboards/planck/keymaps/espynn/keymap.c b/keyboards/planck/keymaps/espynn/keymap.c
index 4a3fe32b8..a24ad9d48 100644
--- a/keyboards/planck/keymaps/espynn/keymap.c
+++ b/keyboards/planck/keymaps/espynn/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM fn_actions[] = {
     [7] = ACTION_MODS_KEY(MOD_LCTL, KC_UNDS),
  };
 
-// This config can be found at Keyboard layout editor site: http://goo.gl/zjXL2l
+// This config can be found at Keyboard layout editor site: https://goo.gl/cF7uIO
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = { /* QWERTY */
     {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},
@@ -69,22 +69,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     {KC_LCTL, KC_ESC,  KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
 },
 [_LOWER] = { /* LOWER */
-    {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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
+    {KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_TRNS},
+    {KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_LPRN, KC_RPRN, KC_LCBR, KC_RCBR, KC_MINS, KC_TRNS, KC_TRNS, KC_TRNS},
     {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_QUOT, KC_DQT,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
     {KC_TRNS, ZM_NRM,  ZM_IN,   ZM_OUT,  KC_TRNS, KC_PGDN, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}
 },
 [_RAISE] = { /* RAISE */
-    {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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_LCBR, KC_BSLS, KC_TRNS},
-    {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_PIPE, KC_GRV,  KC_TILD, KC_LBRC, KC_LBRC, KC_TRNS, KC_TRNS},
-    {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGUP, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
+    {KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,    KC_RPRN,    KC_UNDS, KC_TRNS},
+    {KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PLUS,    KC_TRNS,    KC_TRNS, KC_TRNS},
+    {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_PIPE, KC_GRV,  KC_TILD, S(KC_COMM), S(KC_DOT),  KC_BSLS, KC_TRNS},
+    {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGUP, KC_TRNS, KC_MNXT,    KC_VOLD,    KC_VOLU, KC_MPLY}
 },
 [_CUSTOM] = { /* CUSTOM */
-    {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CUS4,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
-    {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CUS0,    CUS3,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
-    {KC_TRNS, KC_TRNS, CUT,     COPY,    PASTE,   CUS1,    CUS5,    CUS2,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
-    {BL,      RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}
+    {KC_F1,   KC_F2,   KC_F3,              KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_TRNS},
+    {KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS, CUS0,    CUS3,    CUS4,    KC_TRNS, KC_F12,  KC_TRNS},
+    {KC_TRNS, KC_TRNS, CUT,                COPY,    PASTE,   CUS1,    CUS5,    CUS2,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
+    {BL,      RESET,   LALT(LCTL(KC_DEL)), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}
 }
 };
 
diff --git a/keyboards/planck/keymaps/espynn/layout.json b/keyboards/planck/keymaps/espynn/layout.json
index 38ccc3452..ccdf2afde 100644
--- a/keyboards/planck/keymaps/espynn/layout.json
+++ b/keyboards/planck/keymaps/espynn/layout.json
@@ -3,6 +3,7 @@
     "backcolor": "#858585",
     "name": "Planck 40%",
     "author": "James Folkert",
+    "notes": "# Espynn's keymap for Planck Ortholinear 40% Mechanical Keyboard\nAdded several custom functions to the keymap from the \"ab\" map. Special thanks to \"mollat\" for demonstration of macros in their keymap.c\n \n\n![Layout](keyboard-layout.png \"Practical Keymap\")\n\n* Online keyboard layout editor: http://goo.gl/mlLAFZ\n\n# Notes\n* Front legend text is the custom layer (both raise and lower)\n* Holding is denoted by down arrow, for example, right shift is an enter button when tapped, shift when held\n* Simultaneous RAISE+LOWER enters CUSTOM layer. Several custom keymaps are here\n* I disregarded the advice of Jack and used macros for passwords. I accept my fate.\n* RAISE and LOWER also acts as PgUp and PgDn when tapped.\n* [CapsLock] also acts as [Ctrl] key when you press and hold. It is convenient for GNU Emacs users. (not sure if this works)\n* Bracket/ paran/ brace keys are placed in the center of the keyboard for programmer's convenience.",
     "background": {
       "name": "Aluminium brushed",
       "style": "background-image: url('/bg/metal/aluminum_texture1642.jpg');"
@@ -19,41 +20,49 @@
         2,
         2,
         0,
-        2
+        0
       ]
     },
-    "F1\n1\n\n!\n\n\n\n\n\n<i class='kb kb-Tab-2'></i>",
-    "F2\n2\n\n@\n\n\n\n\n\nQ",
-    "F3\n3\n\n#\n\n\n\n\n\nW",
-    "F4\n4\n\n$\n\n\n\n\n\nE",
-    "F5\n5\n\n%\n\n\n\n\n\nR",
-    "F6\n6\n\n^\n\n\n\n\n\nT",
-    "F7\n6\n\n&\n\n\n\n\n\nY",
-    "F8\n8\n\n*\nMacro4\n\n\n\n\nU",
-    "F9\n9\n\n(\n\n\n\n\n\nI",
+    "!\n1\n\n\nF1\n\n\n\n\n<i class='kb kb-Tab-2'></i>",
+    "@\n2\n\n\nF2\n\n\n\n\nQ",
+    "#\n3\n\n\nF3\n\n\n\n\nW",
+    "$\n4\n\n\nF4\n\n\n\n\nE",
+    "%\n5\n\n\nF5\n\n\n\n\nR",
+    "^\n6\n\n\nF6\n\n\n\n\nT",
+    "&\n7\n\n\nF7\n\n\n\n\nY",
+    "*\n8\n\n\nF8\n\n\n\n\nU",
+    "(\n9\n\n\nF9\n\n\n\n\nI",
     {
       "fa": [
+        2,
         0,
         0,
-        0,
-        2
+        0
       ]
     },
-    "F10\n0\n\n)\n\n\n\n\n\nO",
+    ")\n0\n\n\nF10\n\n\n\n\nO",
     {
       "fa": [
         2,
         2,
         0,
-        2
+        0,
+        0,
+        0,
+        0,
+        0,
+        0
       ]
     },
-    "F11\n-\n\n_\n\n\n\n\n\nP",
-    "F12\n=\n\n+\n\n\n\n\n\n<i class='kb kb-Unicode-BackSpace-DeleteLeft-Big'></i>"
+    "_\n-\n\n\nF11\n\n\n\n\nP",
+    {
+      "a": 7,
+      "f": 3
+    },
+    "<i class='kb kb-Unicode-BackSpace-DeleteLeft-Big'></i>"
   ],
   [
     {
-      "a": 7,
       "f": 3
     },
     "<i class='mss mss-Unicode-DeleteRight-Big-2'></i>",
@@ -66,12 +75,12 @@
     },
     "S",
     {
+      "a": 4,
       "f": 3
     },
-    "D",
+    "=\n_\n\n\n\n\n\n\n\nD",
     {
       "t": "#ff0000",
-      "a": 4,
       "f": 3
     },
     "\n(\n\n\n\n\n\n\n\nF",
@@ -93,24 +102,21 @@
       "t": "#000000",
       "f": 3
     },
-    "{\n\n\n\n\n\n\n\n\nK",
+    "+\n-\n\n\nMacro4\n\n\n\n\nK",
     {
+      "a": 7,
       "f": 3
     },
-    "{\n\n\n\n\n\n\n\n\nL",
+    "L",
     {
+      "a": 6,
       "fa": [
         2,
         2,
-        2,
-        2,
-        0,
-        0,
-        0,
         2
       ]
     },
-    "\\\n\n|\n\n\n\n\n:\n\n;",
+    "\n\n:\n\nF12\n\n\n\n;",
     {
       "a": 7,
       "fa": [
@@ -141,66 +147,79 @@
       "fa": [
         2,
         2,
-        2,
-        2
+        0,
+        0
       ]
     },
-    "\\\n[\n|\n{\nPaste\n\n\n\n\nV",
-    "|\n]\n\n}\nMacro1\n\n\n\n\nB",
-    "`\n'\n~\n\"\nMacro5\n\n\n\n\nN",
+    "\\\n[\n\n\nPaste\n\n\n\n\nV",
+    "|\n]\n\n\nMacro1\n\n\n\n\nB",
+    "`\n'\n\n\nMacro5\n\n\n\n\nN",
     "~\n\"\n\n\nMacro2\n\n\n\n\nM",
     {
       "fa": [
         2,
         2,
-        2,
-        2,
         0,
         0,
         0,
-        1
+        0,
+        0,
+        2
       ]
     },
-    "[\n\n{\n\n\n\n\n<\n\n,",
-    "[\n\n{\n\n\n\n\n\n\n.",
+    "<\n\n\n\n\n\n\n<\n\n,",
     {
-      "a": 6
+      "fa": [
+        2,
+        2,
+        0
+      ]
     },
-    "\n\n?\n\n\n\n\n\n/",
+    ">\n\n\n\n\n\n\n>\n\n.",
     {
-      "a": 4,
       "fa": [
+        0,
         2,
-        2,
+        0,
+        0,
+        0,
+        0,
+        0,
+        2
+      ]
+    },
+    "\\\n\n\n\n\n\n\n?\n\n/",
+    {
+      "fa": [
+        0,
         2,
         0,
         0,
         0,
         0,
-        1,
-        9,
-        0
+        0,
+        2,
+        9
       ]
     },
     "\n\n\n<i class='kb kb-Arrows-Bottom-4'></i>Shift\n\n\n\n\n<i class='mss mss-Unicode-Enter-3'></i>\n\n<i class='kb kb-Arrows-Bottom-4'></i>Shift"
   ],
   [
     {
-      "a": 7,
-      "f": 3
+      "a": 7
     },
     "Ctrl\n\n\n\nBLight",
     {
       "a": 4,
       "fa": [
-        2,
+        0,
         1,
-        2,
         0,
         0,
         0,
         0,
-        1,
+        0,
+        2,
         9,
         9
       ]
@@ -208,29 +227,29 @@
     "\nZNorm\n\n\nRESET\n\n\n\n\n<i class='mss mss-Unicode-Escape-3'></i>",
     {
       "fa": [
-        2,
+        0,
         1,
-        2,
         0,
         0,
         0,
         0,
-        1,
+        0,
+        2,
         9,
         6
       ]
     },
-    "\nZIn\n\n\n\n\n\n\n\n<i class='kb kb-logo-windows-8'></i>",
+    "\nZIn\n\n\nc.a.del\n\n\n\n\n<i class='kb kb-logo-windows-8'></i>",
     {
       "fa": [
-        2,
+        0,
         1,
-        2,
         0,
         0,
         0,
         0,
-        1,
+        0,
+        2,
         9,
         9
       ]
diff --git a/keyboards/planck/keymaps/espynn/readme.md b/keyboards/planck/keymaps/espynn/readme.md
index 8882f4601..ea84cf955 100644
--- a/keyboards/planck/keymaps/espynn/readme.md
+++ b/keyboards/planck/keymaps/espynn/readme.md
@@ -3,7 +3,7 @@ Created by James Folkert: https://twitter.com/trekloFsemaJ
 Added several custom functions to the keymap from the "ab" map. Special thanks to "mollat" for demonstration of macros in their keymap.c
  
 
-![Layout](keyboard-layout.png "Practical Keymap")
+![Layout](keyboard-layout.jpg "Practical Keymap")
 
 
 * Online keyboard layout editor: http://www.keyboard-layout-editor.com/
@@ -14,5 +14,11 @@ Added several custom functions to the keymap from the "ab" map. Special thanks t
 * I disregarded the advice of Jack and used macros for passwords. I accept my fate. These have been abstracted to macros 2, 3, and 4
 * add your mobile and email to the keymap before make
 * RAISE and LOWER also acts as PgUp and PgDn when tapped.
-* [CapsLock] also acts as [Ctrl] key when you press and hold. It is convenient for GNU Emacs users. (not sure if this works)
-* Bracket/ paran/ brace keys are placed in the center of the keyboard for programmer's convenience.
\ No newline at end of file
+* Bracket/ paran/ brace keys are placed in the center of the keyboard for programmer's convenience.
+
+## changes
+* Removed some unneeded keys from raise and lower layers
+* moved the + and = signs, backspace is now more intuitive
+* moved all the Function keys to CUSTOM layer
+* added ctrl alt del to CUSTOM layer
+* simplified the layout picture greatly
\ No newline at end of file