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

4 files changed, 93 insertions, 0 deletions

diff --git a/keyboards/nimrod/keymaps/default_center_space/config.h b/keyboards/nimrod/keymaps/default_center_space/config.h
new file mode 100644
index 0000000000..9684b5caed
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_center_space/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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/>.
+ */
+#pragma once
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 3
+#    define COMBO_TERM 150
+#endif
diff --git a/keyboards/nimrod/keymaps/default_center_space/keymap.c b/keyboards/nimrod/keymaps/default_center_space/keymap.c
new file mode 100644
index 0000000000..0ebb2bb9e7
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_center_space/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2020 cjcodell1
+ *
+ * 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 layers{
+  _BASE,
+  _NUM_SYM,
+  _NAV
+};
+
+enum combo_events {
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+};
+
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_center_space(
+  KC_Q,    KC_W,    KC_E, KC_R,  KC_T, KC_Y, KC_U,  KC_I,         KC_O,    KC_P,
+  KC_A,    KC_S,    KC_D, KC_SF, KC_G, KC_H, KC_SJ, KC_K,         KC_L,    KC_ENT,
+  KC_Z,    KC_X,    KC_C, KC_V,  KC_B, KC_N, KC_M,  KC_COMM,      KC_DOT,  KC_SLSH,
+  KC_LCTL, KC_LALT,        LT(_NAV, KC_SPC),        MO(_NUM_SYM), KC_BSPC, KC_RGUI
+  ),
+
+  [_NUM_SYM] = LAYOUT_center_space(
+  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
+  KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, KC_BSLASH,
+  KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS,  KC_TRNS
+  ),
+
+  [_NAV] = LAYOUT_center_space(
+  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_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, KC_TRNS,
+  KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS,  KC_TRNS
+  ),
+
+};
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+
+};
+#endif
diff --git a/keyboards/nimrod/keymaps/default_center_space/readme.md b/keyboards/nimrod/keymaps/default_center_space/readme.md
new file mode 100644
index 0000000000..4912b44c40
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_center_space/readme.md
@@ -0,0 +1,3 @@
+# Center Space Nimrod Layout
+
+This is the layout for a center space bottom row.
diff --git a/keyboards/nimrod/keymaps/default_center_space/rules.mk b/keyboards/nimrod/keymaps/default_center_space/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/nimrod/keymaps/default_center_space/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes