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

4 files changed, 149 insertions, 0 deletions

diff --git a/keyboards/v60_type_r/keymaps/ifohancroft/config.h b/keyboards/v60_type_r/keymaps/ifohancroft/config.h
new file mode 100644
index 0000000000..3d26fae031
--- /dev/null
+++ b/keyboards/v60_type_r/keymaps/ifohancroft/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2021 IFo Hancroft
+ *
+ * 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
+
+// place overrides here
+#ifdef V60_POLESTAR
+#undef V60_POLESTAR
+#endif
+#define USB_POLLING_INTERVAL_MS 1
+#define FORCE_NKRO
diff --git a/keyboards/v60_type_r/keymaps/ifohancroft/keymap.c b/keyboards/v60_type_r/keymaps/ifohancroft/keymap.c
new file mode 100644
index 0000000000..c5ed0d7ed9
--- /dev/null
+++ b/keyboards/v60_type_r/keymaps/ifohancroft/keymap.c
@@ -0,0 +1,105 @@
+/* Copyright 2021 IFo Hancroft
+  *
+  * 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
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Default Layer
+    * ------------------------------------------------------------------------------------------------------------------------------
+    * | `     || 1     || 2     || 3     || 4     || 5     || 6     || 7     || 8     || 9     || 0     || -     || =     || Bkspc |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * | Tab   || Q     || W     || E     || R     || T     || Y     || U     || I     || O     || P     || [     || ]     || \     |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * | ESC   || A     || S     || D     || F     || G     || H     || J     || K     || L     || ;     || "     ||       || Enter |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * | Shift || Z     || X     || C     || V     || B     || N     || M     || ,     || .     || /     ||       || Shift ||       |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * | Ctrl  || Super || Alt   ||       || Space ||       ||       ||       ||       || TG(1) || Alt   || Super || Ctrl  ||       |
+    * ------------------------------------------------------------------------------------------------------------------------------
+    */
+    LAYOUT_60_ansi(
+        KC_GRV,  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_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                                      TG(1),   KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+    /* Function Layer
+    * ------------------------------------------------------------------------------------------------------------------------------
+    * |       || F1    || F2    || F3    || F4    || F5    || F6    || F7    || F8    || F9    || F10   || F11   || F12   || Del   |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       || Left  || Down  || Up    || Right ||       ||       ||       ||       |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * ------------------------------------------------------------------------------------------------------------------------------
+    */
+    LAYOUT_60_ansi(
+        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_DEL,
+        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_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   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, KC_TRNS,          KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    /* Empty Layer
+    * ------------------------------------------------------------------------------------------------------------------------------
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * ------------------------------------------------------------------------------------------------------------------------------
+    */
+    LAYOUT_60_ansi(
+        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, 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, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    /* Empty Layer
+    * ------------------------------------------------------------------------------------------------------------------------------
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * |----------------------------------------------------------------------------------------------------------------------------|
+    * |       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       ||       |
+    * ------------------------------------------------------------------------------------------------------------------------------
+    */
+    LAYOUT_60_ansi(
+        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, 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, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/v60_type_r/keymaps/ifohancroft/readme.md b/keyboards/v60_type_r/keymaps/ifohancroft/readme.md
new file mode 100644
index 0000000000..b2d2249081
--- /dev/null
+++ b/keyboards/v60_type_r/keymaps/ifohancroft/readme.md
@@ -0,0 +1,13 @@
+![IFo Hancroft KBParadise V60 Type R Layout Image](https://i.imgur.com/3BGQS75.png)
+
+# IFo Hancroft's KBParadise V60 Type R Layout
+
+ - Layer 1: A standard ANSI QWERTY layer.
+ - Layer 2: A function layer. It contains the F1-12 keys, the arrow keys and the Del key.
+ - Layer 3: An empty layer in-case I need something on-the-fly so I can remap with VIA.
+ - Layer 4: An empty layer in-case I need something on-the-fly so I can remap with VIA.
+
+This keymap also sets the polling rate of the keyboard to 1ms, disables the MOUSEKEY, EXTRAKEY, BACKLIGHT, RGBLIGHT and RGBLIGHT_CUSTOM_DRIVER features, and enables the following features:
+
+ - NKRO (forced on)
+ - VIA
diff --git a/keyboards/v60_type_r/keymaps/ifohancroft/rules.mk b/keyboards/v60_type_r/keymaps/ifohancroft/rules.mk
new file mode 100644
index 0000000000..b7d5bb5198
--- /dev/null
+++ b/keyboards/v60_type_r/keymaps/ifohancroft/rules.mk
@@ -0,0 +1,7 @@
+MOUSEKEY_ENABLE = no
+EXTRAKEY_ENABLE = no
+BACKLIGHT_ENABLE = no
+RGBLIGHT_ENABLE = no
+RGBLIGHT_CUSTOM_DRIVER = no
+NKRO_ENABLE = yes
+VIA_ENABLE = yes
\ No newline at end of file