aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-06-06 12:35:26 -0400
committerGitHub <noreply@github.com>2017-06-06 12:35:26 -0400
commit5d83d320cbcf2ab59696f72a1ff83d52e4c1beac (patch)
treea73de54089c8ca4638d507cfdf2c224d0a974d31
parent05b007539154b680c205cced3b95ec067e170df0 (diff)
parentb20106d238f69c9756d99309ac70f26452053078 (diff)
downloadqmk_firmware-5d83d320cbcf2ab59696f72a1ff83d52e4c1beac.tar.gz
qmk_firmware-5d83d320cbcf2ab59696f72a1ff83d52e4c1beac.zip
Merge pull request #1366 from abperiasamy/refine-layout
Replace enter with quote and few reorgs
-rw-r--r--keyboards/planck/keymaps/ab/keyboard-layout.json32
-rw-r--r--keyboards/planck/keymaps/ab/keyboard-layout.pngbin26518 -> 27168 bytes
-rw-r--r--keyboards/planck/keymaps/ab/keymap.c10
-rw-r--r--keyboards/planck/keymaps/ab/readme.md2
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 4e631a348..29ca73fb6 100644
--- a/keyboards/planck/keymaps/ab/keyboard-layout.json
+++ b/keyboards/planck/keymaps/ab/keyboard-layout.json
@@ -57,12 +57,12 @@
57 { 57 {
58 "f": 3 58 "f": 3
59 }, 59 },
60 "\n{\n\n\n\n\n\n\n\nH", 60 "\\\n\n\n\n\n\n\n\n\nH",
61 { 61 {
62 "c": "#c4bcbc", 62 "c": "#c4bcbc",
63 "f": 3 63 "f": 3
64 }, 64 },
65 "\n}\n\n\n\n\n\n\n\nJ", 65 "|\n\n\n\n\n\n\n\n\nJ",
66 { 66 {
67 "c": "#cccccc", 67 "c": "#cccccc",
68 "a": 7, 68 "a": 7,
@@ -79,13 +79,13 @@
79 }, 79 },
80 ";\n\n:", 80 ";\n\n:",
81 { 81 {
82 "a": 7,
83 "f": 3 82 "f": 3
84 }, 83 },
85 "Enter" 84 "'\n\n\""
86 ], 85 ],
87 [ 86 [
88 { 87 {
88 "a": 7,
89 "f": 3 89 "f": 3
90 }, 90 },
91 "Shift", 91 "Shift",
@@ -104,6 +104,22 @@
104 { 104 {
105 "a": 4, 105 "a": 4,
106 "fa": [ 106 "fa": [
107 2,
108 2,
109 0,
110 2,
111 0,
112 0,
113 0,
114 0,
115 0,
116 2
117 ]
118 },
119 "\n[\n\n\n\n\n\n\n\nV",
120 "\n]\n\n\n\n\n\n\n\nB",
121 {
122 "fa": [
107 0, 123 0,
108 2, 124 2,
109 0, 125 0,
@@ -116,10 +132,8 @@
116 2 132 2
117 ] 133 ]
118 }, 134 },
119 "\\\n[\n\n\n\n\n\n\n\nV", 135 "`\n{\n\n\n\n\n\n\n\nN",
120 "|\n]\n\n\n\n\n\n\n\nB", 136 "~\n}\n\n\n\n\n\n\n\nM",
121 "`\n'\n\n\n\n\n\n\n\nN",
122 "~\n\"\n\n\n\n\n\n\n\nM",
123 { 137 {
124 "a": 6 138 "a": 6
125 }, 139 },
@@ -129,7 +143,7 @@
129 { 143 {
130 "a": 7 144 "a": 7
131 }, 145 },
132 "Shift\n\n\n\nEnter" 146 "Shift"
133 ], 147 ],
134 [ 148 [
135 { 149 {
diff --git a/keyboards/planck/keymaps/ab/keyboard-layout.png b/keyboards/planck/keymaps/ab/keyboard-layout.png
index dcdbb726d..70e4c2bd4 100644
--- a/keyboards/planck/keymaps/ab/keyboard-layout.png
+++ b/keyboards/planck/keymaps/ab/keyboard-layout.png
Binary files differ
diff --git a/keyboards/planck/keymaps/ab/keymap.c b/keyboards/planck/keymaps/ab/keymap.c
index f3a9333e0..71512773b 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[] = {
56const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 56const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
57[_QWERTY] = { /* QWERTY */ 57[_QWERTY] = { /* QWERTY */
58 {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, 58 {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC},
59 {KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT}, 59 {KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT},
60 {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT}, 60 {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT},
61 {KC_LCTL, KC_ESC, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} 61 {KC_LCTL, KC_ESC, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT}
62}, 62},
63[_LOWER] = { /* LOWER */ 63[_LOWER] = { /* LOWER */
64 {KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL}, 64 {KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL},
65 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, 65 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
66 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_QUOT, KC_DQT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, 66 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
67 {BL, ZM_NRM, ZM_IN, ZM_OUT, KC_TRNS, KC_PGDN, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} 67 {BL, ZM_NRM, ZM_IN, ZM_OUT, KC_TRNS, KC_PGDN, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}
68}, 68},
69[_RAISE] = { /* RAISE */ 69[_RAISE] = { /* RAISE */
70 {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, 70 {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12},
71 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_LCBR, KC_BSLS, KC_TRNS}, 71 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
72 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_PIPE, KC_GRV, KC_TILD, KC_LBRC, KC_LBRC, KC_TRNS, KC_TRNS}, 72 {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_GRV, KC_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS},
73 {RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGUP, KC_TRNS, EM_UNDO, KC_VOLD, KC_VOLU, KC_MUTE} 73 {RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGUP, KC_TRNS, EM_UNDO, KC_VOLD, KC_VOLU, KC_MUTE}
74}, 74},
75[_CUSTOM] = { /* CUSTOM */ 75[_CUSTOM] = { /* CUSTOM */
diff --git a/keyboards/planck/keymaps/ab/readme.md b/keyboards/planck/keymaps/ab/readme.md
index d6280f074..94f930500 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
4![Layout](keyboard-layout.png "Practical Keymap") 4![Layout](keyboard-layout.png "Practical Keymap")
5![Photo](keyboard-photo.jpg "Planck Keyboard") 5![Photo](keyboard-photo.jpg "Planck Keyboard")
6 6
7* Online keyboard layout editor: http://goo.gl/mlLAFZ 7* Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/bda299020baaafe6a2a4a82e615e3cfc
8 8
9# Programming Instructions: 9# Programming Instructions:
10Enter into programming mode and run the following command. 10Enter into programming mode and run the following command.