Merge remote-tracking branch 'upstream/master'

4 files changed, 29 insertions, 15 deletions

diff --git a/keyboards/planck/keymaps/ab/keyboard-layout.json b/keyboards/planck/keymaps/ab/keyboard-layout.json
index 4e631a3487..29ca73fb6f 100644
--- a/keyboards/planck/keymaps/ab/keyboard-layout.json
+++ b/keyboards/planck/keymaps/ab/keyboard-layout.json
@@ -57,12 +57,12 @@
     {
       "f": 3
     },
-    "\n{\n\n\n\n\n\n\n\nH",
+    "\\\n\n\n\n\n\n\n\n\nH",
     {
       "c": "#c4bcbc",
       "f": 3
     },
-    "\n}\n\n\n\n\n\n\n\nJ",
+    "|\n\n\n\n\n\n\n\n\nJ",
     {
       "c": "#cccccc",
       "a": 7,
@@ -79,13 +79,13 @@
     },
     ";\n\n:",
     {
-      "a": 7,
       "f": 3
     },
-    "Enter"
+    "'\n\n\""
   ],
   [
     {
+      "a": 7,
       "f": 3
     },
     "Shift",
@@ -104,6 +104,22 @@
     {
       "a": 4,
       "fa": [
+        2,
+        2,
+        0,
+        2,
+        0,
+        0,
+        0,
+        0,
+        0,
+        2
+      ]
+    },
+    "\n[\n\n\n\n\n\n\n\nV",
+    "\n]\n\n\n\n\n\n\n\nB",
+    {
+      "fa": [
         0,
         2,
         0,
@@ -116,10 +132,8 @@
         2
       ]
     },
-    "\\\n[\n\n\n\n\n\n\n\nV",
-    "|\n]\n\n\n\n\n\n\n\nB",
-    "`\n'\n\n\n\n\n\n\n\nN",
-    "~\n\"\n\n\n\n\n\n\n\nM",
+    "`\n{\n\n\n\n\n\n\n\nN",
+    "~\n}\n\n\n\n\n\n\n\nM",
     {
       "a": 6
     },
@@ -129,7 +143,7 @@
     {
       "a": 7
     },
-    "Shift\n\n\n\nEnter"
+    "Shift ↵"
   ],
   [
     {
diff --git a/keyboards/planck/keymaps/ab/keyboard-layout.png b/keyboards/planck/keymaps/ab/keyboard-layout.png
index dcdbb726df..70e4c2bd47 100644
--- a/keyboards/planck/keymaps/ab/keyboard-layout.png
+++ b/keyboards/planck/keymaps/ab/keyboard-layout.png
diff --git a/keyboards/planck/keymaps/ab/keymap.c b/keyboards/planck/keymaps/ab/keymap.c
index f3a9333e04..71512773b2 100644
--- a/keyboards/planck/keymaps/ab/keymap.c
+++ b/keyboards/planck/keymaps/ab/keymap.c
@@ -56,20 +56,20 @@ const uint16_t PROGMEM fn_actions[] = {
 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},
-    {KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT},
+    {KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},
     {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT},
     {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_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
+    {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
     {BL,      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_TRNS, KC_BSLS, KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
+    {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_GRV,  KC_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
     {RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGUP, KC_TRNS, EM_UNDO, KC_VOLD, KC_VOLU, KC_MUTE}
 },
 [_CUSTOM] = { /* CUSTOM */
diff --git a/keyboards/planck/keymaps/ab/readme.md b/keyboards/planck/keymaps/ab/readme.md
index d6280f074d..94f930500e 100644
--- a/keyboards/planck/keymaps/ab/readme.md
+++ b/keyboards/planck/keymaps/ab/readme.md
@@ -4,7 +4,7 @@ A practical keymap that emulates standard QWERTY keyboard for Planck. Once you g
 ![Layout](keyboard-layout.png "Practical Keymap")
 ![Photo](keyboard-photo.jpg "Planck Keyboard")
 
-* Online keyboard layout editor: http://goo.gl/mlLAFZ
+* Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/bda299020baaafe6a2a4a82e615e3cfc
 
 # Programming Instructions:
 Enter into programming mode and run the following command.