]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
[Keyboard] Add candybar lefty layout (#7286)
authorRob Rogers <r2d2rogers@gmail.com>
Sun, 24 Nov 2019 07:37:09 +0000 (01:37 -0600)
committerJames Young <18669334+noroadsleft@users.noreply.github.com>
Sun, 24 Nov 2019 07:37:09 +0000 (23:37 -0800)
* Add left number pad layout to candybar keyboard

* successfully builds

* Rename new layout to LAYOUT_lefty and add corresponding LAYOUT_righty as alias for LAYOUT

* merge

* Add lefty keymap

* Add lefty layout to info.json

* Added LAYOUT_righty to info.json and corrected some misplaced braces

* Update keyboards/candybar/info.json

* removed redundant sections as suggested.

keyboards/candybar/candybar.h
keyboards/candybar/info.json
keyboards/candybar/keymaps/lefty/keymap.c [new file with mode: 0644]

index 262edf3bbb4d2b3a51727aa117a6e801855b7880..b7a9ef4565e2c3c703b31492daf37441b542409a 100644 (file)
 
 #define LAYOUT( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1c, k1d, k1e, k1f, k1g, \
-    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
-    k30, k31, k32, k35, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, k1d, k1e, k1f, k1g, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
+    k30, k31, k32,           k35,      k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g \
 ) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g } \
+    { k00, k01  , k02, k03  , k04  , k05, k06  , k07, k08, k09, k0a, k0b  , k0c, k0d, k0e, k0f, k0g }  , \
+    { k10, k11  , k12, k13  , k14  , k15, k16  , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }  , \
+    { k20, KC_NO, k22, k23  , k24  , k25, k26  , k27, k28, k29, k2a, k2b  , k2c, k2d, k2e, k2f, k2g }  , \
+    { k30, k31  , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b  , k3c, k3d, k3e, k3f, k3g } \
 }
+
+#define LAYOUT_lefty( \
+    k0d, k0e, k0f, k0g, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
+    k1d, k1e, k1f, k1g, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
+    k2d, k2e, k2f, k2g, k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
+    k3d, k3e, k3f, k3g, k30, k31, k32,           k35,      k37, k38, k39, k3a, k3b, k3c \
+) { \
+    { k00, k01  , k02, k03  , k04  , k05, k06  , k07, k08, k09, k0a, k0b  , k0c, k0d, k0e, k0f, k0g }  , \
+    { k10, k11  , k12, k13  , k14  , k15, k16  , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }  , \
+    { k20, KC_NO, k22, k23  , k24  , k25, k26  , k27, k28, k29, k2a, k2b  , k2c, k2d, k2e, k2f, k2g }  , \
+    { k30, k31  , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b  , k3c, k3d, k3e, k3f, k3g } \
+}
+
+#define LAYOUT_righty LAYOUT
index 442324ece27f9af656ffca073bfa95e917d6d0c5..9cf4216aa199373e32d70e789bf95a1714326baa 100644 (file)
 {
-    "keyboard_name": "TKC Candybar", 
-    "url": "", 
-    "maintainer": "terrymathews", 
-    "width": 17, 
-    "height": 4, 
+    "keyboard_name": "TKC Candybar",
+    "url": "",
+    "maintainer": "terrymathews",
+    "width": 17,
+    "height": 4,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                               {"label":"Esc",
-                               "x":0,
-                               "y":0},
-                               {"label":"Q",
-                               "x":1,
-                               "y":0},
-                               {"label":"W",
-                               "x":2,
-                               "y":0},
-                               {"label":"E",
-                               "x":3,
-                               "y":0},
-                               {"label":"R",
-                               "x":4,
-                               "y":0},
-                               {"label":"T",
-                               "x":5,
-                               "y":0},
-                               {"label":"Y",
-                               "x":6,
-                               "y":0},
-                               {"label":"U",
-                               "x":7,
-                               "y":0},
-                               {"label":"I",
-                               "x":8,
-                               "y":0},
-                               {"label":"O",
-                               "x":9,
-                               "y":0},
-                               {"label":"P",
-                               "x":10,
-                               "y":0},
-                               {"label":"Del",
-                               "x":11,
-                               "y":0},
-                               {"label":"BkSp",
-                               "x":12,
-                               "y":0},
-                               {"label":"7",
-                               "x":13,
-                               "y":0},
-                               {"label":"8",
-                               "x":14,
-                               "y":0},
-                               {"label":"9",
-                               "x":15,
-                               "y":0},
-                               {"label":"*",
-                               "x":16,
-                               "y":0},
-                               {"label":"Tab",
-                               "x":0,
-                               "y":1,
-                               "w":1.25},
-                               {"label":"A",
-                               "x":1.25,
-                               "y":1},
-                               {"label":"S",
-                               "x":2.25,
-                               "y":1},
-                               {"label":"D",
-                               "x":3.25,
-                               "y":1},
-                               {"label":"F",
-                               "x":4.25,
-                               "y":1},
-                               {"label":"G",
-                               "x":5.25,
-                               "y":1},
-                               {"label":"H",
-                               "x":6.25,
-                               "y":1},
-                               {"label":"J",
-                               "x":7.25,
-                               "y":1},
-                               {"label":"K",
-                               "x":8.25,
-                               "y":1},
-                               {"label":"L",
-                               "x":9.25,
-                               "y":1},
-                               {"label":":",
-                               "x":10.25,
-                               "y":1},
-                               {"label":"Enter",
-                               "x":11.25,
-                               "y":1,
-                               "w":1.75},
-                               {"label":"4",
-                               "x":13,
-                               "y":1},
-                               {"label":"5",
-                               "x":14,
-                               "y":1},
-                               {"label":"6",
-                               "x":15,
-                               "y":1},
-                               {"label":"-",
-                               "x":16,
-                               "y":1},
-                               {"label":"Shift",
-                               "x":0,
-                               "y":2,
-                               "w":1.75},
-                               {"label":"Z",
-                               "x":1.75,
-                               "y":2},
-                               {"label":"X",
-                               "x":2.75,
-                               "y":2},
-                               {"label":"C",
-                               "x":3.75,
-                               "y":2},
-                               {"label":"V",
-                               "x":4.75,
-                               "y":2},
-                               {"label":"B",
-                               "x":5.75,
-                               "y":2},
-                               {"label":"N",
-                               "x":6.75,
-                               "y":2},
-                               {"label":"M",
-                               "x":7.75,
-                               "y":2},
-                               {"label":"<",
-                               "x":8.75,
-                               "y":2},
-                               {"label":">",
-                               "x":9.75,
-                               "y":2},
-                               {"label":"Shift",
-                               "x":10.75,
-                               "y":2,
-                               "w":1.25},
-                               {"label":"&uarr;",
-                               "x":12,
-                               "y":2},
-                               {"label":"1",
-                               "x":13,
-                               "y":2},
-                               {"label":"2",
-                               "x":14,
-                               "y":2},
-                               {"label":"3",
-                               "x":15,
-                               "y":2},
-                               {"label":"+",
-                               "x":16,
-                               "y":2},
-                               {"label":"Ctrl",
-                               "x":0,
-                               "y":3,
-                               "w":1.25},
-                               {"label":"GUI",
-                               "x":1.25,
-                               "y":3,
-                               "w":1.25},
-                               {"label":"Alt",
-                               "x":2.5,
-                               "y":3,
-                               "w":1.25},
-                               {"x":3.75,
-                               "y":3,
-                               "w":1.75},
-                               {"x":5.5,
-                               "y":3,
-                               "w":1},
-                               {"label":"Backspace",
-                               "x":6.5,
-                               "y":3,
-                               "w":2.25},
-                               {"label":"Menu",
-                               "x":8.75,
-                               "y":3,
-                               "w":1.25},
-                               {"label":"Fn",
-                               "x":10,
-                               "y":3},
-                               {"label":"&larr;",
-                               "x":11,
-                               "y":3},
-                               {"label":"&darr;",
-                               "x":12,
-                               "y":3},
-                               {"label":"&rarr;",
-                               "x":13,
-                               "y":3},
-                               {"label":"0",
-                               "x":14,
-                               "y":3},
-                               {"label":".",
-                               "x":15,
-                               "y":3},
-                               {"label":"Enter",
-                               "x":16,
-                               "y":3}]
+                               {"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Del", "x":11, "y":0}, {"label":"BkSp", "x":12, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"*", "x":16, "y":0},
+                               {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"-", "x":16, "y":1},
+                               {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"&uarr;", "x":12, "y":2}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"+", "x":16, "y":2},
+                               {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3, "w":1}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"&larr;", "x":11, "y":3}, {"label":"&darr;", "x":12, "y":3}, {"label":"&rarr;", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}]
+        },
+        "LAYOUT_lefty": {
+            "layout": [
+                {"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"Esc", "x":4, "y":0}, {"label":"Q", "x":5, "y":0}, {"label":"W", "x":6, "y":0}, {"label":"E", "x":7, "y":0}, {"label":"R", "x":8, "y":0}, {"label":"T", "x":9, "y":0}, {"label":"Y", "x":10, "y":0}, {"label":"U", "x":11, "y":0}, {"label":"I", "x":12, "y":0}, {"label":"O", "x":13, "y":0}, {"label":"P", "x":14, "y":0}, {"label":"{", "x":15, "y":0}, {"label":"}", "x":16, "y":0},
+                {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"Tab", "x":4, "y":1, "w":1.25}, {"label":"A", "x":5.25, "y":1}, {"label":"S", "x":6.25, "y":1}, {"label":"D", "x":7.25, "y":1}, {"label":"F", "x":8.25, "y":1}, {"label":"G", "x":9.25, "y":1}, {"label":"H", "x":10.25, "y":1}, {"label":"J", "x":11.25, "y":1}, {"label":"K", "x":12.25, "y":1}, {"label":"L", "x":13.25, "y":1}, {"label":":", "x":14.25, "y":1}, {"label":"Enter", "x":15.25, "y":1, "w":1.75},
+                {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2}, {"x":3, "y":2}, {"label":"Shift", "x":4, "y":2, "w":1.75}, {"label":"Z", "x":5.75, "y":2}, {"label":"X", "x":6.75, "y":2}, {"label":"C", "x":7.75, "y":2}, {"label":"V", "x":8.75, "y":2}, {"label":"B", "x":9.75, "y":2}, {"label":"N", "x":10.75, "y":2}, {"label":"M", "x":11.75, "y":2}, {"label":"<", "x":12.75, "y":2}, {"label":">", "x":13.75, "y":2}, {"label":"\u2191", "x":14.75, "y":2}, {"label":"Shift", "x":15.75, "y":2, "w":1.25},
+                {"label":"Fn", "x":0, "y":3}, {"label":"0", "x":1, "y":3}, {"label":".", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"Ctrl", "x":4, "y":3, "w":1.25}, {"label":"Win", "x":5.25, "y":3, "w":1.25}, {"label":"Alt", "x":6.5, "y":3, "w":1.25}, {"x":7.75, "y":3, "w":1.75}, {"x":9.5, "y":3}, {"x":10.5, "y":3, "w":2.25}, {"label":"Win", "x":12.75, "y":3, "w":1.25}, {"label":"\u2190", "x":14, "y":3}, {"label":"\u2193", "x":15, "y":3}, {"label":"\u2192", "x":16, "y":3}
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/candybar/keymaps/lefty/keymap.c b/keyboards/candybar/keymaps/lefty/keymap.c
new file mode 100644 (file)
index 0000000..34cb55b
--- /dev/null
@@ -0,0 +1,38 @@
+/* Copyright 2018 Jack Humbert
+ *
+ * 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
+
+#define _BL 0
+#define _FL 1
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[_BL] = LAYOUT_lefty(
+  KC_P7  , KC_P8, KC_P9  , KC_PAST, KC_ESC , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_O   , KC_P   , KC_DEL , KC_BSPC , \
+  KC_P4  , KC_P5, KC_P6  , KC_PMNS, KC_TAB , KC_A   , KC_S   , KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_SCLN,          KC_ENT  , \
+  KC_P1  , KC_P2, KC_P3  , KC_PPLS, KC_LSFT,          KC_Z   , KC_X, KC_C   , KC_V  , KC_B, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_UP   ,KC_RSFT , \
+  MO(_FL), KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , KC_LEFT, KC_DOWN, KC_RGHT),
+
+  /* Keymap _FL: Function Layer
+  */
+  [_FL] = LAYOUT_lefty(
+  KC_P7 , KC_P8, KC_P9  , KC_VOLU, RESET  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC , \
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
+  KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
+};