Merge remote-tracking branch 'origin/master' into develop

3 files changed, 87 insertions, 0 deletions

diff --git a/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c b/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c
new file mode 100644
index 0000000000..7b10be8c01
--- /dev/null
+++ b/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c
@@ -0,0 +1,79 @@
+/* Copyright 2018 Holten Campbell
+ *
+ * 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
+
+enum primee_layers {
+  _DEFAULT,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+
+#define CTLESC MT(MOD_LCTL, KC_ESC)
+#define LWRSPC LT(_LOWER, KC_SPC)
+#define RSEENT LT(_RAISE, KC_ENT)
+#define MOADJ  MO(_ADJUST)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_DEFAULT] = LAYOUT(
+		KC_TAB,    KC_Q,      KC_W,      KC_E,      KC_R,       KC_T,             KC_Y,     KC_U,        KC_I,      KC_O,      KC_P,      KC_DEL,    KC_BSPC,
+		CTLESC,    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,             MOADJ,    KC_N,        KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSFT,
+		KC_LCTL,   KC_LGUI,                         KC_LALT,    LWRSPC,	          RSEENT,   KC_RALT,                                      KC_RCTL,   KC_RGUI
+    ),
+
+    [_LOWER] = LAYOUT(
+		KC_TRNS,   KC_EXLM,   KC_AT,     KC_HASH,   KC_DLR,     KC_PERC,          KC_CIRC,   KC_AMPR,    KC_ASTR,   KC_LPRN,   KC_RPRN,   KC_TRNS,   KC_TRNS,
+		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_LBRC,    KC_RBRC,   KC_MINS,   KC_EQL,    KC_TRNS,
+		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_TRNS,    KC_GRV,    KC_BSLS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+		KC_TRNS,   KC_TRNS,                         KC_TRNS,    KC_TRNS,	      KC_TRNS,   KC_TRNS,                                     KC_TRNS,   KC_TRNS
+    ),
+
+    [_RAISE] = LAYOUT(
+		KC_TRNS,   KC_1,      KC_2,      KC_3,      KC_4,       KC_5,             KC_6,      KC_7,       KC_8,      KC_9,      KC_0,      KC_TRNS,   KC_TRNS,
+		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_TRNS,    KC_UP,     KC_TRNS,   KC_TRNS,   KC_TRNS,
+		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_TRNS,    KC_LEFT,   KC_DOWN,   KC_RGHT,   KC_TRNS,   KC_TRNS,
+		KC_TRNS,   KC_TRNS,                         KC_TRNS,    KC_TRNS,	      KC_TRNS,   KC_TRNS,                                     KC_TRNS,   KC_TRNS
+    ),
+
+    [_ADJUST] = LAYOUT(
+		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_F12,
+		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+		RESET,     KC_TRNS,                         KC_TRNS,    KC_TRNS,	      KC_TRNS,   KC_TRNS,                                     KC_TRNS,   KC_TRNS
+    )
+};
+
+void matrix_init_user(void) {
+  // set CapsLock LED to output and low
+  setPinOutput(B1);
+  writePinLow(B1);
+  // set NumLock LED to output and low
+  setPinOutput(B2);
+  writePinLow(B2);
+  // set ScrollLock LED to output and low
+  setPinOutput(B3);
+  writePinLow(B3);
+}
+
+//function for layer indicator LED
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(B3, layer_state_cmp(state, 1));
+    writePin(B2, layer_state_cmp(state, 2));
+    writePin(B1, layer_state_cmp(state, 3));
+
+    return state;
+}
diff --git a/keyboards/primekb/prime_e/keymaps/gwillad/readme.md b/keyboards/primekb/prime_e/keymaps/gwillad/readme.md
new file mode 100644
index 0000000000..7886d3962e
--- /dev/null
+++ b/keyboards/primekb/prime_e/keymaps/gwillad/readme.md
@@ -0,0 +1,7 @@
+# Gwillad keymap for prime e 
+This is gwillad's keymap for prime e
+
+Besides using a tweaked version of my prefered layout, this also includes:
+
+* code to use the prime e leds for layers (instead of caps lock or num lock or anything else), which I thought made more sense on a 40%
+* via enabled so people can still adjust their code without having to recompile
diff --git a/keyboards/primekb/prime_e/keymaps/gwillad/rules.mk b/keyboards/primekb/prime_e/keymaps/gwillad/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/primekb/prime_e/keymaps/gwillad/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes